From: Tilman Sauerbeck Date: Tue, 31 Dec 2019 12:32:48 +0000 (+0100) Subject: application: Show current time on the display if we have a GPS fix. X-Git-Url: http://git.code-monkey.de/?a=commitdiff_plain;ds=sidebyside;h=a87bd3430ca58a79b6a59d8c602ddf1d7a6409aa;hp=9ecb8760fe0fd268cf3819fc56d90e6d1e8c300c;p=gps-watch.git application: Show current time on the display if we have a GPS fix. --- diff --git a/src/application/main.rs b/src/application/main.rs index 7eb180c..b119503 100644 --- a/src/application/main.rs +++ b/src/application/main.rs @@ -40,6 +40,8 @@ use common::uart; use common::usb_serial; use common::display; use common::gps; +use common::screen; +use common::time::Time; extern { fn enable_interrupts(); @@ -117,6 +119,8 @@ pub unsafe extern "C" fn _start() -> ! { display.init(); display.clear(); + let mut screen = screen::Screen::new(); + // Hold GPS in reset while configuring its UART. gpio::clear(gpio::GPIOB, 1); systick::delay_ms(50); @@ -134,11 +138,18 @@ pub unsafe extern "C" fn _start() -> ! { let mut heart_icon_timer = Timer::new(1000); let mut gps_icon_timer = Timer::new(500); + let mut prev_tap = gps::TimeAndPos::new(); + loop { let mut tap = gps::TimeAndPos::new(); + let mut show_time = false; let old_gps_has_fix = gps_has_fix; while gps.update(&mut tap) { + prev_tap = tap; + + show_time = true; + gps_has_fix = true; gps_has_fix_ticks = systick::now(); } @@ -172,6 +183,18 @@ pub unsafe extern "C" fn _start() -> ! { }); } + if show_time { + if let Some(tm) = Time::from_unix_time(prev_tap.unix_time) { + let mut time_s = [b' '; 8]; + tm.fmt_time(&mut time_s); + + screen.clear(); + screen.draw_text(&time_s); + + display.draw(&screen); + } + } + heart_icon_timer.update(|state| { if state == 1 { display.hide_icon(display::Icon::Heart);