Now logical switches automatic prompts

This commit is contained in:
Bertrand Songis
2014-02-21 15:18:05 +01:00
parent 5dbf2063f8
commit 095bb38c03
3 changed files with 28 additions and 12 deletions
+3 -1
View File
@@ -318,10 +318,12 @@ bool isAudioFileReferenced(uint32_t i, char * filename)
return false; return false;
} }
tmr10ms_t timeAutomaticPromptsSilence = 0;
void playModelEvent(uint8_t category, uint8_t index, uint8_t event) void playModelEvent(uint8_t category, uint8_t index, uint8_t event)
{ {
char filename[AUDIO_FILENAME_MAXLEN+1]; char filename[AUDIO_FILENAME_MAXLEN+1];
if (isAudioFileReferenced((category << 24) + (index << 16) + event, filename)) { if ((get_tmr10ms()-timeAutomaticPromptsSilence > 10) && isAudioFileReferenced((category << 24) + (index << 16) + event, filename)) {
audioQueue.playFile(filename); audioQueue.playFile(filename);
} }
} }
+10 -3
View File
@@ -305,14 +305,21 @@ void pushPrompt(uint16_t prompt, uint8_t id=0);
#define AUDIO_RESET() audioQueue.reset() #define AUDIO_RESET() audioQueue.reset()
#if defined(SDCARD) #if defined(SDCARD)
extern tmr10ms_t timeAutomaticPromptsSilence;
void playModelEvent(uint8_t category, uint8_t index, uint8_t event=0); void playModelEvent(uint8_t category, uint8_t index, uint8_t event=0);
#define PLAY_PHASE_OFF(phase) playModelEvent(PHASE_AUDIO_CATEGORY, phase, AUDIO_EVENT_OFF) #define PLAY_PHASE_OFF(phase) playModelEvent(PHASE_AUDIO_CATEGORY, phase, AUDIO_EVENT_OFF)
#define PLAY_PHASE_ON(phase) playModelEvent(PHASE_AUDIO_CATEGORY, phase, AUDIO_EVENT_ON) #define PLAY_PHASE_ON(phase) playModelEvent(PHASE_AUDIO_CATEGORY, phase, AUDIO_EVENT_ON)
#define PLAY_SWITCH_MOVED(sw) playModelEvent(SWITCH_AUDIO_CATEGORY, sw) #define PLAY_SWITCH_MOVED(sw) playModelEvent(SWITCH_AUDIO_CATEGORY, sw)
#define PLAY_LOGICAL_SWITCH_OFF(sw) playModelEvent(LOGICAL_SWITCH_AUDIO_CATEGORY, sw, AUDIO_EVENT_OFF)
#define PLAY_LOGICAL_SWITCH_ON(sw) playModelEvent(LOGICAL_SWITCH_AUDIO_CATEGORY, sw, AUDIO_EVENT_ON)
#define SKIP_AUTOMATIC_PROMPTS() timeAutomaticPromptsSilence = get_tmr10ms()
#else #else
#define PLAY_PHASE_OFF(phase) #define PLAY_PHASE_OFF(phase)
#define PLAY_PHASE_ON(phase) #define PLAY_PHASE_ON(phase)
#define PLAY_SWITCH_MOVED(sw) #define PLAY_SWITCH_MOVED(sw)
#define PLAY_LOGICAL_SWITCH_OFF(sw)
#define PLAY_LOGICAL_SWITCH_ON(sw)
#define SKIP_AUTOMATIC_PROMPTS()
#endif #endif
void referenceSystemAudioFiles(); void referenceSystemAudioFiles();
+15 -8
View File
@@ -1327,7 +1327,7 @@ uint32_t switchesPos = 0;
tmr10ms_t potsLastposStart[NUM_XPOTS]; tmr10ms_t potsLastposStart[NUM_XPOTS];
uint8_t potsPos[NUM_XPOTS]; uint8_t potsPos[NUM_XPOTS];
uint32_t check2PosSwitchPosition(EnumKeys sw, bool startup) uint32_t check2PosSwitchPosition(EnumKeys sw)
{ {
uint32_t result; uint32_t result;
uint32_t index; uint32_t index;
@@ -1339,7 +1339,7 @@ uint32_t check2PosSwitchPosition(EnumKeys sw, bool startup)
result = (1 << index); result = (1 << index);
if (!startup && !(switchesPos & result)) { if (!(switchesPos & result)) {
PLAY_SWITCH_MOVED(index); PLAY_SWITCH_MOVED(index);
} }
@@ -1375,14 +1375,14 @@ uint32_t check3PosSwitchPosition(uint8_t idx, EnumKeys sw, bool startup)
result = (switchesPos & (0x7 << (sw - SW_SA0))); result = (switchesPos & (0x7 << (sw - SW_SA0)));
} }
if (!startup && !(switchesPos & result)) { if (!(switchesPos & result)) {
PLAY_SWITCH_MOVED(index); PLAY_SWITCH_MOVED(index);
} }
return result; return result;
} }
#define CHECK_2POS(sw) newPos |= check2PosSwitchPosition(sw ## 0, startup) #define CHECK_2POS(sw) newPos |= check2PosSwitchPosition(sw ## 0)
#define CHECK_3POS(idx, sw) newPos |= check3PosSwitchPosition(idx, sw ## 0, startup) #define CHECK_3POS(idx, sw) newPos |= check3PosSwitchPosition(idx, sw ## 0, startup)
void getSwitchesPosition(bool startup) void getSwitchesPosition(bool startup)
@@ -1412,7 +1412,7 @@ void getSwitchesPosition(bool startup)
else if (startup || (tmr10ms_t)(get_tmr10ms() - potsLastposStart[i]) > DELAY_SWITCH_3POS) { else if (startup || (tmr10ms_t)(get_tmr10ms() - potsLastposStart[i]) > DELAY_SWITCH_3POS) {
potsLastposStart[i] = 0; potsLastposStart[i] = 0;
potsPos[i] = (pos << 4) | pos; potsPos[i] = (pos << 4) | pos;
if (!startup && previousStoredPos != pos) { if (previousStoredPos != pos) {
PLAY_SWITCH_MOVED(SWSRC_LAST_SWITCH+i*POTS_POS_COUNT+pos); PLAY_SWITCH_MOVED(SWSRC_LAST_SWITCH+i*POTS_POS_COUNT+pos);
} }
} }
@@ -1650,10 +1650,14 @@ bool getSwitch(int8_t swtch)
} }
#endif #endif
if (result) if (result) {
PLAY_LOGICAL_SWITCH_ON(cs_idx);
s_last_switch_value |= mask; s_last_switch_value |= mask;
else }
else {
PLAY_LOGICAL_SWITCH_OFF(cs_idx);
s_last_switch_value &= ~mask; s_last_switch_value &= ~mask;
}
} }
} }
@@ -2998,11 +3002,14 @@ void resetAll()
#if defined(FRSKY) #if defined(FRSKY)
resetTelemetry(); resetTelemetry();
#endif #endif
for (uint8_t i=0; i<NUM_CSW; i++) for (uint8_t i=0; i<NUM_CSW; i++) {
csLastValue[i] = CS_LAST_VALUE_INIT; csLastValue[i] = CS_LAST_VALUE_INIT;
}
s_last_switch_value = 0; s_last_switch_value = 0;
SKIP_AUTOMATIC_PROMPTS();
RESET_THR_TRACE(); RESET_THR_TRACE();
} }