Diff: radio.h

Revision:

1:e79b0a55135f

Parent:

0:9c052ff8dd6a

Child:

2:c321b5919516

--- a/radio.h	Thu Jul 05 17:31:54 2018 -0700
+++ b/radio.h	Mon Jul 16 11:15:59 2018 -0700
@@ -64,6 +64,7 @@
      * \param [IN] channelDetected    Channel Activity detected during the CAD
      */
     void ( *CadDone ) ( bool channelActivityDetected );
+
 } RadioEvents_t;
 
 class Radio {
@@ -74,7 +75,7 @@
         static void Sleep(void);
         static void SetChannel(unsigned hz);
         static float getFrfMHz(void);
-        static void SetRxMaxPayloadLength(RadioModems_t, uint8_t);
+        static void SetRxMaxPayloadLength(uint8_t);
         static void Rx(unsigned timeout); // timeout 0 for continuous rx
         static void Standby(void);
         static bool CheckRfFrequency(unsigned hz);
@@ -100,6 +101,8 @@
         static LowPowerTimer lpt;
 #ifdef SX127x_H 
         static SX127x radio;
+        static SX127x_lora lora;
+        static SX127x_fsk fsk;
 #elif defined(SX126x_H)
         static SX126x radio;
 #elif defined(SX128x_H)
@@ -109,11 +112,8 @@
 #endif
 
     private:
+        static void print_buf(const uint8_t* buf, uint8_t size, const char* txt);
         static void boardInit(void);
-#ifdef SX127x_H 
-        static SX127x_lora lora;
-        static SX127x_fsk fsk;
-#endif /* SX127x_H */
 #ifdef SX126x_H 
         static RadioModems_t _m_;
         static void rx_done(uint8_t, float, float);
@@ -123,7 +123,6 @@
         static PacketParams_t pp;
 #endif /* SX126x_H */
 #ifdef SX128x_H 
-        static RadioModems_t _m_;
         static void readChip(void);
         static PacketParams_t ppGFSK, ppLORA, ppFLRC;
         static ModulationParams_t mpFLRC, mpBLE_GFSK, mpLORA;