SQLite3 and MSC_SD work!

Author: hasumikin

CMakeLists.txt

@@ -12,7 +12,7 @@ add_definitions(
   -DMRBC_REQUIRE_32BIT_ALIGNMENT
   -DMAX_REGS_SIZE=256
   -DMAX_VM_COUNT=255
-  -DMAX_SYMBOLS_COUNT=2000
+  -DMAX_SYMBOLS_COUNT=1800
   -DMRBC_CONVERT_CRLF
   -DMRBC_USE_MATH
   -DPICORBC_PTR_SIZE=4
@@ -28,18 +28,23 @@ set (PRK_REVISION  ${CMAKE_REVISION})
 configure_file ("${CMAKE_SOURCE_DIR}/include/version.h.in" "${CMAKE_SOURCE_DIR}/include/version.h")
 
 if(DEFINED ENV{PICORUBY_NO_MSC})
+  set (MSC_NAME NO_MSC)
   add_definitions(-DPICORUBY_NO_MSC)
-  project("prk_firmware-no_msc-${PRK_VERSION}-${PRK_BUILDDATE}-${PRK_REVISION}")
+elseif(DEFINED ENV{PICORUBY_MSC_SD})
+  set (MSC_NAME MSC_SD)
+  add_definitions(-DPICORUBY_MSC_SD)
 else()
+  set (MSC_NAME MSC_FLASH)
   add_definitions(-DPICORUBY_MSC_FLASH)
-  if(DEFINED ENV{PICORUBY_SQLITE3})
-    add_definitions(-DPICORUBY_SQLITE3)
-    project("prk_firmware-sqlite3-${PRK_VERSION}-${PRK_BUILDDATE}-${PRK_REVISION}")
-  else()
-    project("prk_firmware-${PRK_VERSION}-${PRK_BUILDDATE}-${PRK_REVISION}")
-  endif()
 endif()
 
+if(DEFINED ENV{PICORUBY_SQLITE3})
+  set (MSC_NAME ${MSC_NAME}-SQLITE3)
+  add_definitions(-DPICORUBY_SQLITE3)
+endif()
+
+project("prk_firmware-${MSC_NAME}-${PRK_VERSION}-${PRK_BUILDDATE}-${PRK_REVISION}")
+
 # Initializing the Raspberry Pi Pico SDK should happen after project created
 pico_sdk_init()
 

Rakefile

@@ -44,6 +44,7 @@ desc "build production with SQLite3 and SD card"
 task :sqlite3 do
   ENV['PICORUBY_SQLITE3'] = '1'
   ENV['PICORUBY_SD_CARD'] = '1'
+  ENV['PICORUBY_MSC_SD'] = '1'
   Rake::Task[:all].invoke
 end
 

lib/picoruby

@@ -1,3 +1,6 @@
+if PICORUBY_MSC == "MSC_SD"
+  require "spi"
+end
 require "keyboard"
 
 ENV = {}
@@ -11,9 +14,19 @@
 
 Keyboard.mount_volume
 
+keymap_updated_at = -1
+
 while true
   USB.tud_task
   if Keyboard.autoreload_ready?
-    Keyboard.restart
+    if File.exist?("/keymap.rb")
+      unixtime = File::Stat.new("/keymap.rb").mtime.to_i
+      if unixtime != keymap_updated_at
+        Keyboard.restart
+        keymap_updated_at = unixtime
+      else
+        Keyboard.autoreload_off
+      end
+    end
   end
 end

mrblib/usb_task.rb

@@ -32,9 +32,9 @@
 #endif
 
 #if defined(PICORUBY_SQLITE3)
-  #define MEMORY_SIZE (1024*190)
+  #define MEMORY_SIZE (1024*203)
 #else
-  #define MEMORY_SIZE (1024*200)
+  #define MEMORY_SIZE (1024*207)
 #endif
 
 static uint8_t memory_pool[MEMORY_SIZE];
@@ -57,21 +57,26 @@ tud_msc_write10_complete_cb(uint8_t lun)
   autoreload_state = AUTORELOAD_READY;
 }
 
-#endif /* PICORUBY_NO_MSC */
+#endif /* !PICORUBY_NO_MSC */
 
 static void
 prk_init_picoruby(void)
 {
+  mrbc_vm *vm = mrbc_vm_open(NULL);
   /* CONST */
   mrbc_sym sym_id = mrbc_str_to_symid("SIZEOF_POINTER");
   mrbc_set_const(sym_id, &mrbc_integer_value(PICORBC_PTR_SIZE));
-  sym_id = mrbc_str_to_symid("PICORUBY_NO_MSC");
-#ifdef PICORUBY_NO_MSC
-  mrbc_set_const(sym_id, &mrbc_true_value());
-#else
-  mrbc_set_const(sym_id, &mrbc_false_value());
+  sym_id = mrbc_str_to_symid("PICORUBY_MSC");
+  mrbc_value picoruby_msc = mrbc_string_new_cstr(vm,
+#if defined(PICORUBY_NO_MSC)
+    "NO_MSC"
+#elif defined(PICORUBY_MSC_FLASH)
+    "MSC_FLASH"
+#elif defined(PICORUBY_MSC_SD)
+    "MSC_SD"
 #endif
-  mrbc_vm *vm = mrbc_vm_open(NULL);
+  );
+  mrbc_set_const(sym_id, &picoruby_msc);
   sym_id = mrbc_str_to_symid("PRK_DESCRIPTION");
   mrbc_value prk_desc = mrbc_string_new_cstr(vm, PRK_DESCRIPTION);
   mrbc_set_const(sym_id, &prk_desc);

src/main.c

@@ -103,9 +103,13 @@
 // HID buffer size Should be sufficient to hold ID (if any) + Data
 #define CFG_TUD_HID_EP_BUFSIZE    64
 
-// It is normaly 512, but we use 4096 to avoid cache coherency problem
-// on writing flash
-#define CFG_TUD_MSC_EP_BUFSIZE    4096
+#if defined(PICORUBY_MSC_FLASH)
+  #define CFG_TUD_MSC_EP_BUFSIZE   4096
+#elif defined(PICORUBY_MSC_SD)
+  #define CFG_TUD_MSC_EP_BUFSIZE    512
+#else
+  #error PICORUBY_MSC_devicename must be defined
+#endif
 
 // CDC FIFO size of TX and RX
 #define CFG_TUD_CDC_RX_BUFSIZE   (TUD_OPT_HIGH_SPEED ? 512 : 64)