From c98387472d899ba28d0030cae54bdb794feeb823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Fri, 16 Jun 2023 10:31:23 +0200 Subject: [PATCH] chore: move firmware files to firmware/ folder --- {.cargo => firmware/.cargo}/config.toml | 0 .gitignore => firmware/.gitignore | 0 Cargo.lock => firmware/Cargo.lock | 19 ++++++++++++++----- Cargo.toml => firmware/Cargo.toml | 4 ---- README.md => firmware/README.md | 0 .../avr-specs}/avr-atmega1280.json | 0 .../avr-specs}/avr-atmega168.json | 0 .../avr-specs}/avr-atmega2560.json | 0 .../avr-specs}/avr-atmega328p.json | 0 .../avr-specs}/avr-atmega32u4.json | 0 .../avr-specs}/avr-atmega48p.json | 0 .../avr-specs}/avr-atmega8.json | 0 .../avr-specs}/avr-attiny85.json | 0 .../avr-specs}/avr-attiny88.json | 0 .../rust-toolchain.toml | 0 {src => firmware/src}/animation.rs | 0 {src => firmware/src}/button.rs | 0 {src => firmware/src}/entrypoint.rs | 0 {src => firmware/src}/filled_seven_segment.rs | 0 {src => firmware/src}/filled_sipo.rs | 0 {src => firmware/src}/led_matrix.rs | 0 {src => firmware/src}/rng.rs | 0 {src => firmware/src}/seven_segment.rs | 0 {src => firmware/src}/sipo.rs | 0 main.rs | 0 25 files changed, 14 insertions(+), 9 deletions(-) rename {.cargo => firmware/.cargo}/config.toml (100%) rename .gitignore => firmware/.gitignore (100%) rename Cargo.lock => firmware/Cargo.lock (89%) rename Cargo.toml => firmware/Cargo.toml (88%) rename README.md => firmware/README.md (100%) rename {avr-specs => firmware/avr-specs}/avr-atmega1280.json (100%) rename {avr-specs => firmware/avr-specs}/avr-atmega168.json (100%) rename {avr-specs => firmware/avr-specs}/avr-atmega2560.json (100%) rename {avr-specs => firmware/avr-specs}/avr-atmega328p.json (100%) rename {avr-specs => firmware/avr-specs}/avr-atmega32u4.json (100%) rename {avr-specs => firmware/avr-specs}/avr-atmega48p.json (100%) rename {avr-specs => firmware/avr-specs}/avr-atmega8.json (100%) rename {avr-specs => firmware/avr-specs}/avr-attiny85.json (100%) rename {avr-specs => firmware/avr-specs}/avr-attiny88.json (100%) rename rust-toolchain.toml => firmware/rust-toolchain.toml (100%) rename {src => firmware/src}/animation.rs (100%) rename {src => firmware/src}/button.rs (100%) rename {src => firmware/src}/entrypoint.rs (100%) rename {src => firmware/src}/filled_seven_segment.rs (100%) rename {src => firmware/src}/filled_sipo.rs (100%) rename {src => firmware/src}/led_matrix.rs (100%) rename {src => firmware/src}/rng.rs (100%) rename {src => firmware/src}/seven_segment.rs (100%) rename {src => firmware/src}/sipo.rs (100%) delete mode 100644 main.rs diff --git a/.cargo/config.toml b/firmware/.cargo/config.toml similarity index 100% rename from .cargo/config.toml rename to firmware/.cargo/config.toml diff --git a/.gitignore b/firmware/.gitignore similarity index 100% rename from .gitignore rename to firmware/.gitignore diff --git a/Cargo.lock b/firmware/Cargo.lock similarity index 89% rename from Cargo.lock rename to firmware/Cargo.lock index 01fb1a4..bbb77a3 100644 --- a/Cargo.lock +++ b/firmware/Cargo.lock @@ -12,17 +12,21 @@ dependencies = [ [[package]] name = "avr-device" -version = "0.4.0" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb45711b7227cb3f799c40c4e0e8beea1765acff8d06a14bb3479c1a549d8b0" dependencies = [ "avr-device-macros", "bare-metal", - "cfg-if", + "cfg-if 1.0.0", "vcell", ] [[package]] name = "avr-device-macros" -version = "0.4.0" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87c428a2384981d8460668c48c766ff18e7e91d2d467f7b103151984ee952d38" dependencies = [ "proc-macro2", "quote", @@ -34,7 +38,7 @@ name = "avr-hal-generic" version = "0.1.0" dependencies = [ "avr-device", - "cfg-if", + "cfg-if 0.1.10", "embedded-hal", "embedded-storage", "nb 0.1.3", @@ -56,6 +60,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "embedded-hal" version = "0.2.7" @@ -77,7 +87,6 @@ name = "guess-the-number" version = "0.1.0" dependencies = [ "atmega-hal", - "avr-device", "avr-hal-generic", "nb 0.1.3", "panic-halt", diff --git a/Cargo.toml b/firmware/Cargo.toml similarity index 88% rename from Cargo.toml rename to firmware/Cargo.toml index ee5e7f8..8029e06 100644 --- a/Cargo.toml +++ b/firmware/Cargo.toml @@ -15,10 +15,6 @@ panic-halt = "0.2.0" ufmt = "0.1.0" nb = "0.1.2" -[dependencies.avr-device] -path = "../avr-device" -features = ["rt","atmega8"] - [dependencies.atmega-hal] path = "../avr-hal/mcu/atmega-hal" features = ["rt","atmega8"] diff --git a/README.md b/firmware/README.md similarity index 100% rename from README.md rename to firmware/README.md diff --git a/avr-specs/avr-atmega1280.json b/firmware/avr-specs/avr-atmega1280.json similarity index 100% rename from avr-specs/avr-atmega1280.json rename to firmware/avr-specs/avr-atmega1280.json diff --git a/avr-specs/avr-atmega168.json b/firmware/avr-specs/avr-atmega168.json similarity index 100% rename from avr-specs/avr-atmega168.json rename to firmware/avr-specs/avr-atmega168.json diff --git a/avr-specs/avr-atmega2560.json b/firmware/avr-specs/avr-atmega2560.json similarity index 100% rename from avr-specs/avr-atmega2560.json rename to firmware/avr-specs/avr-atmega2560.json diff --git a/avr-specs/avr-atmega328p.json b/firmware/avr-specs/avr-atmega328p.json similarity index 100% rename from avr-specs/avr-atmega328p.json rename to firmware/avr-specs/avr-atmega328p.json diff --git a/avr-specs/avr-atmega32u4.json b/firmware/avr-specs/avr-atmega32u4.json similarity index 100% rename from avr-specs/avr-atmega32u4.json rename to firmware/avr-specs/avr-atmega32u4.json diff --git a/avr-specs/avr-atmega48p.json b/firmware/avr-specs/avr-atmega48p.json similarity index 100% rename from avr-specs/avr-atmega48p.json rename to firmware/avr-specs/avr-atmega48p.json diff --git a/avr-specs/avr-atmega8.json b/firmware/avr-specs/avr-atmega8.json similarity index 100% rename from avr-specs/avr-atmega8.json rename to firmware/avr-specs/avr-atmega8.json diff --git a/avr-specs/avr-attiny85.json b/firmware/avr-specs/avr-attiny85.json similarity index 100% rename from avr-specs/avr-attiny85.json rename to firmware/avr-specs/avr-attiny85.json diff --git a/avr-specs/avr-attiny88.json b/firmware/avr-specs/avr-attiny88.json similarity index 100% rename from avr-specs/avr-attiny88.json rename to firmware/avr-specs/avr-attiny88.json diff --git a/rust-toolchain.toml b/firmware/rust-toolchain.toml similarity index 100% rename from rust-toolchain.toml rename to firmware/rust-toolchain.toml diff --git a/src/animation.rs b/firmware/src/animation.rs similarity index 100% rename from src/animation.rs rename to firmware/src/animation.rs diff --git a/src/button.rs b/firmware/src/button.rs similarity index 100% rename from src/button.rs rename to firmware/src/button.rs diff --git a/src/entrypoint.rs b/firmware/src/entrypoint.rs similarity index 100% rename from src/entrypoint.rs rename to firmware/src/entrypoint.rs diff --git a/src/filled_seven_segment.rs b/firmware/src/filled_seven_segment.rs similarity index 100% rename from src/filled_seven_segment.rs rename to firmware/src/filled_seven_segment.rs diff --git a/src/filled_sipo.rs b/firmware/src/filled_sipo.rs similarity index 100% rename from src/filled_sipo.rs rename to firmware/src/filled_sipo.rs diff --git a/src/led_matrix.rs b/firmware/src/led_matrix.rs similarity index 100% rename from src/led_matrix.rs rename to firmware/src/led_matrix.rs diff --git a/src/rng.rs b/firmware/src/rng.rs similarity index 100% rename from src/rng.rs rename to firmware/src/rng.rs diff --git a/src/seven_segment.rs b/firmware/src/seven_segment.rs similarity index 100% rename from src/seven_segment.rs rename to firmware/src/seven_segment.rs diff --git a/src/sipo.rs b/firmware/src/sipo.rs similarity index 100% rename from src/sipo.rs rename to firmware/src/sipo.rs diff --git a/main.rs b/main.rs deleted file mode 100644 index e69de29..0000000 -- 2.48.1