Merge pull request #171 from picoruby/sqlite3

Sqlite3

Author: hasumikin

CMakeLists.txt

@@ -4,26 +4,20 @@ cmake_minimum_required(VERSION 3.24)
 # note: this must happen before project()
 include(pico_sdk_import.cmake)
 
+#####################################################
+# project specific configuration from here
+
 add_definitions(
-  -DNDEBUG
   -DMRBC_USE_HAL_RP2040
   -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
   -DNO_CLOCK_GETTIME=1
 )
-if(PICORUBY_NO_MSC)
-  add_definitions(-DPICORUBY_NO_MSC)
-else()
-  add_definitions(-DPICORUBY_MSC_FLASH)
-endif()
-
-#####################################################
-# project specific configuration from here
 
 execute_process (COMMAND date +%Y%m%d OUTPUT_VARIABLE CMAKE_BUILDDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE CMAKE_REVISION OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -33,19 +27,32 @@ set (PRK_BUILDDATE ${CMAKE_BUILDDATE})
 set (PRK_REVISION  ${CMAKE_REVISION})
 configure_file ("${CMAKE_SOURCE_DIR}/include/version.h.in" "${CMAKE_SOURCE_DIR}/include/version.h")
 
-if(PICORUBY_NO_MSC)
-  project("prk_firmware-${PRK_VERSION}-${PRK_BUILDDATE}-no_msc")
+if(DEFINED ENV{PICORUBY_NO_MSC})
+  set (MSC_NAME NO_MSC)
+  add_definitions(-DPICORUBY_NO_MSC)
+elseif(DEFINED ENV{PICORUBY_MSC_SD})
+  set (MSC_NAME MSC_SD)
+  add_definitions(-DPICORUBY_MSC_SD)
 else()
-  project("prk_firmware-${PRK_VERSION}-${PRK_BUILDDATE}-${PRK_REVISION}")
+  set (MSC_NAME MSC_FLASH)
+  add_definitions(-DPICORUBY_MSC_FLASH)
 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()
 
 file(GLOB SRCS src/*.c)
 add_executable(${PROJECT_NAME}
   ${SRCS}
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-filesystem-fat/ports/rp2040/flash_disk.c
+  ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-filesystem-fat/ports/rp2040/sd_disk.c
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-filesystem-fat/ports/rp2040/msc_disk.c
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-gpio/ports/rp2040/gpio.c
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-i2c/ports/rp2040/i2c.c
@@ -63,7 +70,10 @@ set(RBC ${CMAKE_CURRENT_SOURCE_DIR}/lib/picoruby/bin/picorbc)
 
 # Ruby
 
-if(PICORUBY_NO_MSC)
+if(DEFINED ENV{PICORUBY_NO_MSC})
+  add_dependencies(${PROJECT_NAME}
+    keymap
+  )
   add_custom_target(keymap
     COMMAND ${RBC} -Bkeymap -o ./keymap.c ../keymap.rb
     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
@@ -100,12 +110,6 @@ add_dependencies(${PROJECT_NAME}
   ${RUBY_TASK_FILES}
 )
 
-if(PICORUBY_NO_MSC)
-  add_dependencies(${PROJECT_NAME}
-    keymap
-  )
-endif()
-
 target_include_directories(${PROJECT_NAME} PRIVATE
   ${CMAKE_SOURCE_DIR}/tinyusb
   ${CMAKE_SOURCE_DIR}/lib/picoruby/include/hal_no_impl

Rakefile

@@ -1,9 +1,9 @@
 require "fileutils"
 
-MRUBY_CONFIG = "prk_firmware-cortex-m0plus"
+ENV['MRUBY_CONFIG'] = "prk_firmware-cortex-m0plus"
 PICO_SDK_TAG = "1.5.0"
 
-task :default => :all
+task :default => :production
 
 task :setup do
   sh "bundle install"
@@ -13,40 +13,54 @@ task :setup do
   end
 end
 
-desc "build production"
-task :all => [:libmruby, :test, :cmake_production, :build]
+task :all => [:libmruby, :test, :cmake, :build]
+
 
 desc "build debug (you may need to rake clean before this)"
-task :debug => [:libmruby, :test, :cmake_debug, :build]
+task :debug do
+  ENV['PICORUBY_DEBUG'] = '1'
+  ENV['-DCMAKE_BUILD_TYPE'] = 'Debug'
+  Rake::Task[:all].invoke
+end
 
-file "lib/picoruby" do
-  sh "git submodule update --init --recursive"
+desc "build production"
+task :production do
+  Rake::Task[:all].invoke
 end
 
-task :libmruby_no_msc => "lib/picoruby" do
-  FileUtils.cd "lib/picoruby" do
-    sh "rake test"
-    sh "CFLAGS='-DPICORUBY_NO_MSC=1' MRUBY_CONFIG=#{MRUBY_CONFIG} rake"
+desc "build PRK Firmware inclusive of keymap.rb (without mass storage)"
+task :build_with_keymap, ['keyboard_name'] do |_t, args|
+  unless args.keyboard_name
+    raise "Argument `keyboard_name` missing.\nUsage: rake build_with_keymap[prk_meishi2]"
   end
+  dir = "keyboards/#{args.keyboard_name}"
+  FileUtils.mkdir_p "#{dir}/build"
+  ENV['PICORUBY_NO_MSC'] = '1'
+  ENV['PRK_BUILD_DIR'] = "#{dir}/"
+  Rake::Task[:all].invoke
 end
 
-task :libmruby => "lib/picoruby" do
-  FileUtils.cd "lib/picoruby" do
-    sh "rake test"
-    sh "MRUBY_CONFIG=#{MRUBY_CONFIG} rake"
-  end
+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
 
-def mruby_config
-  "MRUBY_CONFIG=#{MRUBY_CONFIG}"
+file "lib/picoruby" do
+  sh "git submodule update --init --recursive"
 end
 
-task :cmake_debug do
-  sh "#{mruby_config} cmake -DCMAKE_BUILD_TYPE=Debug -B build"
+task :libmruby => "lib/picoruby" do
+  FileUtils.cd "lib/picoruby" do
+    sh "rake test"
+    sh "rake"
+  end
 end
 
-task :cmake_production do
-  sh "#{mruby_config} cmake -B build"
+task :cmake do
+  sh "cmake -B #{ENV['PRK_BUILD_DIR']}build"
 end
 
 task :check_pico_sdk => :check_pico_sdk_path do
@@ -71,19 +85,7 @@ end
 
 desc "build without cmake preparation"
 task :build => :check_pico_sdk do
-  sh "cmake --build build"
-end
-
-desc "build PRK Firmware inclusive of keymap.rb (without mass storage)"
-task :build_with_keymap, ['keyboard_name'] => [:libmruby_no_msc, :test] do |_t, args|
-  unless args.keyboard_name
-    raise "Argument `keyboard_name` missing.\nUsage: rake build_with_keymap[prk_meishi2]"
-  end
-  dir = "keyboards/#{args.keyboard_name}"
-  FileUtils.mkdir_p "#{dir}/build"
-  #sh "cmake -DPICORUBY_NO_MSC=1 -DCMAKE_BUILD_TYPE=Debug -B #{dir}/build"
-  sh "#{mruby_config} cmake -DPICORUBY_NO_MSC=1 -B #{dir}/build"
-  sh "cmake --build #{dir}/build"
+  sh "cmake --build #{ENV['PRK_BUILD_DIR']}build"
 end
 
 desc "clean built that includes keymap"
@@ -119,7 +121,7 @@ end
 desc "clean built"
 task :clean do
   FileUtils.cd "lib/picoruby" do
-    sh "MRUBY_CONFIG=#{MRUBY_CONFIG} rake clean"
+    sh "rake clean"
   end
   FileUtils.cd "build" do
     FileUtils.rm_rf Dir.glob("prk_firmware-*.*")
@@ -134,7 +136,7 @@ end
 desc "deep clean built"
 task :deep_clean do
   FileUtils.cd "lib/picoruby" do
-    sh "MRUBY_CONFIG=#{MRUBY_CONFIG} rake deep_clean"
+    sh "rake deep_clean"
   end
   FileUtils.cd "build" do
     FileUtils.rm_rf Dir.glob("*")

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

@@ -31,8 +31,11 @@
 #include <keymap.c>
 #endif
 
-
-#define MEMORY_SIZE (1024*200)
+#if defined(PICORUBY_SQLITE3)
+  #define MEMORY_SIZE (1024*203)
+#else
+  #define MEMORY_SIZE (1024*207)
+#endif
 
 static uint8_t memory_pool[MEMORY_SIZE];
 
@@ -54,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)