firmware for my Touchscreen E-Paper Input Module for Framework Laptop 16
fw16-epd-gui: add button element
+141
-14
+22
fw16-epd-gui/src/element/mod.rs
+22
fw16-epd-gui/src/element/mod.rs
···
1
+
pub mod button;
2
+
3
+
use embedded_graphics::pixelcolor::BinaryColor;
4
+
use embedded_graphics::prelude::*;
5
+
use fw16_epd_program_interface::TouchEvent;
6
+
use crate::draw_target::EpdDrawTarget;
7
+
8
+
pub trait GuiElement {
9
+
fn draw_element(&self, target: &mut EpdDrawTarget);
10
+
11
+
fn handle_touch(&mut self, ev: TouchEvent);
12
+
}
13
+
14
+
impl<T: Drawable<Color = BinaryColor>> GuiElement for T {
15
+
fn draw_element(&self, target: &mut EpdDrawTarget) {
16
+
self.draw(target).unwrap();
17
+
}
18
+
19
+
fn handle_touch(&mut self, _ev: TouchEvent) {
20
+
// no-op
21
+
}
22
+
}
+24
-13
fw16-epd-main/src/gui.rs
+24
-13
fw16-epd-main/src/gui.rs
···
1
1
use core::fmt::Write;
2
-
use defmt::debug;
3
2
use embedded_graphics::mono_font::ascii::FONT_10X20;
4
3
use embedded_graphics::mono_font::MonoTextStyle;
5
4
use embedded_graphics::pixelcolor::BinaryColor;
6
5
use embedded_graphics::prelude::*;
6
+
use embedded_graphics::primitives::{PrimitiveStyle, Rectangle, RoundedRectangle};
7
7
use embedded_graphics::text::Text;
8
8
use heapless::String;
9
9
use fw16_epd_gui::draw_target::EpdDrawTarget;
10
-
use fw16_epd_program_interface::TouchEvent;
10
+
use fw16_epd_gui::element::button::Button;
11
+
use fw16_epd_gui::element::GuiElement;
11
12
use crate::{next_touch_event, set_touch_enabled};
12
13
13
14
pub(crate) fn gui_main(mut draw_target: EpdDrawTarget) -> ! {
···
15
16
16
17
unsafe { set_touch_enabled(true) };
17
18
19
+
let mut button = Button::new(
20
+
RoundedRectangle::with_equal_corners(Rectangle::new(Point::new(10, 40), Size::new(100, 20)), Size::new(3, 3)),
21
+
"Click me",
22
+
PrimitiveStyle::with_stroke(BinaryColor::On, 2),
23
+
MonoTextStyle::new(&FONT_10X20, BinaryColor::On)
24
+
);
25
+
button.draw_element(&mut draw_target);
26
+
draw_target.refresh(true, false);
27
+
28
+
let mut counter = 0;
29
+
18
30
loop {
19
-
let mut touch_event: Option<TouchEvent> = None;
20
31
while let Some(ev) = next_touch_event().into() {
21
-
debug!("{}", ev);
22
-
touch_event = Some(ev);
32
+
button.handle_touch(ev);
23
33
}
24
34
25
-
if let Some(ev) = touch_event {
26
-
draw_target.clear(BinaryColor::Off).unwrap();
35
+
if button.clicked(true) {
36
+
counter += 1;
27
37
28
-
let mut s = String::<32>::new();
29
-
write!(s, "{ev}").unwrap();
38
+
let mut s = String::<10>::new();
39
+
write!(s, "{counter}").unwrap();
30
40
31
-
Text::new(s.as_str(), Point::new(10, 40), MonoTextStyle::new(&FONT_10X20, BinaryColor::On))
32
-
.draw(&mut draw_target)
33
-
.unwrap();
34
-
debug!("triggering refresh");
41
+
draw_target.clear(BinaryColor::Off).unwrap();
42
+
button.draw_element(&mut draw_target);
43
+
44
+
Text::new(&s, Point::new(10, 80), MonoTextStyle::new(&FONT_10X20, BinaryColor::On))
45
+
.draw_element(&mut draw_target);
35
46
draw_target.refresh(true, false);
36
47
}
37
48
}
+2
-1
fw16-epd-program-interface/Cargo.toml
+2
-1
fw16-epd-program-interface/Cargo.toml
+5
fw16-epd-program-interface/src/lib.rs
+5
fw16-epd-program-interface/src/lib.rs