From d3c967c6cda8a7f10245bf796e947d04acc7a4b3 Mon Sep 17 00:00:00 2001 From: "bsongis@gmail.com" Date: Tue, 26 Mar 2013 21:36:18 +0000 Subject: [PATCH] [Taranis] Send failsafe straight away when model changed --- src/eeprom_raw.cpp | 4 +++- src/eeprom_rlc.cpp | 2 ++ src/pulses_arm.h | 1 + src/pulses_avr.h | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/eeprom_raw.cpp b/src/eeprom_raw.cpp index 5ae53dfb8..28b90d921 100644 --- a/src/eeprom_raw.cpp +++ b/src/eeprom_raw.cpp @@ -410,11 +410,13 @@ void eeLoadModel(uint8_t id) frskySendAlarms(); #endif -#if defined(SDCARD) +#if defined(CPUARM) && defined(SDCARD) refreshModelAudioFiles(); #endif LOAD_MODEL_BITMAP(); + + SEND_FAILSAFE_1S(); } } diff --git a/src/eeprom_rlc.cpp b/src/eeprom_rlc.cpp index 220560b42..f8b724894 100644 --- a/src/eeprom_rlc.cpp +++ b/src/eeprom_rlc.cpp @@ -914,6 +914,8 @@ void eeLoadModel(uint8_t id) #endif LOAD_MODEL_BITMAP(); + + SEND_FAILSAFE_1S(); } } diff --git a/src/pulses_arm.h b/src/pulses_arm.h index bcd1027e5..4ab57cb0b 100644 --- a/src/pulses_arm.h +++ b/src/pulses_arm.h @@ -47,5 +47,6 @@ inline void pausePulses() { s_pulses_paused = true; } inline void resumePulses() { s_pulses_paused = false; } #define SEND_FAILSAFE_NOW() failsafeCounter = 1 +#define SEND_FAILSAFE_1S() failsafeCounter = 100 #endif diff --git a/src/pulses_avr.h b/src/pulses_avr.h index f6d28b909..a9f8d136e 100644 --- a/src/pulses_avr.h +++ b/src/pulses_avr.h @@ -55,5 +55,8 @@ void setupPulses(); void DSM2_Init(); void DSM2_Done(); +#define SEND_FAILSAFE_NOW() +#define SEND_FAILSAFE_1S() + #endif /*eof*/