Revision 29:fb5769f4a67c, committed 2020-04-02

Comitter:

Jenkins@KEILDM1.dc.multitech.prv

Date:

Thu Apr 02 09:36:13 2020 -0500

Parent:

28:486ba5db902b

Commit message:

xdot-library revision 3.3.5 and mbed-os revision mbed-os-5.15.1

Changed in this revision

diff -r 486ba5db902b -r fb5769f4a67c ChannelPlan.h
--- a/ChannelPlan.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/ChannelPlan.h	Thu Apr 02 09:36:13 2020 -0500
@@ -193,12 +193,18 @@
             virtual uint8_t GetMaxPayloadSize();
 
             /**
+             * Get max payload size for a given datarate
+             * @return size in bytes
+             */
+            virtual uint8_t GetMaxPayloadSize(uint8_t dr);
+
+            /**
              * Get rx window settings for requested window
              * RX_1, RX_2, RX_BEACON, RX_SLOT
              * @param window
              * @return RxWindow
              */
-            virtual RxWindow GetRxWindow(uint8_t window) = 0;
+            virtual RxWindow GetRxWindow(uint8_t window, int8_t id = 0) = 0;
 
             /**
              * Get current channel to use for transmitting
@@ -271,7 +277,8 @@
             virtual uint8_t SetRxConfig(uint8_t window,
                                         bool continuous,
                                         uint16_t wnd_growth = 1,
-                                        uint16_t pad_ms = 0) = 0;
+                                        uint16_t pad_ms = 0,
+                                        int8_t id = 0);
 
             /**
              * Set frequency sub band if supported by plan
@@ -287,11 +294,6 @@
             virtual uint8_t GetFrequencySubBand();
 
             /**
-             * Reset the ack counter used to lower datarate if ACK's are missed
-             */
-            virtual void ResetAckCounter();
-
-            /**
              * Callback for radio to request channel change when frequency hopping
              * @param currentChannel
              */
@@ -578,7 +580,7 @@
              * @param [out] data extracted from the beacon if this packet was indeed a beacon
              * @return true if this packet is beacon, false if not
              */
