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

Update DSM subprotocols naming

Browse Source
This commit is contained in:
Pascal Langer 2021-03-04 10:08:52 +01:00
parent 4dacac29c6
commit f8f7769d9c
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Multiprotocol/DSM_cyrf6936.ino
View File

@ -88,17 +88,17 @@ static void __attribute__((unused)) DSM_build_bind_packet()
else else
packet[11] = num_ch; packet[11] = num_ch;
if (sub_protocol==DSM2_22) if (sub_protocol==DSM2_1F)
packet[12]=num_ch<8?0x01:0x02; // DSM2/1024 1 or 2 packets depending on the number of channels packet[12]=num_ch<8?0x01:0x02; // DSM2/1024 1 or 2 packets depending on the number of channels
else if(sub_protocol==DSM2_11) else if(sub_protocol==DSM2_2F)
packet[12]=0x12; // DSM2/2048 2 packets packet[12]=0x12; // DSM2/2048 2 packets
else if(sub_protocol==DSMX_22) else if(sub_protocol==DSMX_1F)
#if defined DSM_TELEMETRY #if defined DSM_TELEMETRY
packet[12] = 0xb2; // DSMX/2048 2 packets packet[12] = 0xb2; // DSMX/2048 2 packets
#else #else
packet[12] = num_ch<8? 0xa2 : 0xb2; // DSMX/2048 1 or 2 packets depending on the number of channels packet[12] = num_ch<8? 0xa2 : 0xb2; // DSMX/2048 1 or 2 packets depending on the number of channels
#endif #endif
else // DSMX_11 && DSM_AUTO else // DSMX_2F && DSM_AUTO
packet[12]=0xb2; // DSMX/2048 2 packets packet[12]=0xb2; // DSMX/2048 2 packets
packet[13] = 0x00; //??? packet[13] = 0x00; //???
@ -141,7 +141,7 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper)
if(prev_option!=option) if(prev_option!=option)
DSM_update_channels(); DSM_update_channels();
if (sub_protocol==DSMX_11 || sub_protocol==DSMX_22 ) if (sub_protocol==DSMX_2F || sub_protocol==DSMX_1F )
{//DSMX {//DSMX
packet[0] = cyrfmfg_id[2]; packet[0] = cyrfmfg_id[2];
packet[1] = cyrfmfg_id[3]; packet[1] = cyrfmfg_id[3];
@ -150,8 +150,8 @@ static void __attribute__((unused)) DSM_build_data_packet(uint8_t upper)
{//DSM2 {//DSM2
packet[0] = (0xff ^ cyrfmfg_id[2]); packet[0] = (0xff ^ cyrfmfg_id[2]);
packet[1] = (0xff ^ cyrfmfg_id[3]); packet[1] = (0xff ^ cyrfmfg_id[3]);
if(sub_protocol==DSM2_22) if(sub_protocol==DSM2_1F)
bits=10; // Only DSM2_22 is using a resolution of 1024 bits=10; // Only DSM2_1F is using a resolution of 1024
} }
#ifdef DSM_THROTTLE_KILL_CH #ifdef DSM_THROTTLE_KILL_CH
@ -320,7 +320,7 @@ uint16_t DSM_callback()
CYRF_SetTxRxMode(TX_EN); CYRF_SetTxRxMode(TX_EN);
hopping_frequency_no = 0; hopping_frequency_no = 0;
phase = DSM_CH1_WRITE_A; // in fact phase++ phase = DSM_CH1_WRITE_A; // in fact phase++
DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_11||sub_protocol==DSMX_22); DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_2F||sub_protocol==DSMX_1F);
return 10000; return 10000;
case DSM_CH1_WRITE_A: case DSM_CH1_WRITE_A:
#ifdef MULTI_SYNC #ifdef MULTI_SYNC
@ -361,7 +361,7 @@ uint16_t DSM_callback()
CYRF_SetTxRxMode(TX_EN); CYRF_SetTxRxMode(TX_EN);
} }
#endif #endif
DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_11 || sub_protocol==DSMX_22); DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_2F || sub_protocol==DSMX_1F);
phase++; // change from CH1_CHECK to CH2_WRITE phase++; // change from CH1_CHECK to CH2_WRITE
return DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY; return DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY;
} }
@ -400,7 +400,7 @@ uint16_t DSM_callback()
telemetry_link=1; telemetry_link=1;
} }
CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20); // Abort RX operation CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20); // Abort RX operation
if (phase == DSM_CH2_READ_A && (sub_protocol==DSM2_22 || sub_protocol==DSMX_22) && num_ch < 8) // 22ms mode if (phase == DSM_CH2_READ_A && (sub_protocol==DSM2_1F || sub_protocol==DSMX_1F) && num_ch < 8) // 22ms mode
{ {
CYRF_SetTxRxMode(RX_EN); // Force end state read CYRF_SetTxRxMode(RX_EN); // Force end state read
CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00); // Clear abort RX operation CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00); // Clear abort RX operation
@ -418,14 +418,14 @@ uint16_t DSM_callback()
phase = DSM_CH1_WRITE_A; //Transmit lower phase = DSM_CH1_WRITE_A; //Transmit lower
CYRF_SetTxRxMode(TX_EN); //TX mode CYRF_SetTxRxMode(TX_EN); //TX mode
CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00); //Clear abort RX operation CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x00); //Clear abort RX operation
DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_11||sub_protocol==DSMX_22); DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_2F||sub_protocol==DSMX_1F);
return DSM_READ_DELAY; return DSM_READ_DELAY;
#else #else
// No telemetry // No telemetry
DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_11||sub_protocol==DSMX_22); DSM_set_sop_data_crc(phase==DSM_CH1_CHECK_A||phase==DSM_CH1_CHECK_B, sub_protocol==DSMX_2F||sub_protocol==DSMX_1F);
if (phase == DSM_CH2_CHECK_A) if (phase == DSM_CH2_CHECK_A)
{ {
if(num_ch > 7 || sub_protocol==DSM2_11 || sub_protocol==DSMX_11) if(num_ch > 7 || sub_protocol==DSM2_2F || sub_protocol==DSMX_2F)
phase = DSM_CH1_WRITE_B; //11ms mode or upper to transmit change from CH2_CHECK_A to CH1_WRITE_A phase = DSM_CH1_WRITE_B; //11ms mode or upper to transmit change from CH2_CHECK_A to CH1_WRITE_A
else else
{ //Normal mode 22ms { //Normal mode 22ms
@ -465,7 +465,7 @@ void DSM_init()
//Calc CRC seed //Calc CRC seed
seed = (cyrfmfg_id[0] << 8) + cyrfmfg_id[1]; seed = (cyrfmfg_id[0] << 8) + cyrfmfg_id[1];
//Hopping frequencies //Hopping frequencies
if (sub_protocol == DSMX_11 || sub_protocol == DSMX_22) if (sub_protocol == DSMX_2F || sub_protocol == DSMX_1F)
DSM_calc_dsmx_channel(); DSM_calc_dsmx_channel();
else else
{ {

16
Multiprotocol/Multiprotocol.h
View File

@ -151,10 +151,10 @@ enum Hisky
}; };
enum DSM enum DSM
{ {
DSM2_22 = 0, DSM2_1F = 0,
DSM2_11 = 1, DSM2_2F = 1,
DSMX_22 = 2, DSMX_1F = 2,
DSMX_11 = 3, DSMX_2F = 3,
DSM_AUTO = 4, DSM_AUTO = 4,
}; };
enum YD717 enum YD717
@ -911,10 +911,10 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
Hisky 0 Hisky 0
HK310 1 HK310 1
sub_protocol==DSM sub_protocol==DSM
DSM2_22 0 DSM2_1F 0
DSM2_11 1 DSM2_2F 1
DSMX_22 2 DSMX_1F 2
DSMX_11 3 DSMX_2F 3
DSM_AUTO 4 DSM_AUTO 4
sub_protocol==YD717 sub_protocol==YD717
YD717 0 YD717 0

24
Multiprotocol/_Config.h
View File

@ -442,14 +442,14 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= {
#if NBR_BANKS > 1 #if NBR_BANKS > 1
//****************************** BANK 2 ****************************** //****************************** BANK 2 ******************************
// Switch Protocol Sub protocol RX_Num Power Auto Bind Option Chan Order // Switch Protocol Sub protocol RX_Num Power Auto Bind Option Chan Order
/* 1 */ {PROTO_DSM , DSM2_11 , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, // option=number of channels /* 1 */ {PROTO_DSM , DSM2_2F , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, // option=number of channels
/* 2 */ {PROTO_DSM , DSM2_22 , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, // option=number of channels /* 2 */ {PROTO_DSM , DSM2_1F , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, // option=number of channels
/* 3 */ {PROTO_DSM , DSMX_11 , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, // option=number of channels /* 3 */ {PROTO_DSM , DSMX_2F , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, // option=number of channels
/* 4 */ {PROTO_DSM , DSMX_22 , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, // option=number of channels /* 4 */ {PROTO_DSM , DSMX_1F , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, // option=number of channels
/* 5 */ {PROTO_DSM , DSM2_11 , 0 , P_HIGH , NO_AUTOBIND , 8 , 0x00000000 }, // option=number of channels /* 5 */ {PROTO_DSM , DSM2_2F , 0 , P_HIGH , NO_AUTOBIND , 8 , 0x00000000 }, // option=number of channels
/* 6 */ {PROTO_DSM , DSM2_22 , 0 , P_HIGH , NO_AUTOBIND , 8 , 0x00000000 }, // option=number of channels /* 6 */ {PROTO_DSM , DSM2_1F , 0 , P_HIGH , NO_AUTOBIND , 8 , 0x00000000 }, // option=number of channels
/* 7 */ {PROTO_DSM , DSMX_11 , 0 , P_HIGH , NO_AUTOBIND , 8 , 0x00000000 }, // option=number of channels /* 7 */ {PROTO_DSM , DSMX_2F , 0 , P_HIGH , NO_AUTOBIND , 8 , 0x00000000 }, // option=number of channels
/* 8 */ {PROTO_DSM , DSMX_22 , 0 , P_HIGH , NO_AUTOBIND , 8 , 0x00000000 }, // option=number of channels /* 8 */ {PROTO_DSM , DSMX_1F , 0 , P_HIGH , NO_AUTOBIND , 8 , 0x00000000 }, // option=number of channels
/* 9 */ {PROTO_SLT , SLT_V1 , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 }, /* 9 */ {PROTO_SLT , SLT_V1 , 0 , P_HIGH , NO_AUTOBIND , 6 , 0x00000000 },
/* 10 */ {PROTO_HUBSAN, H107 , 0 , P_HIGH , NO_AUTOBIND , 0 , 0x00000000 }, /* 10 */ {PROTO_HUBSAN, H107 , 0 , P_HIGH , NO_AUTOBIND , 0 , 0x00000000 },
/* 11 */ {PROTO_HUBSAN, H301 , 0 , P_HIGH , NO_AUTOBIND , 0 , 0x00000000 }, /* 11 */ {PROTO_HUBSAN, H301 , 0 , P_HIGH , NO_AUTOBIND , 0 , 0x00000000 },
@ -587,10 +587,10 @@ const PPM_Parameters PPM_prot[14*NBR_BANKS]= {
PROTO_DM002 PROTO_DM002
NONE NONE
PROTO_DSM PROTO_DSM
DSM2_22 DSM2_1F
DSM2_11 DSM2_2F
DSMX_22 DSMX_1F
DSMX_11 DSMX_2F
PROTO_DSM_RX PROTO_DSM_RX
NONE NONE
PROTO_E010R5 PROTO_E010R5