2018.10.17.02

Added OVERLAP_LED_ACTIVE_STATE and OVERLAP_LED_INACTIVE_STATE settings
This commit is contained in:
Anthony Good 2018-10-17 23:42:12 -04:00
parent ff16cf365a
commit f299a09a0e
8 changed files with 27 additions and 9 deletions

View File

@ -379,7 +379,10 @@
Modified MechaQMC5883.cpp to get rid of compiler warning about ::read
2018.10.17.01
Added FEATURE_MIDAS_I2C_DISPLAY
Added FEATURE_MIDAS_I2C_DISPLAY
2018.10.17.02
Added OVERLAP_LED_ACTIVE_STATE and OVERLAP_LED_INACTIVE_STATE settings
All library files should be placed in directories likes \sketchbook\libraries\library1\ , \sketchbook\libraries\library2\ , etc.
@ -391,7 +394,7 @@
*/
#define CODE_VERSION "2018.10.17.01"
#define CODE_VERSION "2018.10.17.02"
#include <avr/pgmspace.h>
#include <EEPROM.h>
@ -2359,7 +2362,7 @@ void check_overlap(){
if ((overlap_led) && ((millis() - last_check_time) > 500)) {
// if ((analog_az > (500*HEADING_MULTIPLIER)) && (azimuth > (ANALOG_AZ_OVERLAP_DEGREES*HEADING_MULTIPLIER)) && (!overlap_led_status)) {
if ((raw_azimuth > (ANALOG_AZ_OVERLAP_DEGREES * HEADING_MULTIPLIER)) && (!overlap_led_status)) {
digitalWriteEnhanced(overlap_led, HIGH);
digitalWriteEnhanced(overlap_led, OVERLAP_LED_ACTIVE_STATE);
overlap_led_status = 1;
#ifdef OPTION_BLINK_OVERLAP_LED
last_overlap_led_transition = millis();
@ -2371,7 +2374,7 @@ void check_overlap(){
} else {
// if (((analog_az < (500*HEADING_MULTIPLIER)) || (azimuth < (ANALOG_AZ_OVERLAP_DEGREES*HEADING_MULTIPLIER))) && (overlap_led_status)) {
if ((raw_azimuth < (ANALOG_AZ_OVERLAP_DEGREES * HEADING_MULTIPLIER)) && (overlap_led_status)) {
digitalWriteEnhanced(overlap_led, LOW);
digitalWriteEnhanced(overlap_led, OVERLAP_LED_INACTIVE_STATE);
overlap_led_status = 0;
#ifdef DEBUG_OVERLAP
debug.println("check_overlap: overlap off");
@ -2385,10 +2388,10 @@ void check_overlap(){
#ifdef OPTION_BLINK_OVERLAP_LED
if ((overlap_led_status) && ((millis() - last_overlap_led_transition) >= OPTION_OVERLAP_LED_BLINK_MS)){
if (blink_status){
digitalWriteEnhanced(overlap_led, LOW);
digitalWriteEnhanced(overlap_led, OVERLAP_LED_INACTIVE_STATE);
blink_status = 0;
} else {
digitalWriteEnhanced(overlap_led, HIGH);
digitalWriteEnhanced(overlap_led, OVERLAP_LED_ACTIVE_STATE);
blink_status = 1;
}
last_overlap_led_transition = millis();

View File

@ -23,7 +23,7 @@
#define serial_led 0 // LED blinks when command is received on serial port (set to 0 to disable)
#define rotator_analog_az A0 // reads analog azimuth voltage from rotator - pin 4 on Yaesu connector
#define azimuth_speed_voltage 0 // optional - PWM output for speed control voltage feed into rotator (on continually unlike rotate_cw_pwm and rotate_ccw_pwm)
#define overlap_led 0 // line goes high when azimuth rotator is in overlap (> 360 rotators)
#define overlap_led 0 // line goes active when azimuth rotator is in overlap (> 360 rotators)
#define brake_az 0 // goes high to disengage azimuth brake (set to 0 to disable)
#define az_speed_pot 0 // connect to wiper of 1K to 10K potentiometer for speed control (set to 0 to disable)
#define az_preset_pot 0 // connect to wiper of 1K to 10K potentiometer for preset control (set to 0 to disable)

View File

@ -21,7 +21,7 @@
#define serial_led 13 //0 // LED blinks when command is received on serial port (set to 0 to disable)
#define rotator_analog_az A0 // reads analog azimuth voltage from rotator - pin 4 on Yaesu connector
#define azimuth_speed_voltage 0 // optional - PWM output for speed control voltage feed into rotator (on continually unlike rotate_cw_pwm and rotate_ccw_pwm)
#define overlap_led 0 // line goes high when azimuth rotator is in overlap (> 360 rotators)
#define overlap_led 0 // line goes active when azimuth rotator is in overlap (> 360 rotators)
#define brake_az 13 //0 // goes high to disengage azimuth brake (set to 0 to disable)
#define az_speed_pot 0 //A4 // connect to wiper of 1K to 10K potentiometer for speed control (set to 0 to disable)
#define az_preset_pot 0 // connect to wiper of 1K to 10K potentiometer for preset control (set to 0 to disable)

View File

@ -336,6 +336,9 @@ You can tweak these, but read the online documentation!
#define AUDIBLE_ALERT_AT_AZ_TARGET 1
#define AUDIBLE_ALERT_AT_EL_TARGET 1
#define OVERLAP_LED_ACTIVE_STATE HIGH
#define OVERLAP_LED_INACTIVE_STATE LOW
//#define SET_I2C_BUS_SPEED 800000L // Can set up to 800 kHz, depending on devices. 800000L = 800 khz, 400000L = 400 khz. Default is 100 khz

View File

@ -326,5 +326,8 @@ You can tweak these, but read the online documentation!
#define AUDIBLE_ALERT_AT_AZ_TARGET 1
#define AUDIBLE_ALERT_AT_EL_TARGET 1
#define OVERLAP_LED_ACTIVE_STATE HIGH
#define OVERLAP_LED_INACTIVE_STATE LOW
//#define SET_I2C_BUS_SPEED 800000L // Can set up to 800 kHz, depending on devices. 800000L = 800 khz, 400000L = 400 khz. Default is 100 khz

View File

@ -325,6 +325,9 @@ You can tweak these, but read the online documentation!
#define AUDIBLE_ALERT_AT_STARTUP 1
#define AUDIBLE_ALERT_AT_AZ_TARGET 1
#define AUDIBLE_ALERT_AT_EL_TARGET 1
#define OVERLAP_LED_ACTIVE_STATE HIGH
#define OVERLAP_LED_INACTIVE_STATE LOW
//#define SET_I2C_BUS_SPEED 800000L // Can set up to 800 kHz, depending on devices. 800000L = 800 khz, 400000L = 400 khz. Default is 100 khz

View File

@ -344,7 +344,10 @@ You can tweak these, but read the online documentation!
#define AUDIBLE_PIN_TONE_FREQ 1000
#define AUDIBLE_ALERT_AT_STARTUP 1
#define AUDIBLE_ALERT_AT_AZ_TARGET 1
#define AUDIBLE_ALERT_AT_EL_TARGET
#define AUDIBLE_ALERT_AT_EL_TARGET
#define OVERLAP_LED_ACTIVE_STATE HIGH
#define OVERLAP_LED_INACTIVE_STATE LOW
//#define SET_I2C_BUS_SPEED 800000L // Can set up to 800 kHz, depending on devices. 800000L = 800 khz, 400000L = 400 khz. Default is 100 khz

View File

@ -328,6 +328,9 @@ You can tweak these, but read the online documentation!
#define AUDIBLE_ALERT_AT_AZ_TARGET 1
#define AUDIBLE_ALERT_AT_EL_TARGET 1
#define OVERLAP_LED_ACTIVE_STATE HIGH
#define OVERLAP_LED_INACTIVE_STATE LOW
//#define SET_I2C_BUS_SPEED 800000L // Can set up to 800 kHz, depending on devices. 800000L = 800 khz, 400000L = 400 khz. Default is 100 khz