Updates for latest micropython

pimoroni · Sep 3, 2024 · 649d99f · 649d99f
1 parent 5f624a5
commit 649d99f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/micropython.yml b/.github/workflows/micropython.yml
@@ -7,8 +7,8 @@ on:
     types: [created]
 
 env:
-  MICROPYTHON_VERSION: ae6c33a1dda01d5b36b8f5c9e8e0bd3425ba796a
-  PIMORONI_PICO_VERSION: dd757171c0d54044e89f2fba5916522307892bad
+  MICROPYTHON_VERSION: 7234375200d5cc28ab5caa09d443c9bf99786368
+  PIMORONI_PICO_VERSION: 49a5d4292586f5851978f6f4a2f6b3214fb379ce
   WORKFLOW_VERSION: v2
 
 jobs:

diff --git a/.github/workflows/python-linting.yml b/.github/workflows/python-linting.yml
@@ -12,14 +12,14 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install Python Deps
-      run: python3 -m pip install ruff
+      run: python3 -m pip install flake8
 
     - name: Lint Yukon Examples
       shell: bash
       run: |
-        python3 -m ruff --show-source --ignore E501 examples/
+        python3 -m flake8 --show-source --ignore E501,E201,E241,E222,E116,E266 examples/
 
     - name: Lint Yukon Python Libraries
       shell: bash
       run: |
-        python3 -m ruff --show-source --ignore E501 lib/
+        python3 -m flake8 --show-source --ignore E501,E201,E241,E222,E116,E266 lib/
diff --git a/firmware/yukon_reset.patch b/firmware/yukon_reset.patch
@@ -1,8 +1,8 @@
 diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt
-index 1eaefcfb9..677a5e0e6 100644
+index 19c7178fc..4f98e904b 100644
 --- a/ports/rp2/CMakeLists.txt
 +++ b/ports/rp2/CMakeLists.txt
-@@ -322,6 +322,25 @@ target_include_directories(${MICROPY_TARGET} PRIVATE
+@@ -335,6 +335,25 @@ target_include_directories(${MICROPY_TARGET} PRIVATE
      ${MICROPY_DIR}/shared/tinyusb/
  )
 
@@ -28,7 +28,7 @@ index 1eaefcfb9..677a5e0e6 100644
  if (MICROPY_PY_NETWORK_CYW43)
      string(CONCAT GIT_SUBMODULES "${GIT_SUBMODULES} " lib/cyw43-driver)
      if((NOT (${ECHO_SUBMODULES})) AND NOT EXISTS ${MICROPY_DIR}/lib/cyw43-driver/src/cyw43.h)
-@@ -548,6 +577,11 @@ target_sources(${MICROPY_TARGET} PRIVATE
+@@ -562,6 +591,11 @@ target_sources(${MICROPY_TARGET} PRIVATE
      ${GEN_PINS_HDR}
  )
 
@@ -41,18 +41,18 @@ index 1eaefcfb9..677a5e0e6 100644
  add_custom_command(
      OUTPUT ${GEN_PINS_HDR} ${GEN_PINS_SRC}
 diff --git a/ports/rp2/main.c b/ports/rp2/main.c
-index ec58b70ae..8c0571fcc 100644
+index 134e0edac..37498dd87 100644
 --- a/ports/rp2/main.c
 +++ b/ports/rp2/main.c
-@@ -152,6 +152,7 @@ int main(int argc, char **argv) {
+@@ -158,6 +158,7 @@ int main(int argc, char **argv) {
      // Hook for setting up anything that can wait until after other hardware features are initialised
      MICROPY_BOARD_EARLY_INIT();
 
 +    bool run_main = true;
      for (;;) {
 
          // Initialise MicroPython runtime.
-@@ -185,30 +186,39 @@ int main(int argc, char **argv) {
+@@ -191,30 +192,39 @@ int main(int argc, char **argv) {
          pyexec_frozen_module("_boot.py", false);
          #endif
 
@@ -105,11 +105,11 @@ index ec58b70ae..8c0571fcc 100644
                  }
              }
 diff --git a/shared/runtime/pyexec.h b/shared/runtime/pyexec.h
-index 64c5ef943..6a2cd8b8f 100644
+index 5779d3e09..eb92fbb04 100644
 --- a/shared/runtime/pyexec.h
 +++ b/shared/runtime/pyexec.h
-@@ -41,6 +41,7 @@ extern pyexec_mode_kind_t pyexec_mode_kind;
- extern int pyexec_system_exit;
+@@ -36,6 +36,7 @@ typedef enum {
+ extern pyexec_mode_kind_t pyexec_mode_kind;
 
  #define PYEXEC_FORCED_EXIT (0x100)
 +#define PYEXEC_SKIP_USER_CODE (0x200)