TonBERRY/tonberry-pico
3
0
Fork 0
Code Issues 9 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

micropython: Update to 1.24.1, with cherrypicked patches for pico-sdk 2.1.1

Browse Source
This commit is contained in:
Matthias Blankertz
2025-03-04 19:55:14 +01:00
parent e07e42b9dc
commit c698dad6da
5 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
software/boards/RPI_PICO_W/mpconfigboard.cmake
View File

@@ -17,3 +17,4 @@ set(GEN_PINS_BOARD_CSV "${CMAKE_CURRENT_LIST_DIR}/pins.csv")
set(GEN_PINS_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}") set(GEN_PINS_CSV_ARG --board-csv "${GEN_PINS_BOARD_CSV}")
add_link_options("-Wl,--print-memory-usage") add_link_options("-Wl,--print-memory-usage")
set(PICO_USE_FASTEST_SUPPORTED_CLOCK 1)

4
software/boards/RPI_PICO_W/mpconfigboard.h
View File

@@ -20,6 +20,8 @@
#define MICROPY_HW_PIN_EXT_COUNT CYW43_WL_GPIO_COUNT #define MICROPY_HW_PIN_EXT_COUNT CYW43_WL_GPIO_COUNT
#define MICROPY_HW_PIN_RESERVED(i) ((i) == CYW43_PIN_WL_HOST_WAKE || (i) == CYW43_PIN_WL_REG_ON) // If this returns true for a pin then its irq will not be disabled on a soft reboot
int mp_hal_is_pin_reserved(int n);
#define MICROPY_HW_PIN_RESERVED(i) mp_hal_is_pin_reserved(i)
#define MICROPY_PY_THREAD (0) #define MICROPY_PY_THREAD (0)

2
software/lib/micropython

Submodule software/lib/micropython updated: 9fdf5586f5...29275e2c58

4
software/src/audiocore/module.c
View File

@@ -9,6 +9,7 @@
// This module is RP2 specific // This module is RP2 specific
#include "mphalport.h" #include "mphalport.h"
#include <pico/platform/sections.h>
#include <string.h> #include <string.h>
@@ -74,6 +75,7 @@ static mp_obj_t audiocore_Context_put(mp_obj_t self_in, mp_obj_t buffer)
} }
static MP_DEFINE_CONST_FUN_OBJ_2(audiocore_Context_put_obj, audiocore_Context_put); static MP_DEFINE_CONST_FUN_OBJ_2(audiocore_Context_put_obj, audiocore_Context_put);
static uint32_t __scratch_y("core1_stack") core1_stack[1024];
static const mp_rom_map_elem_t audiocore_Context_locals_dict_table[] = { static const mp_rom_map_elem_t audiocore_Context_locals_dict_table[] = {
{MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&audiocore_Context_deinit_obj)}, {MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&audiocore_Context_deinit_obj)},
{MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiocore_Context_deinit_obj)}, {MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&audiocore_Context_deinit_obj)},
@@ -123,7 +125,7 @@ static mp_obj_t audiocore_init(mp_obj_t pin_obj, mp_obj_t sideset_obj, mp_obj_t
shared_context.sideset_base = sideset_pin; shared_context.sideset_base = sideset_pin;
shared_context.samplerate = samplerate; shared_context.samplerate = samplerate;
initialized = true; initialized = true;
multicore_launch_core1(&core1_main); multicore_launch_core1_with_stack(&core1_main, core1_stack, sizeof(core1_stack));
uint32_t result = multicore_fifo_pop_blocking(); uint32_t result = multicore_fifo_pop_blocking();
if (result != 0) { if (result != 0) {
multicore_reset_core1(); multicore_reset_core1();

1
software/update-submodules.sh
View File

@@ -5,4 +5,3 @@ set -eu
git submodule update --init lib git submodule update --init lib
git -C lib/micropython submodule update --init lib/pico-sdk lib/mbedtls lib/micropython-lib lib/tinyusb lib/btstack lib/cyw43-driver lib/lwip git -C lib/micropython submodule update --init lib/pico-sdk lib/mbedtls lib/micropython-lib lib/tinyusb lib/btstack lib/cyw43-driver lib/lwip
git -C lib/micropython/lib/pico-sdk submodule update --init lib git -C lib/micropython/lib/pico-sdk submodule update --init lib
git -C lib/micropython/lib/pico-sdk/lib/tinyusb submodule update --init hw/mcu/raspberry_pi/Pico-PIO-USB/