projects
/
gps-watch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
application: Set up a Logger instance.
[gps-watch.git]
/
src
/
application
/
main.rs
diff --git
a/src/application/main.rs
b/src/application/main.rs
index 3523b885fe9a907b081c9b85da75f9d8b3380643..e11aaf71cc5a9f538c9794cf570f87f9ac245bf8 100644
(file)
--- a/
src/application/main.rs
+++ b/
src/application/main.rs
@@
-30,6
+30,7
@@
extern crate common;
mod uart0;
use common::buffer::Buffer;
mod uart0;
use common::buffer::Buffer;
+use common::ringbuf::Ringbuf;
use common::clock;
use common::systick;
use common::port;
use common::clock;
use common::systick;
use common::port;
@@
-45,6
+46,7
@@
use common::screen;
use common::time::Time;
use common::mx25l::Mx25l;
use common::shell::Shell;
use common::time::Time;
use common::mx25l::Mx25l;
use common::shell::Shell;
+use common::logger::Logger;
extern {
fn enable_interrupts();
extern {
fn enable_interrupts();
@@
-122,6
+124,20
@@
fn configure_push_buttons() {
port::set_pull(port::PORTE, 31, port::Pull::Up);
}
port::set_pull(port::PORTE, 31, port::Pull::Up);
}
+fn uart0_try_read() -> Option<u8> {
+ extern {
+ static mut uart0_rx_buf: Ringbuf;
+ }
+
+ unsafe {
+ if uart0_rx_buf.is_empty() {
+ None
+ } else {
+ Some(uart0_rx_buf.read())
+ }
+ }
+}
+
#[no_mangle]
pub unsafe extern "C" fn _start() -> ! {
clock::configure();
#[no_mangle]
pub unsafe extern "C" fn _start() -> ! {
clock::configure();
@@
-192,6
+208,9
@@
pub unsafe extern "C" fn _start() -> ! {
let mut mx25l = Mx25l::new(gpio::GPIOD, 1 << 0);
let mut mx25l = Mx25l::new(gpio::GPIOD, 1 << 0);
+ let mut logger = Logger::new(&mut mx25l);
+ logger.init();
+
let mut gps = gps::Gps::new();
let mut gps_has_fix = false;
let mut gps = gps::Gps::new();
let mut gps_has_fix = false;
@@
-207,7
+226,7
@@
pub unsafe extern "C" fn _start() -> ! {
let mut show_time = false;
let old_gps_has_fix = gps_has_fix;
let mut show_time = false;
let old_gps_has_fix = gps_has_fix;
- while gps.update(&mut tap) {
+ while gps.update(&mut tap
, uart0_try_read
) {
prev_tap = tap;
show_time = true;
prev_tap = tap;
show_time = true;
@@
-267,7
+286,7
@@
pub unsafe extern "C" fn _start() -> ! {
}
});
}
});
- shell.update(&mut
mx25l
);
+ shell.update(&mut
logger
);
if reset_requested() {
nvic::system_reset();
if reset_requested() {
nvic::system_reset();