Merge pull request #20 from picoruby/pico-sdk-2.2.0

Upgrade pico-sdk from 2.1.1 to 2.2.0

Author: hasumikin

CMakeLists.txt

@@ -80,6 +80,10 @@ elseif(PICO_BOARD STREQUAL "pico2" OR PICO_BOARD STREQUAL "pico2_w")
   target_compile_definitions(${PROJECT_NAME} PRIVATE FLASH_TARGET_OFFSET=0x00340000)
 endif()
 
+# Fix for pico-sdk 2.2.0: Assume core1 is safe for flash operations
+# Core1 is used for PSG audio processing but doesn't access flash during BTStack operations
+add_compile_definitions(PICO_FLASH_ASSUME_CORE1_SAFE=1)
+
 set(PICORBC ${CMAKE_SOURCE_DIR}/lib/picoruby/bin/picorbc)
 
 add_custom_target(mrbdir ALL
@@ -192,8 +196,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-filesystem-fat/lib/ff14b/source
   ${CMAKE_SOURCE_DIR}/lib/picoruby/build/${MRUBY_CONFIG}/mrbgems
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-mbedtls/include
-  ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-mbedtls/mbedtls/include
-  ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-mbedtls/mbedtls/library
+  ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-mbedtls/lib/mbedtls/include
+  ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-mbedtls/lib/mbedtls/library
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-net/include
 )
 

Rakefile

@@ -7,12 +7,8 @@ unless ENV.include? "PICO_EXTRAS_PATH"
   ENV["PICO_EXTRAS_PATH"] = "#{File.dirname(__FILE__)}/lib/pico-extras"
 end
 
-PICO_SDK_TAG = "2.1.1"
-if PICO_SDK_TAG == "2.1.1"
-  PICO_EXTRAS_TAG = "sdk-2.1.0" # workaround. 2.1.1 and 2.1.0 are the same
-else
-  PICO_EXTRAS_TAG = "sdk-#{PICO_SDK_TAG}"
-end
+PICO_SDK_TAG = "2.2.0"
+PICO_EXTRAS_TAG = "sdk-#{PICO_SDK_TAG}"
 
 def mruby_config(vm, board)
   name = (vm == 'mruby' ? 'microruby-' : '')

lib/pico-extras

@@ -14,7 +14,7 @@
 #if !defined(HEAP_SIZE)
   #if defined(PICO_RP2040)
     #if defined(USE_WIFI)
-      #define HEAP_SIZE (1024 * 150)
+      #define HEAP_SIZE (1024 * 140)
     #else
       #define HEAP_SIZE (1024 * 194)
     #endif