From e35c4d3ce88dd3c891644fc7140d5625c78ca4e2 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Mon, 28 Jul 2025 01:06:12 +0200 Subject: [PATCH] WPL 1 ID --- Multiprotocol/Multi_Protos.ino | 2 +- Multiprotocol/WPL_nrf24l01.ino | 13 +++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Multiprotocol/Multi_Protos.ino b/Multiprotocol/Multi_Protos.ino index c631b67..1ece75c 100644 --- a/Multiprotocol/Multi_Protos.ino +++ b/Multiprotocol/Multi_Protos.ino @@ -520,7 +520,7 @@ const mm_protocol_definition multi_protocols[] = { {PROTO_WL91X, STR_WL91X, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_NRF, WL91X_init, WL91X_callback }, #endif #if defined(WPL_NRF24L01_INO) - {PROTO_WPL, STR_WPL, NO_SUBTYPE, 0, OPTION_OPTION, 0, 0, SW_NRF, WPL_init, WPL_callback }, + {PROTO_WPL, STR_WPL, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_NRF, WPL_init, WPL_callback }, #endif #if defined(XERALL_NRF24L01_INO) {PROTO_XERALL, STR_XERALL, NO_SUBTYPE, 0, OPTION_NONE, 0, 0, SW_NRF, XERALL_init, XERALL_callback }, diff --git a/Multiprotocol/WPL_nrf24l01.ino b/Multiprotocol/WPL_nrf24l01.ino index 8563ebb..cb6d14a 100644 --- a/Multiprotocol/WPL_nrf24l01.ino +++ b/Multiprotocol/WPL_nrf24l01.ino @@ -19,7 +19,6 @@ Multiprotocol is distributed in the hope that it will be useful, #include "iface_xn297.h" #define FORCE_WPL_ORIGINAL_ID -//#define WPL_TEST #define WPL_PACKET_PERIOD 9875 #define WPL_RF_NUM_CHANNELS 4 @@ -31,9 +30,6 @@ static void __attribute__((unused)) WPL_send_packet() #if 0 debug("no:%d, rf:%d, ",hopping_frequency_no + (IS_BIND_IN_PROGRESS?0:4),hopping_frequency[hopping_frequency_no + (IS_BIND_IN_PROGRESS?0:4)]); #endif - #ifdef WPL_TEST - memset(hopping_frequency+4,option,4); - #endif XN297_Hopping(hopping_frequency_no + (IS_BIND_IN_PROGRESS?0:4) ); hopping_frequency_no++; hopping_frequency_no &= WPL_RF_NUM_CHANNELS-1; // 4 RF channels @@ -86,14 +82,11 @@ static void __attribute__((unused)) WPL_initialize_txid() { //Bind frequencies memcpy(hopping_frequency ,"\x17\x25\x46\x36", WPL_RF_NUM_CHANNELS); //23=17, 37=25, 70=46, 54=36 - //Normal frequencies - memcpy(hopping_frequency+4,"\x0C\x2A\x3D\x1D", WPL_RF_NUM_CHANNELS); //12=0C, 42=2A, 61=3D, 29=1D #ifdef FORCE_WPL_ORIGINAL_ID + //Original ID memcpy(rx_tx_addr,"\x96\x2A\xA9\x32\xB4",5); - #endif - #ifdef WPL_TEST - memcpy(rx_tx_addr,"\x96\x2A\xA9\x32\xB4",5); - rx_tx_addr[0] += RX_num; + //Normal frequencies + memcpy(hopping_frequency+4,"\x0C\x2A\x3D\x1D", WPL_RF_NUM_CHANNELS); //12=0C, 42=2A, 61=3D, 29=1D #endif }