diff --git a/.gitmodules b/.gitmodules index de2f8b2..5030c5f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "firmware2/libxkbcommon"] - path = firmware2/libxkbcommon + path = firmware/libxkbcommon url = https://github.com/xkbcommon/libxkbcommon [submodule "firmware2/spectre-api-c"] - path = firmware2/spectre-api-c + path = firmware/spectre-api-c url = https://github.com/Limeth/spectre-api.git diff --git a/firmware2/.cargo/config.toml b/firmware/.cargo/config.toml similarity index 100% rename from firmware2/.cargo/config.toml rename to firmware/.cargo/config.toml diff --git a/firmware2/.vscode/launch.json b/firmware/.vscode/launch.json similarity index 100% rename from firmware2/.vscode/launch.json rename to firmware/.vscode/launch.json diff --git a/firmware2/.vscode/tasks.json b/firmware/.vscode/tasks.json similarity index 100% rename from firmware2/.vscode/tasks.json rename to firmware/.vscode/tasks.json diff --git a/firmware2/Cargo.lock b/firmware/Cargo.lock similarity index 100% rename from firmware2/Cargo.lock rename to firmware/Cargo.lock diff --git a/firmware2/Cargo.toml b/firmware/Cargo.toml similarity index 100% rename from firmware2/Cargo.toml rename to firmware/Cargo.toml diff --git a/firmware2/README.md b/firmware/README.md similarity index 100% rename from firmware2/README.md rename to firmware/README.md diff --git a/firmware2/build.rs b/firmware/build.rs similarity index 100% rename from firmware2/build.rs rename to firmware/build.rs diff --git a/firmware2/compose/cs_CZ Compose.txt b/firmware/compose/cs_CZ Compose.txt similarity index 100% rename from firmware2/compose/cs_CZ Compose.txt rename to firmware/compose/cs_CZ Compose.txt diff --git a/firmware2/cross-esp32s3.txt b/firmware/cross-esp32s3.txt similarity index 100% rename from firmware2/cross-esp32s3.txt rename to firmware/cross-esp32s3.txt diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Bold.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Bold.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Bold.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Bold.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-BoldItalic.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-BoldItalic.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-BoldItalic.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-BoldItalic.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-ExtraLight.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-ExtraLight.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-ExtraLight.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-ExtraLight.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-ExtraLightItalic.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-ExtraLightItalic.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-ExtraLightItalic.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-ExtraLightItalic.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Italic.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Italic.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Italic.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Italic.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Light.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Light.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Light.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Light.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-LightItalic.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-LightItalic.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-LightItalic.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-LightItalic.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Medium.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Medium.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Medium.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Medium.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-MediumItalic.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-MediumItalic.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-MediumItalic.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-MediumItalic.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Regular.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Regular.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Regular.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Regular.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-SemiBold.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-SemiBold.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-SemiBold.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-SemiBold.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-SemiBoldItalic.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-SemiBoldItalic.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-SemiBoldItalic.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-SemiBoldItalic.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Thin.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Thin.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-Thin.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-Thin.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-ThinItalic.ttf b/firmware/fonts/IBM_Plex_Mono/IBMPlexMono-ThinItalic.ttf similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/IBMPlexMono-ThinItalic.ttf rename to firmware/fonts/IBM_Plex_Mono/IBMPlexMono-ThinItalic.ttf diff --git a/firmware2/fonts/IBM_Plex_Mono/OFL.txt b/firmware/fonts/IBM_Plex_Mono/OFL.txt similarity index 100% rename from firmware2/fonts/IBM_Plex_Mono/OFL.txt rename to firmware/fonts/IBM_Plex_Mono/OFL.txt diff --git a/firmware2/keymaps/cz.xkb b/firmware/keymaps/cz.xkb similarity index 100% rename from firmware2/keymaps/cz.xkb rename to firmware/keymaps/cz.xkb diff --git a/firmware2/libsodium-compile.sh b/firmware/libsodium-compile.sh similarity index 100% rename from firmware2/libsodium-compile.sh rename to firmware/libsodium-compile.sh diff --git a/firmware2/libxkbcommon b/firmware/libxkbcommon similarity index 100% rename from firmware2/libxkbcommon rename to firmware/libxkbcommon diff --git a/firmware2/libxkbcommon-compile.sh b/firmware/libxkbcommon-compile.sh similarity index 100% rename from firmware2/libxkbcommon-compile.sh rename to firmware/libxkbcommon-compile.sh diff --git a/firmware2/password-hash/Cargo.lock b/firmware/password-hash/Cargo.lock similarity index 100% rename from firmware2/password-hash/Cargo.lock rename to firmware/password-hash/Cargo.lock diff --git a/firmware2/password-hash/Cargo.toml b/firmware/password-hash/Cargo.toml similarity index 100% rename from firmware2/password-hash/Cargo.toml rename to firmware/password-hash/Cargo.toml diff --git a/firmware2/password-hash/README.md b/firmware/password-hash/README.md similarity index 100% rename from firmware2/password-hash/README.md rename to firmware/password-hash/README.md diff --git a/firmware2/password-hash/build.rs b/firmware/password-hash/build.rs similarity index 100% rename from firmware2/password-hash/build.rs rename to firmware/password-hash/build.rs diff --git a/firmware2/password-hash/src/bin.rs b/firmware/password-hash/src/bin.rs similarity index 100% rename from firmware2/password-hash/src/bin.rs rename to firmware/password-hash/src/bin.rs diff --git a/firmware2/password-hash/src/blocks.rs b/firmware/password-hash/src/blocks.rs similarity index 100% rename from firmware2/password-hash/src/blocks.rs rename to firmware/password-hash/src/blocks.rs diff --git a/firmware2/password-hash/src/lib.rs b/firmware/password-hash/src/lib.rs similarity index 100% rename from firmware2/password-hash/src/lib.rs rename to firmware/password-hash/src/lib.rs diff --git a/firmware2/redefine-syms.sh b/firmware/redefine-syms.sh similarity index 100% rename from firmware2/redefine-syms.sh rename to firmware/redefine-syms.sh diff --git a/firmware2/rust-toolchain.toml b/firmware/rust-toolchain.toml similarity index 100% rename from firmware2/rust-toolchain.toml rename to firmware/rust-toolchain.toml diff --git a/firmware2/spectre-api-c b/firmware/spectre-api-c similarity index 100% rename from firmware2/spectre-api-c rename to firmware/spectre-api-c diff --git a/firmware2/spectre-api-compile.sh b/firmware/spectre-api-compile.sh similarity index 100% rename from firmware2/spectre-api-compile.sh rename to firmware/spectre-api-compile.sh diff --git a/firmware2/src/console.rs b/firmware/src/console.rs similarity index 100% rename from firmware2/src/console.rs rename to firmware/src/console.rs diff --git a/firmware2/src/crypto.rs b/firmware/src/crypto.rs similarity index 100% rename from firmware2/src/crypto.rs rename to firmware/src/crypto.rs diff --git a/firmware2/src/ffi/alloc.rs b/firmware/src/ffi/alloc.rs similarity index 100% rename from firmware2/src/ffi/alloc.rs rename to firmware/src/ffi/alloc.rs diff --git a/firmware2/src/ffi/crypto.rs b/firmware/src/ffi/crypto.rs similarity index 100% rename from firmware2/src/ffi/crypto.rs rename to firmware/src/ffi/crypto.rs diff --git a/firmware2/src/ffi/gcc_runtime.rs b/firmware/src/ffi/gcc_runtime.rs similarity index 100% rename from firmware2/src/ffi/gcc_runtime.rs rename to firmware/src/ffi/gcc_runtime.rs diff --git a/firmware2/src/ffi/inout/dir.rs b/firmware/src/ffi/inout/dir.rs similarity index 100% rename from firmware2/src/ffi/inout/dir.rs rename to firmware/src/ffi/inout/dir.rs diff --git a/firmware2/src/ffi/inout/file.rs b/firmware/src/ffi/inout/file.rs similarity index 100% rename from firmware2/src/ffi/inout/file.rs rename to firmware/src/ffi/inout/file.rs diff --git a/firmware2/src/ffi/inout/mod.rs b/firmware/src/ffi/inout/mod.rs similarity index 100% rename from firmware2/src/ffi/inout/mod.rs rename to firmware/src/ffi/inout/mod.rs diff --git a/firmware2/src/ffi/mod.rs b/firmware/src/ffi/mod.rs similarity index 100% rename from firmware2/src/ffi/mod.rs rename to firmware/src/ffi/mod.rs diff --git a/firmware2/src/ffi/string.rs b/firmware/src/ffi/string.rs similarity index 100% rename from firmware2/src/ffi/string.rs rename to firmware/src/ffi/string.rs diff --git a/firmware2/src/ffi/time.rs b/firmware/src/ffi/time.rs similarity index 100% rename from firmware2/src/ffi/time.rs rename to firmware/src/ffi/time.rs diff --git a/firmware2/src/keymap.rs b/firmware/src/keymap.rs similarity index 100% rename from firmware2/src/keymap.rs rename to firmware/src/keymap.rs diff --git a/firmware2/src/logging.rs b/firmware/src/logging.rs similarity index 100% rename from firmware2/src/logging.rs rename to firmware/src/logging.rs diff --git a/firmware2/src/main.rs b/firmware/src/main.rs similarity index 100% rename from firmware2/src/main.rs rename to firmware/src/main.rs diff --git a/firmware2/src/matrix.rs b/firmware/src/matrix.rs similarity index 100% rename from firmware2/src/matrix.rs rename to firmware/src/matrix.rs diff --git a/firmware2/src/peripherals/mod.rs b/firmware/src/peripherals/mod.rs similarity index 100% rename from firmware2/src/peripherals/mod.rs rename to firmware/src/peripherals/mod.rs diff --git a/firmware2/src/peripherals/st7701s/lcd.rs b/firmware/src/peripherals/st7701s/lcd.rs similarity index 100% rename from firmware2/src/peripherals/st7701s/lcd.rs rename to firmware/src/peripherals/st7701s/lcd.rs diff --git a/firmware2/src/peripherals/st7701s/mod.rs b/firmware/src/peripherals/st7701s/mod.rs similarity index 100% rename from firmware2/src/peripherals/st7701s/mod.rs rename to firmware/src/peripherals/st7701s/mod.rs diff --git a/firmware2/src/ui/backend.rs b/firmware/src/ui/backend.rs similarity index 100% rename from firmware2/src/ui/backend.rs rename to firmware/src/ui/backend.rs diff --git a/firmware2/src/ui/mod.rs b/firmware/src/ui/mod.rs similarity index 100% rename from firmware2/src/ui/mod.rs rename to firmware/src/ui/mod.rs diff --git a/firmware2/src/ui/window_adapter.rs b/firmware/src/ui/window_adapter.rs similarity index 100% rename from firmware2/src/ui/window_adapter.rs rename to firmware/src/ui/window_adapter.rs diff --git a/firmware2/src/util.rs b/firmware/src/util.rs similarity index 100% rename from firmware2/src/util.rs rename to firmware/src/util.rs diff --git a/firmware2/src/vial.rs b/firmware/src/vial.rs similarity index 100% rename from firmware2/src/vial.rs rename to firmware/src/vial.rs diff --git a/firmware2/ui/main.slint b/firmware/ui/main.slint similarity index 100% rename from firmware2/ui/main.slint rename to firmware/ui/main.slint diff --git a/firmware2/vial.json b/firmware/vial.json similarity index 100% rename from firmware2/vial.json rename to firmware/vial.json