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

LOLI: adjust timing

Browse Source
This commit is contained in:
Pascal Langer 2021-01-18 15:51:35 +01:00
parent 52e8d87ab1
commit 2bcebbda45
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Multiprotocol/LOLI_nrf24l01.ino
View File

@ -84,7 +84,7 @@ static void __attribute__((unused)) LOLI_send_packet()
if(Channel_data[CH2+8] > CHANNEL_MAX_COMMAND) if(Channel_data[CH2+8] > CHANNEL_MAX_COMMAND)
P1|=LOLI_FLAG_PWM2; P1|=LOLI_FLAG_PWM2;
//ch5: SBUS //ch5: SBUS
if(Channel_data[CH7+8] > CHANNEL_SWITCH) if(Channel_data[CH5+8] > CHANNEL_SWITCH)
P1|=LOLI_FLAG_SBUS; P1|=LOLI_FLAG_SBUS;
//ch7: PWM //ch7: PWM
if(Channel_data[CH7+8] > CHANNEL_MAX_COMMAND) if(Channel_data[CH7+8] > CHANNEL_MAX_COMMAND)
@ -167,6 +167,8 @@ enum{
LOLI_SET_FAILSAFE LOLI_SET_FAILSAFE
}; };
#define LOLI_WRITE_TIME 1000
uint16_t LOLI_callback() uint16_t LOLI_callback()
{ {
switch (phase) switch (phase)
@ -270,15 +272,17 @@ uint16_t LOLI_callback()
#ifdef LOLI_HUB_TELEMETRY #ifdef LOLI_HUB_TELEMETRY
phase ++; phase ++;
return 2000; return LOLI_WRITE_TIME;
case LOLI_DATA2: case LOLI_DATA2:
// Wait for packet to be sent
while( (NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_TX_DS)) == 0);
// Switch to RX mode // Switch to RX mode
NRF24L01_SetTxRxMode(TXRX_OFF); NRF24L01_SetTxRxMode(TXRX_OFF);
NRF24L01_FlushRx(); NRF24L01_FlushRx();
NRF24L01_SetTxRxMode(RX_EN); NRF24L01_SetTxRxMode(RX_EN);
NRF24L01_WriteReg(NRF24L01_00_CONFIG, 0x3b); // 8bit CRC, RX NRF24L01_WriteReg(NRF24L01_00_CONFIG, 0x3b); // 8bit CRC, RX
phase = LOLI_DATA1; phase = LOLI_DATA1;
return 18000; return 20000 - LOLI_WRITE_TIME;
#else #else
break; break;
#endif #endif

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 2 #define VERSION_REVISION 2
#define VERSION_PATCH_LEVEL 5 #define VERSION_PATCH_LEVEL 6
//****************** //******************
// Protocols // Protocols

14
Multiprotocol/TX_Def.h
View File

@ -35,16 +35,16 @@
#endif #endif
//Channel MIN MAX values //Channel MIN MAX values
#define CHANNEL_MAX_100 1844 // 100% #define CHANNEL_MAX_100 1844 // +100%
#define CHANNEL_MIN_100 204 // 100% #define CHANNEL_MIN_100 204 // -100%
#define CHANNEL_MAX_125 2047 // 125% #define CHANNEL_MAX_125 2047 // +125%
#define CHANNEL_MIN_125 0 // 125% #define CHANNEL_MIN_125 0 // -125%
#define CHANNEL_MID 1024 #define CHANNEL_MID 1024
#define CHANNEL_MIN_COMMAND 784 // 1350us #define CHANNEL_MIN_COMMAND 409 // -75%
#define CHANNEL_SWITCH 1104 // 1550us #define CHANNEL_SWITCH 1106 // +10%
#define CHANNEL_MAX_COMMAND 1424 // 1750us #define CHANNEL_MAX_COMMAND 1639 // +75%
//Channel definitions //Channel definitions
#define CH1 0 #define CH1 0