From 8a81a7c8279c2205d5cd4a2655238fc83f26f55f Mon Sep 17 00:00:00 2001 From: jgromes Date: Sun, 18 Sep 2022 16:14:42 +0200 Subject: [PATCH] [RF69] Added finishTransmit --- .../RF69_Transmit_Interrupt.ino | 5 +++++ src/modules/RF69/RF69.cpp | 21 ++++++++++--------- src/modules/RF69/RF69.h | 7 +++++++ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/examples/RF69/RF69_Transmit_Interrupt/RF69_Transmit_Interrupt.ino b/examples/RF69/RF69_Transmit_Interrupt/RF69_Transmit_Interrupt.ino index 6ae3fa1c..214474f9 100644 --- a/examples/RF69/RF69_Transmit_Interrupt/RF69_Transmit_Interrupt.ino +++ b/examples/RF69/RF69_Transmit_Interrupt/RF69_Transmit_Interrupt.ino @@ -128,6 +128,11 @@ void loop() { } + // clean up after transmission is finished + // this will ensure transmitter is disabled, + // RF switch is powered down etc. + radio.finishTransmit(); + // wait a second before transmitting again delay(1000); diff --git a/src/modules/RF69/RF69.cpp b/src/modules/RF69/RF69.cpp index 9867b576..699bf16d 100644 --- a/src/modules/RF69/RF69.cpp +++ b/src/modules/RF69/RF69.cpp @@ -125,19 +125,12 @@ int16_t RF69::transmit(uint8_t* data, size_t len, uint8_t addr) { _mod->yield(); if(_mod->micros() - start > timeout) { - standby(); - clearIRQFlags(); + finishTransmit(); return(RADIOLIB_ERR_TX_TIMEOUT); } } - - // set mode to standby - standby(); - - // clear interrupt flags - clearIRQFlags(); - - return(RADIOLIB_ERR_NONE); + + return(finishTransmit()); } int16_t RF69::receive(uint8_t* data, size_t len) { @@ -442,6 +435,14 @@ int16_t RF69::startTransmit(uint8_t* data, size_t len, uint8_t addr) { return(state); } +int16_t RF69::finishTransmit() { + // clear interrupt flags + clearIRQFlags(); + + // set mode to standby to disable transmitter/RF switch + return(standby()); +} + int16_t RF69::readData(uint8_t* data, size_t len) { // set mode to standby int16_t state = standby(); diff --git a/src/modules/RF69/RF69.h b/src/modules/RF69/RF69.h index e1d3acf7..9233f57a 100644 --- a/src/modules/RF69/RF69.h +++ b/src/modules/RF69/RF69.h @@ -684,6 +684,13 @@ class RF69: public PhysicalLayer { */ int16_t startTransmit(uint8_t* data, size_t len, uint8_t addr = 0) override; + /*! + \brief Clean up after transmission is done. + + \returns \ref status_codes + */ + int16_t finishTransmit() override; + /*! \brief Interrupt-driven receive method. GDO0 will be activated when full packet is received.