Merge pull request #6411 from AnttiKauppila/stack_refactoring

Stack refactoring

Author: Cruz Monrreal

features/lorawan/LoRaWANBase.h

@@ -331,6 +331,18 @@ class LoRaWANBase {
      *                          callbacks.
      */
     virtual lorawan_status_t add_app_callbacks(lorawan_app_callbacks_t *callbacks) = 0;
+
+    /** Change device class
+     *
+     * Change current device class.
+     *
+     * @param    device_class   The device class
+     *
+     * @return                  LORAWAN_STATUS_OK on success,
+     *                          LORAWAN_STATUS_UNSUPPORTED is requested class is not supported,
+     *                          or other negative error code if request failed.
+     */
+    virtual lorawan_status_t set_device_class(device_class_t device_class) = 0;
 };
 
 #endif /* LORAWAN_BASE_H_ */

features/lorawan/LoRaWANInterface.cpp

@@ -28,14 +28,9 @@ inline LoRaWANStack& stk_obj()
     return LoRaWANStack::get_lorawan_stack();
 }
 
-LoRaWANInterface::LoRaWANInterface(LoRaRadio& radio) : _link_check_requested(false)
+LoRaWANInterface::LoRaWANInterface(LoRaRadio& radio)
 {
-    // Pass mac_handlers to radio to the radio driver after
-    // binding radio driver to PHY layer
-    radio_events_t *events = stk_obj().bind_radio_driver(radio);
-    radio.lock();
-    radio.init_radio(events);
-    radio.unlock();
+    stk_obj().bind_radio_driver(radio);
 }
 
 LoRaWANInterface::~LoRaWANInterface()
@@ -44,71 +39,17 @@ LoRaWANInterface::~LoRaWANInterface()
 
 lorawan_status_t LoRaWANInterface::initialize(EventQueue *queue)
 {
-    if(!queue) {
-        return LORAWAN_STATUS_PARAMETER_INVALID;
-    }
-
     return stk_obj().initialize_mac_layer(queue);
 }
 
 lorawan_status_t LoRaWANInterface::connect()
 {
-    // connection attempt without parameters.
-    // System tries to look for configuration in mbed_lib.json that can be
-    // overridden by mbed_app.json. However, if none of the json files are
-    // available (highly unlikely), we still fallback to some default parameters.
-    // Check lorawan_data_structure for fallback defaults.
-
-    lorawan_connect_t connection_params;
-
-    if (MBED_CONF_LORA_OVER_THE_AIR_ACTIVATION) {
-        static uint8_t dev_eui[] = MBED_CONF_LORA_DEVICE_EUI;
-        static uint8_t app_eui[] = MBED_CONF_LORA_APPLICATION_EUI;
-        static uint8_t app_key[] = MBED_CONF_LORA_APPLICATION_KEY;
-        /**
-         *
-         * OTAA join
-         */
-        connection_params.connect_type = LORAWAN_CONNECTION_OTAA;
-        connection_params.connection_u.otaa.app_eui = app_eui;
-        connection_params.connection_u.otaa.dev_eui = dev_eui;
-        connection_params.connection_u.otaa.app_key = app_key;
-        connection_params.connection_u.otaa.nb_trials = MBED_CONF_LORA_NB_TRIALS;
-
-        return connect(connection_params);
-    } else {
-        static uint8_t nwk_skey[] = MBED_CONF_LORA_NWKSKEY;
-        static uint8_t app_skey[] = MBED_CONF_LORA_APPSKEY;
-        static uint32_t dev_addr = MBED_CONF_LORA_DEVICE_ADDRESS;
-        static uint32_t nwk_id = (MBED_CONF_LORA_DEVICE_ADDRESS & LORAWAN_NETWORK_ID_MASK);
-
-        /**
-         *
-         * ABP connection
-         */
-        connection_params.connect_type = LORAWAN_CONNECTION_ABP;
-        connection_params.connection_u.abp.nwk_id = nwk_id;
-        connection_params.connection_u.abp.dev_addr = dev_addr;
-        connection_params.connection_u.abp.nwk_skey = nwk_skey;
-        connection_params.connection_u.abp.app_skey = app_skey;
-
-        return connect(connection_params);
-    }
+    return stk_obj().connect();
 }
 
 lorawan_status_t LoRaWANInterface::connect(const lorawan_connect_t &connect)
 {
-    lorawan_status_t mac_status;
-
-    if (connect.connect_type == LORAWAN_CONNECTION_OTAA) {
-        mac_status = stk_obj().join_request_by_otaa(connect);
-    } else if (connect.connect_type == LORAWAN_CONNECTION_ABP) {
-        mac_status = stk_obj().activation_by_personalization(connect);
-    } else {
-        return LORAWAN_STATUS_PARAMETER_INVALID;
-    }
-
-    return mac_status;
+    return stk_obj().connect(connect);
 }
 
 lorawan_status_t LoRaWANInterface::disconnect()
