22 files changed, 16 insertions(+), 8 deletions(-)
R .cargo/config => source/.cargo/config
R .gitignore => source/.gitignore
R Cargo.lock => source/Cargo.lock
R Cargo.toml => source/Cargo.toml
R memory.x => source/memory.x
R src/brightness_manager.rs => source/src/brightness_manager.rs
R src/button.rs => source/src/button.rs
R src/calendar.rs => source/src/calendar.rs
R src/clock_app.rs => source/src/clock_app.rs
R src/clock_display.rs => source/src/clock_display.rs
R src/clock_display_viewer.rs => source/src/clock_display_viewer.rs
R src/clock_state.rs => source/src/clock_state.rs
R src/count_down.rs => source/src/count_down.rs
R src/display.rs => source/src/display.rs
R src/display_view.rs => source/src/display_view.rs
R src/display_view/clock_display_view.rs => source/src/display_view/clock_display_view.rs
R src/display_view/date_display_view.rs => source/src/display_view/date_display_view.rs
R src/lib.rs => source/src/lib.rs
R src/linear_interpolation.rs => source/src/linear_interpolation.rs
R src/main.rs => source/src/main.rs
R src/number_digits.rs => source/src/number_digits.rs
R src/seven_segments.rs => source/src/seven_segments.rs
R .cargo/config => source/.cargo/config +0 -0
R .gitignore => source/.gitignore +0 -0
R Cargo.lock => source/Cargo.lock +0 -0
R Cargo.toml => source/Cargo.toml +0 -0
R memory.x => source/memory.x +0 -0
R src/brightness_manager.rs => source/src/brightness_manager.rs +10 -2
@@ 35,8 35,10 @@ impl BrightnessManager {
]),
brightness_interpolation: LinearInterpolation::new(vec![
Point::new(0, 1),
- Point::new(6 * 60, 1),
- Point::new(8 * 60, 50),
+ Point::new(5 * 60, 1),
+ Point::new(6 * 60, 20),
+ Point::new(7 * 60, 50),
+ Point::new(8 * 60, 70),
Point::new(12 * 60, 100),
Point::new(18 * 60, 90),
Point::new(20 * 60, 70),
@@ 95,3 97,9 @@ impl BrightnessManager {
}
}
}
+
+impl Default for BrightnessManager {
+ fn default() -> Self {
+ Self::new()
+ }
+}
R src/button.rs => source/src/button.rs +2 -2
@@ 86,8 86,8 @@ impl<ACTIVELEVEL: ActiveLevel> Button<ACTIVELEVEL> {
if raw_pressed != self.prev_state {
self.debounce = 0;
- } else if self.debounce < u8::MAX {
- self.debounce += 1;
+ } else {
+ self.debounce = self.debounce.saturating_add(1);
}
self.prev_state = raw_pressed;
R src/calendar.rs => source/src/calendar.rs +0 -0
R src/clock_app.rs => source/src/clock_app.rs +0 -0
R src/clock_display.rs => source/src/clock_display.rs +0 -0
R src/clock_display_viewer.rs => source/src/clock_display_viewer.rs +1 -1
@@ 29,7 29,7 @@ impl ClockDisplayViewer {
}
}
- pub fn clock_display<'a>(&'a mut self) -> &'a mut ClockDisplay {
+ pub fn clock_display(&mut self) -> &mut ClockDisplay {
&mut self.clock_display
}
R src/clock_state.rs => source/src/clock_state.rs +0 -0
R src/count_down.rs => source/src/count_down.rs +1 -1
@@ 29,7 29,7 @@ where
type Time = MicrosDurationU32;
fn start(&mut self, count: Self::Time) {
- self.counter.start(count.into()).unwrap();
+ self.counter.start(count).unwrap();
}
fn wait(&mut self) -> nb::Result<(), timer::Error> {
R src/display.rs => source/src/display.rs +0 -0
R src/display_view.rs => source/src/display_view.rs +0 -0
R src/display_view/clock_display_view.rs => source/src/display_view/clock_display_view.rs +0 -0
R src/display_view/date_display_view.rs => source/src/display_view/date_display_view.rs +0 -0
R src/lib.rs => source/src/lib.rs +0 -1
@@ 4,7 4,6 @@
use defmt_rtt as _; // global logger
use embedded_alloc::Heap;
-use stm32f1xx_hal::prelude::*;
use panic_probe as _;
R src/linear_interpolation.rs => source/src/linear_interpolation.rs +0 -0
R src/main.rs => source/src/main.rs +1 -0
@@ 25,6 25,7 @@ use clock_app::{ClockApp, ClockInterrupt};
use clock_display::{ClockDisplay, DisplayPart};
use clock_display_viewer::ClockDisplayViewer;
use clock_state::ClockState;
+use simple_clock::button::Button;
use core::{alloc::Layout, cell::RefCell, convert::Infallible, panic::PanicInfo};
use cortex_m::asm::wfi;
use cortex_m_rt::entry;
R src/number_digits.rs => source/src/number_digits.rs +1 -1
@@ 8,7 8,7 @@ impl NumberDigits for u8 {
for _ in 0..digit_index {
number /= 10;
}
- (number % 10) as u8
+ number % 10
}
}
R src/seven_segments.rs => source/src/seven_segments.rs +0 -0