From b006a9d52b214f2007da2b67854094d138d399e1 Mon Sep 17 00:00:00 2001 From: jgromes Date: Sun, 13 Jan 2019 19:54:14 +0100 Subject: [PATCH] [CC1101] Fixed parameter type --- src/modules/CC1101.cpp | 8 +++++--- src/modules/CC1101.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/CC1101.cpp b/src/modules/CC1101.cpp index 8d9ab6d1..90fee162 100644 --- a/src/modules/CC1101.cpp +++ b/src/modules/CC1101.cpp @@ -174,7 +174,8 @@ int16_t CC1101::setBitRate(float br) { SPIsendCommand(CC1101_CMD_IDLE); // calculate exponent and mantisa values - uint8_t e, m; + uint8_t e = 0; + uint8_t m = 0; getExpMant(br * 1000.0, 256, 28, 14, e, m); // set bit rate value @@ -223,7 +224,8 @@ int16_t CC1101::setFrequencyDeviation(float freqDev) { SPIsendCommand(CC1101_CMD_IDLE); // calculate exponent and mantisa values - uint8_t e, m; + uint8_t e = 0; + uint8_t m = 0; getExpMant(freqDev * 1000.0, 8, 17, 7, e, m); // set frequency deviation value @@ -252,7 +254,7 @@ int16_t CC1101::directMode() { return(state); } -void CC1101::getExpMant(float target, uint8_t mantOffset, uint8_t divExp, uint8_t expMax, uint8_t& exp, uint8_t& mant) { +void CC1101::getExpMant(float target, uint16_t mantOffset, uint8_t divExp, uint8_t expMax, uint8_t& exp, uint8_t& mant) { // get table origin point (exp = 0, mant = 0) float origin = (mantOffset * CC1101_CRYSTAL_FREQ * 1000000.0)/((uint32_t)1 << divExp); diff --git a/src/modules/CC1101.h b/src/modules/CC1101.h index 27051433..a2734f10 100644 --- a/src/modules/CC1101.h +++ b/src/modules/CC1101.h @@ -519,7 +519,7 @@ class CC1101: public PhysicalLayer { int16_t config(); int16_t directMode(); - void getExpMant(float target, uint8_t mantOffset, uint8_t divExp, uint8_t expMax, uint8_t& exp, uint8_t& mant); + void getExpMant(float target, uint16_t mantOffset, uint8_t divExp, uint8_t expMax, uint8_t& exp, uint8_t& mant); // SPI read overrides to set access bit for status registers int16_t SPIgetRegValue(uint8_t reg, uint8_t msb = 7, uint8_t lsb = 0);