@@ -118,13 +59,12 @@ lorawan_status_t LoRaWANInterface::disconnect()
 
 lorawan_status_t LoRaWANInterface::add_link_check_request()
 {
-    _link_check_requested = true;
     return stk_obj().set_link_check_request();
 }
 
 void LoRaWANInterface::remove_link_check_request()
 {
-    _link_check_requested = false;
+    stk_obj().remove_link_check_request();
 }
 
 lorawan_status_t LoRaWANInterface::set_datarate(uint8_t data_rate)
@@ -170,37 +110,22 @@ lorawan_status_t LoRaWANInterface::remove_channel_plan()
 int16_t LoRaWANInterface::send(uint8_t port, const uint8_t* data,
                                uint16_t length, int flags)
 {
-    if (_link_check_requested) {
-        // add a link check request with normal data, until the application
-        // explicitly removes it.
-        add_link_check_request();
-    }
+    return stk_obj().handle_tx(port, data, length, flags);
 
-    if (data) {
-        return stk_obj().handle_tx(port, data, length, flags);
-    } else {
-        return LORAWAN_STATUS_PARAMETER_INVALID;
-    }
 }
 
 int16_t LoRaWANInterface::receive(uint8_t port, uint8_t* data, uint16_t length,
                                   int flags)
 {
-    if (data && length > 0) {
-        return stk_obj().handle_rx(port, data, length, flags);
-    } else {
-        return LORAWAN_STATUS_PARAMETER_INVALID;
-    }
+    return stk_obj().handle_rx(port, data, length, flags);
 }
 
 lorawan_status_t LoRaWANInterface::add_app_callbacks(lorawan_app_callbacks_t *callbacks)
-  {
-
-     if (!callbacks || !callbacks->events) {
-         // Event Callback is mandatory
-         return LORAWAN_STATUS_PARAMETER_INVALID;
-     }
+{
+    return stk_obj().set_lora_callbacks(callbacks);
+}
 
-     stk_obj().set_lora_callbacks(callbacks);
-     return LORAWAN_STATUS_OK;
-  }
+lorawan_status_t LoRaWANInterface::set_device_class(const device_class_t device_class)
+{
+    return stk_obj().set_device_class(device_class);
+}

features/lorawan/LoRaWANInterface.h

@@ -429,8 +429,17 @@ class LoRaWANInterface: public LoRaWANBase {
        */
     virtual lorawan_status_t add_app_callbacks(lorawan_app_callbacks_t *callbacks);
 
-private:
-    bool _link_check_requested;
+    /** Change device class
+     *
+     * Change current device class.
+     *
+     * @param    device_class   The device class
+     *
+     * @return                  LORAWAN_STATUS_OK on success,
+     *                          LORAWAN_STATUS_UNSUPPORTED is requested class is not supported,
+     *                          or other negative error code if request failed.
+     */
+    virtual lorawan_status_t set_device_class(const device_class_t device_class);
 };
 
 #endif /* LORAWANINTERFACE_H_ */