projects
/
gps-watch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
application: Integrate the shell.
[gps-watch.git]
/
src
/
application
/
main.rs
diff --git
a/src/application/main.rs
b/src/application/main.rs
index 0fe48f7d490132ef68b06247002f4ac894bb697e..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::gps;
use common::screen;
use common::time::Time;
+use common::shell::Shell;
extern {
fn enable_interrupts();
extern {
fn enable_interrupts();
@@
-77,7
+78,10
@@
impl Timer {
}
fn reset_requested() -> bool {
}
fn reset_requested() -> bool {
- (gpio::get(gpio::GPIOA) & (1 << 12)) == 0
+ let pta1 = gpio::get(gpio::GPIOA) & (1 << 1);
+ let pte25 = gpio::get(gpio::GPIOE) & (1 << 25);
+
+ (pta1 | pte25) == 0
}
#[inline(never)]
}
#[inline(never)]
@@
-183,6
+187,8
@@
pub unsafe extern "C" fn _start() -> ! {
nvic::enable_irq(12); // UART0
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;
let mut gps = gps::Gps::new();
let mut gps_has_fix = false;
@@
-258,6
+264,8
@@
pub unsafe extern "C" fn _start() -> ! {
}
});
}
});
+ shell.update();
+
if reset_requested() {
nvic::system_reset();
}
if reset_requested() {
nvic::system_reset();
}