Merge remote-tracking branch 'iwahdan/master'

Author: iwahdan88

esp32/mods/modbt.c

@@ -58,7 +58,8 @@
  ******************************************************************************/
 #define BT_SCAN_QUEUE_SIZE_MAX                              (16)
 #define BT_GATTS_QUEUE_SIZE_MAX                             (2)
-#define BT_CHAR_VALUE_SIZE_MAX                              (20)
+#define BT_MTU_SIZE_MAX                                     (200)
+#define BT_CHAR_VALUE_SIZE_MAX                              (BT_MTU_SIZE_MAX - 3)
 
 #define MOD_BT_CLIENT_APP_ID                                (0)
 #define MOD_BT_SERVER_APP_ID                                (1)
@@ -209,6 +210,9 @@ static volatile bt_obj_t bt_obj;
 static QueueHandle_t xScanQueue;
 static QueueHandle_t xGattsQueue;
 
+static esp_ble_adv_data_t adv_data;
+static esp_ble_adv_data_t scan_rsp_data;
+
 static const mp_obj_type_t mod_bt_connection_type;
 static const mp_obj_type_t mod_bt_service_type;
 static const mp_obj_type_t mod_bt_characteristic_type;
@@ -219,7 +223,7 @@ static const mp_obj_type_t mod_bt_gatts_char_type;
 
 static esp_ble_adv_params_t bt_adv_params = {
     .adv_int_min        = 0x20,
-    .adv_int_max        = 0x20,
+    .adv_int_max        = 0x40,
     .adv_type           = ADV_TYPE_IND,
     .own_addr_type      = BLE_ADDR_TYPE_PUBLIC,
     .channel_map        = ADV_CHNL_ALL,
@@ -451,6 +455,7 @@ static void gattc_events_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc
         bt_obj.busy = false;
         // intentional fall through
     case ESP_GATTC_CLOSE_EVT:
+    case ESP_GATTC_DISCONNECT_EVT:
         close_connection(p_data->close.conn_id);
         break;
     default:
@@ -684,7 +689,7 @@ static mp_obj_t bt_init_helper(bt_obj_t *self, const mp_arg_val_t *args) {
         esp_ble_gattc_app_register(MOD_BT_CLIENT_APP_ID);
         esp_ble_gatts_app_register(MOD_BT_SERVER_APP_ID);
 
-        esp_ble_gatt_set_local_mtu(200);
+        esp_ble_gatt_set_local_mtu(BT_MTU_SIZE_MAX);
 
         self->init = true;
     }
@@ -989,7 +994,6 @@ STATIC mp_obj_t bt_set_advertisement (mp_uint_t n_args, const mp_obj_t *pos_args
         { MP_QSTR_service_uuid,             MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
     };
 
-    esp_ble_adv_data_t adv_data;
     mp_buffer_info_t manuf_bufinfo;
     mp_buffer_info_t srv_bufinfo;
     mp_buffer_info_t uuid_bufinfo;
@@ -1056,7 +1060,21 @@ STATIC mp_obj_t bt_set_advertisement (mp_uint_t n_args, const mp_obj_t *pos_args
     adv_data.appearance = 0x00;
     adv_data.flag = (ESP_BLE_ADV_FLAG_GEN_DISC | ESP_BLE_ADV_FLAG_BREDR_NOT_SPT);
 
+    // copy all the info to the scan response
+    memcpy(&scan_rsp_data, &adv_data, sizeof(esp_ble_adv_data_t));
+    scan_rsp_data.set_scan_rsp = true;
+    // do not include the name or the tx power in the scan response
+    scan_rsp_data.include_name = false;
+    scan_rsp_data.include_txpower = false;
+    // do not include the service uuid or service data in the advertisement, only in the scan response
+    adv_data.manufacturer_len = 0;
+    adv_data.p_manufacturer_data =  NULL;
+    adv_data.service_data_len = 0;
+    adv_data.p_service_data = NULL;
+    adv_data.service_uuid_len = 0;
+    adv_data.p_service_uuid = NULL;
     esp_ble_gap_config_adv_data(&adv_data);
+    esp_ble_gap_config_adv_data(&scan_rsp_data);
 
     // wait for the advertisement data to be configured
     bt_gatts_event_result_t gatts_event;
@@ -1068,6 +1086,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(bt_set_advertisement_obj, 1, bt_set_advertisem
 
 STATIC mp_obj_t bt_advertise(mp_obj_t self_in, mp_obj_t enable) {
     if (mp_obj_is_true(enable)) {
+        // some sensible time to wait for the advertisement configuration to complete
+        mp_hal_delay_ms(50);
         esp_ble_gap_start_advertising(&bt_adv_params);
         bt_obj.advertising = true;
     } else {

esp32/mods/modlora.c

@@ -967,6 +967,10 @@ static void TASK_LoRa (void *pvParameters) {
                 #if defined(FIPY) || defined(LOPY4)
                     xSemaphoreTake(xLoRaSigfoxSem, portMAX_DELAY);
                 #endif
+                    mibReq.Type = MIB_NETWORK_ACTIVATION;
+                    mibReq.Param.NetworkActivation = ACTIVATION_TYPE_OTAA;
+                    LoRaMacMibSetRequestConfirm( &mibReq );
+                    
                     TimerStart( &TxNextActReqTimer );
                     mlmeReq.Type = MLME_JOIN;
                     mlmeReq.Req.Join.DevEui = (uint8_t *)lora_obj.u.otaa.DevEui;
@@ -976,6 +980,10 @@ static void TASK_LoRa (void *pvParameters) {
                     mlmeReq.Req.Join.DR = (uint8_t) lora_obj.otaa_dr;
                     LoRaMacMlmeRequest( &mlmeReq );
                 } else {
+                    mibReq.Type = MIB_NETWORK_ACTIVATION;
+                    mibReq.Param.NetworkActivation = ACTIVATION_TYPE_ABP;
+                    LoRaMacMibSetRequestConfirm( &mibReq );
+                    
                     mibReq.Type = MIB_NET_ID;
                     mibReq.Param.NetID = lora_obj.net_id;
                     LoRaMacMibSetRequestConfirm( &mibReq );

esp32/mods/modlora.h

@@ -21,7 +21,7 @@
 #define LORA_DATA_QUEUE_SIZE_MAX                                (3)
 #define LORA_CB_QUEUE_SIZE_MAX                                  (7)
 #define LORA_STACK_SIZE                                         (2560)
-#define LORA_TIMER_STACK_SIZE                                   (2048)
+#define LORA_TIMER_STACK_SIZE                                   (3072)
 #define LORA_TASK_PRIORITY                                      (6)
 #define LORA_TIMER_TASK_PRIORITY                                (8)
 

esp32/pycom_version.h

@@ -10,7 +10,7 @@
 #ifndef VERSION_H_
 #define VERSION_H_
 
-#define SW_VERSION_NUMBER                              "1.18.2.r4"
+#define SW_VERSION_NUMBER                              "1.18.2.r5"
 
 #define LORAWAN_VERSION_NUMBER                         "1.0.2"
 

lib/lora/mac/LoRaMac.c

@@ -120,6 +120,11 @@ static MulticastParams_t *MulticastChannels = NULL;
  */
 static DeviceClass_t LoRaMacDeviceClass;
 
+/*
+ * End-Device network activation
+ */
+static ActivationType_t NetworkActivation;
+
 /*!
  * Indicates if the node is connected to a private or public network
  */
@@ -1458,6 +1463,10 @@ static void OnRxWindow2TimerEvent( void )
     else
     {
         RxWindow2Config.RxContinuous = true;
+        
+        if (NetworkActivation == ACTIVATION_TYPE_ABP){
+            RxWindow2Config.Datarate = McpsIndication.RxDatarate;
+        }
     }
 
     if( RegionRxConfig( LoRaMacRegion, &RxWindow2Config, ( int8_t* )&McpsIndication.RxDatarate ) == true )
@@ -2301,6 +2310,7 @@ LoRaMacStatus_t LoRaMacInitialization( LoRaMacPrimitives_t *primitives, LoRaMacC
 
     LoRaMacDeviceClass = CLASS_A;
     LoRaMacState = LORAMAC_IDLE;
+    NetworkActivation = ACTIVATION_TYPE_NONE;
 
     JoinRequestTrials = 0;
     MaxJoinRequestTrials = 1;
@@ -2501,6 +2511,11 @@ LoRaMacStatus_t LoRaMacMibGetRequestConfirm( MibRequestConfirm_t *mibGet )
             mibGet->Param.Class = LoRaMacDeviceClass;
             break;
         }
+        case MIB_NETWORK_ACTIVATION:
+        {
+            mibGet->Param.NetworkActivation = NetworkActivation;
+            break;
+        }
         case MIB_NETWORK_JOINED:
         {
             mibGet->Param.IsNetworkJoined = IsLoRaMacNetworkJoined;
@@ -2705,6 +2720,18 @@ LoRaMacStatus_t LoRaMacMibSetRequestConfirm( MibRequestConfirm_t *mibSet )
             }
             break;
         }
+        case MIB_NETWORK_ACTIVATION:
+        {
+            if( mibSet->Param.NetworkActivation != ACTIVATION_TYPE_OTAA )
+            {
+                NetworkActivation = mibSet->Param.NetworkActivation;
+            }
+            else
+            {
+                status = LORAMAC_STATUS_PARAMETER_INVALID;
+            }
+            break;
+        }
         case MIB_NETWORK_JOINED:
         {
             IsLoRaMacNetworkJoined = mibSet->Param.IsNetworkJoined;

lib/lora/mac/LoRaMac.h

@@ -142,6 +142,25 @@ typedef enum eDeviceClass
     CLASS_C,
 }DeviceClass_t;
 
+/*!
+ * End-Device activation type
+ */
+typedef enum eActivationType
+{
+    /*!
+     * None
+     */
+    ACTIVATION_TYPE_NONE = 0,
+    /*!
+     * Activation By Personalization (ACTIVATION_TYPE_ABP)
+     */
+    ACTIVATION_TYPE_ABP = 1,
+    /*!
+     * Over-The-Air Activation (ACTIVATION_TYPE_OTAA)
+     */
+    ACTIVATION_TYPE_OTAA = 2,
+}ActivationType_t;
+
 /*!
  * LoRaMAC channels parameters definition
  */
@@ -1111,6 +1130,7 @@ typedef struct sMlmeConfirm
  * Attribute                         | Get | Set
  * --------------------------------- | :-: | :-:
  * \ref MIB_DEVICE_CLASS             | YES | YES
+ * \ref MIB_NETWORK_ACTIVATION       | YES | YES
  * \ref MIB_NETWORK_JOINED           | YES | YES
  * \ref MIB_ADR                      | YES | YES
  * \ref MIB_NET_ID                   | YES | YES
@@ -1156,6 +1176,12 @@ typedef enum eMib
      * LoRaWAN Specification V1.0.2
      */
     MIB_DEVICE_CLASS,
+    /*!
+     * LoRaWAN Network End-Device Activation
+     *
+     * LoRaWAN Specification V1.0.2
+     */
+    MIB_NETWORK_ACTIVATION,
     /*!
      * LoRaWAN Network joined attribute
      *
@@ -1359,6 +1385,12 @@ typedef union uMibParam
      * Related MIB type: \ref MIB_DEVICE_CLASS
      */
     DeviceClass_t Class;
+    /*!
+     * LoRaWAN Network End-Device Activation ( ACTIVATION_TYPE_NONE, ACTIVATION_TYPE_ABP or OTTA )
+     *
+     * Related MIB type: \ref MIB_NETWORK_ACTIVATION
+     */
+    ActivationType_t NetworkActivation;
     /*!
      * LoRaWAN network joined attribute
      *