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] 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.