-            virtual bool DecodeBeacon(const uint8_t* payload,
+            virtual uint8_t DecodeBeacon(const uint8_t* payload,
                                       size_t size,
                                       BeaconData_t& data) = 0;
 
@@ -600,10 +602,12 @@
              * Search enabled channels for lowest available datarate
              */
             virtual uint8_t GetMinEnabledDatarate();
-        protected:
 
             SxRadio* GetRadio();                //!< Get pointer to the SxRadio object or assert if it is null
             Settings* GetSettings();            //!< Get pointer to the settings object or assert if it is null
+
+        protected:
+
             /**
              * 16 bit ITU-T CRC implementation
              */
@@ -663,6 +667,8 @@
             static const uint8_t* MAX_PAYLOAD_SIZE;             //!< List of max payload sizes for each datarate
             static const uint8_t* MAX_PAYLOAD_SIZE_REPEATER;    //!< List of repeater compatible max payload sizes for each datarate
 
+            uint8_t _beaconSize;
+
             uint8_t _plan;
             std::string _planName;
 

diff -r 486ba5db902b -r fb5769f4a67c Lora.h
--- a/Lora.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/Lora.h	Thu Apr 02 09:36:13 2020 -0500
@@ -24,8 +24,13 @@
 //#include <cstring>
 #include <inttypes.h>
 
+
 namespace lora {
 
+#ifndef MAC_VERSION
+    const std::string MAC_VERSION = "1.0.4";
+#endif
+
     /**
      * Frequency bandwidth of a Datarate, higher bandwidth gives higher datarate
      */
@@ -106,12 +111,13 @@
     const uint16_t BEACON_PREAMBLE_LENGTH = 10U;                //!< Beacon preamble length
     const uint16_t DEFAULT_BEACON_PERIOD = 128U;                //!< Default period of the beacon (in seconds)
     const uint16_t PING_SLOT_LENGTH = 30U;                      //!< Duration of each class B ping slot (in milliseconds)
-    const uint16_t BEACON_RESERVED_TIME = 2120U;                //!< Time reserved for beacon broadcast (in milliseconds)
+    const uint32_t BEACON_RESERVED_TIME = 2120U;                //!< Time reserved for beacon broadcast (in milliseconds)
     const uint16_t BEACON_GUARD_TIME = 3000U;                   //!< Guard time before beacon transmission where no ping slots can be scheduled (in milliseconds)
     const uint32_t MAX_BEACONLESS_OP_TIME = 7200U;              //!< Maximum time to operate in class B since last beacon received (in seconds)
     const uint16_t MAX_CLASS_B_WINDOW_GROWTH = 3U;              //!< Maximum window growth factor for beacons and ping slots in beacon-less operation
     const uint16_t DEFAULT_PING_NB = 1U;                        //!< Default number of ping slots per beacon interval
     const uint16_t CLS_B_PAD = 15U;                             //!< Pad added to the beginning of ping slot rx windows (in milliseconds)
+    const uint16_t BEACON_PAD = 100U;                           //!< Pad beacon window is expanded (in milliseconds)
 
     const int16_t DEFAULT_FREE_CHAN_RSSI_THRESHOLD = -90;       //!< Threshold for channel activity detection (CAD) dBm
 
@@ -187,7 +193,9 @@
         LORA_AGGREGATED_DUTY_CYCLE = 16,
         LORA_MAC_COMMAND_ERROR = 17,
         LORA_MAX_PAYLOAD_EXCEEDED = 18,
-        LORA_LBT_CHANNEL_BUSY = 19
+        LORA_LBT_CHANNEL_BUSY = 19,
+        LORA_BEACON_SIZE = 20,
+        LORA_BEACON_CRC = 21
     };
 
     /**
@@ -282,7 +290,7 @@
             uint8_t Crc;
             uint8_t TxIQ;
             uint8_t RxIQ;
-            uint8_t SymbolTimeout(uint16_t pad_ms = 0);
+            uint16_t SymbolTimeout(uint16_t pad_ms = 0);
             float Timeout();
             Datarate();
     } Datarate;
@@ -342,13 +350,15 @@
             uint8_t Mode;               //!< PUBLIC, PRIVATE or PEER_TO_PEER network mode
             uint8_t Class;              //!< Operating class of device
             uint8_t EUI[8];             //!< Network ID or AppEUI
+            uint16_t DevNonce;         //!< Incrementing DevNonce Counter
+            uint32_t AppNonce;          //!< Incrementing AppNonce Counter
             uint8_t Key[16];            //!< Network Key or AppKey
             uint8_t GenAppKey[16];      //!< Generic App Key, will be AppKey for LW 1.1.x
             uint8_t McKEKey[16];        //!< Multicast Key Encryption Key
             uint8_t JoinDelay;          //!< Number of seconds to wait before 1st RX Window
             uint8_t RxDelay;            //!< Number of seconds to wait before 1st RX Window
             uint8_t FrequencySubBand;   //!< FrequencySubBand used for US915 hybrid operation 0:72 channels, 1:1-8 channels ...
-            uint8_t AckAttempts;        //!< Number of attempts to send packet and receive an ACK from server
+            uint8_t AckEnabled;         //!< Enable confirmed messages to be sent with Retries
             uint8_t Retries;            //!< Number of times to resend a packet without receiving an ACK, redundancy
             uint8_t ADREnabled;         //!< Enable adaptive datarate
             uint8_t AdrAckLimit;       //!< Number of uplinks without a downlink to allow before setting ADRACKReq
@@ -402,7 +412,6 @@
             uint32_t JoinFirstAttempt;          //!< RTC time of first failed join attempt
             uint32_t AggregatedTimeOffEnd;      //!< Time off air expiration for aggregate duty cycle
             uint16_t AggregateDutyCycle;        //!< Used for enforcing time-on-air
-            uint8_t AckCounter;                 //!< Current number of packets sent without ACK from server
             uint8_t AdrCounter;                 //!< Current number of packets received without downlink from server
             uint8_t RxDelay;                    //!< Number of seconds to wait before 1st RX Window
             uint8_t CommandBuffer[COMMANDS_BUFFER_SIZE]; //!< Buffer to hold Mac Commands and parameters to be sent in next packet
@@ -420,11 +429,22 @@
     /**
      * Multicast session info
      */
-    typedef struct {
+    typedef struct MulticastSession {
             uint32_t Address;               //!< Network address
             uint8_t NetworkSessionKey[16];  //!< Network session key
             uint8_t DataSessionKey[16];     //!< Data session key
             uint32_t DownlinkCounter;       //!< Downlink counter of last packet received from server
+            int8_t Periodicity;             //!< Number of downlink windows to open per beacon period
+            uint32_t Frequency;             //!< Frequency used for downlink windows
+            uint8_t DatarateIndex;          //!< Datarate used for downlink windows
+            bool DataPending;               //!< Indicates network has data pending for this address
+            uint16_t PingPeriod;
+            int32_t NextPingSlot;
+            MulticastSession() :
+                Periodicity(-1)
+            {
+
+            }
     } MulticastSession;
 
     /**
@@ -459,6 +479,7 @@
             uint8_t DisableRx2;
             uint8_t FixedUplinkCounter;
             uint8_t DisableRandomJoinDatarate;
+            uint8_t DisableAppNonceValidation;
     } Testing;
 
     /**
@@ -536,6 +557,13 @@
             } Bits;
     } DownlinkControl;
 
+    typedef struct PingSlot {
+        uint32_t MSec;
+        int8_t Id;
+        PingSlot() : MSec(0), Id(-1) {}
+        PingSlot(uint32_t msec, int8_t id) : MSec(msec), Id(id) {}
+    } PingSlot;
+
     /**
      * Frame type of packet
      */

diff -r 486ba5db902b -r fb5769f4a67c MTS-Lora/vendor/multitech/MTS-Utils/MTSCircularBuffer.h
--- a/MTS-Lora/vendor/multitech/MTS-Utils/MTSCircularBuffer.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/MTS-Lora/vendor/multitech/MTS-Utils/MTSCircularBuffer.h	Thu Apr 02 09:36:13 2020 -0500
@@ -82,7 +82,7 @@
     void attach(T *tptr, void( T::*mptr)(void), int threshold, RelationalOperator op) {
         _threshold = threshold;
         _op = op;
-        notify.attach(tptr, mptr);
+        notify = callback(tptr, mptr);
     }
 
     /** This method is used to setup a callback funtion when the buffer reaches

diff -r 486ba5db902b -r fb5769f4a67c MTS-Lora/vendor/multitech/MTS-Utils/MTSLog.h
--- a/MTS-Lora/vendor/multitech/MTS-Utils/MTSLog.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/MTS-Lora/vendor/multitech/MTS-Utils/MTSLog.h	Thu Apr 02 09:36:13 2020 -0500
@@ -38,6 +38,13 @@
     mts::MTSLog::printMessage(mts::MTSLog::DEBUG_LEVEL, "%s:%s:%d| [%s] " format "\r\n", __CLASSNAME__, __func__, __LINE__, mts::MTSLog::DEBUG_LABEL, ##__VA_ARGS__)
 #define logTrace(format, ...) \
     mts::MTSLog::printMessage(mts::MTSLog::TRACE_LEVEL, "%s:%s:%d| [%s] " format "\r\n", __CLASSNAME__, __func__, __LINE__, mts::MTSLog::TRACE_LABEL, ##__VA_ARGS__)
+#elif defined(MTS_DEBUG_OFF)
+#define logFatal(...)
+#define logError(...)
+#define logWarning(...)
+#define logInfo(...)
+#define logDebug(...)
+#define logTrace(...)
 #else
 #define logFatal(format, ...) \
     __LOG__(mts::MTSLog::FATAL_LEVEL, format, ##__VA_ARGS__)

diff -r 486ba5db902b -r fb5769f4a67c Mote.h
--- a/Mote.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/Mote.h	Thu Apr 02 09:36:13 2020 -0500
@@ -168,6 +168,13 @@
             const char* getId();
 
             /**
+             * MAC version
+             *
+             * @return string containing version information of supported LoRaWAN MAC Version
+             */
+            const char* getMACVersion();
+
+            /**
              * Indicator for network session join status
              * @return true if joined to network
              */

diff -r 486ba5db902b -r fb5769f4a67c SxRadio.h
--- a/SxRadio.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/SxRadio.h	Thu Apr 02 09:36:13 2020 -0500
@@ -16,7 +16,6 @@
 #define __SXRADIO_H__
 
 #include <stdint.h>
-#include "rtos.h"
 #include "SxRadioEvents.h"
 
 /*!

diff -r 486ba5db902b -r fb5769f4a67c SxRadioEvents.h
--- a/SxRadioEvents.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/SxRadioEvents.h	Thu Apr 02 09:36:13 2020 -0500
@@ -33,6 +33,7 @@
      * \brief  Tx Timeout callback prototype.
      */
     virtual void TxTimeout( void ) {}
+
     /*!
      * \brief Rx Done callback prototype.
      *
@@ -44,6 +45,17 @@
      *                     LoRa: SNR value is two's complement in 1/4 dB
      */
     virtual void RxDone( uint8_t *payload, uint16_t size, int16_t rssi, int16_t snr ) {}
+
+    /*!
+     * \brief Called if Beacon Window cannot be opened or is missed
+     *
+     * \param [IN] beaconTime  Updated time of beacon for the period
+     * \param [IN] no_rx       True if called from rx done
+     */
+    virtual void OnBeaconless( uint32_t beaconTime, bool no_rx = false ) {}
+
+
+
     /*!
      * \brief  Rx Timeout callback prototype.
      */

diff -r 486ba5db902b -r fb5769f4a67c libxDot-ARMC6.ar
Binary file libxDot-ARMC6.ar has changed

diff -r 486ba5db902b -r fb5769f4a67c libxDot-GCC_ARM.a
Binary file libxDot-GCC_ARM.a has changed

diff -r 486ba5db902b -r fb5769f4a67c plans/ChannelPlan_AS923.h
--- a/plans/ChannelPlan_AS923.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/plans/ChannelPlan_AS923.h	Thu Apr 02 09:36:13 2020 -0500
@@ -98,7 +98,7 @@
              * @param window
              * @return RxWindow
              */
-            virtual RxWindow GetRxWindow(uint8_t window);
+            virtual RxWindow GetRxWindow(uint8_t window, int8_t id = -1);
 
             /**
              * Get datarate to use on the join request
@@ -119,18 +119,6 @@
              */
             virtual uint8_t SetTxConfig();
 
-            /**
-             * Set the SxRadio rx config provided window
-             * @param window to be opened
-             * @param continuous keep window open
-             * @param wnd_growth factor to increase the rx window by
-             * @param pad_ms time in milliseconds to add to computed window size
-             * @return LORA_OK
-             */
-            virtual uint8_t SetRxConfig(uint8_t window,
-                                        bool continuous,
-                                        uint16_t wnd_growth,
-                                        uint16_t pad_ms);
 
             /**
              * Set frequency sub band if supported by plan
@@ -140,12 +128,6 @@
             virtual uint8_t SetFrequencySubBand(uint8_t sub_band);
 
             /**
-             * Callback for ACK timeout event
-             * @return LORA_OK
-             */
-            virtual uint8_t HandleAckTimeout();
-
-            /**
              * Callback for Join Accept packet to load optional channels
              * @return LORA_OK
              */
@@ -259,6 +241,12 @@
             virtual uint8_t GetMaxPayloadSize();
 
             /**
+             * Get max payload size for given datarate
+             * @return size in bytes
+             */
+            virtual uint8_t GetMaxPayloadSize(uint8_t dr) { return ChannelPlan::GetMaxPayloadSize(dr); }
+
+            /**
              * Decrements the datarate based on TxDwellTime
              */
             virtual void DecrementDatarate();
@@ -270,7 +258,7 @@
              * @param [out] data extracted from the beacon if this packet was indeed a beacon
              * @return true if this packet is beacon, false if not
              */
-            virtual bool DecodeBeacon(const uint8_t* payload,
+            virtual uint8_t DecodeBeacon(const uint8_t* payload,
                                       size_t size,
                                       BeaconData_t& data);
 

diff -r 486ba5db902b -r fb5769f4a67c plans/ChannelPlan_AU915.h
--- a/plans/ChannelPlan_AU915.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/plans/ChannelPlan_AU915.h	Thu Apr 02 09:36:13 2020 -0500
@@ -109,7 +109,7 @@
              * @param window
              * @return RxWindow
              */
-            virtual RxWindow GetRxWindow(uint8_t window);
+            virtual RxWindow GetRxWindow(uint8_t window, int8_t id = -1);
 
             /**
              * Get datarate to use on the join request
@@ -152,19 +152,6 @@
             virtual uint8_t SetTxConfig();
 
             /**
-             * Set the SxRadio rx config provided window
-             * @param window to be opened
-             * @param continuous keep window open
-             * @param wnd_growth factor to increase the rx window by
-             * @param pad_ms time in milliseconds to add to computed window size
-             * @return LORA_OK
-             */
-            virtual uint8_t SetRxConfig(uint8_t window,
-                                        bool continuous,
-                                        uint16_t wnd_growth,
-                                        uint16_t pad_ms);
-
-            /**
              * Set frequency sub band if supported by plan
              * @param sub_band
              * @return LORA_OK
@@ -288,6 +275,12 @@
              */
             virtual uint8_t GetMaxPayloadSize();
 
+            /**
+             * Get max payload size for given datarate
+             * @return size in bytes
+             */
+            virtual uint8_t GetMaxPayloadSize(uint8_t dr) { return ChannelPlan::GetMaxPayloadSize(dr); }
+
             virtual uint8_t GetMinDatarate();
 
             virtual uint8_t GetMaxDatarate();
@@ -299,7 +292,7 @@
              * @param [out] data extracted from the beacon if this packet was indeed a beacon
              * @return true if this packet is beacon, false if not
              */
-            virtual bool DecodeBeacon(const uint8_t* payload,
+            virtual uint8_t DecodeBeacon(const uint8_t* payload,
                                       size_t size,
                                       BeaconData_t& data);
 

diff -r 486ba5db902b -r fb5769f4a67c plans/ChannelPlan_EU868.h
--- a/plans/ChannelPlan_EU868.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/plans/ChannelPlan_EU868.h	Thu Apr 02 09:36:13 2020 -0500
@@ -111,7 +111,7 @@
              * @param window
              * @return RxWindow
              */
-            virtual RxWindow GetRxWindow(uint8_t window);
+            virtual RxWindow GetRxWindow(uint8_t window, int8_t id = 0);
 
             /**
              * Get datarate to use on the join request
@@ -133,19 +133,6 @@
             virtual uint8_t SetTxConfig();
 
             /**
-             * Set the SxRadio rx config provided window
-             * @param window to be opened
-             * @param continuous keep window open
-             * @param wnd_growth factor to increase the rx window by
-             * @param pad_ms time in milliseconds to add to computed window size
-             * @return LORA_OK
-             */
-            virtual uint8_t SetRxConfig(uint8_t window,
-                                        bool continuous,
-                                        uint16_t wnd_growth,
-                                        uint16_t pad_ms);
-
-            /**
              * Set frequency sub band if supported by plan
              * @param sub_band
              * @return LORA_OK
@@ -153,12 +140,6 @@
             virtual uint8_t SetFrequencySubBand(uint8_t sub_band);
 
             /**
-             * Callback for ACK timeout event
-             * @return LORA_OK
-             */
-            virtual uint8_t HandleAckTimeout();
-
-            /**
              * Callback for Join Accept packet to load optional channels
              * @return LORA_OK
              */
@@ -265,7 +246,7 @@
              * @param [out] data extracted from the beacon if this packet was indeed a beacon
              * @return true if this packet is beacon, false if not
              */
-            virtual bool DecodeBeacon(const uint8_t* payload,
+            virtual uint8_t DecodeBeacon(const uint8_t* payload,
                                       size_t size,
                                       BeaconData_t& data);
 

diff -r 486ba5db902b -r fb5769f4a67c plans/ChannelPlan_IN865.h
--- a/plans/ChannelPlan_IN865.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/plans/ChannelPlan_IN865.h	Thu Apr 02 09:36:13 2020 -0500
@@ -80,7 +80,7 @@
              * @param window
              * @return RxWindow
              */
-            virtual RxWindow GetRxWindow(uint8_t window);
+            virtual RxWindow GetRxWindow(uint8_t window, int8_t id = 0);
 
             /**
              * Get datarate to use on the join request
@@ -101,18 +101,6 @@
              */
             virtual uint8_t SetTxConfig();
 
-            /**
-             * Set the SxRadio rx config provided window
-             * @param window to be opened
-             * @param continuous keep window open
-             * @param wnd_growth factor to increase the rx window by
-             * @param pad_ms time in milliseconds to add to computed window size
-             * @return LORA_OK
-             */
-            virtual uint8_t SetRxConfig(uint8_t window,
-                                        bool continuous,
-                                        uint16_t wnd_growth,
-                                        uint16_t pad_ms);
 
             /**
              * Set frequency sub band if supported by plan
@@ -122,12 +110,6 @@
             virtual uint8_t SetFrequencySubBand(uint8_t sub_band);
 
             /**
-             * Callback for ACK timeout event
-             * @return LORA_OK
-             */
-            virtual uint8_t HandleAckTimeout();
-
-            /**
              * Callback for Join Accept packet to load optional channels
              * @return LORA_OK
              */
@@ -251,7 +233,7 @@
              * @param [out] data extracted from the beacon if this packet was indeed a beacon
              * @return true if this packet is beacon, false if not
              */
-            virtual bool DecodeBeacon(const uint8_t* payload,
+            virtual uint8_t DecodeBeacon(const uint8_t* payload,
                                       size_t size,
                                       BeaconData_t& data);
 

diff -r 486ba5db902b -r fb5769f4a67c plans/ChannelPlan_KR920.h
--- a/plans/ChannelPlan_KR920.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/plans/ChannelPlan_KR920.h	Thu Apr 02 09:36:13 2020 -0500
@@ -79,7 +79,7 @@
              * @param window
              * @return RxWindow
              */
-            virtual RxWindow GetRxWindow(uint8_t window);
+            virtual RxWindow GetRxWindow(uint8_t window, int8_t id = 0);
 
             /**
              * Get datarate to use on the join request
@@ -101,32 +101,13 @@
             virtual uint8_t SetTxConfig();
 
             /**
-             * Set the SxRadio rx config provided window
-             * @param window to be opened
-             * @param continuous keep window open
-             * @param wnd_growth factor to increase the rx window by
-             * @param pad_ms time in milliseconds to add to computed window size
-             * @return LORA_OK
-             */
-            virtual uint8_t SetRxConfig(uint8_t window,
-                                        bool continuous,
-                                        uint16_t wnd_growth,
-                                        uint16_t pad_ms);
-
-            /**
              * Set frequency sub band if supported by plan
              * @param sub_band
              * @return LORA_OK
              */
             virtual uint8_t SetFrequencySubBand(uint8_t sub_band);
 
-            /**
-             * Callback for ACK timeout event
-             * @return LORA_OK
-             */
-            virtual uint8_t HandleAckTimeout();
-
-            /**
+           /**
              * Callback for Join Accept packet to load optional channels
              * @return LORA_OK
              */
@@ -245,7 +226,7 @@
              * @param [out] data extracted from the beacon if this packet was indeed a beacon
              * @return true if this packet is beacon, false if not
              */
-            virtual bool DecodeBeacon(const uint8_t* payload,
+            virtual uint8_t DecodeBeacon(const uint8_t* payload,
                                       size_t size,
                                       BeaconData_t& data);
 

diff -r 486ba5db902b -r fb5769f4a67c plans/ChannelPlan_RU864.h
--- a/plans/ChannelPlan_RU864.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/plans/ChannelPlan_RU864.h	Thu Apr 02 09:36:13 2020 -0500
@@ -96,7 +96,7 @@
              * @param window
              * @return RxWindow
              */
-            virtual RxWindow GetRxWindow(uint8_t window);
+            virtual RxWindow GetRxWindow(uint8_t window, int8_t id = 0);
 
             /**
              * Get datarate to use on the join request
@@ -117,18 +117,6 @@
              */
             virtual uint8_t SetTxConfig();
 
-            /**
-             * Set the SxRadio rx config provided window
-             * @param window to be opened
-             * @param continuous keep window open
-             * @param wnd_growth factor to increase the rx window by
-             * @param pad_ms time in milliseconds to add to computed window size
-             * @return LORA_OK
-             */
-            virtual uint8_t SetRxConfig(uint8_t window,
-                                        bool continuous,
-                                        uint16_t wnd_growth,
-                                        uint16_t pad_ms);
 
             /**
              * Set frequency sub band if supported by plan
@@ -138,12 +126,6 @@
             virtual uint8_t SetFrequencySubBand(uint8_t sub_band);
 
             /**
-             * Callback for ACK timeout event
-             * @return LORA_OK
-             */
-            virtual uint8_t HandleAckTimeout();
-
-            /**
              * Callback for Join Accept packet to load optional channels
              * @return LORA_OK
              */
@@ -250,7 +232,7 @@
              * @param [out] data extracted from the beacon if this packet was indeed a beacon
              * @return true if this packet is beacon, false if not
              */
-            virtual bool DecodeBeacon(const uint8_t* payload,
+            virtual uint8_t DecodeBeacon(const uint8_t* payload,
                                       size_t size,
                                       BeaconData_t& data);
 

diff -r 486ba5db902b -r fb5769f4a67c plans/ChannelPlan_US915.h
--- a/plans/ChannelPlan_US915.h	Thu Apr 02 09:18:21 2020 -0500
+++ b/plans/ChannelPlan_US915.h	Thu Apr 02 09:36:13 2020 -0500
@@ -109,7 +109,7 @@
              * @param window
              * @return RxWindow
              */
-            virtual RxWindow GetRxWindow(uint8_t window);
+            virtual RxWindow GetRxWindow(uint8_t window, int8_t id = 0);
 
             /**
              * Get datarate to use on the join request
@@ -152,19 +152,6 @@
             virtual uint8_t SetTxConfig();
 
             /**
-             * Set the SxRadio rx config provided window
-             * @param window to be opened
-             * @param continuous keep window open
-             * @param wnd_growth factor to increase the rx window by
-             * @param pad_ms time in milliseconds to add to computed window size
-             * @return LORA_OK
-             */
-            virtual uint8_t SetRxConfig(uint8_t window,
-                                        bool continuous,
-                                        uint16_t wnd_growth,
-                                        uint16_t pad_ms);
-
-            /**
              * Set frequency sub band if supported by plan
              * @param sub_band
              * @return LORA_OK
@@ -286,7 +273,7 @@
              * @param [out] data extracted from the beacon if this packet was indeed a beacon
              * @return true if this packet is beacon, false if not
              */
-            virtual bool DecodeBeacon(const uint8_t* payload,
+            virtual uint8_t DecodeBeacon(const uint8_t* payload,
                                       size_t size,
                                       BeaconData_t& data);
             /**