Update to development release 1.19.0.b3

esp32/core: Add support for FatFS & LittleFS

esp32/mods: Enabled wifi/bt after light sleep wakeup

esp32/mods/pycom: Add bootmgr() function to control application partition, filesystem type and safeboot

esp32/mods: added blutooth client re-connection after wakeup from light sleep + Server advertisments resume after light sleep wakeup

esp32/mods: feature to recover wifi connectivity after light sleep wakeup

esp32/mods/modbt: Remov unnecessary Api

esp32/ftp: Fix a bug were files are listed twice through FTP on LFS

esp32/sdkconfig.h: updated after IDF new version update

Author: Xykon

README.md

@@ -109,6 +109,14 @@ By default the firmware is built for the WIPY2:
     $ make
     $ make flash
 
+You can force the firmware to use LittleFS (the default is FatFS if not configured via pycom.bootmgr() or firmware updater):
+
+    $ cd esp32
+    $ make clean
+    $ make FS=LFS
+    $ make flash
+
+
 By default, both bootloader and application are built. To build them separately:
 
     $ cd esp32

drivers/sx127x/sx1272/sx1272.c

@@ -1,7 +1,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2016, Pycom Limited and its licensors.
+ * Copyright (c) 2018, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

drivers/sx127x/sx1276/sx1276.c

@@ -1,7 +1,7 @@
 /*
  * This file is derived from the MicroPython project, http://micropython.org/
  *
- * Copyright (c) 2016, Pycom Limited and its licensors.
+ * Copyright (c) 2018, Pycom Limited and its licensors.
  *
  * This software is licensed under the GNU GPL version 3 or any later version,
  * with permitted additional terms. For more information see the Pycom Licence

esp32/application.mk

@@ -333,6 +333,12 @@ CFLAGS += $(APP_INC) -DMICROPY_NLR_SETJMP=1 -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_
 CFLAGS_SIGFOX += $(APP_INC) -DMICROPY_NLR_SETJMP=1 -DMBEDTLS_CONFIG_FILE='"mbedtls/esp_config.h"' -DHAVE_CONFIG_H -DESP_PLATFORM
 CFLAGS += -DREGION_AS923 -DREGION_AU915 -DREGION_EU868 -DREGION_US915
 
+# Give the possibility to use LittleFs on /flash, otherwise  FatFs is used
+FS ?= ""
+ifeq ($(FS), LFS)
+    CFLAGS += -DFS_USE_LITTLEFS
+endif
+
 # add the application archive, this order is very important
 APP_LIBS = -Wl,--start-group $(LIBS) $(BUILD)/application.a -Wl,--end-group -Wl,-EL
 

esp32/bootloader/bootloader.c

@@ -745,7 +745,7 @@ static void print_flash_info(const esp_image_header_t* phdr)
 
 static void vddsdio_configure()
 {
-#if CONFIG_BOOTLOADER_VDDSDIO_BOOST
+#if CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V
     rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
     if (cfg.enable == 1 && cfg.tieh == 0) {    // VDDSDIO regulator is enabled @ 1.8V
         cfg.drefh = 3;
@@ -755,7 +755,7 @@ static void vddsdio_configure()
         rtc_vddsdio_set_config(cfg);
         ets_delay_us(10); // wait for regulator to become stable
     }
-#endif // CONFIG_BOOTLOADER_VDDSDIO_BOOST
+#endif // CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V
 }
 
 

esp32/ftp/ftp.c

@@ -51,6 +51,8 @@
 
 #include "machrtc.h"
 
+#include "mptask.h"
+
 /******************************************************************************
  DEFINE PRIVATE CONSTANTS
  ******************************************************************************/
@@ -1419,8 +1421,16 @@ static ftp_result_t ftp_list_dir (char *list, uint32_t maxlistsize, uint32_t *li
                     result = E_FTP_RESULT_OK;
                     break;                                                                                 /* Break on error or end of dp */
                 }
