Skip to content

add battery percentage and colors #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lulf merged 1 commit into from
Mar 10, 2025
Merged

add battery percentage and colors #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 40 additions & 6 deletions watchful-ui/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ fn text_text_style(color: Rgb) -> U8g2TextStyle<Rgb> {
U8g2TextStyle::new(fonts::u8g2_font_unifont_t_symbols, color)
}

fn perc_text_style(color: Rgb) -> U8g2TextStyle<Rgb> {
U8g2TextStyle::new(fonts::u8g2_font_spleen12x24_mf, color)
//U8g2TextStyle::new(fonts::u8g2_font_spleen8x16_mf, color)
}

pub enum ButtonEvent {
ShortPress,
LongPress,
Expand Down Expand Up @@ -110,26 +115,55 @@ impl TimeView {
.align_to(&display_area, horizontal::Center, vertical::Center)
.draw(display)?;

let color;
let display_area = display_area.offset(-5);
let top_right_y = display_area.top_left.y;
let top_right_x = display_area.top_left.x + display_area.size.width as i32 - 30;
let pos = Point::new(top_right_x, top_right_y);

if self.battery_charging {
Image::new(&icons::size24px::system::BatteryCharging::new(Rgb::CSS_DARK_CYAN), pos).draw(display)?
color = Rgb::CSS_DEEP_SKY_BLUE;
Image::new(&icons::size24px::system::BatteryCharging::new(color), pos).draw(display)?
} else {
if self.battery_level > 85 {
Image::new(&icons::size24px::system::BatteryFull::new(Rgb::CSS_DARK_CYAN), pos).draw(display)?
color = Rgb::CSS_DARK_GREEN;
Image::new(&icons::size24px::system::BatteryFull::new(color), pos).draw(display)?
} else if self.battery_level > 65 {
Image::new(&icons::size24px::system::BatterySevenFive::new(Rgb::CSS_DARK_CYAN), pos).draw(display)?
color = Rgb::CSS_GREEN;
Image::new(&icons::size24px::system::BatterySevenFive::new(color), pos).draw(display)?
} else if self.battery_level > 35 {
Image::new(&icons::size24px::system::BatteryFiveZero::new(Rgb::CSS_DARK_CYAN), pos).draw(display)?
color = Rgb::CSS_YELLOW;
Image::new(&icons::size24px::system::BatteryFiveZero::new(color), pos).draw(display)?
} else if self.battery_level > 10 {
Image::new(&icons::size24px::system::BatteryTwoFive::new(Rgb::CSS_DARK_CYAN), pos).draw(display)?
color = Rgb::CSS_DARK_ORANGE;
Image::new(&icons::size24px::system::BatteryTwoFive::new(color), pos).draw(display)?
} else {
Image::new(&icons::size24px::system::BatteryEmpty::new(Rgb::CSS_DARK_CYAN), pos).draw(display)?
color = Rgb::CSS_RED;
Image::new(&icons::size24px::system::BatteryEmpty::new(color), pos).draw(display)?
}
};

let mut buf: heapless::String<16> = heapless::String::new();
write!(buf, "{}%", self.battery_level).unwrap();
let perc = Text::with_text_style(
&buf,
display.bounding_box().center(),
perc_text_style(color),
TextStyleBuilder::new()
.alignment(embedded_graphics::text::Alignment::Right)
.baseline(embedded_graphics::text::Baseline::Alphabetic)
.build(),
);

let display_area = display.bounding_box();
LinearLayout::horizontal(Chain::new(perc))
.with_spacing(spacing::FixedMargin(10))
.with_alignment(vertical::Center)
.arrange()
.align_to(&display_area, horizontal::Right, vertical::Top)
.translate(Point::new(-40, 5))
.draw(display)?;

Ok(())
}
}
Expand Down