diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/includes/Core/fsm.h | 7 | ||||
| -rw-r--r-- | src/common/src/Core/main.c | 10 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/common/includes/Core/fsm.h b/src/common/includes/Core/fsm.h index e562241..f8a800c 100644 --- a/src/common/includes/Core/fsm.h +++ b/src/common/includes/Core/fsm.h @@ -78,8 +78,11 @@ struct fsm_input_signals_t { float humidity; // relative humidity, range [0-100] % int wind_generator_ok; // false if the generator is folded out of the wind int discrim_d; // FM discriminator says RX is too low in frequency - int tone_1750; // Detect 1750Hz tone - int sstv_mode; // The 1750Hz filter is disabled, permitting SSTV usage + int button_1750; // Front panel button 1750Hz + + /* Signals coming from FAX and 1750 detector */ + int fax_mode; // 1750Hz filter disabled for machine-generated modes + int det_1750; // 1750Hz detected /* Signals coming from CW and PSK generator */ int cw_psk31_done; // The CW and PSK generator has finished transmitting the message diff --git a/src/common/src/Core/main.c b/src/common/src/Core/main.c index aaa629b..18c25b2 100644 --- a/src/common/src/Core/main.c +++ b/src/common/src/Core/main.c @@ -501,7 +501,7 @@ static void exercise_fsm(void __attribute__ ((unused))*pvParameters) fsm_input.humidity = 0; fsm_input.temp = 15; fsm_input.swr_high = 0; - fsm_input.sstv_mode = 0; + fsm_input.fax_mode = 0; fsm_input.wind_generator_ok = 1; while (1) { @@ -513,10 +513,6 @@ static void exercise_fsm(void __attribute__ ((unused))*pvParameters) last_sq = fsm_input.sq; usart_debug("In SQ %d\r\n", last_sq); } - if (last_1750 != fsm_input.tone_1750) { - last_1750 = fsm_input.tone_1750; - usart_debug("In 1750 %d\r\n", last_1750); - } if (last_qrp != fsm_input.qrp) { last_qrp = fsm_input.qrp; usart_debug("In QRP %d\r\n", last_qrp); @@ -563,6 +559,10 @@ static void exercise_fsm(void __attribute__ ((unused))*pvParameters) leds_turn_on(LED_ORANGE); } +#warning "TODO: from tone detector" + fsm_input.det_1750 = 0; + fsm_input.fax_mode = 0; + fsm_input.swr_high = swr_error_flag; fsm_input.hour_is_even = hour_is_even; |