Merge branch 'main' into nes

fix

Cargo.lock

@@ -12,27 +12,6 @@ dependencies = [
  "regex",
 ]
 
-[[package]]
-name = "abi"
-version = "0.1.0"
-dependencies = [
- "abi_sys",
- "embedded-graphics",
- "once_cell",
- "rand_core 0.9.3",
-]
-
-[[package]]
-name = "abi_sys"
-version = "0.1.0"
-dependencies = [
- "bitflags 2.10.0",
- "cbindgen",
- "defmt 0.3.100",
- "embedded-graphics",
- "strum",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.12"
@@ -263,9 +242,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 name = "calculator"
 version = "0.1.0"
 dependencies = [
- "abi",
  "embedded-graphics",
  "embedded-layout",
+ "userlib",
 ]
 
 [[package]]
@@ -427,9 +406,9 @@ checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a"
 dependencies = [
  "generic-array",
  "typenum",
@@ -948,6 +927,14 @@ dependencies = [
  "rlsf",
 ]
 
+[[package]]
+name = "embedded-audio"
+version = "0.1.0"
+source = "git+https://github.com/LegitCamper/embedded-audio#087784644d810b94dd659a03dbed4795dfb0bd24"
+dependencies = [
+ "heapless",
+]
+
 [[package]]
 name = "embedded-graphics"
 version = "0.8.1"
@@ -1278,27 +1265,27 @@ dependencies = [
 name = "gallery"
 version = "0.1.0"
 dependencies = [
- "abi",
  "embedded-graphics",
  "tinybmp",
+ "userlib",
 ]
 
 [[package]]
 name = "gboy"
 version = "0.1.0"
 dependencies = [
- "abi",
  "bindgen",
  "cc",
  "embedded-graphics",
  "selection_ui",
+ "userlib",
 ]
 
 [[package]]
 name = "generic-array"
-version = "0.14.9"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
@@ -1331,10 +1318,10 @@ dependencies = [
 name = "gif"
 version = "0.1.0"
 dependencies = [
- "abi",
  "embedded-graphics",
  "selection_ui",
  "tinygif",
+ "userlib",
 ]
 
 [[package]]
@@ -1515,7 +1502,6 @@ dependencies = [
 name = "kernel"
 version = "0.0.1"
 dependencies = [
- "abi_sys",
  "assign-resources",
  "bitflags 2.10.0",
  "bt-hci",
@@ -1543,8 +1529,10 @@ dependencies = [
  "embedded-layout",
  "embedded-sdmmc",
  "embedded-text",
+ "fixed",
  "goblin",
  "heapless",
+ "micromath",
  "num_enum 0.7.5",
  "once_cell",
  "panic-probe",
@@ -1556,6 +1544,7 @@ dependencies = [
  "strum",
  "talc",
  "trouble-host",
+ "userlib_sys",
 ]
 
 [[package]]
@@ -2262,10 +2251,10 @@ checksum = "c1257cd4248b4132760d6524d6dda4e053bc648c9070b960929bf50cfb1e7add"
 name = "selection_ui"
 version = "0.1.0"
 dependencies = [
- "abi",
  "embedded-graphics",
  "embedded-layout",
  "embedded-text",
+ "userlib",
 ]
 
 [[package]]
@@ -2382,10 +2371,10 @@ dependencies = [
 name = "snake"
 version = "0.1.0"
 dependencies = [
- "abi",
  "embedded-graphics",
  "embedded-snake",
  "rand",
+ "userlib",
 ]
 
 [[package]]
@@ -2758,6 +2747,27 @@ dependencies = [
  "usbd-hid-descriptors",
 ]
 
+[[package]]
+name = "userlib"
+version = "0.1.0"
+dependencies = [
+ "embedded-graphics",
+ "once_cell",
+ "rand_core 0.9.3",
+ "userlib_sys",
+]
+
+[[package]]
+name = "userlib_sys"
+version = "0.1.0"
+dependencies = [
+ "bitflags 2.10.0",
+ "cbindgen",
+ "defmt 0.3.100",
+ "embedded-graphics",
+ "strum",
+]
+
 [[package]]
 name = "uuid"
 version = "1.18.1"
@@ -2865,6 +2875,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wav_player"
+version = "0.1.0"
+dependencies = [
+ "embedded-audio",
+ "embedded-graphics",
+ "rand",
+ "selection_ui",
+ "userlib",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"