projects
/
gps-watch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
810fc22
)
application: Integrate the shell.
author
Tilman Sauerbeck
<tilman@code-monkey.de>
Wed, 8 Jan 2020 10:20:32 +0000
(11:20 +0100)
committer
Tilman Sauerbeck
<tilman@code-monkey.de>
Thu, 9 Jan 2020 14:19:36 +0000
(15:19 +0100)
src/application/main.rs
patch
|
blob
|
history
diff --git
a/src/application/main.rs
b/src/application/main.rs
index f1eb522a739068dda8977821c694e7bf768d215a..4096dc403707129edf83cd4156f929f18c396a41 100644
(file)
--- a/
src/application/main.rs
+++ b/
src/application/main.rs
@@
-43,6
+43,7
@@
use common::display;
use common::gps;
use common::screen;
use common::time::Time;
+use common::shell::Shell;
extern {
fn enable_interrupts();
@@
-186,6
+187,8
@@
pub unsafe extern "C" fn _start() -> ! {
nvic::enable_irq(12); // UART0
+ let mut shell = Shell::new(&mut cdc_tx_buf);
+
let mut gps = gps::Gps::new();
let mut gps_has_fix = false;
@@
-261,6
+264,8
@@
pub unsafe extern "C" fn _start() -> ! {
}
});
+ shell.update();
+
if reset_requested() {
nvic::system_reset();
}