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

Fix E01X hang up when option=0

Browse Source
This commit is contained in:
Pascal Langer 2019-01-09 16:56:53 +01:00
parent 103acb8294
commit 15dfe8cead
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Multiprotocol/GD00X_nrf24l01.ino
View File

@ -43,7 +43,7 @@ static void __attribute__((unused)) GD00X_send_packet()
channel=convert_channel_ppm(CH5); // TRIM channel=convert_channel_ppm(CH5); // TRIM
packet[9 ] = channel; packet[9 ] = channel;
packet[10] = channel>>8; packet[10] = channel>>8;
packet[11] = GD00X_FLAG_DR // Force high rate packet[11] = GD00X_FLAG_DR // Force high rate
| GET_FLAG(CH6_SW, GD00X_FLAG_LIGHT); | GET_FLAG(CH6_SW, GD00X_FLAG_LIGHT);
packet[12] = 0x00; packet[12] = 0x00;
packet[13] = 0x00; packet[13] = 0x00;
@ -54,7 +54,7 @@ static void __attribute__((unused)) GD00X_send_packet()
if(IS_BIND_DONE) if(IS_BIND_DONE)
{ {
NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no++]); NRF24L01_WriteReg(NRF24L01_05_RF_CH, hopping_frequency[hopping_frequency_no++]);
hopping_frequency_no &= 3; // 4 RF channels hopping_frequency_no &= 3; // 4 RF channels
} }
NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70); NRF24L01_WriteReg(NRF24L01_07_STATUS, 0x70);

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 2 #define VERSION_MINOR 2
#define VERSION_REVISION 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 23 #define VERSION_PATCH_LEVEL 25
//****************** //******************
// Protocols // Protocols

2
Multiprotocol/NRF24l01_SPI.ino
View File

@ -618,7 +618,7 @@ void HS6200_WritePayload(uint8_t* msg, uint8_t len)
} }
NRF24L01_WritePayload(payload, pos); NRF24L01_WritePayload(payload, pos);
delayMicroseconds(option); delayMicroseconds(option+20);
NRF24L01_WritePayload(payload, pos); NRF24L01_WritePayload(payload, pos);
} }
// //

2
Multiprotocol/V911S_nrf24l01.ino
View File

@ -59,7 +59,7 @@ static void __attribute__((unused)) V911S_send_packet(uint8_t bind)
packet[ 0]=(rf_ch_num<<3)|channel; packet[ 0]=(rf_ch_num<<3)|channel;
packet[ 1]=V911S_FLAG_EXPERT; // short press on left button packet[ 1]=V911S_FLAG_EXPERT; // short press on left button
packet[ 2]=GET_FLAG(CH5_SW,V911S_FLAG_CALIB); // long press on right button packet[ 2]=GET_FLAG(CH5_SW,V911S_FLAG_CALIB); // long press on right button
memset(packet+3,0x00,14); memset(packet+3, 0x00, V911S_PACKET_SIZE - 3);
//packet[3..6]=trims TAER signed //packet[3..6]=trims TAER signed
uint16_t ch=convert_channel_16b_limit(THROTTLE ,0,0x7FF); uint16_t ch=convert_channel_16b_limit(THROTTLE ,0,0x7FF);
packet[ 7] = ch; packet[ 7] = ch;