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

HoTT: add subprotocols

Browse Source
This commit is contained in:
Pascal Langer 2020-06-01 22:55:32 +02:00
parent 1f65025036
commit aeb8d67219
6 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Multiprotocol/HOTT_cc2500.ino
View File

@ -245,7 +245,10 @@ static void __attribute__((unused)) HOTT_prep_data_packet()
else else
{ {
packet[28] = 0x89+HOTT_sensor_cur; // 0x89/8A/8B/8C/8D/8E during normal packets packet[28] = 0x89+HOTT_sensor_cur; // 0x89/8A/8B/8C/8D/8E during normal packets
if(sub_protocol == HOTT_SYNC)
packet[29] = ((HOTT_sensor_seq+1)<<3) | 2; // Telemetry packet sequence packet[29] = ((HOTT_sensor_seq+1)<<3) | 2; // Telemetry packet sequence
else
packet[29] = 0x02;
//debugln("28=%02X,29=%02X",packet[28],packet[29]); //debugln("28=%02X,29=%02X",packet[28],packet[29]);
} }
} }
@ -272,7 +275,7 @@ static void __attribute__((unused)) HOTT_prep_data_packet()
uint16_t ReadHOTT() uint16_t ReadHOTT()
{ {
#ifdef HOTT_FW_TELEMETRY #ifdef HOTT_FW_TELEMETRY
static uint8_t pps_counter=0, HOTT_sensor_rx=0; static uint8_t pps_counter=0;
#endif #endif
switch(phase) switch(phase)

2
Multiprotocol/Multi.txt
View File

@ -54,7 +54,7 @@
54,Scanner 54,Scanner
55,Frsky_RX,RX,CloneTX 55,Frsky_RX,RX,CloneTX
56,AFHDS2A_RX 56,AFHDS2A_RX
57,HoTT 57,HoTT,Sync,No_Sync
58,FX816,P38 58,FX816,P38
59,Bayang_RX 59,Bayang_RX
60,Pelikan 60,Pelikan

3
Multiprotocol/Multi_Names.ino
View File

@ -134,6 +134,7 @@ const char STR_SUBTYPE_PROPEL[] = "\x04""74-Z";
const char STR_SUBTYPE_FRSKY_RX[] = "\x07""RX\0 ""CloneTX"; const char STR_SUBTYPE_FRSKY_RX[] = "\x07""RX\0 ""CloneTX";
const char STR_SUBTYPE_FRSKYL[] = "\x08""LR12\0 ""LR12 6ch"; const char STR_SUBTYPE_FRSKYL[] = "\x08""LR12\0 ""LR12 6ch";
const char STR_SUBTYPE_WFLY[] = "\x06""WFR0xS"; const char STR_SUBTYPE_WFLY[] = "\x06""WFR0xS";
const char STR_SUBTYPE_HOTT[] = "\x07""Sync\0 ""No_Sync";
enum enum
{ {
@ -267,7 +268,7 @@ const mm_protocol_definition multi_protocols[] = {
{PROTO_HONTAI, STR_HONTAI, 4, STR_SUBTYPE_HONTAI, OPTION_NONE }, {PROTO_HONTAI, STR_HONTAI, 4, STR_SUBTYPE_HONTAI, OPTION_NONE },
#endif #endif
#if defined(HOTT_CC2500_INO) #if defined(HOTT_CC2500_INO)
{PROTO_HOTT, STR_HOTT, 0, NO_SUBTYPE, OPTION_RFTUNE }, {PROTO_HOTT, STR_HOTT, 2, STR_SUBTYPE_HOTT, OPTION_RFTUNE },
#endif #endif
#if defined(HUBSAN_A7105_INO) #if defined(HUBSAN_A7105_INO)
{PROTO_HUBSAN, STR_HUBSAN, 3, STR_SUBTYPE_HUBSAN, OPTION_VIDFREQ }, {PROTO_HUBSAN, STR_HUBSAN, 3, STR_SUBTYPE_HUBSAN, OPTION_VIDFREQ },

11
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 1 #define VERSION_REVISION 1
#define VERSION_PATCH_LEVEL 5 #define VERSION_PATCH_LEVEL 6
//****************** //******************
// Protocols // Protocols
@ -358,6 +358,12 @@ enum FRSKYL
LR12_6CH = 1, LR12_6CH = 1,
}; };
enum HOTT
{
HOTT_SYNC = 0,
HOTT_NO_SYNC= 1,
};
#define NONE 0 #define NONE 0
#define P_HIGH 1 #define P_HIGH 1
#define P_LOW 0 #define P_LOW 0
@ -943,6 +949,9 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
sub_protocol==FRSKYL sub_protocol==FRSKYL
LR12 0 LR12 0
LR12_6CH 1 LR12_6CH 1
sub_protocol==HOTT
HOTT_SYNC 0
HOTT_NO_SYNC 1
Power value => 0x80 0=High/1=Low Power value => 0x80 0=High/1=Low
Stream[3] = option_protocol; Stream[3] = option_protocol;

3
Multiprotocol/_Config.h
View File

@ -630,7 +630,8 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= {
X5C1 X5C1
FQ777_951 FQ777_951
PROTO_HOTT PROTO_HOTT
NONE HOTT_SYNC
HOTT_NO_SYNC
PROTO_HUBSAN PROTO_HUBSAN
H107 H107
H301 H301

6
Protocols_Details.md
View File

@ -504,6 +504,12 @@ CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12
---|---|---|---|---|---|---|---|---|----|----|---- ---|---|---|---|---|---|---|---|---|----|----|----
CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12 CH1|CH2|CH3|CH4|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12
### Sub_protocol Sync - *0*
Recommended for best telemetry performance.
### Sub_protocol No_Sync - *1*
Compatibility mode with older receiver firmwares.
## Scanner - *54* ## Scanner - *54*
2.4GHz scanner accessible using the OpenTX 2.3 Spectrum Analyser tool. 2.4GHz scanner accessible using the OpenTX 2.3 Spectrum Analyser tool.