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:
b00dd20
)
bootloader: Stay in bootloader when the middle left push button is held.
author
Tilman Sauerbeck
<tilman@code-monkey.de>
Sun, 5 Jan 2020 18:51:22 +0000
(19:51 +0100)
committer
Tilman Sauerbeck
<tilman@code-monkey.de>
Wed, 8 Jan 2020 11:06:51 +0000
(12:06 +0100)
src/bootloader/main.rs
patch
|
blob
|
history
diff --git
a/src/bootloader/main.rs
b/src/bootloader/main.rs
index 2ce598050464a12deedb8c32c94153ca319f653e..a7755030bb0f5da0bd11d0a1687de17f090cac8b 100644
(file)
--- a/
src/bootloader/main.rs
+++ b/
src/bootloader/main.rs
@@
-75,7
+75,7
@@
fn bootloader_requested() -> bool {
let start_ticks = systick::now();
while !systick::has_timeout_ms(start_ticks, 3000) {
let start_ticks = systick::now();
while !systick::has_timeout_ms(start_ticks, 3000) {
- if (gpio::get(gpio::GPIOE) & (1 <<
24
)) == 0 {
+ if (gpio::get(gpio::GPIOE) & (1 <<
31
)) == 0 {
return true;
}
}
return true;
}
}
@@
-97,10
+97,10
@@
pub unsafe extern "C" fn _start() -> ! {
systick::init();
port::init();
systick::init();
port::init();
- // Configure
lower
left push button.
- gpio::set_direction(gpio::GPIOE, 1 <<
24
, gpio::Direction::Input);
- port::set_af(port::PORTE,
24
, 1);
- port::set_pull(port::PORTE,
24
, port::Pull::Up);
+ // Configure
middle
left push button.
+ gpio::set_direction(gpio::GPIOE, 1 <<
31
, gpio::Direction::Input);
+ port::set_af(port::PORTE,
31
, 1);
+ port::set_pull(port::PORTE,
31
, port::Pull::Up);
enable_interrupts();
enable_interrupts();