Skip to content

Commit cc6be60

Browse files
author
Pascal Langer
committed
New DSM RX protocol
1 parent 4cfde0a commit cc6be60

12 files changed

Lines changed: 713 additions & 204 deletions

‎Multiprotocol/CYRF6936_SPI.ino‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ const uint8_t PROGMEM DEVO_j6pro_sopcodes[][8] = {
313313
#endif
314314
};
315315
#endif
316+
316317
static void __attribute__((unused)) CYRF_PROGMEM_ConfigSOPCode(const uint8_t *data)
317318
{
318319
uint8_t code[8];

‎Multiprotocol/DSM.ino‎

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,181 @@
1+
#if defined(DSM_CYRF6936_INO) || defined(DSM_RX_CYRF6936_INO)
2+
3+
#include "iface_cyrf6936.h"
4+
5+
uint8_t sop_col;
6+
7+
const uint8_t PROGMEM DSM_pncodes[5][9][8] = {
8+
/* Note these are in order transmitted (LSB 1st) */
9+
{ /* Row 0 */
10+
/* Col 0 */ {0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8},
11+
/* Col 1 */ {0x88, 0x17, 0x13, 0x3B, 0x2D, 0xBF, 0x06, 0xD6},
12+
/* Col 2 */ {0xF1, 0x94, 0x30, 0x21, 0xA1, 0x1C, 0x88, 0xA9},
13+
/* Col 3 */ {0xD0, 0xD2, 0x8E, 0xBC, 0x82, 0x2F, 0xE3, 0xB4},
14+
/* Col 4 */ {0x8C, 0xFA, 0x47, 0x9B, 0x83, 0xA5, 0x66, 0xD0},
15+
/* Col 5 */ {0x07, 0xBD, 0x9F, 0x26, 0xC8, 0x31, 0x0F, 0xB8},
16+
/* Col 6 */ {0xEF, 0x03, 0x95, 0x89, 0xB4, 0x71, 0x61, 0x9D},
17+
/* Col 7 */ {0x40, 0xBA, 0x97, 0xD5, 0x86, 0x4F, 0xCC, 0xD1},
18+
/* Col 8 */ {0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86}
19+
},
20+
{ /* Row 1 */
21+
/* Col 0 */ {0x83, 0xF7, 0xA8, 0x2D, 0x7A, 0x44, 0x64, 0xD3},
22+
/* Col 1 */ {0x3F, 0x2C, 0x4E, 0xAA, 0x71, 0x48, 0x7A, 0xC9},
23+
/* Col 2 */ {0x17, 0xFF, 0x9E, 0x21, 0x36, 0x90, 0xC7, 0x82},
24+
/* Col 3 */ {0xBC, 0x5D, 0x9A, 0x5B, 0xEE, 0x7F, 0x42, 0xEB},
25+
/* Col 4 */ {0x24, 0xF5, 0xDD, 0xF8, 0x7A, 0x77, 0x74, 0xE7},
26+
/* Col 5 */ {0x3D, 0x70, 0x7C, 0x94, 0xDC, 0x84, 0xAD, 0x95},
27+
/* Col 6 */ {0x1E, 0x6A, 0xF0, 0x37, 0x52, 0x7B, 0x11, 0xD4},
28+
/* Col 7 */ {0x62, 0xF5, 0x2B, 0xAA, 0xFC, 0x33, 0xBF, 0xAF},
29+
/* Col 8 */ {0x40, 0x56, 0x32, 0xD9, 0x0F, 0xD9, 0x5D, 0x97}
30+
},
31+
{ /* Row 2 */
32+
/* Col 0 */ {0x40, 0x56, 0x32, 0xD9, 0x0F, 0xD9, 0x5D, 0x97},
33+
/* Col 1 */ {0x8E, 0x4A, 0xD0, 0xA9, 0xA7, 0xFF, 0x20, 0xCA},
34+
/* Col 2 */ {0x4C, 0x97, 0x9D, 0xBF, 0xB8, 0x3D, 0xB5, 0xBE},
35+
/* Col 3 */ {0x0C, 0x5D, 0x24, 0x30, 0x9F, 0xCA, 0x6D, 0xBD},
36+
/* Col 4 */ {0x50, 0x14, 0x33, 0xDE, 0xF1, 0x78, 0x95, 0xAD},
37+
/* Col 5 */ {0x0C, 0x3C, 0xFA, 0xF9, 0xF0, 0xF2, 0x10, 0xC9},
38+
/* Col 6 */ {0xF4, 0xDA, 0x06, 0xDB, 0xBF, 0x4E, 0x6F, 0xB3},
39+
/* Col 7 */ {0x9E, 0x08, 0xD1, 0xAE, 0x59, 0x5E, 0xE8, 0xF0},
40+
/* Col 8 */ {0xC0, 0x90, 0x8F, 0xBB, 0x7C, 0x8E, 0x2B, 0x8E}
41+
},
42+
{ /* Row 3 */
43+
/* Col 0 */ {0xC0, 0x90, 0x8F, 0xBB, 0x7C, 0x8E, 0x2B, 0x8E},
44+
/* Col 1 */ {0x80, 0x69, 0x26, 0x80, 0x08, 0xF8, 0x49, 0xE7},
45+
/* Col 2 */ {0x7D, 0x2D, 0x49, 0x54, 0xD0, 0x80, 0x40, 0xC1},
46+
/* Col 3 */ {0xB6, 0xF2, 0xE6, 0x1B, 0x80, 0x5A, 0x36, 0xB4},
47+
/* Col 4 */ {0x42, 0xAE, 0x9C, 0x1C, 0xDA, 0x67, 0x05, 0xF6},
48+
/* Col 5 */ {0x9B, 0x75, 0xF7, 0xE0, 0x14, 0x8D, 0xB5, 0x80},
49+
/* Col 6 */ {0xBF, 0x54, 0x98, 0xB9, 0xB7, 0x30, 0x5A, 0x88},
50+
/* Col 7 */ {0x35, 0xD1, 0xFC, 0x97, 0x23, 0xD4, 0xC9, 0x88},
51+
/* Col 8 */ {0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93}
52+
// Wrong values used by Orange TX/RX
53+
// /* Col 8 */ {0x88, 0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40}
54+
},
55+
{ /* Row 4 */
56+
/* Col 0 */ {0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93},
57+
/* Col 1 */ {0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C},
58+
/* Col 2 */ {0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA},
59+
/* Col 3 */ {0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC},
60+
/* Col 4 */ {0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84},
61+
/* Col 5 */ {0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7},
62+
/* Col 6 */ {0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0},
63+
/* Col 7 */ {0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1},
64+
/* Col 8 */ {0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8}
65+
},
66+
};
67+
68+
static void __attribute__((unused)) DSM_read_code(uint8_t *buf, uint8_t row, uint8_t col, uint8_t len)
69+
{
70+
for(uint8_t i=0;i<len;i++)
71+
buf[i]=pgm_read_byte_near( &DSM_pncodes[row][col][i] );
72+
}
73+
74+
const uint8_t PROGMEM DSM_init_vals[][2] = {
75+
{CYRF_02_TX_CTRL, 0x00}, // All TX interrupt disabled
76+
{CYRF_05_RX_CTRL, 0x00}, // All RX interrupt disabled
77+
{CYRF_28_CLK_EN, 0x02}, // Force receive clock enable
78+
{CYRF_32_AUTO_CAL_TIME, 0x3c}, // Default init value
79+
{CYRF_35_AUTOCAL_OFFSET, 0x14}, // Default init value
80+
{CYRF_06_RX_CFG, 0x4A}, // LNA enabled, RX override enabled, Fast turn mode enabled, RX is 1MHz below TX
81+
{CYRF_1B_TX_OFFSET_LSB, 0x55}, // Default init value
82+
{CYRF_1C_TX_OFFSET_MSB, 0x05}, // Default init value
83+
{CYRF_39_ANALOG_CTRL, 0x01}, // All slow for synth setting time
84+
{CYRF_01_TX_LENGTH, 0x10}, // 16 bytes packet
85+
{CYRF_14_EOP_CTRL, 0x02}, // Set EOP Symbol Count to 2
86+
{CYRF_12_DATA64_THOLD, 0x0a}, // 64 Chip Data PN corelator threshold, default datasheet value is 0x0E
87+
//Below is for bind only
88+
{CYRF_03_TX_CFG, 0x38 | CYRF_BIND_POWER}, //64 chip codes, SDR mode
89+
{CYRF_10_FRAMING_CFG, 0x4a}, // SOP disabled, no LEN field and SOP correlator of 0x0a but since SOP is disabled...
90+
{CYRF_1F_TX_OVERRIDE, 0x04}, // Disable TX CRC, no ACK, use TX synthesizer
91+
{CYRF_1E_RX_OVERRIDE, 0x14}, // Disable RX CRC, Force receive data rate, use RX synthesizer
92+
};
93+
94+
const uint8_t PROGMEM DSM_data_vals[][2] = {
95+
{CYRF_29_RX_ABORT, 0x20}, // Abort RX operation in case we are coming from bind
96+
{CYRF_0F_XACT_CFG, 0x24}, // Force Idle
97+
{CYRF_29_RX_ABORT, 0x00}, // Clear abort RX
98+
{CYRF_03_TX_CFG, 0x28 | CYRF_HIGH_POWER}, // 64 chip codes, 8DR mode
99+
{CYRF_10_FRAMING_CFG, 0xea}, // SOP enabled, SOP_CODE_ADR 64 chips, Packet len enabled, SOP correlator 0x0A
100+
{CYRF_1F_TX_OVERRIDE, 0x00}, // CRC16 enabled, no ACK
101+
{CYRF_1E_RX_OVERRIDE, 0x00}, // CRC16 enabled, no ACK
102+
};
103+
104+
static void __attribute__((unused)) DSM_cyrf_config()
105+
{
106+
for(uint8_t i = 0; i < sizeof(DSM_init_vals) / 2; i++)
107+
CYRF_WriteRegister(pgm_read_byte_near(&DSM_init_vals[i][0]), pgm_read_byte_near(&DSM_init_vals[i][1]));
108+
CYRF_WritePreamble(0x333304);
109+
}
110+
111+
static void __attribute__((unused)) DSM_cyrf_configdata()
112+
{
113+
for(uint8_t i = 0; i < sizeof(DSM_data_vals) / 2; i++)
114+
CYRF_WriteRegister(pgm_read_byte_near(&DSM_data_vals[i][0]), pgm_read_byte_near(&DSM_data_vals[i][1]));
115+
}
116+
117+
static uint8_t __attribute__((unused)) DSM_get_pn_row(uint8_t channel, bool dsmx)
118+
{
119+
return (dsmx ? (channel - 2) % 5 : channel % 5);
120+
}
121+
122+
static void __attribute__((unused)) DSM_set_sop_data_crc(bool ch2, bool dsmx)
123+
{
124+
//The crc for channel '1' is NOT(mfgid[0] << 8 + mfgid[1])
125+
//The crc for channel '2' is (mfgid[0] << 8 + mfgid[1])
126+
if(ch2)
127+
CYRF_ConfigCRCSeed(seed); //CH2
128+
else
129+
CYRF_ConfigCRCSeed(~seed); //CH1
130+
131+
uint8_t pn_row = DSM_get_pn_row(hopping_frequency[hopping_frequency_no], dsmx);
132+
uint8_t code[16];
133+
DSM_read_code(code,pn_row,sop_col,8); // pn_row between 0 and 4, sop_col between 1 and 7
134+
CYRF_ConfigSOPCode(code);
135+
DSM_read_code(code,pn_row,7 - sop_col,8); // 7-sop_col between 0 and 6
136+
DSM_read_code(code+8,pn_row,7 - sop_col + 1,8); // 7-sop_col+1 between 1 and 7
137+
CYRF_ConfigDataCode(code, 16);
138+
139+
CYRF_ConfigRFChannel(hopping_frequency[hopping_frequency_no]);
140+
hopping_frequency_no++;
141+
if(dsmx)
142+
hopping_frequency_no %=23;
143+
else
144+
hopping_frequency_no %=2;
145+
}
146+
147+
static void __attribute__((unused)) DSM_calc_dsmx_channel()
148+
{
149+
uint8_t idx = 0;
150+
uint32_t id = ~(((uint32_t)cyrfmfg_id[0] << 24) | ((uint32_t)cyrfmfg_id[1] << 16) | ((uint32_t)cyrfmfg_id[2] << 8) | (cyrfmfg_id[3] << 0));
151+
uint32_t id_tmp = id;
152+
while(idx < 23)
153+
{
154+
uint8_t i;
155+
uint8_t count_3_27 = 0, count_28_51 = 0, count_52_76 = 0;
156+
id_tmp = id_tmp * 0x0019660D + 0x3C6EF35F; // Randomization
157+
uint8_t next_ch = ((id_tmp >> 8) % 0x49) + 3; // Use least-significant byte and must be larger than 3
158+
if ( (next_ch ^ cyrfmfg_id[3]) & 0x01 )
159+
continue;
160+
for (i = 0; i < idx; i++)
161+
{
162+
if(hopping_frequency[i] == next_ch)
163+
break;
164+
if(hopping_frequency[i] <= 27)
165+
count_3_27++;
166+
else
167+
if (hopping_frequency[i] <= 51)
168+
count_28_51++;
169+
else
170+
count_52_76++;
171+
}
172+
if (i != idx)
173+
continue;
174+
if ((next_ch < 28 && count_3_27 < 8)
175+
||(next_ch >= 28 && next_ch < 52 && count_28_51 < 7)
176+
||(next_ch >= 52 && count_52_76 < 8))
177+
hopping_frequency[idx++] = next_ch;
178+
}
179+
}
180+
181+
#endif

0 commit comments

Comments
 (0)