gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-05 05:48:13 +00:00
Code Issues Projects Releases Wiki Activity

Send MULTI NAMES all the time

Browse Source
This commit is contained in:
pascallanger 2019-10-15 11:19:42 +02:00
parent 822aa84fa2
commit 7a8e099a79
3 changed files with 3 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 3 #define VERSION_MINOR 3
#define VERSION_REVISION 0 #define VERSION_REVISION 0
#define VERSION_PATCH_LEVEL 16 #define VERSION_PATCH_LEVEL 17
//****************** //******************
// Protocols // Protocols

3
Multiprotocol/Multiprotocol.ino
View File

@ -236,7 +236,6 @@ uint8_t packet_in[TELEMETRY_BUFFER_SIZE];//telemetry receiving packets
}; };
extern const mm_protocol_definition multi_protocols[]; extern const mm_protocol_definition multi_protocols[];
uint8_t multi_protocols_index=0xFF; uint8_t multi_protocols_index=0xFF;
uint8_t multi_protocols_send;
#endif #endif
#endif // TELEMETRY #endif // TELEMETRY
@ -957,7 +956,6 @@ static void protocol_init()
inputRefreshRate = 7000; // Default value inputRefreshRate = 7000; // Default value
#endif #endif
#ifdef MULTI_NAMES #ifdef MULTI_NAMES
multi_protocols_send = 0;
multi_protocols_index = 0xFF; multi_protocols_index = 0xFF;
#endif #endif
tx_pause(); tx_pause();
@ -1412,7 +1410,6 @@ static void protocol_init()
if(multi_protocols[index].protocol==protocol) if(multi_protocols[index].protocol==protocol)
{ {
multi_protocols_index=index; multi_protocols_index=index;
multi_protocols_send = 0;
SEND_MULTI_STATUS_on; SEND_MULTI_STATUS_on;
#ifdef DEBUG_SERIAL #ifdef DEBUG_SERIAL
debug("Proto=%s",multi_protocols[multi_protocols_index].ProtoString); debug("Proto=%s",multi_protocols[multi_protocols_index].ProtoString);

5
Multiprotocol/Telemetry.ino
View File

@ -128,7 +128,7 @@ inline void telemetry_set_input_sync(uint16_t refreshRate)
static void multi_send_status() static void multi_send_status()
{ {
#ifdef MULTI_NAMES #ifdef MULTI_NAMES
if(multi_protocols_send && multi_protocols_index != 0xFF) if(multi_protocols_index != 0xFF)
multi_send_header(MULTI_TELEMETRY_STATUS, 25); multi_send_header(MULTI_TELEMETRY_STATUS, 25);
else else
#endif #endif
@ -188,9 +188,8 @@ static void multi_send_status()
Serial_write(RUDDER<<6|THROTTLE<<4|ELEVATOR<<2|AILERON); Serial_write(RUDDER<<6|THROTTLE<<4|ELEVATOR<<2|AILERON);
#ifdef MULTI_NAMES #ifdef MULTI_NAMES
if(multi_protocols_send && multi_protocols_index != 0xFF) if(multi_protocols_index != 0xFF)
{ {
multi_protocols_send--;
// Protocol next/prev // Protocol next/prev
if(multi_protocols[multi_protocols_index+1].protocol != 0) if(multi_protocols[multi_protocols_index+1].protocol != 0)
Serial_write(multi_protocols[multi_protocols_index+1].protocol); // next protocol number Serial_write(multi_protocols[multi_protocols_index+1].protocol); // next protocol number