WIP: ledmatrix: Use framework-ledmatrix HAL

Don't need to package it in here anymore if merged upstream. rp-rs/rp-hal-boards#92 Signed-off-by: Daniel Schaefer <[email protected]>
FrameworkComputer · Oct 22, 2024 · 1c321bd · 1c321bd
1 parent 1c225d7
commit 1c321bd
Show file tree

Hide file tree

Showing 8 changed files with 207 additions and 87 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,6 +44,7 @@ tinybmp = "0.5.0"
 # C1 Minimal
 smart-leds = "0.3.0"
 ws2812-pio = "0.6.0"
+framework-ledmatrix = { git = "https://github.com/FrameworkComputer/rp-hal-boards", branch = "framework16-hals" }
 
 [profile.dev.package.ledmatrix]
 codegen-units = 1

diff --git a/fl16-inputmodules/Cargo.toml b/fl16-inputmodules/Cargo.toml
@@ -15,7 +15,7 @@ defmt-rtt.workspace = true
 #panic-probe.workspace = true
 rp2040-panic-usb-boot.workspace = true
 
-# Not using an external BSP, we've got the Framework Laptop 16 BSPs locally in this crate
+framework-ledmatrix.workspace = true
 rp2040-hal.workspace = true
 rp2040-boot2.workspace = true
 

diff --git a/fl16-inputmodules/src/led_hal.rs b/fl16-inputmodules/src/led_hal.rs
diff --git a/fl16-inputmodules/src/lib.rs b/fl16-inputmodules/src/lib.rs
@@ -13,8 +13,6 @@ pub mod fl16;
 #[cfg(feature = "ledmatrix")]
 pub mod games;
 #[cfg(feature = "ledmatrix")]
-pub mod led_hal;
-#[cfg(feature = "ledmatrix")]
 #[rustfmt::skip]
 pub mod mapping;
 #[cfg(feature = "ledmatrix")]

diff --git a/fl16-inputmodules/src/patterns.rs b/fl16-inputmodules/src/patterns.rs
@@ -3,9 +3,9 @@ use rp2040_hal::{
     pac::I2C1,
 };
 
-use crate::led_hal as bsp;
 use crate::mapping::*;
 use crate::matrix::*;
+use framework_ledmatrix as bsp;
 use is31fl3741::devices::LedMatrix;
 
 /// Bytes needed to represent all LEDs with a single bit

diff --git a/ledmatrix/Cargo.toml b/ledmatrix/Cargo.toml
@@ -18,7 +18,7 @@ defmt-rtt.workspace = true
 #panic-probe.workspace = true
 rp2040-panic-usb-boot.workspace = true
 
-# Not using an external BSP, we've got the Framework Laptop 16 BSPs locally in this crate
+framework-ledmatrix.workspace = true
 rp2040-hal.workspace = true
 rp2040-boot2.workspace = true
 

diff --git a/ledmatrix/src/main.rs b/ledmatrix/src/main.rs
@@ -112,9 +112,10 @@ use bsp::entry;
 use fl16_inputmodules::animations::*;
 #[cfg(feature = "evt")]
 use fl16_inputmodules::fl16::EVT_CALC_PIXEL;
+use fl16_inputmodules::games::game_of_life;
 use fl16_inputmodules::games::pong_animation::*;
 use fl16_inputmodules::games::snake_animation::*;
-use fl16_inputmodules::{games::game_of_life, led_hal as bsp};
+use framework_ledmatrix as bsp;
 use is31fl3741::devices::LedMatrix;
 #[cfg(not(feature = "evt"))]
 use is31fl3741::devices::CALC_PIXEL;