gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-01 10:17:53 +00:00
Code Issues Projects Releases Wiki Activity

Protocol change: make sure that main loop is aware

Browse Source
This commit is contained in:
pascallanger 2017-02-02 14:30:46 +01:00
parent 4eb2d073ac
commit 9ce23c3d61
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 1 #define VERSION_MINOR 1
#define VERSION_REVISION 6 #define VERSION_REVISION 6
#define VERSION_PATCH_LEVEL 10 #define VERSION_PATCH_LEVEL 11
//****************** //******************
// Protocols // Protocols
//****************** //******************

16
Multiprotocol/Multiprotocol.ino
View File

@ -413,7 +413,7 @@ void loop()
{ {
TX_MAIN_PAUSE_on; TX_MAIN_PAUSE_on;
tx_pause(); tx_pause();
if(IS_INPUT_SIGNAL_on) if(IS_INPUT_SIGNAL_on && remote_callback!=0)
next_callback=remote_callback(); next_callback=remote_callback();
else else
next_callback=2000; // No PPM/serial signal check again in 2ms... next_callback=2000; // No PPM/serial signal check again in 2ms...
@ -430,9 +430,11 @@ void loop()
TIMER2_BASE->SR &= ~TIMER_SR_CC1IF; //clear compare Flag TIMER2_BASE->SR &= ~TIMER_SR_CC1IF; //clear compare Flag
#endif #endif
sei(); // enable global int sei(); // enable global int
Update_All(); if(Update_All()) // Protocol changed?
if(IS_CHANGE_PROTOCOL_FLAG_on) {
break; // Protocol has been changed next_callback=0; // Launch new protocol ASAP
break;
}
#ifndef STM32_BOARD #ifndef STM32_BOARD
while((TIFR1 & OCF1A_bm) == 0); // wait 2ms... while((TIFR1 & OCF1A_bm) == 0); // wait 2ms...
#else #else
@ -456,7 +458,7 @@ void loop()
} }
} }
void Update_All() uint8_t Update_All()
{ {
#ifdef ENABLE_SERIAL #ifdef ENABLE_SERIAL
if(mode_select==MODE_SERIAL && IS_RX_FLAG_on) // Serial mode and something has been received if(mode_select==MODE_SERIAL && IS_RX_FLAG_on) // Serial mode and something has been received
@ -484,6 +486,7 @@ void Update_All()
last_signal=millis(); last_signal=millis();
} }
#endif //ENABLE_PPM #endif //ENABLE_PPM
update_channels_aux();
#ifdef ENABLE_BIND_CH #ifdef ENABLE_BIND_CH
if(IS_AUTOBIND_FLAG_on && IS_BIND_CH_PREV_off && Servo_data[BIND_CH-1]>PPM_MAX_COMMAND && Servo_data[THROTTLE]<(servo_min_100+25)) if(IS_AUTOBIND_FLAG_on && IS_BIND_CH_PREV_off && Servo_data[BIND_CH-1]>PPM_MAX_COMMAND && Servo_data[THROTTLE]<(servo_min_100+25))
{ // Autobind is on and BIND_CH went up and Throttle is low { // Autobind is on and BIND_CH went up and Throttle is low
@ -498,8 +501,8 @@ void Update_All()
LED_off; //led off during protocol init LED_off; //led off during protocol init
modules_reset(); //reset all modules modules_reset(); //reset all modules
protocol_init(); //init new protocol protocol_init(); //init new protocol
return 1;
} }
update_channels_aux();
#if defined(TELEMETRY) #if defined(TELEMETRY)
#if ( !( defined(MULTI_TELEMETRY) || defined(MULTI_STATUS) ) ) #if ( !( defined(MULTI_TELEMETRY) || defined(MULTI_STATUS) ) )
if((protocol==MODE_FRSKYD) || (protocol==MODE_BAYANG) || (protocol==MODE_HUBSAN) || (protocol==MODE_AFHDS2A) || (protocol==MODE_FRSKYX) || (protocol==MODE_DSM) ) if((protocol==MODE_FRSKYD) || (protocol==MODE_BAYANG) || (protocol==MODE_HUBSAN) || (protocol==MODE_AFHDS2A) || (protocol==MODE_FRSKYX) || (protocol==MODE_DSM) )
@ -507,6 +510,7 @@ void Update_All()
TelemetryUpdate(); TelemetryUpdate();
#endif #endif
update_led_status(); update_led_status();
return 0;
} }
// Update channels direction and Servo_AUX flags based on servo AUX positions // Update channels direction and Servo_AUX flags based on servo AUX positions