-                if (fno.u.fpinfo_lfs.name[0] == '.' && fno.u.fpinfo_lfs.name[1] == 0) continue;                                    /* Ignore . entry */
-                if (fno.u.fpinfo_lfs.name[0] == '.' && fno.u.fpinfo_lfs.name[1] == '.' && fno.u.fpinfo_lfs.name[2] == 0) continue;             /* Ignore .. entry */
+                if (fno.u.fpinfo_lfs.name[0] == '.' && fno.u.fpinfo_lfs.name[1] == 0)
+                {
+                    ftp_last_dir_idx++;
+                    continue;            /* Ignore . entry, but need to count it as LittleFs does not filter it out opposed to FatFs */
+                }
+                if (fno.u.fpinfo_lfs.name[0] == '.' && fno.u.fpinfo_lfs.name[1] == '.' && fno.u.fpinfo_lfs.name[2] == 0)
+                {
+                    ftp_last_dir_idx++;
+                    continue;            /* Ignore .. entry, but need to count it as LittleFs does not filter it out opposed to FatFs */
+                }
             }
             else
             {

esp32/littlefs/vfs_littlefs.c

@@ -168,19 +168,6 @@ static int parse_and_append_to_cwd(vfs_lfs_struct_t* littlefs, const char* path_
     return LFS_ERR_OK;
 }
 
-bool isLittleFs(const TCHAR *path)
-{
-    const char *flash = "/flash";
-
-    if(strncmp(flash, path, sizeof(flash)-1) == 0)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
-}
 
 // this table converts from FRESULT to POSIX errno
 byte littleFsErrorToErrno(enum lfs_error littleFsError)

esp32/littlefs/vfs_littlefs.h

@@ -14,7 +14,6 @@ typedef struct vfs_lfs_struct_s
     SemaphoreHandle_t mutex; // Needs to be created
 }vfs_lfs_struct_t;
 
-extern bool isLittleFs(const TCHAR *path);
 extern byte littleFsErrorToErrno(enum lfs_error littleFsError);
 extern FRESULT lfsErrorToFatFsError(int lfs_error);
 extern int fatFsModetoLittleFsMode(int FatFsMode);

esp32/mods/modbt.c

@@ -226,6 +226,9 @@ static esp_ble_adv_params_t bt_adv_params = {
     .adv_filter_policy  = ADV_FILTER_ALLOW_SCAN_ANY_CON_ANY,
 };
 
+static bool mod_bt_is_deinit;
+static bool mod_bt_is_conn_restore_available;
+
 /******************************************************************************
  DECLARE PRIVATE FUNCTIONS
  ******************************************************************************/
@@ -237,6 +240,9 @@ static void close_connection(int32_t conn_id);
 STATIC void bluetooth_callback_handler(void *arg);
 STATIC void gattc_char_callback_handler(void *arg);
 STATIC void gatts_char_callback_handler(void *arg);
+static mp_obj_t modbt_start_scan(mp_obj_t timeout);
+static mp_obj_t modbt_conn_disconnect(mp_obj_t self_in);
+static mp_obj_t modbt_connect(mp_obj_t addr);
 
 /******************************************************************************
  DEFINE PUBLIC FUNCTIONS
@@ -263,6 +269,69 @@ void modbt_init0(void) {
     mp_obj_list_init((mp_obj_t)&MP_STATE_PORT(bts_attr_list), 0);
 
     esp_bt_controller_mem_release(ESP_BT_MODE_CLASSIC_BT);
+
+    mod_bt_is_deinit = false;
+    mod_bt_is_conn_restore_available = false;
+}
+
+void bt_resume(bool reconnect)
+{
+	if(mod_bt_is_deinit && !bt_obj.init)
+	{
+		esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT();
+		esp_bt_controller_init(&bt_cfg);
+
+		esp_bt_controller_enable(ESP_BT_MODE_BLE);
+
+        if (ESP_OK != esp_bluedroid_init()) {
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Bluetooth init failed"));
+        }
+        if (ESP_OK != esp_bluedroid_enable()) {
+            nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "Bluetooth enable failed"));
+        }
+
+        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);
+
+        bt_connection_obj_t *connection_obj = NULL;
+
+        if(MP_STATE_PORT(btc_conn_list).len > 0)
+        {
+        	/* Get the Last gattc connection obj before sleep */
+        	connection_obj = ((bt_connection_obj_t *)(MP_STATE_PORT(btc_conn_list).items[MP_STATE_PORT(btc_conn_list).len - 1]));
+        }
+
+		if (reconnect)
+		{
+	        /* Check if there was a gattc connection Active before sleep */
+			if (connection_obj != NULL) {
+				if (connection_obj->conn_id >= 0) {
+					/* Enable Scan */
+					modbt_start_scan(MP_OBJ_NEW_SMALL_INT(-1));
+					mp_hal_delay_ms(50);
+					while(!bt_obj.scanning){
+						/* Wait for scanning to start */
+					}
+					/* re-connect to Last Connection */
+					mp_obj_list_remove((void *)&MP_STATE_PORT(btc_conn_list), connection_obj);
+					mp_obj_list_append((void *)&MP_STATE_PORT(btc_conn_list), modbt_connect(mp_obj_new_bytes((const byte *)connection_obj->srv_bda, 6)));
+
+					mod_bt_is_conn_restore_available = true;
+				}
+			}
+
+			/* See if there was an averstisment active before Sleep */
+			if(bt_obj.advertising)
+			{
+				esp_ble_gap_start_advertising(&bt_adv_params);
+			}
+		}
+
+		bt_obj.init = true;
+		mod_bt_is_deinit = false;
+	}
 }
 
 /******************************************************************************
@@ -282,7 +351,8 @@ static esp_ble_scan_params_t ble_scan_params = {
 static void close_connection (int32_t conn_id) {
     for (mp_uint_t i = 0; i < MP_STATE_PORT(btc_conn_list).len; i++) {
         bt_connection_obj_t *connection_obj = ((bt_connection_obj_t *)(MP_STATE_PORT(btc_conn_list).items[i]));
-        if (connection_obj->conn_id == conn_id) {
+        /* Only reset Conn Id if it is a normal disconnect not module de-init to mark conn obj to be restored */
+        if (connection_obj->conn_id == conn_id && (!mod_bt_is_deinit)) {
             connection_obj->conn_id = -1;
             mp_obj_list_remove((void *)&MP_STATE_PORT(btc_conn_list), connection_obj);
         }
