From 52feecbee858f0f0a61ea1ece2b5a604c7204d14 Mon Sep 17 00:00:00 2001 From: Pawel Spychalski Date: Fri, 1 Dec 2017 12:20:41 +0100 Subject: [PATCH] cleanup --- crossbow.ino | 4 ++-- lora.cpp | 25 +------------------------ lora.h | 19 +++++-------------- 3 files changed, 8 insertions(+), 40 deletions(-) diff --git a/crossbow.ino b/crossbow.ino index d7822b0..bfd88d6 100644 --- a/crossbow.ino +++ b/crossbow.ino @@ -1,5 +1,5 @@ -#define DEVICE_MODE_TX -// #define DEVICE_MODE_RX +// #define DEVICE_MODE_TX +#define DEVICE_MODE_RX #define FEATURE_TX_OLED #define FORCE_TX_WITHOUT_INPUT diff --git a/lora.cpp b/lora.cpp index 6960824..c7966a9 100644 --- a/lora.cpp +++ b/lora.cpp @@ -60,8 +60,7 @@ LoRaClass::LoRaClass() : _implicitHeaderMode(0), _onReceive(NULL) { - // overide Stream timeout value - setTimeout(0); + } int LoRaClass::begin(long frequency) @@ -250,28 +249,6 @@ int LoRaClass::read() return readRegister(REG_FIFO); } -int LoRaClass::peek() -{ - if (!available()) { - return -1; - } - - // store current FIFO address - int currentAddress = readRegister(REG_FIFO_ADDR_PTR); - - // read - uint8_t b = readRegister(REG_FIFO); - - // restore FIFO address - writeRegister(REG_FIFO_ADDR_PTR, currentAddress); - - return b; -} - -void LoRaClass::flush() -{ -} - void LoRaClass::onReceive(void(*callback)(int)) { _onReceive = callback; diff --git a/lora.h b/lora.h index 6afa17b..ef9e992 100644 --- a/lora.h +++ b/lora.h @@ -16,7 +16,7 @@ #define PA_OUTPUT_RFO_PIN 0 #define PA_OUTPUT_PA_BOOST_PIN 1 -class LoRaClass : public Stream { +class LoRaClass { public: LoRaClass(); @@ -30,15 +30,10 @@ public: int packetRssi(); float packetSnr(); - // from Print - virtual size_t write(uint8_t byte); - virtual size_t write(const uint8_t *buffer, size_t size); - - // from Stream - virtual int available(); - virtual int read(); - virtual int peek(); - virtual void flush(); + size_t write(uint8_t byte); + size_t write(const uint8_t *buffer, size_t size); + int available(); + int read(); void onReceive(void(*callback)(int)); @@ -56,10 +51,6 @@ public: void enableCrc(); void disableCrc(); - // deprecated - void crc() { enableCrc(); } - void noCrc() { disableCrc(); } - byte random(); void setPins(int ss = LORA_DEFAULT_SS_PIN, int reset = LORA_DEFAULT_RESET_PIN, int dio0 = LORA_DEFAULT_DIO0_PIN);