From a552d95c6d5de610940afa1e3e30425cda208609 Mon Sep 17 00:00:00 2001 From: Stefan Brand Date: Mon, 20 Jan 2020 19:24:40 +0100 Subject: [PATCH] New Beacon Mode --- Firmware/lib/RFM95/RFM95.cpp | 5 ----- Firmware/lib/RFM95/RFM95.h | 1 - Firmware/src/main.cpp | 13 ++++++++++++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Firmware/lib/RFM95/RFM95.cpp b/Firmware/lib/RFM95/RFM95.cpp index 2461090..b427a18 100644 --- a/Firmware/lib/RFM95/RFM95.cpp +++ b/Firmware/lib/RFM95/RFM95.cpp @@ -167,11 +167,6 @@ void RFM95::RFM_Set_Datarate(lora_dr_t datarate) { _bw = 0x72; _mc = 0x04; break; - case SF7BW250: - _sf = 0x74; - _bw = 0x82; - _mc = 0x04; - break; case SF8BW125: _sf = 0x84; _bw = 0x72; diff --git a/Firmware/lib/RFM95/RFM95.h b/Firmware/lib/RFM95/RFM95.h index 2b5f164..e15f063 100644 --- a/Firmware/lib/RFM95/RFM95.h +++ b/Firmware/lib/RFM95/RFM95.h @@ -15,7 +15,6 @@ typedef enum lora_dr { SF7BW125, - SF7BW250, SF8BW125, SF9BW125, SF10BW125, diff --git a/Firmware/src/main.cpp b/Firmware/src/main.cpp index 95c43cb..d35f84e 100644 --- a/Firmware/src/main.cpp +++ b/Firmware/src/main.cpp @@ -163,7 +163,7 @@ void loop() #ifdef HAS_NO_SENSOR struct lora_data { uint8_t bat; - } __attribute__ ((packed)) data; + } __attribute__ ((packed)) data; #elif defined HAS_SHT21 struct lora_data { uint8_t bat; @@ -201,9 +201,20 @@ void loop() #endif #ifdef RF_LORA + #ifdef HAS_NO_SENSOR + // Send Packet in all 12 SFs for Beacon Mode + + for (int i = SF7BW125; i<=SF12BW125; i++) { + lora_data tdata = data; + lora.Send_Data((unsigned char *)&tdata, sizeof(tdata), Frame_Counter_Tx, static_cast(i)); + Frame_Counter_Tx++; + delay(25); + } + #else // Send LoRa Packet, Increment Frame Counter lora.Send_Data((unsigned char *)&data, sizeof(data), Frame_Counter_Tx, SF7BW125); Frame_Counter_Tx++; + #endif #endif #ifdef RF_RFM69