From a7ac09375399a45ea7c570912cf42d87d18d6eb5 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Mon, 17 Feb 2020 16:44:02 +0100 Subject: [PATCH] SLT: CC2500 fix --- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/NRF250K_EMU.ino | 4 +--- Multiprotocol/SLT_nrf24l01.ino | 21 +++------------------ 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 0a55345..4bba508 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 0 -#define VERSION_PATCH_LEVEL 70 +#define VERSION_PATCH_LEVEL 71 //****************** // Protocols diff --git a/Multiprotocol/NRF250K_EMU.ino b/Multiprotocol/NRF250K_EMU.ino index cb0e205..37051dc 100644 --- a/Multiprotocol/NRF250K_EMU.ino +++ b/Multiprotocol/NRF250K_EMU.ino @@ -428,9 +428,7 @@ static boolean __attribute__((unused)) NRF250K_IsPacketSent() { //NRF return NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_TX_DS); } - #ifdef CC2500_INSTALLED - return CC2500_ReadReg(CC2500_35_MARCSTATE)==0x01; // State is IDLE - #endif + return true; // don't know on the CC2500 how to detect if the packet has been transmitted... } #endif \ No newline at end of file diff --git a/Multiprotocol/SLT_nrf24l01.ino b/Multiprotocol/SLT_nrf24l01.ino index 5bbed53..71fdf44 100644 --- a/Multiprotocol/SLT_nrf24l01.ino +++ b/Multiprotocol/SLT_nrf24l01.ino @@ -50,7 +50,6 @@ enum { SLT_DATA3, SLT_BIND1, SLT_BIND2, - SLT_TEST }; static void __attribute__((unused)) SLT_init() @@ -183,12 +182,6 @@ static void __attribute__((unused)) SLT_send_bind_packet() SLT_send_packet(SLT_TXID_SIZE); else // SLT_BIND1 SLT_send_packet(SLT_PAYLOADSIZE_V2); - - SLT_wait_radio(); //Wait until the packet's sent before changing TX address! - - NRF250K_SetPower(); //Change power back to normal level - if(phase==SLT_BIND2) //After V1 bind and V2 second bind packet - NRF250K_SetTXAddr(rx_tx_addr, SLT_TXID_SIZE); } #define SLT_TIMING_BUILD 1000 @@ -206,6 +199,8 @@ uint16_t SLT_callback() telemetry_set_input_sync(sub_protocol==SLT_V1?20000:13730); #endif SLT_build_packet(); + NRF250K_SetPower(); //Change power level + NRF250K_SetTXAddr(rx_tx_addr, SLT_TXID_SIZE); phase++; return SLT_TIMING_BUILD; case SLT_DATA1: @@ -260,13 +255,7 @@ uint16_t SLT_callback() return 20000-SLT_TIMING_BUILD-SLT_V1_TIMING_BIND2; else //V2 return 13730-SLT_TIMING_BUILD-SLT_V2_TIMING_BIND1-SLT_V2_TIMING_BIND2; -/* case SLT_TEST: - for(uint8_t i=0;i<10;i++) - packet[i]=0x10+i; - NRF250K_WritePayload(packet,10); - NRF250K_SetFreqOffset(); // Set frequency offset - return 5000; -*/ } + } return 19000; } @@ -288,10 +277,6 @@ uint16_t initSLT() SLT_init(); phase = SLT_BUILD; -/* phase=SLT_TEST; - NRF250K_SetTXAddr((uint8_t*)"\x01\x02\x03\x04\x05",5); - NRF250K_RFChannel(0); -*/ return 50000; }