@@ -461,6 +531,7 @@ static void gattc_events_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc
         // intentional fall through
     case ESP_GATTC_CLOSE_EVT:
         close_connection(p_data->close.conn_id);
+        bt_obj.busy = false;
         break;
     default:
         break;
@@ -765,10 +836,23 @@ mp_obj_t bt_deinit(mp_obj_t self_in) {
             esp_ble_gap_stop_scanning();
             bt_obj.scanning = false;
         }
+        /* Indicate module is de-initializing */
+        mod_bt_is_deinit = true;
+
+        bt_connection_obj_t *connection_obj;
+
+        for (mp_uint_t i = 0; i < MP_STATE_PORT(btc_conn_list).len; i++)
+        {
+            // loop through the connections
+            connection_obj = ((bt_connection_obj_t *)(MP_STATE_PORT(btc_conn_list).items[i]));
+            //close connections
+            modbt_conn_disconnect(connection_obj);
+        }
         esp_bluedroid_disable();
         esp_bluedroid_deinit();
         esp_bt_controller_disable();
         bt_obj.init = false;
+        mod_bt_is_conn_restore_available = false;
     }
     return mp_const_none;
 }
@@ -795,6 +879,11 @@ STATIC mp_obj_t bt_start_scan(mp_obj_t self_in, mp_obj_t timeout) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bt_start_scan_obj, bt_start_scan);
 
+static mp_obj_t modbt_start_scan(mp_obj_t timeout)
+{
+	return bt_start_scan(NULL, timeout);
+}
+
 STATIC mp_obj_t bt_isscanning(mp_obj_t self_in) {
     if (bt_obj.scanning) {
         return mp_const_true;
@@ -990,6 +1079,11 @@ STATIC mp_obj_t bt_connect(mp_obj_t self_in, mp_obj_t addr) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_2(bt_connect_obj, bt_connect);
 
+static mp_obj_t modbt_connect(mp_obj_t addr)
+{
+	return bt_connect(NULL, addr);
+}
+
 STATIC mp_obj_t bt_set_advertisement (mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     static const mp_arg_t allowed_args[] = {
         { MP_QSTR_name,                     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
@@ -1510,12 +1604,21 @@ STATIC mp_obj_t bt_conn_disconnect(mp_obj_t self_in) {
     if (self->conn_id >= 0) {
         esp_ble_gattc_close(bt_obj.gattc_if, self->conn_id);
         esp_ble_gap_disconnect(self->srv_bda);
-        self->conn_id = -1;
+		/* Only reset Conn Id if it is a normal disconnect not module de-init to mark conn obj to be restored */
+		if(!mod_bt_is_deinit)
+		{
+			self->conn_id = -1;
+		}
     }
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(bt_conn_disconnect_obj, bt_conn_disconnect);
 
+static mp_obj_t modbt_conn_disconnect(mp_obj_t self_in)
+{
+	return bt_conn_disconnect(self_in);
+}
+
 STATIC mp_obj_t bt_conn_services (mp_obj_t self_in) {
     bt_connection_obj_t *self = self_in;
     bt_event_result_t bt_event;

esp32/mods/modbt.h

@@ -27,5 +27,5 @@
  ******************************************************************************/
 extern void modbt_init0(void);
 extern mp_obj_t bt_deinit(mp_obj_t self_in);
-
+extern void bt_resume(bool reconnect);
 #endif  // MODBT_H_