hodasemi/MacroBoard-rs
1
0
Fork 0
Code Issues 2 Pull requests Packages Projects Releases Wiki Activity

Improve button press logic

Browse source
This commit is contained in:
hodasemi 2022-07-23 14:52:05 +02:00
parent ceb5423420
commit 857840e3bf
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
arduino/src/buttons.rs
View file

@ -12,7 +12,7 @@ pub const BUTTON_COUNT: usize = 8;
pub struct Button {
pub index: usize,
pub pin: Pin<Input<PullUp>, Dynamic>,
pub is_low: bool,
pub was_low: bool,
// pub last_debounce_time: u64,
}
@ -20,8 +20,8 @@ impl Button {
pub fn new(index: usize, pin: Pin<Input<PullUp>, Dynamic>) -> Self {
Button {
index,
was_low: pin.is_low(),
pin,
is_low: true,
// last_debounce_time: 0,
}
}
@ -30,14 +30,13 @@ impl Button {
where
F: FnMut(usize, bool),
{
match (self.pin.is_high(), self.is_low) {
(true, true) | (false, false) => {
self.is_low = !self.is_low;
// check if current state is different from previous one
if self.pin.is_high() == self.was_low {
// change state
self.was_low = !self.was_low;
f(self.index, !self.is_low);
}
_ => (),
//
f(self.index, !self.was_low);
}
}
}

2
arduino/src/main.rs
View file

@ -55,7 +55,7 @@ fn main() -> ! {
loop {
for button in buttons.iter_mut() {
button.check_state(|index, pressed| {
if !pressed {
if pressed {
ufmt::uwriteln!(&mut serial, "{}{}{}", MESSAGE_START, index, MESSAGE_END)
.unwrap();
}