From 7157d3d906c4694892288fbad5055b9f2fbe850b Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Mon, 3 May 2021 16:57:08 +0200 Subject: [PATCH] Losi: optimization --- Multiprotocol/Losi_cyrf6936.ino | 25 ++++++++++++------------- Protocols_Details.md | 3 +++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Multiprotocol/Losi_cyrf6936.ino b/Multiprotocol/Losi_cyrf6936.ino index fc17b60..e504ff4 100644 --- a/Multiprotocol/Losi_cyrf6936.ino +++ b/Multiprotocol/Losi_cyrf6936.ino @@ -22,21 +22,21 @@ const uint8_t PROGMEM LOSI_bind_sop_code[] = {0x62, 0xdf, 0xc1, 0x49, 0xdf, 0xb1, 0xc0, 0x49}; 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 }, +/* { 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 } + { 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 }; 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 +56,8 @@ 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? + packet[8] = 0x05; // CRC? + packet[9] = 0x52; // CRC? } else { @@ -94,7 +94,7 @@ static void __attribute__((unused)) LOSI_cyrf_init() CYRF_WritePreamble(0x333304); //CYRF_WriteRegister(CYRF_27_CLK_OVERRIDE, 0x00); CYRF_WriteRegister(CYRF_10_FRAMING_CFG, 0x4A); - CYRF_WriteRegister(CYRF_1F_TX_OVERRIDE, 0x04); // No CRC + CYRF_WriteRegister(CYRF_1F_TX_OVERRIDE, 0x04); // No CRC //CYRF_WriteRegister(CYRF_1E_RX_OVERRIDE, 0x14); //CYRF_WriteRegister(CYRF_14_EOP_CTRL, 0x02); } @@ -111,7 +111,7 @@ uint16_t LOSI_callback() if(bind_counter==0) { BIND_DONE; - CYRF_ConfigDataCode(LOSI_data_code[num_ch], 16); // Load normal data code + CYRF_ConfigDataCode(LOSI_data_code[1], 16); // Load normal data code } return 8763; } @@ -124,12 +124,11 @@ void LOSI_init() 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] | 1); // Only odd channels - #ifdef LOSI_FORCE_ID + #ifdef LOSI_FORCE_ID rx_tx_addr[0] = 0x47; rx_tx_addr[1] = 0x52; - rx_tx_addr[2] = 0xAE; - rx_tx_addr[3] = 0xAA; - num_ch = 8; // It looks that you could choose what you want based on channel business + rx_tx_addr[2] = 0xAE; + rx_tx_addr[3] = 0xAA; #endif if(IS_BIND_IN_PROGRESS) @@ -139,7 +138,7 @@ void LOSI_init() } else { - CYRF_ConfigDataCode(LOSI_data_code[num_ch], 16); // Load normal data code + CYRF_ConfigDataCode(LOSI_data_code[1], 16); // Load normal data code bind_counter = 0; } } diff --git a/Protocols_Details.md b/Protocols_Details.md index d042926..efb475f 100644 --- a/Protocols_Details.md +++ b/Protocols_Details.md @@ -114,6 +114,7 @@ CFlie|38|CFlie||||||||NRF24L01| [KN](Protocols_Details.md#KN---9)|9|WLTOYS|FEILUN|||||||NRF24L01| [Kyosho](Protocols_Details.md#Kyosho---73)|73|FHSS|Hype|||||||A7105| [LOLI](Protocols_Details.md#LOLI---82)|82|||||||||NRF24L01| +[Losi](Protocols_Details.md#LOLI---89)|89|||||||||CYRF6936| [MJXq](Protocols_Details.md#MJXQ---18)|18|WLH08|X600|X800|H26D|E010*|H26WH|PHOENIX*||NRF24L01|XN297 [MLINK](Protocols_Details.md#MLINK---78)|78|||||||||CYRF6936| [MT99xx](Protocols_Details.md#MT99XX---17)|17|MT|H7|YZ|LS|FY805|A180|DRAGON||NRF24L01|XN297 @@ -598,6 +599,8 @@ A|E|T|R|CH5|CH6|CH7|CH8|CH9|CH10|CH11|CH12 ## Losi - *89* TX: LSR-3000 +**Only 1 ID available**. More IDs can be added if you dump your original TX. + Extended limits supported CH1|CH2|CH3