From 932921440514875973bdbe9b1577272f1a35c4db Mon Sep 17 00:00:00 2001
From: Alessandro Fiorillo <alessandro.fiorillo@mail.polimi.it>
Date: Sat, 28 Nov 2020 00:56:24 +0100
Subject: [PATCH 1/3] Fixed compiling issues

---
 src/modules/CC1101/CC1101.cpp | 1 -
 src/modules/CC1101/CC1101.h   | 1 +
 src/modules/RF69/RF69.cpp     | 2 ++
 src/modules/RF69/RF69.h       | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/CC1101/CC1101.cpp b/src/modules/CC1101/CC1101.cpp
index 46e10452..6362937d 100644
--- a/src/modules/CC1101/CC1101.cpp
+++ b/src/modules/CC1101/CC1101.cpp
@@ -660,7 +660,6 @@ int16_t CC1101::setOOK(bool enableOOK) {
   return(setOutputPower(_power));
 }
 
-
 float CC1101::getRSSI() const {
   float rssi;
   if(_rawRSSI >= 128) {
diff --git a/src/modules/CC1101/CC1101.h b/src/modules/CC1101/CC1101.h
index 5f9e3e2d..af5899bc 100644
--- a/src/modules/CC1101/CC1101.h
+++ b/src/modules/CC1101/CC1101.h
@@ -881,6 +881,7 @@ class CC1101: public PhysicalLayer {
     Module* _mod;
 
     float _freq = 0;
+    float _br = 0;
     uint8_t _rawRSSI = 0;
     uint8_t _rawLQI = 0;
     uint8_t _modulation = CC1101_MOD_FORMAT_2_FSK;
diff --git a/src/modules/RF69/RF69.cpp b/src/modules/RF69/RF69.cpp
index 24002914..ca7920ed 100644
--- a/src/modules/RF69/RF69.cpp
+++ b/src/modules/RF69/RF69.cpp
@@ -369,6 +369,7 @@ int16_t RF69::readData(uint8_t* data, size_t len) {
   return(ERR_NONE);
 }
 
+/*
 int16_t CC1101::setOOK(bool enableOOK) {
   // Change modulation
   if(enableOOK) {
@@ -387,6 +388,7 @@ int16_t CC1101::setOOK(bool enableOOK) {
 
   return(setOutputPower(_power));
 }
+*/
 
 int16_t RF69::setFrequency(float freq) {
   // check allowed frequency range
diff --git a/src/modules/RF69/RF69.h b/src/modules/RF69/RF69.h
index 0f6fe507..4752967b 100644
--- a/src/modules/RF69/RF69.h
+++ b/src/modules/RF69/RF69.h
@@ -621,7 +621,7 @@ class RF69: public PhysicalLayer {
 
       \returns \ref status_codes
     */
-    int16_t setOOK(bool enableOOK);
+    //int16_t setOOK(bool enableOOK);
 
     /*!
       \brief Sets carrier frequency. Allowed values are in bands 290.0 to 340.0 MHz, 431.0 to 510.0 MHz and 862.0 to 1020.0 MHz.

From 3d1c45654b6a6127cf5546f9dac03142be0412ea Mon Sep 17 00:00:00 2001
From: Alessandro Fiorillo <alessandro.fiorillo@mail.polimi.it>
Date: Wed, 2 Dec 2020 16:43:02 +0100
Subject: [PATCH 2/3] [CC1101] Fix in promiscuous mode

---
 src/modules/CC1101/CC1101.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/CC1101/CC1101.cpp b/src/modules/CC1101/CC1101.cpp
index 6362937d..24a2ffa8 100644
--- a/src/modules/CC1101/CC1101.cpp
+++ b/src/modules/CC1101/CC1101.cpp
@@ -749,6 +749,8 @@ int16_t CC1101::setPromiscuousMode(bool promiscuous) {
     state = setCrcFiltering(true);
   }
 
+  _promiscuous = promiscuous;
+  
   return(state);
 }
 

From 1787505ea7ac24843683e9a5735672564f447cf9 Mon Sep 17 00:00:00 2001
From: Alessandro Fiorillo <alessandro.fiorillo@mail.polimi.it>
Date: Fri, 4 Dec 2020 15:36:58 +0100
Subject: [PATCH 3/3] [RF69] Fixed setOOK()

---
 src/modules/CC1101/CC1101.cpp |  1 -
 src/modules/RF69/RF69.cpp     | 10 +---------
 src/modules/RF69/RF69.h       |  2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/modules/CC1101/CC1101.cpp b/src/modules/CC1101/CC1101.cpp
index 24a2ffa8..ba93bdc5 100644
--- a/src/modules/CC1101/CC1101.cpp
+++ b/src/modules/CC1101/CC1101.cpp
@@ -641,7 +641,6 @@ int16_t CC1101::setOOK(bool enableOOK) {
     state = SPIsetRegValue(CC1101_REG_FREND0, 1, 2, 0);
     RADIOLIB_ASSERT(state);
 
-
     // update current modulation
     _modulation = CC1101_MOD_FORMAT_ASK_OOK;
   } else {
diff --git a/src/modules/RF69/RF69.cpp b/src/modules/RF69/RF69.cpp
index ca7920ed..2e7f755e 100644
--- a/src/modules/RF69/RF69.cpp
+++ b/src/modules/RF69/RF69.cpp
@@ -369,26 +369,18 @@ int16_t RF69::readData(uint8_t* data, size_t len) {
   return(ERR_NONE);
 }
 
-/*
-int16_t CC1101::setOOK(bool enableOOK) {
+int16_t RF69::setOOK(bool enableOOK) {
   // Change modulation
   if(enableOOK) {
     int16_t state = SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_OOK, 4, 3);
     RADIOLIB_ASSERT(state);
-
-    // update current modulation
-    _modulation = CC1101_MOD_FORMAT_ASK_OOK;
   } else {
     int16_t state = SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK, 4, 3);
     RADIOLIB_ASSERT(state);
-
-    // update current modulation
-    _modulation = CC1101_MOD_FORMAT_2_FSK;
   }
 
   return(setOutputPower(_power));
 }
-*/
 
 int16_t RF69::setFrequency(float freq) {
   // check allowed frequency range
diff --git a/src/modules/RF69/RF69.h b/src/modules/RF69/RF69.h
index 4752967b..0f6fe507 100644
--- a/src/modules/RF69/RF69.h
+++ b/src/modules/RF69/RF69.h
@@ -621,7 +621,7 @@ class RF69: public PhysicalLayer {
 
       \returns \ref status_codes
     */
-    //int16_t setOOK(bool enableOOK);
+    int16_t setOOK(bool enableOOK);
 
     /*!
       \brief Sets carrier frequency. Allowed values are in bands 290.0 to 340.0 MHz, 431.0 to 510.0 MHz and 862.0 to 1020.0 MHz.