diff --git a/Multiprotocol/DSM_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino index 91fbfce..8984496 100644 --- a/Multiprotocol/DSM_cyrf6936.ino +++ b/Multiprotocol/DSM_cyrf6936.ino @@ -326,6 +326,7 @@ uint16_t ReadDsm() #ifdef MULTI_SYNC telemetry_set_input_sync(11000); // Always request 11ms spacing even if we don't use half of it in 22ms mode #endif + CYRF_SetPower(0x28); //Keep transmit power in sync case DSM_CH1_WRITE_B: DSM_build_data_packet(phase == DSM_CH1_WRITE_B); // build lower or upper channels case DSM_CH2_WRITE_A: @@ -364,8 +365,6 @@ uint16_t ReadDsm() phase++; // change from CH1_CHECK to CH2_WRITE return DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY; } - if (phase == DSM_CH2_CHECK_A) - CYRF_SetPower(0x28); //Keep transmit power in sync #if defined DSM_TELEMETRY phase++; // change from CH2_CHECK to CH2_READ CYRF_SetTxRxMode(RX_EN); //Receive mode diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index c92948e..c958879 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 2 -#define VERSION_PATCH_LEVEL 12 +#define VERSION_PATCH_LEVEL 13 //****************** // Protocols @@ -572,8 +572,9 @@ enum MultiPacketTypes //******************** #if defined(STM32_BOARD) && (defined (DEBUG_SERIAL) || defined (ARDUINO_MULTI_DEBUG)) uint16_t debug_time=0; - #define debug(msg, ...) {char debug_buf[64]; sprintf(debug_buf, msg, ##__VA_ARGS__); Serial.write(debug_buf);} - #define debugln(msg, ...) {char debug_buf[64]; sprintf(debug_buf, msg "\r\n", ##__VA_ARGS__); Serial.write(debug_buf);} + char debug_buf[64]; + #define debug(msg, ...) { sprintf(debug_buf, msg, ##__VA_ARGS__); Serial.write(debug_buf);} + #define debugln(msg, ...) { sprintf(debug_buf, msg "\r\n", ##__VA_ARGS__); Serial.write(debug_buf);} #define debug_time(msg) { uint16_t debug_time_TCNT1=TCNT1; debug_time=debug_time_TCNT1-debug_time; debug(msg "%u", debug_time>>1); debug_time=debug_time_TCNT1; } #define debugln_time(msg) { uint16_t debug_time_TCNT1=TCNT1; debug_time=debug_time_TCNT1-debug_time; debug(msg "%u\r\n", debug_time>>1); debug_time=debug_time_TCNT1; } #else diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 52ef460..c104aa4 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -292,7 +292,7 @@ void setup() currMillis = millis(); } - delay(50); // Brief delay for FTDI debugging + delay(250); // Brief delay for FTDI debugging debugln("Multiprotocol version: %d.%d.%d.%d", VERSION_MAJOR, VERSION_MINOR, VERSION_REVISION, VERSION_PATCH_LEVEL); #endif