gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-04 20:58:10 +00:00
Code Issues Projects Releases Wiki Activity

SLT: CC2500 fix

Browse Source
This commit is contained in:
Pascal Langer 2020-02-17 16:44:02 +01:00
parent 5503502bad
commit a7ac093753
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_REVISION 0 #define VERSION_REVISION 0
#define VERSION_PATCH_LEVEL 70 #define VERSION_PATCH_LEVEL 71
//****************** //******************
// Protocols // Protocols

4
Multiprotocol/NRF250K_EMU.ino
View File

@ -428,9 +428,7 @@ static boolean __attribute__((unused)) NRF250K_IsPacketSent()
{ //NRF { //NRF
return NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_TX_DS); return NRF24L01_ReadReg(NRF24L01_07_STATUS) & _BV(NRF24L01_07_TX_DS);
} }
#ifdef CC2500_INSTALLED return true; // don't know on the CC2500 how to detect if the packet has been transmitted...
return CC2500_ReadReg(CC2500_35_MARCSTATE)==0x01; // State is IDLE
#endif
} }
#endif #endif

21
Multiprotocol/SLT_nrf24l01.ino
View File

@ -50,7 +50,6 @@ enum {
SLT_DATA3, SLT_DATA3,
SLT_BIND1, SLT_BIND1,
SLT_BIND2, SLT_BIND2,
SLT_TEST
}; };
static void __attribute__((unused)) SLT_init() static void __attribute__((unused)) SLT_init()
@ -183,12 +182,6 @@ static void __attribute__((unused)) SLT_send_bind_packet()
SLT_send_packet(SLT_TXID_SIZE); SLT_send_packet(SLT_TXID_SIZE);
else // SLT_BIND1 else // SLT_BIND1
SLT_send_packet(SLT_PAYLOADSIZE_V2); 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 #define SLT_TIMING_BUILD 1000
@ -206,6 +199,8 @@ uint16_t SLT_callback()
telemetry_set_input_sync(sub_protocol==SLT_V1?20000:13730); telemetry_set_input_sync(sub_protocol==SLT_V1?20000:13730);
#endif #endif
SLT_build_packet(); SLT_build_packet();
NRF250K_SetPower(); //Change power level
NRF250K_SetTXAddr(rx_tx_addr, SLT_TXID_SIZE);
phase++; phase++;
return SLT_TIMING_BUILD; return SLT_TIMING_BUILD;
case SLT_DATA1: case SLT_DATA1:
@ -260,13 +255,7 @@ uint16_t SLT_callback()
return 20000-SLT_TIMING_BUILD-SLT_V1_TIMING_BIND2; return 20000-SLT_TIMING_BUILD-SLT_V1_TIMING_BIND2;
else //V2 else //V2
return 13730-SLT_TIMING_BUILD-SLT_V2_TIMING_BIND1-SLT_V2_TIMING_BIND2; 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; return 19000;
} }
@ -288,10 +277,6 @@ uint16_t initSLT()
SLT_init(); SLT_init();
phase = SLT_BUILD; phase = SLT_BUILD;
/* phase=SLT_TEST;
NRF250K_SetTXAddr((uint8_t*)"\x01\x02\x03\x04\x05",5);
NRF250K_RFChannel(0);
*/
return 50000; return 50000;
} }