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 444ffd464da0219263f11038f4abd6df6561704d..e11aaf71cc5a9f538c9794cf570f87f9ac245bf8 100644
(file)
--- a/
src/application/main.rs
+++ b/
src/application/main.rs
@@
-46,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();
@@
-207,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;
@@
-282,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();