Spade multi-game support (#1620)

* pin pico-extras version * multi-game support! * fix version number stuff * updated uf2 * remove redundant debug vars * run engine code from binary instead of flash (#2238) we do not need to copy this that many times Co-authored-by: Cheru Berhanu <[email protected]> * fix OO_FLASH communication/dialog * remove unnecessary string len calculation * gitignore jerry build files * fix upload issue, remove useless comment * update uf2 * slots -> blocks (#2239) * slots -> blocks * Update out-of-space.tsx * Update out-of-space.tsx * Update out-of-space.tsx --------- Co-authored-by: Cheru Berhanu <[email protected]> * clean up code * update pico uf2 * fix button pressses * fix games_len not being updated in get_games * new better code --------- Co-authored-by: Nora <[email protected]>
hackclub · Aug 30, 2024 · 6265083 · 6265083
1 parent 1e2089c
commit 6265083
Show file tree

Hide file tree

Showing 35 changed files with 924 additions and 3,736 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,8 +6,4 @@ yarn-error.log
 .env
 dist/
 games/metadata.json
-public/*.json
-firmware/spade/src/rpi/jerry/lib/*.a
-firmware/spade/src/rpi/jerry/lib/libjerry-core.a
-firmware/spade/src/rpi/jerry/lib/libjerry-ext.a
-firmware/spade/src/rpi/jerry/lib/libjerry-port-default.a
+public/*.json
diff --git a/firmware/spade/.gitignore b/firmware/spade/.gitignore
@@ -5,6 +5,8 @@ rpi_build/
 .DS_Store
 src/pc/jerry/include
 src/pc/jerry/lib
+src/rpi/jerry/include
+src/rpi/jerry/lib
 CMakeFiles/
 Makefile
 cmake_install.cmake

diff --git a/firmware/spade/docker/dockerfile b/firmware/spade/docker/dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.19
 
-RUN apk add git python3 clang make cmake entr uglify-js gcc-arm-none-eabi g++-arm-none-eabi gdb-multiarch
+RUN apk add git python3 clang make cmake entr uglify-js gcc-arm-none-eabi g++-arm-none-eabi gdb-multiarch gcc
 
 COPY ./importBuildRepos.sh /opt/importBuildRepos.sh
 

diff --git a/firmware/spade/src/pc/main.c b/firmware/spade/src/pc/main.c
@@ -224,8 +224,7 @@ static void js_init(char *file, int file_size) {
   strcpy(combined, engine_script);
   strcpy(combined + sizeof(engine_script) - 1, file);
 
-  const jerry_length_t combined_size = sizeof (engine_script) - 1 + file_size;
-  js_run(combined, combined_size);
+  js_run(combined, 0);
 }
 
 /**

diff --git a/firmware/spade/src/rpi/jerry/include/jerryscript-compiler.h b/firmware/spade/src/rpi/jerry/include/jerryscript-compiler.h