From 5d26357025786347171d1d9188181939b081628c Mon Sep 17 00:00:00 2001 From: pascallanger Date: Sun, 24 Jan 2016 17:15:02 +0100 Subject: [PATCH] Couple of edits... --- Multiprotocol/CG023_nrf24l01.ino | 8 ++++---- Multiprotocol/CX10_nrf24l01.ino | 2 +- Multiprotocol/Multiprotocol.ino | 5 ++--- Multiprotocol/NRF24l01_SPI.ino | 2 +- Multiprotocol/multiprotocol.h | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Multiprotocol/CG023_nrf24l01.ino b/Multiprotocol/CG023_nrf24l01.ino index 7236dd0..adb6539 100644 --- a/Multiprotocol/CG023_nrf24l01.ino +++ b/Multiprotocol/CG023_nrf24l01.ino @@ -255,10 +255,10 @@ static void CG023_initialize_txid() rx_tx_addr[2] = rx_tx_addr[2] % 0x20; rx_tx_addr[3] = rx_tx_addr[3] % 0x11; - hopping_frequency[0] = 0x06 + (rx_tx_addr[0]&0x0f); - hopping_frequency[1] = 0x15 + (rx_tx_addr[1]&0x0f); - hopping_frequency[2] = 0x24 + (rx_tx_addr[2]&0x0f); - hopping_frequency[3] = 0x33 + (rx_tx_addr[3]&0x0f); + hopping_frequency[0] = 0x06 + ((rx_tx_addr[0]&0x0f) % 0x0f); + hopping_frequency[1] = 0x15 + ((rx_tx_addr[1]&0x0f) % 0x0f); + hopping_frequency[2] = 0x24 + ((rx_tx_addr[2]&0x0f) % 0x0f); + hopping_frequency[3] = 0x33 + ((rx_tx_addr[3]&0x0f) % 0x0f); } else { // CG023 and YD829 diff --git a/Multiprotocol/CX10_nrf24l01.ino b/Multiprotocol/CX10_nrf24l01.ino index 10b9437..6f6c816 100644 --- a/Multiprotocol/CX10_nrf24l01.ino +++ b/Multiprotocol/CX10_nrf24l01.ino @@ -199,7 +199,7 @@ uint16_t CX10_callback() { NRF24L01_SetTxRxMode(TXRX_OFF); NRF24L01_SetTxRxMode(TX_EN); CX10_Write_Packet(1); - delay(1); // used to be 300µs in deviation but not working so 1ms now + delayMicroseconds(400); // 300µs in deviation but not working so using 400µs instead // switch to RX mode NRF24L01_SetTxRxMode(TXRX_OFF); NRF24L01_FlushRx(); diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 564a171..543a12c 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -469,7 +469,7 @@ static void update_serial_data() static void module_reset() { if(remote_callback) - { // a protocol was loaded, reset the module used + { // previous protocol loaded remote_callback = 0; switch(prev_protocol) { @@ -486,8 +486,7 @@ static void module_reset() case MODE_DEVO: CYRF_Reset(); break; - default: - // MODE_HISKY, MODE_V2X2, MODE_YD717, MODE_KN, MODE_SYMAX, MODE_SLT, MODE_CX10, MODE_CG023, MODE_BAYANG, MODE_ESKY + default: // MODE_HISKY, MODE_V2X2, MODE_YD717, MODE_KN, MODE_SYMAX, MODE_SLT, MODE_CX10, MODE_CG023, MODE_BAYANG, MODE_ESKY NRF24L01_Reset(); break; } diff --git a/Multiprotocol/NRF24l01_SPI.ino b/Multiprotocol/NRF24l01_SPI.ino index 200365e..c14f5d5 100644 --- a/Multiprotocol/NRF24l01_SPI.ino +++ b/Multiprotocol/NRF24l01_SPI.ino @@ -271,7 +271,7 @@ static const uint8_t xn297_scramble[] = { static const uint16_t xn297_crc_xorout[] = { 0x0000, 0x3448, 0x9BA7, 0x8BBB, 0x85E1, 0x3E8C, // 1st entry is missing, probably never needed - 0x451E, 0x18E6, 0x6B24, 0xE7AB, 0x3828, 0x8148, // it's used for 3-byte address w/ 0 byte payload only + 0x451E, 0x18E6, 0x6B24, 0xE7AB, 0x3828, 0x814B, // it's used for 3-byte address w/ 0 byte payload only 0xD461, 0xF494, 0x2503, 0x691D, 0xFE8B, 0x9BA7, 0x8B17, 0x2920, 0x8B5F, 0x61B1, 0xD391, 0x7401, 0x2138, 0x129F, 0xB3A0, 0x2988}; diff --git a/Multiprotocol/multiprotocol.h b/Multiprotocol/multiprotocol.h index 389a862..addda61 100644 --- a/Multiprotocol/multiprotocol.h +++ b/Multiprotocol/multiprotocol.h @@ -28,7 +28,7 @@ enum PROTOCOLS MODE_DEVO =7, // =>CYRF6936 / DEVO protocol MODE_YD717 = 8, // =>NRF24L01 / YD717 protocol (CX10 red pcb) MODE_KN = 9, // =>NRF24L01 / KN protocol - MODE_SYMAX = 10, // =>NRF24L01 / SYMAX protocol (SYMAX4 working) + MODE_SYMAX = 10, // =>NRF24L01 / SYMAX protocol MODE_SLT = 11, // =>NRF24L01 / SLT protocol MODE_CX10 = 12, // =>NRF24L01 / CX-10 protocol MODE_CG023 = 13, // =>NRF24L01 / CG023 protocol