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

MT99XX: code cleanup

Browse Source
This commit is contained in:
Pascal Langer 2021-02-01 18:25:11 +01:00
parent 0bfe1f8e63
commit 821076ce95
3 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Multiprotocol/MT99xx_nrf24l01.ino
View File

@ -90,13 +90,6 @@ static void __attribute__((unused)) MT99XX_send_packet()
packet[0] = 0x20; packet[0] = 0x20;
switch(sub_protocol) switch(sub_protocol)
{ {
case A180:
packet_period = MT99XX_PACKET_PERIOD_A180;
default: // MT99 & H7 & A180
packet[1] = 0x14;
packet[2] = 0x03;
packet[3] = 0x25;
break;
case YZ: case YZ:
packet_period = MT99XX_PACKET_PERIOD_YZ; packet_period = MT99XX_PACKET_PERIOD_YZ;
packet[1] = 0x15; packet[1] = 0x15;
@ -114,6 +107,13 @@ static void __attribute__((unused)) MT99XX_send_packet()
packet[2] = 0x12; packet[2] = 0x12;
packet[3] = 0x17; packet[3] = 0x17;
break; break;
case A180:
packet_period = MT99XX_PACKET_PERIOD_A180;
default: // MT99 & H7 & A180
packet[1] = 0x14;
packet[2] = 0x03;
packet[3] = 0x25;
break;
} }
packet[4] = rx_tx_addr[0]; packet[4] = rx_tx_addr[0];
packet[5] = rx_tx_addr[1]; packet[5] = rx_tx_addr[1];
@ -249,24 +249,25 @@ static void __attribute__((unused)) MT99XX_initialize_txid()
{ {
rx_tx_addr[1] = rx_tx_addr[3]; // RX_Num rx_tx_addr[1] = rx_tx_addr[3]; // RX_Num
if(sub_protocol == YZ) switch(protocol)
{ {
rx_tx_addr[0] = 0x53; // test (SB id) case YZ:
rx_tx_addr[1] = 0x00; rx_tx_addr[0] = 0x53; // test (SB id)
rx_tx_addr[2] = 0x00; rx_tx_addr[1] = 0x00;
} rx_tx_addr[2] = 0x00;
else break;
if(sub_protocol == FY805) case FY805:
{
rx_tx_addr[0] = 0x81; // test (SB id) rx_tx_addr[0] = 0x81; // test (SB id)
rx_tx_addr[1] = 0x0F; rx_tx_addr[1] = 0x0F;
rx_tx_addr[2] = 0x00; rx_tx_addr[2] = 0x00;
} break;
else case LS:
if(sub_protocol == LS) rx_tx_addr[0] = 0xCC;
rx_tx_addr[0] = 0xCC; break;
else //MT99 & H7 & A180 default: //MT99 & H7 & A180
rx_tx_addr[2] = 0x00; rx_tx_addr[2] = 0x00;
}
rx_tx_addr[3] = 0xCC; rx_tx_addr[3] = 0xCC;
rx_tx_addr[4] = 0xCC; rx_tx_addr[4] = 0xCC;

2
Multiprotocol/Multi_Names.ino
View File

@ -114,7 +114,7 @@ const char STR_SUBTYPE_SLT[] = "\x06""V1_6ch""V2_8ch""Q100\0 ""Q200\0 ""M
const char STR_SUBTYPE_CX10[] = "\x07""Green\0 ""Blue\0 ""DM007\0 ""-\0 ""JC3015a""JC3015b""MK33041"; const char STR_SUBTYPE_CX10[] = "\x07""Green\0 ""Blue\0 ""DM007\0 ""-\0 ""JC3015a""JC3015b""MK33041";
const char STR_SUBTYPE_CG023[] = "\x05""Std\0 ""YD829"; const char STR_SUBTYPE_CG023[] = "\x05""Std\0 ""YD829";
const char STR_SUBTYPE_BAYANG[] = "\x07""Std\0 ""H8S3D\0 ""X16 AH\0""IRDrone""DHD D4\0""QX100\0 "; const char STR_SUBTYPE_BAYANG[] = "\x07""Std\0 ""H8S3D\0 ""X16 AH\0""IRDrone""DHD D4\0""QX100\0 ";
const char STR_SUBTYPE_MT99[] = "\x06""MT99\0 ""H7\0 ""YZ\0 ""LS\0 ""FY805""A180\0"; const char STR_SUBTYPE_MT99[] = "\x05""MT99\0""H7\0 ""YZ\0 ""LS\0 ""FY805""A180\0";
const char STR_SUBTYPE_MJXQ[] = "\x07""WLH08\0 ""X600\0 ""X800\0 ""H26D\0 ""E010\0 ""H26WH\0 ""Phoenix"; const char STR_SUBTYPE_MJXQ[] = "\x07""WLH08\0 ""X600\0 ""X800\0 ""H26D\0 ""E010\0 ""H26WH\0 ""Phoenix";
const char STR_SUBTYPE_FY326[] = "\x05""Std\0 ""FY319"; const char STR_SUBTYPE_FY326[] = "\x05""Std\0 ""FY319";
const char STR_SUBTYPE_HONTAI[] = "\x07""Std\0 ""JJRC X1""X5C1\0 ""FQ_951"; const char STR_SUBTYPE_HONTAI[] = "\x07""Std\0 ""JJRC X1""X5C1\0 ""FQ_951";

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 17 #define VERSION_PATCH_LEVEL 18
//****************** //******************
// Protocols // Protocols