ledmatrix: Build separate EVT version

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

.github/workflows/firmware.yml

@@ -36,6 +36,7 @@ jobs:
       - run: cargo make --cwd c1minimal
       - run: cargo make --cwd ledmatrix build-release
       - run: cargo make --cwd ledmatrix build-release-10k
+      - run: cargo make --cwd ledmatrix build-release-evt
       - run: cargo make --cwd b1display build-release
       - run: cargo make --cwd c1minimal build-release
 
@@ -46,6 +47,7 @@ jobs:
             cargo make --cwd b1display uf2
             cargo make --cwd c1minimal uf2
             cargo make --cwd ledmatrix build-release-10k-uf2
+            cargo make --cwd ledmatrix build-release-evt-uf2
             cargo make --cwd ledmatrix uf2
 
       - name: Convert to bin format
@@ -64,6 +66,7 @@ jobs:
             ledmatrix.bin
             ledmatrix.uf2
             ledmatrix_10k.uf2
+            ledmatrix_evt.uf2
 
       - name: Upload b1display files
         uses: actions/upload-artifact@v3

ledmatrix/Cargo.toml

@@ -5,6 +5,7 @@ version = "0.1.7-pre"
 
 [features]
 10k = []
+evt = []
 
 [dependencies]
 cortex-m.workspace = true

ledmatrix/Makefile.toml

@@ -1,22 +1,58 @@
 extend = "../Makefile.toml"
 
+[tasks.build-release-evt]
+command = "cargo"
+args = [
+    "build",
+    "--target=thumbv6m-none-eabi",
+    "--release",
+    "--features",
+    "evt",
+]
+
+[tasks.build-release-evt-uf2]
+command = "elf2uf2-rs"
+args = [
+    "../target/thumbv6m-none-eabi/release/ledmatrix",
+    "../target/thumbv6m-none-eabi/release/ledmatrix_evt.uf2",
+]
+dependencies = ["build-release-evt"]
+install_crate = "elf2uf2-rs"
+
 [tasks.build-release-10k]
 command = "cargo"
-args = ["build", "--target=thumbv6m-none-eabi", "--release", "--features", "10k"]
+args = [
+    "build",
+    "--target=thumbv6m-none-eabi",
+    "--release",
+    "--features",
+    "10k",
+    "evt",
+]
 
 [tasks.build-release-10k-uf2]
 command = "elf2uf2-rs"
-args = ["../target/thumbv6m-none-eabi/release/ledmatrix", "../target/thumbv6m-none-eabi/release/ledmatrix_10k.uf2"]
+args = [
+    "../target/thumbv6m-none-eabi/release/ledmatrix",
+    "../target/thumbv6m-none-eabi/release/ledmatrix_10k.uf2",
+]
 dependencies = ["build-release-10k"]
 install_crate = "elf2uf2-rs"
 
 [tasks.uf2]
 command = "elf2uf2-rs"
-args = ["../target/thumbv6m-none-eabi/release/ledmatrix", "../target/thumbv6m-none-eabi/release/ledmatrix.uf2"]
+args = [
+    "../target/thumbv6m-none-eabi/release/ledmatrix",
+    "../target/thumbv6m-none-eabi/release/ledmatrix.uf2",
+]
 dependencies = ["build-release"]
 install_crate = "elf2uf2-rs"
 
 [tasks.bin]
 command = "llvm-objcopy"
-args = ["-Obinary", "../target/thumbv6m-none-eabi/release/ledmatrix", "../target/thumbv6m-none-eabi/release/ledmatrix.bin"]
+args = [
+    "-Obinary",
+    "../target/thumbv6m-none-eabi/release/ledmatrix",
+    "../target/thumbv6m-none-eabi/release/ledmatrix.bin",
+]
 dependencies = ["build-release"]

ledmatrix/src/main.rs

@@ -106,7 +106,11 @@ const MAX_BRIGHTNESS: u8 = 255;
 // Provide an alias for our BSP so we can switch targets quickly.
 // Uncomment the BSP you included in Cargo.toml, the rest of the code does not need to change.
 use bsp::entry;
-use fl16_inputmodules::{fl16::DVT2_CALC_PIXEL, games::game_of_life, led_hal as bsp};
+#[cfg(not(feature = "evt"))]
+use fl16_inputmodules::fl16::DVT2_CALC_PIXEL;
+#[cfg(feature = "evt")]
+use fl16_inputmodules::fl16::EVT_CALC_PIXEL;
+use fl16_inputmodules::{games::game_of_life, led_hal as bsp};
 //use rp_pico as bsp;
 // use sparkfun_pro_micro_rp2040 as bsp;
 
@@ -238,18 +242,22 @@ fn main() -> ! {
         state.grid = every_nth_col(2);
     };
 
-    //let mut matrix = LedMatrix::new(i2c, EVT_CALC_PIXEL);
+    #[cfg(feature = "evt")]
+    let mut matrix = LedMatrix::new(i2c, EVT_CALC_PIXEL);
+    #[cfg(not(feature = "evt"))]
     let mut matrix = LedMatrix::new(i2c, DVT2_CALC_PIXEL);
     matrix
         .setup(&mut delay)
         .expect("failed to setup RGB controller");
 
     // EVT
-    // matrix
-    //     .device
-    //     .sw_enablement(is31fl3741::SwSetting::Sw1Sw9)
-    //     .unwrap();
+    #[cfg(feature = "evt")]
+    matrix
+        .device
+        .sw_enablement(is31fl3741::SwSetting::Sw1Sw9)
+        .unwrap();
     // DVT
+    #[cfg(not(feature = "evt"))]
     matrix
         .device
         .sw_enablement(is31fl3741::SwSetting::Sw1Sw8)