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

WK2x01: added fixed id mode for WK2801

Browse Source
This commit is contained in:
pascallanger 2017-01-04 11:35:38 +01:00
parent 8677e73d75
commit e51fb06ceb
2 changed files with 72 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Multiprotocol/Multiprotocol.ino
View File

@ -749,6 +749,28 @@ static void protocol_init()
remote_callback = devo_callback; remote_callback = devo_callback;
break; break;
#endif #endif
#if defined(WK2x01_CYRF6936_INO)
case MODE_WK2x01:
#ifdef ENABLE_PPM
if(mode_select) //PPM mode
{
if(IS_BIND_BUTTON_FLAG_on)
{
eeprom_write_byte((EE_ADDR)(30+mode_select),0x00); // reset to autobind mode for the current model
option=0;
}
else
{
option=eeprom_read_byte((EE_ADDR)(30+mode_select)); // load previous mode: autobind or fixed id
if(option!=1) option=0; // if not fixed id mode then it should be autobind
}
}
#endif //ENABLE_PPM
PE2_on; //antenna RF4
next_callback = WK_setup();
remote_callback = WK_cb;
break;
#endif
#if defined(J6PRO_CYRF6936_INO) #if defined(J6PRO_CYRF6936_INO)
case MODE_J6PRO: case MODE_J6PRO:
PE2_on; //antenna RF4 PE2_on; //antenna RF4
@ -756,13 +778,6 @@ static void protocol_init()
remote_callback = ReadJ6Pro; remote_callback = ReadJ6Pro;
break; break;
#endif #endif
#if defined(WK2x01_CYRF6936_INO)
case MODE_WK2x01:
PE2_on; //antenna RF4
next_callback = WK_setup();
remote_callback = WK_cb;
break;
#endif
#endif #endif
#ifdef NRF24L01_INSTALLED #ifdef NRF24L01_INSTALLED
#if defined(HISKY_NRF24L01_INO) #if defined(HISKY_NRF24L01_INO)

62
Multiprotocol/WK2x01_cyrf6936.ino
View File

@ -289,8 +289,37 @@ static void __attribute__((unused)) WK_build_beacon_pkt_2801()
{ {
WK_last_beacon ^= 1; WK_last_beacon ^= 1;
uint8_t en = 0; uint8_t en = 0;
uint8_t bind_state=0x99; //Ignoring WK2801 bind process which is the same as Devo uint8_t bind_state;
#ifdef ENABLE_PPM
if(mode_select && option==0 && IS_BIND_DONE_on) //PPM mode and option not already set and bind is finished
{
BIND_SET_INPUT;
BIND_SET_PULLUP; // set pullup
if(IS_BIND_BUTTON_on)
{
eeprom_write_byte((EE_ADDR)(30+mode_select),0x01); // Set fixed id mode for the current model
option=1;
}
BIND_SET_OUTPUT;
}
#endif //ENABLE_PPM
if(prev_option!=option && IS_BIND_DONE_on)
{
set_rx_tx_addr(MProtocol_id);
rx_tx_addr[2]=rx_tx_addr[3]<<4; // Make use of RX_Num
bind_counter = WK_BIND_COUNT / 8 + 1;
}
if (option)
{
if (bind_counter)
bind_state = 0xe4;
else
bind_state = 0x1b;
}
else
bind_state = 0x99;
for (uint8_t i = 0; i < 4; i++) for (uint8_t i = 0; i < 4; i++)
{ // failsafe info: WARNING All channels are set to 0 instead of midstick and 0 for throttle { // failsafe info: WARNING All channels are set to 0 instead of midstick and 0 for throttle
packet[i+1] = 0; packet[i+1] = 0;
@ -439,18 +468,27 @@ uint16_t WK_setup() {
packet_count = 0; packet_count = 0;
packet_sent = 0; packet_sent = 0;
WK_last_beacon = 0; WK_last_beacon = 0;
prev_option=option;
if(sub_protocol!=WK2801 || option==0)
{
CYRF_GetMfgData(cyrfmfg_id);
rx_tx_addr[2]=(hopping_frequency[0] ^ cyrfmfg_id[0] ^ cyrfmfg_id[3])<<4;
rx_tx_addr[1]=hopping_frequency[1] ^ cyrfmfg_id[1] ^ cyrfmfg_id[4];
rx_tx_addr[0]=hopping_frequency[2] ^ cyrfmfg_id[2] ^ cyrfmfg_id[5];
if(sub_protocol == WK2401)
rx_tx_addr[0] |= 0x01; //ID must be odd for 2401
CYRF_GetMfgData(cyrfmfg_id); bind_counter = WK_BIND_COUNT;
rx_tx_addr[2]=(hopping_frequency[0] ^ cyrfmfg_id[0] ^ cyrfmfg_id[3])<<4; phase = WK_BIND;
rx_tx_addr[1]=hopping_frequency[1] ^ cyrfmfg_id[1] ^ cyrfmfg_id[4]; BIND_IN_PROGRESS;
rx_tx_addr[0]=hopping_frequency[2] ^ cyrfmfg_id[2] ^ cyrfmfg_id[5]; }
if(sub_protocol == WK2401) else
rx_tx_addr[0] |= 0x01; //ID must be odd for 2401 {
rx_tx_addr[2]=rx_tx_addr[3]<<4; // Make use of RX_Num
bind_counter = WK_BIND_COUNT; bind_counter = 0;
phase = WK_BIND; phase = WK_BOUND_1;
BIND_IN_PROGRESS; BIND_DONE;
//Ignoring WK2801 bind process which is the same as Devo }
return 2800; return 2800;
} }