Prepare release for EuRuKo 2025

- Upgrade picoruby
- Require "numeric-ext" in main_task.rb
- Refactor HEAP_SIZE to make maintainance easy
- Debug printf in usb_tud.c

Author: hasumikin

lib/picoruby

@@ -1,4 +1,5 @@
 require "machine"
+require "numeric-ext"
 require "watchdog"
 Watchdog.disable
 require "shell"

mrblib/main_task.rb

@@ -13,36 +13,40 @@
 
 #if !defined(HEAP_SIZE)
   #if defined(PICO_RP2040)
-    #if defined(USE_WIFI)
-      #define HEAP_SIZE (1024 * 140)
-    #else
-      #define HEAP_SIZE (1024 * 174)
-    #endif
+    #define RAM_SIZE_KB 264
   #elif defined(PICO_RP2350)
-    #if defined(USE_WIFI)
-      #define HEAP_SIZE (1024 * (150 + 200))
-    #else
-      #define HEAP_SIZE (1024 * (194 + 200))
-    #endif
+    #define RAM_SIZE_KB 524
   #else
-    #error "Unknown board"
+    #error "PICO_RP2040 or PICO_RP2350 must be defined"
   #endif
+  // Compiling a big Ruby code may need more stack size
+  #define BASIC_STACK_SIZE_KB   80
+  #define WIFI_STACK_SIZE_KB    60
+  #if defined(USE_WIFI)
+    #define STACK_SIZE_KB (BASIC_STACK_SIZE_KB + WIFI_STACK_SIZE_KB)
+  #else
+    #define STACK_SIZE_KB BASIC_STACK_SIZE_KB
+  #endif
+  #define HEAP_SIZE_KB (RAM_SIZE_KB - STACK_SIZE_KB)
+  #define HEAP_SIZE (HEAP_SIZE_KB * 1024)
 #endif
 
 #if defined(R2P2_ALLOC_LIBC)
-#define heap_pool NULL
+  #define heap_pool NULL
 #else
-static uint8_t heap_pool[HEAP_SIZE] __attribute__((aligned(8)));
+  static uint8_t heap_pool[HEAP_SIZE] __attribute__((aligned(8)));
 #endif
 
-mrb_state *global_mrb = NULL;
+#if defined(PICORB_VM_MRUBY)
+  mrb_state *global_mrb = NULL;
+#endif
 
 int
 main(void)
 {
   stdio_init_all();
   printf("R2P2 PicoRuby starting...\n");
-  printf("HEAP_SIZE: %d bytes\n", HEAP_SIZE);
+  printf("Heap size: %d KB\n", HEAP_SIZE_KB);
   board_init();
 
   int ret = 0;

src/main.c

@@ -1,29 +1,38 @@
 #include <pico/stdlib.h>
+#include <stdio.h>
 
 //--------------------------------------------------------------------+
 // Device callbacks
 //--------------------------------------------------------------------+
 
 // Invoked when device is mounted
-void tud_mount_cb(void)
+void
+tud_mount_cb(void)
 {
+  printf("USB mounted!\n");
 }
 
 // Invoked when device is unmounted
-void tud_umount_cb(void)
+void
+tud_umount_cb(void)
 {
+  printf("USB unmounted!\n");
 }
 
 // Invoked when usb bus is suspended
 // remote_wakeup_en : if host allow us  to perform remote wakeup
 // Within 7ms, device must draw an average of current less than 2.5 mA from bus
-void tud_suspend_cb(bool remote_wakeup_en)
+void
+tud_suspend_cb(bool remote_wakeup_en)
 {
   (void) remote_wakeup_en;
+  printf("USB suspended!\n");
 }
 
 // Invoked when usb bus is resumed
-void tud_resume_cb(void)
+void
+tud_resume_cb(void)
 {
+  printf("USB resumed!\n");
 }