From 15e37cefeebe18a97375f71eba013b49e14ca995 Mon Sep 17 00:00:00 2001 From: Pascal Langer Date: Sun, 16 Aug 2020 18:48:40 +0200 Subject: [PATCH] OMP: fix? --- Multiprotocol/Multiprotocol.h | 2 +- Multiprotocol/OMP_nrf24l01.ino | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index 295973e..b836c0d 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -19,7 +19,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_REVISION 1 -#define VERSION_PATCH_LEVEL 56 +#define VERSION_PATCH_LEVEL 57 //****************** // Protocols diff --git a/Multiprotocol/OMP_nrf24l01.ino b/Multiprotocol/OMP_nrf24l01.ino index 7ea7e10..49bdf2a 100644 --- a/Multiprotocol/OMP_nrf24l01.ino +++ b/Multiprotocol/OMP_nrf24l01.ino @@ -79,7 +79,6 @@ static void __attribute__((unused)) OMP_send_packet() packet[13] = channel>>8; //unknown - //packet[13] = 0x00; //packet[14] = 0x00; packet[15] = 0x04; } @@ -115,7 +114,10 @@ uint16_t OMP_callback() { if(IS_BIND_IN_PROGRESS) if(--bind_counter==0) + { BIND_DONE; + XN297L_SetTXAddr(rx_tx_addr, 5); + } OMP_send_packet(); #ifdef MULTI_SYNC telemetry_set_input_sync(OMP_PACKET_PERIOD); @@ -128,7 +130,10 @@ uint16_t initOMP() OMP_initialize_txid(); OMP_init(); hopping_frequency_no = 0; - bind_counter=OMP_BIND_COUNT; + if(IS_BIND_IN_PROGRESS) + bind_counter=OMP_BIND_COUNT; + else + XN297L_SetTXAddr(rx_tx_addr, 5); return OMP_INITIAL_WAIT; }