Merge pull request #17 from realroot2185/main

Add support for vibration

firmware/src/device.rs

@@ -29,6 +29,7 @@ pub struct Device<'a> {
     pub touchpad: Touchpad<'static>,
     pub hrs: Hrs<'static>,
     pub firmware_validator: FirmwareValidator<'static>,
+	pub vibrator: Vibrator<'static>,
 }
 
 impl<'a> Device<'a> {}
@@ -78,6 +79,26 @@ impl<'a> Battery<'a> {
     }
 }
 
+pub struct Vibrator<'a> {
+    motor: Output<'a>,
+}
+
+impl<'a> Vibrator<'a> {
+    pub fn new(motor: Output<'a>) -> Self {
+        Self { motor }
+    }
+
+    pub async fn on_for(&mut self, ms: u64) {
+        self.motor.set_low();
+        Timer::after(Duration::from_millis(ms)).await;
+        self.motor.set_high();
+    }
+
+    pub fn off(&mut self) {
+        self.motor.set_high();
+    }
+}
+
 pub enum BacklightLevel {
     Low,
     Medium,

firmware/src/main.rs

@@ -38,7 +38,7 @@ mod device;
 mod firmware_validator;
 mod state;
 use crate::clock::clock;
-use crate::device::{Battery, Button, Device, Hrs, Screen};
+use crate::device::{Battery, Button, Device, Hrs, Screen, Vibrator};
 use crate::state::WatchState;
 
 bind_interrupts!(struct Irqs {
@@ -197,7 +197,11 @@ async fn main(s: Spawner) {
 
     // BLE
     ble::start(s, sdc, dfu_config);
-
+
+    // Vibration
+    let motor = Output::new(p.P0_16, Level::High, OutputDrive::Standard0Disconnect1);
+    let vibrator = Vibrator::new(motor);
+
     // Display
     let backlight = Backlight::new(p.P0_14.degrade(), p.P0_22.degrade(), p.P0_23.degrade());
     let rst = Output::new(p.P0_26, Level::Low, OutputDrive::Standard);
@@ -222,6 +226,7 @@ async fn main(s: Spawner) {
         touchpad,
         hrs,
         firmware_validator,
+        vibrator,
     };
 
     let mut state = WatchState::default();

firmware/src/state.rs

@@ -1,6 +1,6 @@
 use defmt::info;
 use embassy_futures::select::{select, select3, Either, Either3};
-use embassy_time::{Duration, Instant, Timer};
+use embassy_time::{Duration, Instant, Ticker, Timer};
 use embedded_graphics::prelude::*;
 use watchful_ui::{FirmwareDetails, MenuAction, MenuView, TimeView, WorkoutView};
 
@@ -244,6 +244,7 @@ impl WorkoutState {
         let screen = &mut device.screen;
         let button = &mut device.button;
         let hrs = &mut device.hrs;
+        let mut ticker = Ticker::every(Duration::from_secs(2));
         hrs.init().unwrap();
         hrs.enable_hrs().unwrap();
         hrs.enable_oscillator().unwrap();
@@ -256,7 +257,7 @@ impl WorkoutState {
                     .draw(screen.display())
                     .unwrap();
                 screen.on();
-                Timer::after(Duration::from_secs(2)).await;
+                ticker.next().await;
                 seconds += 2;
             }
         };