Support for Pico W

Delete rp2sleep dir and merge code into rp2

Rebase from upstream

Author: ghubcoder

ports/rp2/CMakeLists.txt

@@ -14,6 +14,12 @@ else()
     set(PICO_SDK_PATH ../../lib/pico-sdk)
 endif()
 
+if (PICO_EXTRAS_PATH_OVERRIDE)
+    set(PICO_EXTRAS_PATH ${PICO_EXTRAS_PATH_OVERRIDE})
+else()
+    set(PICO_EXTRAS_PATH ../../lib/pico-extras)
+endif()
+
 # Use the local tinyusb instead of the one in pico-sdk
 set(PICO_TINYUSB_PATH ${MICROPY_DIR}/lib/tinyusb)
 # Use the local lwip instead of the one in pico-sdk
@@ -62,6 +68,7 @@ string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/tinyusb)
 include(${MICROPY_DIR}/py/py.cmake)
 include(${MICROPY_DIR}/extmod/extmod.cmake)
 include(${PICO_SDK_PATH}/pico_sdk_init.cmake)
+include(pico_extras_import.cmake)
 
 # Define the top-level project
 project(${MICROPY_TARGET})
@@ -116,6 +123,7 @@ set(MICROPY_SOURCE_PORT
     machine_uart.c
     machine_wdt.c
     main.c
+    modpicosleep.c
     modmachine.c
     modrp2.c
     modutime.c
@@ -145,6 +153,7 @@ set(MICROPY_SOURCE_QSTR
     ${PROJECT_SOURCE_DIR}/machine_timer.c
     ${PROJECT_SOURCE_DIR}/machine_uart.c
     ${PROJECT_SOURCE_DIR}/machine_wdt.c
+    ${PROJECT_SOURCE_DIR}/modpicosleep.c
     ${PROJECT_SOURCE_DIR}/modmachine.c
     ${PROJECT_SOURCE_DIR}/modrp2.c
     ${PROJECT_SOURCE_DIR}/moduos.c
@@ -168,6 +177,8 @@ set(PICO_SDK_COMPONENTS
     hardware_pwm
     hardware_regs
     hardware_rtc
+    hardware_rosc
+    hardware_sleep
     hardware_spi
     hardware_structs
     hardware_sync
@@ -180,6 +191,7 @@ set(PICO_SDK_COMPONENTS
     pico_bootrom
     pico_multicore
     pico_platform
+    pico_runtime
     pico_stdio
     pico_stdlib
     pico_sync

ports/rp2/boards/PICO/mpconfigboard.h

@@ -1,6 +1,3 @@
 // Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico"
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico (sleep)"
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (1408 * 1024)
-
-// Enable USB Mass Storage with FatFS filesystem.
-// #define MICROPY_HW_USB_MSC  (1)

ports/rp2/boards/PICO_W/mpconfigboard.h

@@ -1,5 +1,5 @@
 // Board and hardware specific configuration
-#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W"
+#define MICROPY_HW_BOARD_NAME                   "Raspberry Pi Pico W (sleep)"
 
 // todo: We need something to check our binary size
 #define MICROPY_HW_FLASH_STORAGE_BYTES          (848 * 1024)

ports/rp2sleep/modpicosleep.c renamed to ports/rp2/modpicosleep.c

@@ -11,82 +11,82 @@
 #include "hardware/rosc.h"
 #include "hardware/structs/scb.h"
 
-
-static void sleep_callback(void) {
+static void sleep_callback(void)
+{
     return;
 }
 
-static void rtc_sleep_seconds(uint32_t seconds_to_sleep) {
+static void rtc_sleep_seconds(uint32_t seconds_to_sleep)
+{
 
-    //Hangs if we attempt to sleep for 1 second....
-    //Guard against this and perform a normal sleep
-    if(seconds_to_sleep == 1){
+    // Hangs if we attempt to sleep for 1 second....
+    // Guard against this and perform a normal sleep
+    if (seconds_to_sleep == 1)
+    {
         sleep_ms(1000);
         return;
     }
 
-    int y=2020, m=6, d=5, hour=15, mins=45, secs=0;
-    struct tm t = { .tm_year=y-1900,
-                    .tm_mon=m-1,
-                    .tm_mday=d,
-                    .tm_hour=hour,
-                    .tm_min=mins,
-                    .tm_sec=secs
-                  };
+    int y = 2020, m = 6, d = 5, hour = 15, mins = 45, secs = 0;
+    struct tm t = {.tm_year = y - 1900,
+                   .tm_mon = m - 1,
+                   .tm_mday = d,
+                   .tm_hour = hour,
+                   .tm_min = mins,
+                   .tm_sec = secs};
 
     t.tm_sec += seconds_to_sleep;
     mktime(&t);
 
     datetime_t t_alarm = {
-            .year  = t.tm_year+1900,
-            .month = t.tm_mon+1,
-            .day   = t.tm_mday,
-            .dotw  = t.tm_wday, // 0 is Sunday, so 5 is Friday
-            .hour  = t.tm_hour,
-            .min   = t.tm_min,
-            .sec   = t.tm_sec
-    };
+        .year = t.tm_year + 1900,
+        .month = t.tm_mon + 1,
+        .day = t.tm_mday,
+        .dotw = t.tm_wday, // 0 is Sunday, so 5 is Friday
+        .hour = t.tm_hour,
+        .min = t.tm_min,
+        .sec = t.tm_sec};
 
     sleep_goto_sleep_until(&t_alarm, &sleep_callback);
 }
 
-void recover_from_sleep(uint scb_orig, uint clock0_orig, uint clock1_orig){
+void recover_from_sleep(uint scb_orig, uint clock0_orig, uint clock1_orig)
+{
 
-    //Re-enable ring Oscillator control
+    // Re-enable ring Oscillator control
     rosc_write(&rosc_hw->ctrl, ROSC_CTRL_ENABLE_BITS);
 
-    //reset procs back to default
+    // reset procs back to default
     scb_hw->scr = scb_orig;
     clocks_hw->sleep_en0 = clock0_orig;
     clocks_hw->sleep_en1 = clock1_orig;
 
-    //reset clocks
+    // reset clocks
     clocks_init();
     stdio_init_all();
 
     return;
 }
 
-STATIC mp_obj_t picosleep_seconds(mp_obj_t seconds_obj) {
+STATIC mp_obj_t picosleep_seconds(mp_obj_t seconds_obj)
+{
     mp_int_t seconds = mp_obj_get_int(seconds_obj);
     stdio_init_all();
-    //save values for later
+    // save values for later
     uint scb_orig = scb_hw->scr;
     uint clock0_orig = clocks_hw->sleep_en0;
     uint clock1_orig = clocks_hw->sleep_en1;
 
-
-    //crudely reset the clock each time
-    //to the value below
+    // crudely reset the clock each time
+    // to the value below
     datetime_t t = {
-            .year  = 2020,
-            .month = 06,
-            .day   = 05,
-            .dotw  = 5, // 0 is Sunday, so 5 is Friday
-            .hour  = 15,
-            .min   = 45,
-            .sec   = 00
-    };
+        .year = 2020,
+        .month = 06,
+        .day = 05,
+        .dotw = 5, // 0 is Sunday, so 5 is Friday
+        .hour = 15,
+        .min = 45,
+        .sec = 00};
 
     // Start the Real time clock
     rtc_init();
@@ -100,12 +100,14 @@ STATIC mp_obj_t picosleep_seconds(mp_obj_t seconds_obj) {
 MP_DEFINE_CONST_FUN_OBJ_1(picosleep_seconds_obj, picosleep_seconds);
 
 STATIC const mp_rom_map_elem_t picosleep_module_globals_table[] = {
-    { MP_ROM_QSTR(MP_QSTR___name__),            MP_ROM_QSTR(MP_QSTR_picosleep) },
-    { MP_ROM_QSTR(MP_QSTR_seconds),                MP_ROM_PTR(&picosleep_seconds_obj) },
+    {MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_picosleep)},
+    {MP_ROM_QSTR(MP_QSTR_seconds), MP_ROM_PTR(&picosleep_seconds_obj)},
 };
 STATIC MP_DEFINE_CONST_DICT(picosleep_module_globals, picosleep_module_globals_table);
 
 const mp_obj_module_t mp_module_picosleep = {
-    .base = { &mp_type_module },
+    .base = {&mp_type_module},
     .globals = (mp_obj_dict_t *)&picosleep_module_globals,
-};
+};
+
+MP_REGISTER_MODULE(MP_QSTR_picosleep, mp_module_picosleep);

ports/rp2/mpconfigport.h

@@ -148,6 +148,8 @@
 #endif
 #endif
 
+extern const struct _mp_obj_module_t mp_module_picosleep;
+
 #if MICROPY_PY_NETWORK_CYW43
 extern const struct _mp_obj_type_t mp_network_cyw43_type;
 #define MICROPY_HW_NIC_CYW43 \