Refactor the bike library until it compiles with no_std

Theoretically, this is the first step to getting to running on the pico
This commit is contained in:
Savanni D'Gerinel 2023-11-27 18:51:36 -05:00
parent 22f0f9061c
commit 6164cb3b39
8 changed files with 126 additions and 24 deletions

13
Cargo.lock generated
View File

@ -373,6 +373,19 @@ version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
[[package]]
name = "bike"
version = "0.1.0"
dependencies = [
"cortex-m",
"cortex-m-rt",
"embedded-hal",
"fugit",
"lights-core",
"panic-halt",
"rp-pico",
]
[[package]] [[package]]
name = "bit-set" name = "bit-set"
version = "0.5.3" version = "0.5.3"

View File

@ -2,6 +2,7 @@
resolver = "2" resolver = "2"
members = [ members = [
"authdb", "authdb",
"bike-lights/bike",
"bike-lights/core", "bike-lights/core",
"bike-lights/simulator", "bike-lights/simulator",
"changeset", "changeset",

View File

@ -0,0 +1,12 @@
[build]
target = "thumbv6m-none-eabi"
[target.thumbv6m-none-eabi]
rustflags = [
"-C", "link-arg=--nmagic",
"-C", "link-arg=-Tlink.x",
"-C", "inline-threshold=5",
"-C", "no-vectorize-loops",
]
runner = "elf2uf2-rs -d"

View File

@ -0,0 +1,15 @@
[package]
name = "bike"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cortex-m = "0.7.7"
cortex-m-rt = "0.7.3"
embedded-hal = "0.2.7"
fugit = "0.3.7"
panic-halt = "0.2.0"
rp-pico = "0.8.0"
lights-core = { path = "../core" }

View File

@ -0,0 +1,10 @@
#![no_main]
#![no_std]
use panic_halt as _;
use rp_pico::entry;
#[entry]
fn main() -> ! {
loop {}
}

View File

@ -1,9 +1,26 @@
#![no_std]
extern crate alloc;
use alloc::boxed::Box;
use core::{clone::Clone, cmp::PartialEq, ops::Sub, option::Option};
mod patterns; mod patterns;
pub use patterns::*; pub use patterns::*;
mod types; mod types;
pub use types::{DashboardPattern, Pattern, RGB}; pub use types::{DashboardPattern, Pattern, RGB};
#[derive(Clone, Copy)]
pub struct Instant(pub u128);
impl Sub for Instant {
type Output = Self;
fn sub(self, r: Self) -> Self::Output {
Self(self.0 - r.0)
}
}
pub const FPS: u8 = 30; pub const FPS: u8 = 30;
pub trait UI { pub trait UI {
@ -12,13 +29,13 @@ pub trait UI {
} }
pub trait Animation { pub trait Animation {
fn tick(&mut self, time: std::time::Instant) -> (DashboardPattern, Pattern); fn tick(&mut self, time: Instant) -> (DashboardPattern, Pattern);
} }
pub struct DefaultAnimation {} pub struct DefaultAnimation {}
impl Animation for DefaultAnimation { impl Animation for DefaultAnimation {
fn tick(&mut self, _: std::time::Instant) -> (DashboardPattern, Pattern) { fn tick(&mut self, _: Instant) -> (DashboardPattern, Pattern) {
(PRIDE_DASHBOARD, PRIDE) (PRIDE_DASHBOARD, PRIDE)
} }
} }
@ -27,9 +44,9 @@ pub struct Fade {
starting_dashboard: DashboardPattern, starting_dashboard: DashboardPattern,
starting_lights: Pattern, starting_lights: Pattern,
start_time: std::time::Instant, start_time: Instant,
dashboard_slope: Vec<RGB<f64>>, dashboard_slope: [RGB<f64>; 3],
body_slope: Vec<RGB<f64>>, body_slope: [RGB<f64>; 60],
frames: u8, frames: u8,
} }
@ -40,17 +57,17 @@ impl Fade {
ending_dashboard: DashboardPattern, ending_dashboard: DashboardPattern,
ending_lights: Pattern, ending_lights: Pattern,
frames: u8, frames: u8,
time: std::time::Instant, time: Instant,
) -> Self { ) -> Self {
let mut dashboard_slope = Vec::new(); let mut dashboard_slope = [Default::default(); 3];
let mut body_slope = Vec::new(); let mut body_slope = [Default::default(); 60];
for i in 0..3 { for i in 0..3 {
let slope = RGB { let slope = RGB {
r: (ending_dashboard[i].r as f64 - dashboard[i].r as f64) / frames as f64, r: (ending_dashboard[i].r as f64 - dashboard[i].r as f64) / frames as f64,
g: (ending_dashboard[i].g as f64 - dashboard[i].g as f64) / frames as f64, g: (ending_dashboard[i].g as f64 - dashboard[i].g as f64) / frames as f64,
b: (ending_dashboard[i].b as f64 - dashboard[i].b as f64) / frames as f64, b: (ending_dashboard[i].b as f64 - dashboard[i].b as f64) / frames as f64,
}; };
dashboard_slope.push(slope); dashboard_slope[i] = slope;
} }
for i in 0..60 { for i in 0..60 {
@ -59,11 +76,9 @@ impl Fade {
g: (ending_lights[i].g as f64 - lights[i].g as f64) / frames as f64, g: (ending_lights[i].g as f64 - lights[i].g as f64) / frames as f64,
b: (ending_lights[i].b as f64 - lights[i].b as f64) / frames as f64, b: (ending_lights[i].b as f64 - lights[i].b as f64) / frames as f64,
}; };
body_slope.push(slope); body_slope[i] = slope;
} }
println!("dashboard slope: {:?}", dashboard_slope);
Self { Self {
starting_dashboard: dashboard, starting_dashboard: dashboard,
starting_lights: lights, starting_lights: lights,
@ -76,8 +91,8 @@ impl Fade {
} }
impl Animation for Fade { impl Animation for Fade {
fn tick(&mut self, time: std::time::Instant) -> (DashboardPattern, Pattern) { fn tick(&mut self, time: Instant) -> (DashboardPattern, Pattern) {
let mut frames: u8 = ((time - self.start_time).as_millis() as f64 / FPS as f64) as u8; let mut frames: u8 = ((time - self.start_time).0 as f64 / FPS as f64) as u8;
if frames > self.frames { if frames > self.frames {
frames = self.frames frames = self.frames
} }
@ -142,7 +157,7 @@ pub struct Blinker {
fade_out: Fade, fade_out: Fade,
direction: FadeDirection, direction: FadeDirection,
start_time: std::time::Instant, start_time: Instant,
frames: u8, frames: u8,
} }
@ -151,7 +166,7 @@ impl Blinker {
starting_dashboard: DashboardPattern, starting_dashboard: DashboardPattern,
starting_body: Pattern, starting_body: Pattern,
direction: BlinkerDirection, direction: BlinkerDirection,
time: std::time::Instant, time: Instant,
) -> Self { ) -> Self {
let mut ending_dashboard = starting_dashboard.clone(); let mut ending_dashboard = starting_dashboard.clone();
@ -211,8 +226,8 @@ impl Blinker {
} }
impl Animation for Blinker { impl Animation for Blinker {
fn tick(&mut self, time: std::time::Instant) -> (DashboardPattern, Pattern) { fn tick(&mut self, time: Instant) -> (DashboardPattern, Pattern) {
let frames: u8 = ((time - self.start_time).as_millis() as f64 / FPS as f64) as u8; let frames: u8 = ((time - self.start_time).0 as f64 / FPS as f64) as u8;
if frames > self.frames { if frames > self.frames {
match self.direction { match self.direction {
FadeDirection::FadeIn => { FadeDirection::FadeIn => {
@ -226,7 +241,6 @@ impl Animation for Blinker {
} }
self.start_time = time; self.start_time = time;
} }
println!("anim: {:?} {}", self.direction, frames);
match self.direction { match self.direction {
FadeDirection::FadeIn => self.fade_in.tick(time), FadeDirection::FadeIn => self.fade_in.tick(time),
@ -276,7 +290,7 @@ impl App {
} }
} }
fn update_animation(&mut self, time: std::time::Instant) { fn update_animation(&mut self, time: Instant) {
match self.state { match self.state {
State::Pattern(0) => { State::Pattern(0) => {
self.current_animation = Box::new(Fade::new( self.current_animation = Box::new(Fade::new(
@ -374,7 +388,7 @@ impl App {
} }
} }
pub fn tick(&mut self, time: std::time::Instant) { pub fn tick(&mut self, time: Instant) {
match self.ui.check_event() { match self.ui.check_event() {
Some(event) => { Some(event) => {
self.update_state(event); self.update_state(event);

View File

@ -1,4 +1,6 @@
#[derive(Clone, Default, Debug)] use core::default::Default;
#[derive(Clone, Copy, Default, Debug)]
pub struct RGB<T> { pub struct RGB<T> {
pub r: T, pub r: T,
pub g: T, pub g: T,
@ -6,4 +8,34 @@ pub struct RGB<T> {
} }
pub type DashboardPattern = [RGB<u8>; 3]; pub type DashboardPattern = [RGB<u8>; 3];
/*
#[derive(Clone)]
pub struct DashboardPattern(pub [RGB<u8>; 3]);
*/
/*
impl Clone for DashboardPattern {
fn clone(&self) -> Self {
let mut v: [RGB<u8>; 3] = Default::default();
for i in 0..3 {
v[i] = self.0[i]
}
Self(v)
}
}
*/
pub type Pattern = [RGB<u8>; 60]; pub type Pattern = [RGB<u8>; 60];
/*
pub struct Pattern(pub [RGB<u8>; 60]);
impl Pattern {
pub fn clone(&self) -> Self {
let mut v: [RGB<u8>; 60] = [Default::default(); 60];
for i in 0..60 {
v[i] = self.0[i]
}
Self(v)
}
}
*/

View File

@ -1,7 +1,7 @@
use adw::prelude::*; use adw::prelude::*;
use glib::{Object, Sender}; use glib::{Object, Sender};
use gtk::subclass::prelude::*; use gtk::subclass::prelude::*;
use lights_core::{App, DashboardPattern, Event, Pattern, FPS, RGB, UI}; use lights_core::{App, DashboardPattern, Event, Instant, Pattern, FPS, RGB, UI};
use std::{ use std::{
cell::RefCell, cell::RefCell,
env, env,
@ -248,7 +248,12 @@ fn main() {
rx: event_rx, rx: event_rx,
})); }));
loop { loop {
bike_app.tick(std::time::Instant::now()); bike_app.tick(Instant(
(std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap())
.as_millis(),
));
std::thread::sleep(std::time::Duration::from_millis(1000 / (FPS as u64))); std::thread::sleep(std::time::Duration::from_millis(1000 / (FPS as u64)));
} }
}); });