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

added packet_in[14] to transfer HoTT device warnings to OpenTx (#627)

Browse Source
This commit is contained in:
Michael 2021-11-04 14:57:25 +01:00 committed by GitHub
parent 22590ed4f7
commit da33df4346
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Multiprotocol/HOTT_cc2500.ino
View File

@ -390,7 +390,7 @@ uint16_t HOTT_callback()
{ //Telemetry { //Telemetry
// [0..4] = TXID // [0..4] = TXID
// [5..9] = RXID // [5..9] = RXID
// [10] = 0x40 bind, 0x00 normal, 0x80 config menu // [10] = holds warnings issued by hott devices
// [11] = telmetry pages. For sensors 0x00 to 0x04, for config mennu 0x00 to 0x12. // [11] = telmetry pages. For sensors 0x00 to 0x04, for config mennu 0x00 to 0x12.
// Normal telem page 0 = 0x55, 0x32, 0x38, 0x55, 0x64, 0x32, 0xD0, 0x07, 0x00, 0x55 // Normal telem page 0 = 0x55, 0x32, 0x38, 0x55, 0x64, 0x32, 0xD0, 0x07, 0x00, 0x55
// Page 0 [12] = [21] = [15] // Page 0 [12] = [21] = [15]
@ -400,7 +400,7 @@ uint16_t HOTT_callback()
// Page 0 [16] = RX_LQI in % // Page 0 [16] = RX_LQI in %
// Page 0 [17] = RX_Voltage Min*10 in V // Page 0 [17] = RX_Voltage Min*10 in V
// Page 0 [18,19] = [19]<<8+[18]=max lost packet time in ms, max value seems 2s=0x7D0 // Page 0 [18,19] = [19]<<8+[18]=max lost packet time in ms, max value seems 2s=0x7D0
// Page 0 [20] = 0x00 ?? // Page 0 [20] = rx events
// //
// Config menu consists of the different telem pages put all together // Config menu consists of the different telem pages put all together
// Page X [12] = seems like all the telem pages with the same value are going together to make the full config menu text. Seen so far 'a', 'b', 'c', 'd' // Page X [12] = seems like all the telem pages with the same value are going together to make the full config menu text. Seen so far 'a', 'b', 'c', 'd'
@ -412,6 +412,7 @@ uint16_t HOTT_callback()
// Reduce telemetry to 14 bytes // Reduce telemetry to 14 bytes
packet_in[0]= packet_in[HOTT_RX_PACKET_LEN]; packet_in[0]= packet_in[HOTT_RX_PACKET_LEN];
packet_in[1]= TX_LQI; packet_in[1]= TX_LQI;
uint8_t hott_warnings = packet_in[10]; // save warnings from hott devices
bool send_telem=true; bool send_telem=true;
HOTT_sensor_seq++; // Increment RX sequence counter HOTT_sensor_seq++; // Increment RX sequence counter
if(packet[29] & 1) if(packet[29] & 1)
@ -464,6 +465,7 @@ uint16_t HOTT_callback()
packet_in[i-8]=packet_in[i]; packet_in[i-8]=packet_in[i];
debug(" %02X",packet_in[i]); debug(" %02X",packet_in[i]);
} }
packet_in[14] = hott_warnings; // restore saved warnings from hott devices
debugln(""); debugln("");
if(send_telem) if(send_telem)
telemetry_link=2; telemetry_link=2;

4
Multiprotocol/Telemetry.ino
View File

@ -309,8 +309,8 @@ static void multi_send_status()
#ifdef HOTT_FW_TELEMETRY #ifdef HOTT_FW_TELEMETRY
void HOTT_short_frame() void HOTT_short_frame()
{ {
multi_send_header(MULTI_TELEMETRY_HOTT, 14); multi_send_header(MULTI_TELEMETRY_HOTT, 15);
for (uint8_t i = 0; i < 14; i++) // TX RSSI and TX LQI values followed by frame number and telemetry data for (uint8_t i = 0; i < 15; i++) // TX RSSI and TX LQI values followed by frame number and telemetry data
Serial_write(packet_in[i]); Serial_write(packet_in[i]);
} }
#endif #endif