From 5575e1eef5440668849f2029b8b858827a35becd Mon Sep 17 00:00:00 2001 From: jgromes Date: Mon, 3 Mar 2025 07:35:19 +0000 Subject: [PATCH] deploy: d142928e9f6b47635ff1b7e2b9fa39f3c179bd48 --- .../HardwareEmulation.hpp.func-sort-c.html | 6 +- .../include/HardwareEmulation.hpp.func.html | 6 +- .../include/HardwareEmulation.hpp.gcov.html | 10 +-- .../unit/include/TestHal.hpp.func-sort-c.html | 14 ++-- .../test/unit/include/TestHal.hpp.func.html | 14 ++-- .../test/unit/include/TestHal.hpp.gcov.html | 64 +++++++++---------- .../test/unit/include/index-sort-f.html | 2 +- .../test/unit/include/index-sort-l.html | 2 +- coverage/extras/test/unit/include/index.html | 2 +- .../tests/TestModule.cpp.func-sort-c.html | 2 +- .../test/unit/tests/TestModule.cpp.func.html | 2 +- .../test/unit/tests/TestModule.cpp.gcov.html | 2 +- .../extras/test/unit/tests/index-sort-f.html | 2 +- .../extras/test/unit/tests/index-sort-l.html | 2 +- coverage/extras/test/unit/tests/index.html | 2 +- coverage/index-sort-f.html | 2 +- coverage/index-sort-l.html | 2 +- coverage/index.html | 2 +- coverage/src/Hal.cpp.func-sort-c.html | 2 +- coverage/src/Hal.cpp.func.html | 2 +- coverage/src/Hal.cpp.gcov.html | 2 +- coverage/src/Module.cpp.func-sort-c.html | 6 +- coverage/src/Module.cpp.func.html | 6 +- coverage/src/Module.cpp.gcov.html | 56 ++++++++-------- coverage/src/index-sort-f.html | 2 +- coverage/src/index-sort-l.html | 2 +- coverage/src/index.html | 2 +- 27 files changed, 109 insertions(+), 109 deletions(-) diff --git a/coverage/extras/test/unit/include/HardwareEmulation.hpp.func-sort-c.html b/coverage/extras/test/unit/include/HardwareEmulation.hpp.func-sort-c.html index 6482892d..02f23ac6 100644 --- a/coverage/extras/test/unit/include/HardwareEmulation.hpp.func-sort-c.html +++ b/coverage/extras/test/unit/include/HardwareEmulation.hpp.func-sort-c.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 3 @@ -65,11 +65,11 @@ _ZN13EmulatedRadio10HandleGPIOEv - 2930 + 2932 _ZN13EmulatedRadio9HandleSPIEh - 4190 + 4192
diff --git a/coverage/extras/test/unit/include/HardwareEmulation.hpp.func.html b/coverage/extras/test/unit/include/HardwareEmulation.hpp.func.html index e684366e..22a4d017 100644 --- a/coverage/extras/test/unit/include/HardwareEmulation.hpp.func.html +++ b/coverage/extras/test/unit/include/HardwareEmulation.hpp.func.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 3 @@ -61,7 +61,7 @@ _ZN13EmulatedRadio10HandleGPIOEv - 2930 + 2932 _ZN13EmulatedRadio7connectEP13EmulatedPin_tS1_S1_S1_ @@ -69,7 +69,7 @@ _ZN13EmulatedRadio9HandleSPIEh - 4190 + 4192
diff --git a/coverage/extras/test/unit/include/HardwareEmulation.hpp.gcov.html b/coverage/extras/test/unit/include/HardwareEmulation.hpp.gcov.html index 1a8393ed..dca1e999 100644 --- a/coverage/extras/test/unit/include/HardwareEmulation.hpp.gcov.html +++ b/coverage/extras/test/unit/include/HardwareEmulation.hpp.gcov.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 3 @@ -111,15 +111,15 @@ 49 4 : this->gpio->func = PIN_GPIO; 50 4 : } 51 : - 52 4190 : virtual uint8_t HandleSPI(uint8_t b) { + 52 4192 : virtual uint8_t HandleSPI(uint8_t b) { 53 : (void)b; 54 : // handle the SPI input and generate output here - 55 4190 : return(EMULATED_RADIO_SPI_RETURN); + 55 4192 : return(EMULATED_RADIO_SPI_RETURN); 56 : } 57 : - 58 2930 : virtual void HandleGPIO() { + 58 2932 : virtual void HandleGPIO() { 59 : // handle discrete GPIO signals here (e.g. reset state machine on NSS falling edge) - 60 2930 : } + 60 2932 : } 61 : 62 : protected: 63 : // pointers to emulated GPIO pins diff --git a/coverage/extras/test/unit/include/TestHal.hpp.func-sort-c.html b/coverage/extras/test/unit/include/TestHal.hpp.func-sort-c.html index 9d825128..38564213 100644 --- a/coverage/extras/test/unit/include/TestHal.hpp.func-sort-c.html +++ b/coverage/extras/test/unit/include/TestHal.hpp.func-sort-c.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 15 @@ -133,27 +133,27 @@ _ZN7TestHal6microsEv - 1461 + 1462 _ZN7TestHal11spiTransferEPhmS0_ - 1463 + 1464 _ZN7TestHal17spiEndTransactionEv - 1463 + 1464 _ZN7TestHal19spiBeginTransactionEv - 1463 + 1464 _ZN7TestHal12digitalWriteEjj - 2930 + 2932 _ZN7TestHal17delayMicrosecondsEm - 4613 + 4615
diff --git a/coverage/extras/test/unit/include/TestHal.hpp.func.html b/coverage/extras/test/unit/include/TestHal.hpp.func.html index 274b0b56..b8e13220 100644 --- a/coverage/extras/test/unit/include/TestHal.hpp.func.html +++ b/coverage/extras/test/unit/include/TestHal.hpp.func.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 15 @@ -69,7 +69,7 @@ _ZN7TestHal11spiTransferEPhmS0_ - 1463 + 1464 _ZN7TestHal12connectRadioEP13EmulatedRadio @@ -77,7 +77,7 @@ _ZN7TestHal12digitalWriteEjj - 2930 + 2932 _ZN7TestHal12spiLogMemcmpEPKvm @@ -93,15 +93,15 @@ _ZN7TestHal17delayMicrosecondsEm - 4613 + 4615 _ZN7TestHal17spiEndTransactionEv - 1463 + 1464 _ZN7TestHal19spiBeginTransactionEv - 1463 + 1464 _ZN7TestHal4initEv @@ -125,7 +125,7 @@ _ZN7TestHal6microsEv - 1461 + 1462 _ZN7TestHal6millisEv diff --git a/coverage/extras/test/unit/include/TestHal.hpp.gcov.html b/coverage/extras/test/unit/include/TestHal.hpp.gcov.html index af453066..9143fcd1 100644 --- a/coverage/extras/test/unit/include/TestHal.hpp.gcov.html +++ b/coverage/extras/test/unit/include/TestHal.hpp.gcov.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 15 @@ -131,26 +131,26 @@ 69 4 : this->gpio[pin].mode = mode; 70 4 : } 71 : - 72 2930 : void digitalWrite(uint32_t pin, uint32_t value) override { + 72 2932 : void digitalWrite(uint32_t pin, uint32_t value) override { 73 : HAL_LOG("TestHal::digitalWrite(pin=" << pin << ", value=" << value << " [" << ((value == TEST_HAL_LOW) ? "LOW" : "HIGH") << "])"); 74 : 75 : // check the range - 76 2930 : BOOST_ASSERT_MSG(pin < TEST_HAL_NUM_GPIO_PINS, "Pin number out of range"); + 76 2932 : BOOST_ASSERT_MSG(pin < TEST_HAL_NUM_GPIO_PINS, "Pin number out of range"); 77 : 78 : // check it is output - 79 2930 : BOOST_ASSERT_MSG(this->gpio[pin].mode == TEST_HAL_OUTPUT, "GPIO is not output!"); + 79 2932 : BOOST_ASSERT_MSG(this->gpio[pin].mode == TEST_HAL_OUTPUT, "GPIO is not output!"); 80 : 81 : // check known values - 82 2930 : BOOST_ASSERT_MSG(((value == TEST_HAL_LOW) || (value == TEST_HAL_HIGH)), "Invalid output value"); + 82 2932 : BOOST_ASSERT_MSG(((value == TEST_HAL_LOW) || (value == TEST_HAL_HIGH)), "Invalid output value"); 83 : 84 : // set value - 85 2930 : this->gpio[pin].value = value; - 86 2930 : this->gpio[pin].event = true; - 87 2930 : if(radio) { - 88 2930 : this->radio->HandleGPIO(); + 85 2932 : this->gpio[pin].value = value; + 86 2932 : this->gpio[pin].event = true; + 87 2932 : if(radio) { + 88 2932 : this->radio->HandleGPIO(); 89 : } - 90 2930 : this->gpio[pin].event = false; - 91 2930 : } + 90 2932 : this->gpio[pin].event = false; + 91 2932 : } 92 : 93 846 : uint32_t digitalRead(uint32_t pin) override { 94 : HAL_LOG("TestHal::digitalRead(pin=" << pin << ")"); @@ -196,19 +196,19 @@ 134 : HAL_LOG("TestHal::delay(ms=" << ms << ")=" << elapsed.count() << "ms"); 135 0 : } 136 : - 137 4613 : void delayMicroseconds(unsigned long us) override { + 137 4615 : void delayMicroseconds(unsigned long us) override { 138 : HAL_LOG("TestHal::delayMicroseconds(us=" << us << ")"); - 139 4613 : const auto start = std::chrono::high_resolution_clock::now(); + 139 4615 : const auto start = std::chrono::high_resolution_clock::now(); 140 : 141 : // busy wait is needed for microseconds precision - 142 4613 : const auto len = std::chrono::microseconds(us); - 143 6617088 : while(std::chrono::high_resolution_clock::now() - start < len); + 142 4615 : const auto len = std::chrono::microseconds(us); + 143 6669095 : while(std::chrono::high_resolution_clock::now() - start < len); 144 : 145 : // measure and print - 146 4613 : const auto end = std::chrono::high_resolution_clock::now(); - 147 4613 : const std::chrono::duration<double, std::micro> elapsed = end - start; + 146 4615 : const auto end = std::chrono::high_resolution_clock::now(); + 147 4615 : const std::chrono::duration<double, std::micro> elapsed = end - start; 148 : HAL_LOG("TestHal::delayMicroseconds(us=" << us << ")=" << elapsed.count() << "us"); - 149 4613 : } + 149 4615 : } 150 : 151 0 : void yield() override { 152 : HAL_LOG("TestHal::yield()"); @@ -222,12 +222,12 @@ 160 846 : return(res.count()); 161 : } 162 : - 163 1461 : unsigned long micros() override { + 163 1462 : unsigned long micros() override { 164 : HAL_LOG("TestHal::micros()"); - 165 1461 : std::chrono::time_point now = std::chrono::high_resolution_clock::now(); - 166 1461 : auto res = std::chrono::duration_cast<std::chrono::microseconds>(now - this->start); + 165 1462 : std::chrono::time_point now = std::chrono::high_resolution_clock::now(); + 166 1462 : auto res = std::chrono::duration_cast<std::chrono::microseconds>(now - this->start); 167 : HAL_LOG("TestHal::micros()=" << res.count()); - 168 1461 : return(res.count()); + 168 1462 : return(res.count()); 169 : } 170 : 171 0 : long pulseIn(uint32_t pin, uint32_t state, unsigned long timeout) override { @@ -244,33 +244,33 @@ 182 : HAL_LOG("TestHal::spiBegin()"); 183 0 : } 184 : - 185 1463 : void spiBeginTransaction() { + 185 1464 : void spiBeginTransaction() { 186 : HAL_LOG("TestHal::spiBeginTransaction()"); - 187 1463 : } + 187 1464 : } 188 : - 189 1463 : void spiTransfer(uint8_t* out, size_t len, uint8_t* in) { + 189 1464 : void spiTransfer(uint8_t* out, size_t len, uint8_t* in) { 190 : HAL_LOG("TestHal::spiTransfer(len=" << len << ")"); 191 : - 192 5653 : for(size_t i = 0; i < len; i++) { + 192 5656 : for(size_t i = 0; i < len; i++) { 193 : // append to log - 194 4190 : (*this->spiLogPtr++) = out[i]; + 194 4192 : (*this->spiLogPtr++) = out[i]; 195 : 196 : // process the SPI byte - 197 4190 : in[i] = this->radio->HandleSPI(out[i]); + 197 4192 : in[i] = this->radio->HandleSPI(out[i]); 198 : 199 : // artificial delay to emulate SPI running at a finite speed 200 : // this is added because timeouts are based on time duration, 201 : // so we need to make sure some time actually elapses - 202 4190 : this->delayMicroseconds(100); + 202 4192 : this->delayMicroseconds(100); 203 : 204 : // output debug 205 : HAL_LOG(fmt::format("out={:#02x}, in={:#02x}", out[i], in[i])); 206 : } - 207 1463 : } + 207 1464 : } 208 : - 209 1463 : void spiEndTransaction() { + 209 1464 : void spiEndTransaction() { 210 : HAL_LOG("TestHal::spiEndTransaction()"); - 211 1463 : } + 211 1464 : } 212 : 213 0 : void spiEnd() { 214 : HAL_LOG("TestHal::spiEnd()"); diff --git a/coverage/extras/test/unit/include/index-sort-f.html b/coverage/extras/test/unit/include/index-sort-f.html index e0b24a58..0f4d23c6 100644 --- a/coverage/extras/test/unit/include/index-sort-f.html +++ b/coverage/extras/test/unit/include/index-sort-f.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 18 diff --git a/coverage/extras/test/unit/include/index-sort-l.html b/coverage/extras/test/unit/include/index-sort-l.html index b9cc0cd5..84f36b94 100644 --- a/coverage/extras/test/unit/include/index-sort-l.html +++ b/coverage/extras/test/unit/include/index-sort-l.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 18 diff --git a/coverage/extras/test/unit/include/index.html b/coverage/extras/test/unit/include/index.html index 4fa239e8..93fb066c 100644 --- a/coverage/extras/test/unit/include/index.html +++ b/coverage/extras/test/unit/include/index.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 18 diff --git a/coverage/extras/test/unit/tests/TestModule.cpp.func-sort-c.html b/coverage/extras/test/unit/tests/TestModule.cpp.func-sort-c.html index ce23719e..ed0e5c70 100644 --- a/coverage/extras/test/unit/tests/TestModule.cpp.func-sort-c.html +++ b/coverage/extras/test/unit/tests/TestModule.cpp.func-sort-c.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10 diff --git a/coverage/extras/test/unit/tests/TestModule.cpp.func.html b/coverage/extras/test/unit/tests/TestModule.cpp.func.html index 5787cb9c..fc0b5359 100644 --- a/coverage/extras/test/unit/tests/TestModule.cpp.func.html +++ b/coverage/extras/test/unit/tests/TestModule.cpp.func.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10 diff --git a/coverage/extras/test/unit/tests/TestModule.cpp.gcov.html b/coverage/extras/test/unit/tests/TestModule.cpp.gcov.html index 24bcfbff..5efb036e 100644 --- a/coverage/extras/test/unit/tests/TestModule.cpp.gcov.html +++ b/coverage/extras/test/unit/tests/TestModule.cpp.gcov.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10 diff --git a/coverage/extras/test/unit/tests/index-sort-f.html b/coverage/extras/test/unit/tests/index-sort-f.html index bfac0d7c..74c2e638 100644 --- a/coverage/extras/test/unit/tests/index-sort-f.html +++ b/coverage/extras/test/unit/tests/index-sort-f.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10 diff --git a/coverage/extras/test/unit/tests/index-sort-l.html b/coverage/extras/test/unit/tests/index-sort-l.html index b86bda70..78432ec6 100644 --- a/coverage/extras/test/unit/tests/index-sort-l.html +++ b/coverage/extras/test/unit/tests/index-sort-l.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10 diff --git a/coverage/extras/test/unit/tests/index.html b/coverage/extras/test/unit/tests/index.html index 23aa3e62..b610c779 100644 --- a/coverage/extras/test/unit/tests/index.html +++ b/coverage/extras/test/unit/tests/index.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10 diff --git a/coverage/index-sort-f.html b/coverage/index-sort-f.html index 678ee92e..3dd7cba7 100644 --- a/coverage/index-sort-f.html +++ b/coverage/index-sort-f.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 38 diff --git a/coverage/index-sort-l.html b/coverage/index-sort-l.html index 271acdf3..f1bd625d 100644 --- a/coverage/index-sort-l.html +++ b/coverage/index-sort-l.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 38 diff --git a/coverage/index.html b/coverage/index.html index c91ebf32..54df9195 100644 --- a/coverage/index.html +++ b/coverage/index.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 38 diff --git a/coverage/src/Hal.cpp.func-sort-c.html b/coverage/src/Hal.cpp.func-sort-c.html index 42bdb34e..26d64d72 100644 --- a/coverage/src/Hal.cpp.func-sort-c.html +++ b/coverage/src/Hal.cpp.func-sort-c.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 1 diff --git a/coverage/src/Hal.cpp.func.html b/coverage/src/Hal.cpp.func.html index e5e5e0af..f982f6de 100644 --- a/coverage/src/Hal.cpp.func.html +++ b/coverage/src/Hal.cpp.func.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 1 diff --git a/coverage/src/Hal.cpp.gcov.html b/coverage/src/Hal.cpp.gcov.html index 03414bb5..35ed02b4 100644 --- a/coverage/src/Hal.cpp.gcov.html +++ b/coverage/src/Hal.cpp.gcov.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 1 diff --git a/coverage/src/Module.cpp.func-sort-c.html b/coverage/src/Module.cpp.func-sort-c.html index 4ff89ad0..70581f33 100644 --- a/coverage/src/Module.cpp.func-sort-c.html +++ b/coverage/src/Module.cpp.func-sort-c.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 9 @@ -145,11 +145,11 @@ _ZN6Module11SPItransferEtjPKhPhm - 1040 + 1041 _ZN6Module15SPIreadRegisterEj - 1453 + 1454
diff --git a/coverage/src/Module.cpp.func.html b/coverage/src/Module.cpp.func.html index cf7f5658..33068170 100644 --- a/coverage/src/Module.cpp.func.html +++ b/coverage/src/Module.cpp.func.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 9 @@ -61,7 +61,7 @@ _ZN6Module11SPItransferEtjPKhPhm - 1040 + 1041 _ZN6Module13SPIreadStreamEPKhhPhmbb @@ -93,7 +93,7 @@ _ZN6Module15SPIreadRegisterEj - 1453 + 1454 _ZN6Module15setRfSwitchPinsEjj diff --git a/coverage/src/Module.cpp.gcov.html b/coverage/src/Module.cpp.gcov.html index 410ef3a3..eae8eb78 100644 --- a/coverage/src/Module.cpp.gcov.html +++ b/coverage/src/Module.cpp.gcov.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 9 @@ -143,9 +143,9 @@ 81 : #if RADIOLIB_DEBUG_SPI 82 : uint8_t readValue = 0x00; 83 : #endif - 84 1447 : while(this->hal->micros() - start < (checkInterval * 1000)) { - 85 1439 : uint8_t val = SPIreadRegister(reg); - 86 1439 : if((val & checkMask) == (newValue & checkMask)) { + 84 1448 : while(this->hal->micros() - start < (checkInterval * 1000)) { + 85 1440 : uint8_t val = SPIreadRegister(reg); + 86 1440 : if((val & checkMask) == (newValue & checkMask)) { 87 : // check passed, we can stop the loop 88 2 : return(RADIOLIB_ERR_NONE); 89 : } @@ -186,10 +186,10 @@ 124 : } 125 0 : } 126 : - 127 1453 : uint8_t Module::SPIreadRegister(uint32_t reg) { - 128 1453 : uint8_t resp = 0; - 129 1453 : if(!spiConfig.stream) { - 130 1035 : SPItransfer(this->spiConfig.cmds[RADIOLIB_MODULE_SPI_COMMAND_READ], reg, NULL, &resp, 1); + 127 1454 : uint8_t Module::SPIreadRegister(uint32_t reg) { + 128 1454 : uint8_t resp = 0; + 129 1454 : if(!spiConfig.stream) { + 130 1036 : SPItransfer(this->spiConfig.cmds[RADIOLIB_MODULE_SPI_COMMAND_READ], reg, NULL, &resp, 1); 131 : } else { 132 : uint8_t cmd[6]; 133 418 : uint8_t* cmdPtr = cmd; @@ -201,7 +201,7 @@ 139 : } 140 418 : SPItransferStream(cmd, this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_CMD]/8 + this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_ADDR]/8, false, NULL, &resp, 1, true); 141 : } - 142 1453 : return(resp); + 142 1454 : return(resp); 143 : } 144 : 145 0 : void Module::SPIwriteRegisterBurst(uint32_t reg, const uint8_t* data, size_t numBytes) { @@ -236,44 +236,44 @@ 174 : } 175 10 : } 176 : - 177 1040 : void Module::SPItransfer(uint16_t cmd, uint32_t reg, const uint8_t* dataOut, uint8_t* dataIn, size_t numBytes) { + 177 1041 : void Module::SPItransfer(uint16_t cmd, uint32_t reg, const uint8_t* dataOut, uint8_t* dataIn, size_t numBytes) { 178 : // prepare the buffers - 179 1040 : size_t buffLen = this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_CMD]/8 + this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_ADDR]/8 + numBytes; + 179 1041 : size_t buffLen = this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_CMD]/8 + this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_ADDR]/8 + numBytes; 180 : #if RADIOLIB_STATIC_ONLY 181 : uint8_t buffOut[RADIOLIB_STATIC_ARRAY_SIZE]; 182 : uint8_t buffIn[RADIOLIB_STATIC_ARRAY_SIZE]; 183 : #else - 184 1040 : uint8_t* buffOut = new uint8_t[buffLen]; - 185 1040 : uint8_t* buffIn = new uint8_t[buffLen]; + 184 1041 : uint8_t* buffOut = new uint8_t[buffLen]; + 185 1041 : uint8_t* buffIn = new uint8_t[buffLen]; 186 : #endif - 187 1040 : uint8_t* buffOutPtr = buffOut; + 187 1041 : uint8_t* buffOutPtr = buffOut; 188 : 189 : // copy the command 190 : // TODO properly handle variable commands and addresses - 191 1040 : if(this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_ADDR] <= 8) { - 192 1040 : *(buffOutPtr++) = reg | cmd; + 191 1041 : if(this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_ADDR] <= 8) { + 192 1041 : *(buffOutPtr++) = reg | cmd; 193 : } else { 194 0 : *(buffOutPtr++) = (reg >> 8) | cmd; 195 0 : *(buffOutPtr++) = reg & 0xFF; 196 : } 197 : 198 : // copy the data - 199 1040 : if(cmd == spiConfig.cmds[RADIOLIB_MODULE_SPI_COMMAND_WRITE]) { + 199 1041 : if(cmd == spiConfig.cmds[RADIOLIB_MODULE_SPI_COMMAND_WRITE]) { 200 5 : memcpy(buffOutPtr, dataOut, numBytes); 201 : } else { - 202 1035 : memset(buffOutPtr, this->spiConfig.cmds[RADIOLIB_MODULE_SPI_COMMAND_NOP], numBytes); + 202 1036 : memset(buffOutPtr, this->spiConfig.cmds[RADIOLIB_MODULE_SPI_COMMAND_NOP], numBytes); 203 : } 204 : 205 : // do the transfer - 206 1040 : this->hal->spiBeginTransaction(); - 207 1040 : this->hal->digitalWrite(this->csPin, this->hal->GpioLevelLow); - 208 1040 : this->hal->spiTransfer(buffOut, buffLen, buffIn); - 209 1040 : this->hal->digitalWrite(this->csPin, this->hal->GpioLevelHigh); - 210 1040 : this->hal->spiEndTransaction(); + 206 1041 : this->hal->spiBeginTransaction(); + 207 1041 : this->hal->digitalWrite(this->csPin, this->hal->GpioLevelLow); + 208 1041 : this->hal->spiTransfer(buffOut, buffLen, buffIn); + 209 1041 : this->hal->digitalWrite(this->csPin, this->hal->GpioLevelHigh); + 210 1041 : this->hal->spiEndTransaction(); 211 : 212 : // copy the data - 213 1040 : if(cmd == spiConfig.cmds[RADIOLIB_MODULE_SPI_COMMAND_READ]) { - 214 1035 : memcpy(dataIn, &buffIn[this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_ADDR]/8], numBytes); + 213 1041 : if(cmd == spiConfig.cmds[RADIOLIB_MODULE_SPI_COMMAND_READ]) { + 214 1036 : memcpy(dataIn, &buffIn[this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_ADDR]/8], numBytes); 215 : } 216 : 217 : // print debug information @@ -293,10 +293,10 @@ 231 : #endif 232 : 233 : #if !RADIOLIB_STATIC_ONLY - 234 1040 : delete[] buffOut; - 235 1040 : delete[] buffIn; + 234 1041 : delete[] buffOut; + 235 1041 : delete[] buffIn; 236 : #endif - 237 1040 : } + 237 1041 : } 238 : 239 0 : int16_t Module::SPIreadStream(uint16_t cmd, uint8_t* data, size_t numBytes, bool waitForGpio, bool verify) { 240 : uint8_t cmdBuf[2]; diff --git a/coverage/src/index-sort-f.html b/coverage/src/index-sort-f.html index 506d90a6..c704c9eb 100644 --- a/coverage/src/index-sort-f.html +++ b/coverage/src/index-sort-f.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10 diff --git a/coverage/src/index-sort-l.html b/coverage/src/index-sort-l.html index 25794817..63a8b745 100644 --- a/coverage/src/index-sort-l.html +++ b/coverage/src/index-sort-l.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10 diff --git a/coverage/src/index.html b/coverage/src/index.html index 6870580c..840fd053 100644 --- a/coverage/src/index.html +++ b/coverage/src/index.html @@ -37,7 +37,7 @@ Date: - 2025-03-02 19:27:13 + 2025-03-03 07:35:17 Functions: 10