From b7097bdfb79fa72a44f33e7431b506a28e0a6fe4 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Mon, 27 Nov 2023 15:56:50 +0100 Subject: [PATCH] LOSI --- Multiprotocol/Losi_cyrf6936.ino | 60 ++++++++++++++++++++++----------- Multiprotocol/Multiprotocol.h | 2 +- 2 files changed, 42 insertions(+), 20 deletions(-) diff --git a/Multiprotocol/Losi_cyrf6936.ino b/Multiprotocol/Losi_cyrf6936.ino index a7414fa..29b8026 100644 --- a/Multiprotocol/Losi_cyrf6936.ino +++ b/Multiprotocol/Losi_cyrf6936.ino @@ -20,23 +20,21 @@ #define LOSI_FORCE_ID //const uint8_t PROGMEM LOSI_bind_sop_code[] = {0x62, 0xdf, 0xc1, 0x49, 0xdf, 0xb1, 0xc0, 0x49}; +const uint8_t LOSI_bind_data_code[16] = { 0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86, 0xC9, 0x2C, 0x06, 0x93, 0x86, 0xB9, 0x9E, 0xD7 } ; + const uint8_t LOSI_data_code[][16] = { - { 0xD7, 0xA1, 0x54, 0xB1, 0x5E, 0x89, 0xAE, 0x86, 0xC9, 0x2C, 0x06, 0x93, 0x86, 0xB9, 0x9E, 0xD7 }, //bind -/* { 0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93, 0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C }, - { 0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C, 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA }, - { 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA, 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC }, - { 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC, 0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84 }, - { 0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84, 0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7 }, - { 0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7, 0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0 }, - { 0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0, 0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1 },*/ - { 0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1, 0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8 } //normal + { 0xF1, 0x94, 0x30, 0x21, 0xA1, 0x1C, 0x88, 0xA9, 0xD0, 0xD2, 0x8E, 0xBC, 0x82, 0x2F, 0xE3, 0xB4 }, + { 0x17, 0xFF, 0x9E, 0x21, 0x36, 0x90, 0xC7, 0x82, 0xBC, 0x5D, 0x9A, 0x5B, 0xEE, 0x7F, 0x42, 0xEB }, + { 0x4C, 0x97, 0x9D, 0xBF, 0xB8, 0x3D, 0xB5, 0xBE, 0x0C, 0x5D, 0x24, 0x30, 0x9F, 0xCA, 0x6D, 0xBD }, + { 0x7D, 0x2D, 0x49, 0x54, 0xD0, 0x80, 0x40, 0xC1, 0xB6, 0xF2, 0xE6, 0x1B, 0x80, 0x5A, 0x36, 0xB4 }, + { 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA, 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC } }; static uint16_t __attribute__((unused)) LOSI_check(uint16_t val) { const uint8_t PROGMEM tab[] = { 0xF1, 0xDA, 0xB6, 0xC8 }; uint8_t res = 0x0B, tmp; - uint16_t calc = val>>2; // don't care about the 2 first bits + uint16_t calc = val>>2; // don't care about the 2 first bits for(uint8_t i=0; i<5; i++) { tmp=pgm_read_byte_near(&tab[i&0x03]); @@ -56,8 +54,11 @@ static void __attribute__((unused)) LOSI_send_packet() if(IS_BIND_IN_PROGRESS) { memcpy(&packet[4], rx_tx_addr, 4); - packet[8] = 0x05; // CRC? - packet[9] = 0x52; // CRC? + crc = 0x170; + for(uint8_t i=0; i < 8; i++) + crc += packet[i]; + packet[8] = crc >> 8; + packet[9] = crc; } else { @@ -88,7 +89,7 @@ static void __attribute__((unused)) LOSI_cyrf_init() CYRF_WriteRegister(CYRF_1B_TX_OFFSET_LSB, 0x55); CYRF_WriteRegister(CYRF_1C_TX_OFFSET_MSB, 0x05); //CYRF_WriteRegister(CYRF_0F_XACT_CFG, 0x24); - CYRF_SetPower(0x38); + CYRF_SetPower(0x38); // 64 SDR mode CYRF_WriteRegister(CYRF_12_DATA64_THOLD, 0x0A); CYRF_WriteRegister(CYRF_39_ANALOG_CTRL, 0x01); CYRF_WritePreamble(0x333304); @@ -97,7 +98,7 @@ static void __attribute__((unused)) LOSI_cyrf_init() CYRF_WriteRegister(CYRF_1F_TX_OVERRIDE, 0x04); // No CRC //CYRF_WriteRegister(CYRF_1E_RX_OVERRIDE, 0x14); //CYRF_WriteRegister(CYRF_14_EOP_CTRL, 0x02); - CYRF_ConfigDataCode(LOSI_data_code[0], 16); // Load bind data code + CYRF_ConfigDataCode(LOSI_bind_data_code[0], 16); // Load bind data code by default } uint16_t LOSI_callback() @@ -111,7 +112,7 @@ uint16_t LOSI_callback() if(bind_counter==0) { BIND_DONE; - CYRF_ConfigDataCode(LOSI_data_code[1], 16); // Load normal data code + CYRF_ConfigDataCode(LOSI_data_code[hopping_frequency[0] % 5], 16); // Load normal data code packet_period = 19738; } } @@ -123,16 +124,37 @@ void LOSI_init() { LOSI_cyrf_init(); + CYRF_FindBestChannels(hopping_frequency, 1, 0, 0x07, 0x4F); // 75 is unknown since dump stops at 0x27, this routine resets the CRC Seed to 0 + #ifdef LOSI_FORCE_ID - rx_tx_addr[0] = 0x47; + /* rx_tx_addr[0] = 0x47; rx_tx_addr[1] = 0x52; rx_tx_addr[2] = 0xAE; rx_tx_addr[3] = 0xAA; - CYRF_ConfigRFChannel(0x27); + hopping_frequency[0] = 0x27; + /* { 0xE1, 0xD6, 0x31, 0x26, 0x5F, 0xBD, 0x40, 0x93, 0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C }, + { 0xDC, 0x68, 0x08, 0x99, 0x97, 0xAE, 0xAF, 0x8C, 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA }, + { 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA, 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC }, + { 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC, 0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84 }, + { 0x5C, 0xD5, 0x9C, 0xB8, 0x46, 0x9C, 0x7D, 0x84, 0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7 }, + { 0xF1, 0xC6, 0xFE, 0x5C, 0x9D, 0xA5, 0x4F, 0xB7, 0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0 }, + { 0x58, 0xB5, 0xB3, 0xDD, 0x0E, 0x28, 0xF1, 0xB0, 0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1 },*/ + // { 0x5F, 0x30, 0x3B, 0x56, 0x96, 0x45, 0xF4, 0xA1, 0x03, 0xBC, 0x6E, 0x8A, 0xEF, 0xBD, 0xFE, 0xF8 } //for channel 0x27 + + rx_tx_addr[0] = 0x56; + rx_tx_addr[1] = 0x52; + rx_tx_addr[2] = 0x22; + rx_tx_addr[3] = 0x8A; + /* DATA Code RF freq % 5 + { 0xF1, 0x94, 0x30, 0x21, 0xA1, 0x1C, 0x88, 0xA9, 0xD0, 0xD2, 0x8E, 0xBC, 0x82, 0x2F, 0xE3, 0xB4 }, + { 0x17, 0xFF, 0x9E, 0x21, 0x36, 0x90, 0xC7, 0x82, 0xBC, 0x5D, 0x9A, 0x5B, 0xEE, 0x7F, 0x42, 0xEB }, + { 0x4C, 0x97, 0x9D, 0xBF, 0xB8, 0x3D, 0xB5, 0xBE, 0x0C, 0x5D, 0x24, 0x30, 0x9F, 0xCA, 0x6D, 0xBD }, + { 0x7D, 0x2D, 0x49, 0x54, 0xD0, 0x80, 0x40, 0xC1, 0xB6, 0xF2, 0xE6, 0x1B, 0x80, 0x5A, 0x36, 0xB4 }, + { 0xC3, 0x0E, 0x01, 0x16, 0x0E, 0x32, 0x06, 0xBA, 0xE0, 0x83, 0x01, 0xFA, 0xAB, 0x3E, 0x8F, 0xAC } + */ #endif - CYRF_FindBestChannels(hopping_frequency, 1, 0, 0x13, 75); // 75 is unknown since dump stops at 0x27, this routine resets the CRC Seed to 0 - CYRF_ConfigRFChannel(hopping_frequency[0]); // Only odd channels integrated in CYRF code... + CYRF_ConfigRFChannel(hopping_frequency[0]); // Only odd channels are used, integrated in CYRF code... bind_counter = IS_BIND_IN_PROGRESS?300:1; packet_period = 8763; diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index c34b173..8e96fcd 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 3 -#define VERSION_PATCH_LEVEL 38 +#define VERSION_PATCH_LEVEL 39 #define MODE_SERIAL 0