From 9a82d5eec0c6de36140bb72311230a4a12d7a9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Sat, 29 Jul 2023 12:54:49 +0200 Subject: [PATCH] chore(src): move source to source/ folder --- {.cargo => source/.cargo}/config | 0 .gitignore => source/.gitignore | 0 Cargo.lock => source/Cargo.lock | 0 Cargo.toml => source/Cargo.toml | 0 memory.x => source/memory.x | 0 {src => source/src}/brightness_manager.rs | 12 ++++++++++-- {src => source/src}/button.rs | 4 ++-- {src => source/src}/calendar.rs | 0 {src => source/src}/clock_app.rs | 0 {src => source/src}/clock_display.rs | 0 {src => source/src}/clock_display_viewer.rs | 2 +- {src => source/src}/clock_state.rs | 0 {src => source/src}/count_down.rs | 2 +- {src => source/src}/display.rs | 0 {src => source/src}/display_view.rs | 0 .../src}/display_view/clock_display_view.rs | 0 .../src}/display_view/date_display_view.rs | 0 {src => source/src}/lib.rs | 1 - {src => source/src}/linear_interpolation.rs | 0 {src => source/src}/main.rs | 1 + {src => source/src}/number_digits.rs | 2 +- {src => source/src}/seven_segments.rs | 0 22 files changed, 16 insertions(+), 8 deletions(-) rename {.cargo => source/.cargo}/config (100%) rename .gitignore => source/.gitignore (100%) rename Cargo.lock => source/Cargo.lock (100%) rename Cargo.toml => source/Cargo.toml (100%) rename memory.x => source/memory.x (100%) rename {src => source/src}/brightness_manager.rs (92%) rename {src => source/src}/button.rs (96%) rename {src => source/src}/calendar.rs (100%) rename {src => source/src}/clock_app.rs (100%) rename {src => source/src}/clock_display.rs (100%) rename {src => source/src}/clock_display_viewer.rs (95%) rename {src => source/src}/clock_state.rs (100%) rename {src => source/src}/count_down.rs (92%) rename {src => source/src}/display.rs (100%) rename {src => source/src}/display_view.rs (100%) rename {src => source/src}/display_view/clock_display_view.rs (100%) rename {src => source/src}/display_view/date_display_view.rs (100%) rename {src => source/src}/lib.rs (98%) rename {src => source/src}/linear_interpolation.rs (100%) rename {src => source/src}/main.rs (99%) rename {src => source/src}/number_digits.rs (96%) rename {src => source/src}/seven_segments.rs (100%) diff --git a/.cargo/config b/source/.cargo/config similarity index 100% rename from .cargo/config rename to source/.cargo/config diff --git a/.gitignore b/source/.gitignore similarity index 100% rename from .gitignore rename to source/.gitignore diff --git a/Cargo.lock b/source/Cargo.lock similarity index 100% rename from Cargo.lock rename to source/Cargo.lock diff --git a/Cargo.toml b/source/Cargo.toml similarity index 100% rename from Cargo.toml rename to source/Cargo.toml diff --git a/memory.x b/source/memory.x similarity index 100% rename from memory.x rename to source/memory.x diff --git a/src/brightness_manager.rs b/source/src/brightness_manager.rs similarity index 92% rename from src/brightness_manager.rs rename to source/src/brightness_manager.rs index 9ea6149..8f67f13 100644 --- a/src/brightness_manager.rs +++ b/source/src/brightness_manager.rs @@ -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() + } +} diff --git a/src/button.rs b/source/src/button.rs similarity index 96% rename from src/button.rs rename to source/src/button.rs index 26a4f6b..70d0d86 100644 --- a/src/button.rs +++ b/source/src/button.rs @@ -86,8 +86,8 @@ impl Button { 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; diff --git a/src/calendar.rs b/source/src/calendar.rs similarity index 100% rename from src/calendar.rs rename to source/src/calendar.rs diff --git a/src/clock_app.rs b/source/src/clock_app.rs similarity index 100% rename from src/clock_app.rs rename to source/src/clock_app.rs diff --git a/src/clock_display.rs b/source/src/clock_display.rs similarity index 100% rename from src/clock_display.rs rename to source/src/clock_display.rs diff --git a/src/clock_display_viewer.rs b/source/src/clock_display_viewer.rs similarity index 95% rename from src/clock_display_viewer.rs rename to source/src/clock_display_viewer.rs index f019fd8..fbaa7b0 100644 --- a/src/clock_display_viewer.rs +++ b/source/src/clock_display_viewer.rs @@ -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 } diff --git a/src/clock_state.rs b/source/src/clock_state.rs similarity index 100% rename from src/clock_state.rs rename to source/src/clock_state.rs diff --git a/src/count_down.rs b/source/src/count_down.rs similarity index 92% rename from src/count_down.rs rename to source/src/count_down.rs index e858ca0..ed211ca 100644 --- a/src/count_down.rs +++ b/source/src/count_down.rs @@ -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> { diff --git a/src/display.rs b/source/src/display.rs similarity index 100% rename from src/display.rs rename to source/src/display.rs diff --git a/src/display_view.rs b/source/src/display_view.rs similarity index 100% rename from src/display_view.rs rename to source/src/display_view.rs diff --git a/src/display_view/clock_display_view.rs b/source/src/display_view/clock_display_view.rs similarity index 100% rename from src/display_view/clock_display_view.rs rename to source/src/display_view/clock_display_view.rs diff --git a/src/display_view/date_display_view.rs b/source/src/display_view/date_display_view.rs similarity index 100% rename from src/display_view/date_display_view.rs rename to source/src/display_view/date_display_view.rs diff --git a/src/lib.rs b/source/src/lib.rs similarity index 98% rename from src/lib.rs rename to source/src/lib.rs index be6d5a6..128f86e 100644 --- a/src/lib.rs +++ b/source/src/lib.rs @@ -4,7 +4,6 @@ use defmt_rtt as _; // global logger use embedded_alloc::Heap; -use stm32f1xx_hal::prelude::*; use panic_probe as _; diff --git a/src/linear_interpolation.rs b/source/src/linear_interpolation.rs similarity index 100% rename from src/linear_interpolation.rs rename to source/src/linear_interpolation.rs diff --git a/src/main.rs b/source/src/main.rs similarity index 99% rename from src/main.rs rename to source/src/main.rs index 488a04c..6be0274 100644 --- a/src/main.rs +++ b/source/src/main.rs @@ -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; diff --git a/src/number_digits.rs b/source/src/number_digits.rs similarity index 96% rename from src/number_digits.rs rename to source/src/number_digits.rs index d5e8f06..a1170a0 100644 --- a/src/number_digits.rs +++ b/source/src/number_digits.rs @@ -8,7 +8,7 @@ impl NumberDigits for u8 { for _ in 0..digit_index { number /= 10; } - (number % 10) as u8 + number % 10 } } diff --git a/src/seven_segments.rs b/source/src/seven_segments.rs similarity index 100% rename from src/seven_segments.rs rename to source/src/seven_segments.rs -- 2.48.1