cleanup

crossbow.ino

@@ -1,5 +1,5 @@
-#define DEVICE_MODE_TX
+// #define DEVICE_MODE_TX
-// #define DEVICE_MODE_RX
+#define DEVICE_MODE_RX
 
 #define FEATURE_TX_OLED
 #define FORCE_TX_WITHOUT_INPUT

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;

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
+  size_t write(uint8_t byte);
-  virtual size_t write(uint8_t byte);
+  size_t write(const uint8_t *buffer, size_t size);
-  virtual size_t write(const uint8_t *buffer, size_t size);
+  int available();
-
+  int read();
-  // from Stream
-  virtual int available();
-  virtual int read();
-  virtual int peek();
-  virtual void flush();
 
   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);