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

V761 telemetry fix

Browse Source
This commit is contained in:
pascallanger 2023-10-09 16:53:17 +02:00
parent f97aa3597d
commit ecfe17915f
2 changed files with 44 additions and 34 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 3 #define VERSION_REVISION 3
#define VERSION_PATCH_LEVEL 32 #define VERSION_PATCH_LEVEL 33
#define MODE_SERIAL 0 #define MODE_SERIAL 0

76
Multiprotocol/V761_nrf24l01.ino
View File

@ -30,6 +30,7 @@ Multiprotocol is distributed in the hope that it will be useful,
#define TOPRC_PACKET_PERIOD 14120 // Timeout for callback in uSec #define TOPRC_PACKET_PERIOD 14120 // Timeout for callback in uSec
#define V761_WRITE_TIME 450 #define V761_WRITE_TIME 450
#define V761_TELEM_PACKET_PERIOD 14088 // Timeout for callback in uSec
//#define V761_TELEM_DEBUG //#define V761_TELEM_DEBUG
enum enum
@ -72,6 +73,10 @@ static void __attribute__((unused)) V761_send_packet()
} }
else else
{ {
#ifdef V761_TELEM_DEBUG
debug_time("");
debugln(" Ph:%d",hopping_frequency_no);
#endif
XN297_Hopping(hopping_frequency_no++); XN297_Hopping(hopping_frequency_no++);
if(hopping_frequency_no >= V761_RF_NUM_CHANNELS) if(hopping_frequency_no >= V761_RF_NUM_CHANNELS)
{ {
@ -228,22 +233,24 @@ uint16_t V761_callback()
return 15730; return 15730;
#ifdef V761_HUB_TELEMETRY #ifdef V761_HUB_TELEMETRY
case V761_RX_CHECK: case V761_RX_CHECK:
rx = XN297_IsRX(); // Needed for the NRF24L01 since otherwise the bit gets cleared rx = XN297_IsRX(); // Needed for the NRF24L01 since otherwise the bit gets cleared
packet_count++;
if(packet_count > 6*21) // About 1 sec with no telemetry
telemetry_lost = 1;
if(packet_telem++ >= 100)
TX_LQI = packet_telem = 0;
if(!telemetry_lost && !rx && (packet_count%22) == 0)
{// Should have received a telem packet but... Send telem to the radio to keep it alive
TX_LQI++;
RX_RSSI = 100 - TX_LQI;
telemetry_link = 1;
#ifdef V761_TELEM_DEBUG
debugln("Miss");
#endif
}
XN297_SetTxRxMode(TXRX_OFF); XN297_SetTxRxMode(TXRX_OFF);
if(packet_count > 4*63) // Around 3.5sec with no telemetry
{
telemetry_lost = 1;
packet_period = V761_PACKET_PERIOD;
}
else
{
packet_count++;
if(!telemetry_lost && !rx && (packet_count%64) == 0)
{// Should have received a telem packet but... Send telem to the radio to keep it alive
telemetry_link = 1;
#ifdef V761_TELEM_DEBUG
debugln("Miss");
#endif
}
}
phase++; phase++;
#endif #endif
case V761_DATA: case V761_DATA:
@ -252,11 +259,8 @@ uint16_t V761_callback()
#endif #endif
V761_send_packet(); V761_send_packet();
#ifdef V761_HUB_TELEMETRY #ifdef V761_HUB_TELEMETRY
if(hopping_frequency_no == 1) if(sub_protocol == V761_TOPRC)
{ // Start RX on RF channel 0 break;
phase++;
return V761_WRITE_TIME;
}
if(rx) if(rx)
{ // Check if a packet has been received { // Check if a packet has been received
#ifdef V761_TELEM_DEBUG #ifdef V761_TELEM_DEBUG
@ -268,14 +272,25 @@ uint16_t V761_callback()
debug("OK:"); debug("OK:");
for(uint8_t i=0;i<V761_RXPAYLOAD_SIZE;i++) for(uint8_t i=0;i<V761_RXPAYLOAD_SIZE;i++)
debug(" %02X",packet_in[i]); debug(" %02X",packet_in[i]);
debug(" pps:%d", packet_count);
#endif #endif
// packet_in[] = AA 00 55 -> battery ok // packet_in[] = AA 00 55 -> battery ok
// packet_in[] = 55 00 AA -> low battery // packet_in[] = 55 00 AA -> low battery
v_lipo1=packet_in[0] >> 1; crc8 = 0;
RX_RSSI = 100 - TX_LQI; for(uint8_t i=0;i<V761_RXPAYLOAD_SIZE;i++)
telemetry_link = 1; crc8 ^= packet_in[i];
telemetry_lost = 0; if(crc8 == 0xFF)
packet_count = 0; {
v_lipo1 = packet_in[0] >> 1;
telemetry_link = 1;
telemetry_lost = 0;
packet_count = 0;
packet_period = V761_TELEM_PACKET_PERIOD;
}
#ifdef V761_TELEM_DEBUG
else // Bad packet
debug(" NOK");
#endif
} }
#ifdef V761_TELEM_DEBUG #ifdef V761_TELEM_DEBUG
else // Bad packet else // Bad packet
@ -284,23 +299,17 @@ uint16_t V761_callback()
#endif #endif
rx = false; rx = false;
} }
break; phase++;
return V761_WRITE_TIME;
case V761_RX: case V761_RX:
{ // Wait for packet to be sent before switching to receive mode { // Wait for packet to be sent before switching to receive mode
uint16_t start=(uint16_t)micros(); uint16_t start=(uint16_t)micros();
while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500) while ((uint16_t)((uint16_t)micros()-(uint16_t)start) < 500)
{
if(XN297_IsPacketSent()) if(XN297_IsPacketSent())
break; break;
}
} }
XN297_SetTxRxMode(RX_EN); XN297_SetTxRxMode(RX_EN);
phase = V761_RX_CHECK; phase = V761_RX_CHECK;
if(!telemetry_lost && packet_count%20==0)
{ // Telemetry packets are sent every 21 packets but with a huge jitter from 4ms to 10+ms
hopping_frequency_no++; //don't send next packet to ensure we have enough time to receive the telemetry
return 2 * packet_period - V761_WRITE_TIME;
}
return packet_period - V761_WRITE_TIME; return packet_period - V761_WRITE_TIME;
#else #else
break; break;
@ -343,6 +352,7 @@ void V761_init(void)
#ifdef V761_HUB_TELEMETRY #ifdef V761_HUB_TELEMETRY
packet_count = 0; packet_count = 0;
telemetry_lost = 1; telemetry_lost = 1;
RX_RSSI = 100; // Dummy value
#endif #endif
} }