From 7994fe4d2dea3c69ccff1cb21423f8bf68cf79ac Mon Sep 17 00:00:00 2001 From: Rory Hayes Date: Thu, 19 Jul 2018 21:47:43 -0700 Subject: [PATCH] add battery icon to powerbutton menu --- components/nofrendo-esp32/component.mk | 2 +- components/nofrendo-esp32/graphics.xcf | Bin 62379 -> 62057 bytes components/nofrendo-esp32/menu.c | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/components/nofrendo-esp32/component.mk b/components/nofrendo-esp32/component.mk index 49dbd07..448df00 100644 --- a/components/nofrendo-esp32/component.mk +++ b/components/nofrendo-esp32/component.mk @@ -13,5 +13,5 @@ COMPONENTS_EXTRA_CLEAN := graphics.inc graphics.rgba menu.o: graphics.inc graphics.inc: $(COMPONENT_PATH)/graphics.xcf - convert $^ -background none -layers flatten -crop 80x316+0+0 graphics.rgba + convert $^ -background none -layers flatten -crop 80x324+0+0 graphics.rgba cat graphics.rgba | xxd -i > graphics.inc diff --git a/components/nofrendo-esp32/graphics.xcf b/components/nofrendo-esp32/graphics.xcf index 00848e0492d1126b4b19b653eaba414a7de50686..e77e2919de9fe4e10cc7c6f649e45a13c615e90c 100644 GIT binary patch literal 62057 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 MKP1t9c(w2U2k&1Kvj6}9 literal 62379 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 Q^YUSP`diG|bSUxv2k}ol2><{9 diff --git a/components/nofrendo-esp32/menu.c b/components/nofrendo-esp32/menu.c index dd4b909..6b01f19 100644 --- a/components/nofrendo-esp32/menu.c +++ b/components/nofrendo-esp32/menu.c @@ -197,6 +197,20 @@ int nofrendoShowMenu(uint16_t *overlay) { if (v>255) v=255; renderGfx(overlay, 14, 25+16, 14, 193, (v*60)/256, 4); } + + // draw empty battery cell + renderGfx(overlay, KC_SCREEN_W-16, 0, 0, 316, 16, 7); + + // fill in the battery with appropriate color + int batPct = kchal_get_bat_pct(); + if (batPct < 20) renderGfx(overlay, KC_SCREEN_W-15, 1, 17, 317, (batPct*12)/100, 5); + else if (batPct < 50) renderGfx(overlay, KC_SCREEN_W-15, 1, 33, 317, (batPct*12)/100, 5); + else renderGfx(overlay, KC_SCREEN_W-15, 1, 49, 317, (batPct*12)/100, 5); + + // add lightning bolt icon if applicable + if (kchal_get_chg_status() > 0) { + renderGfx(overlay, KC_SCREEN_W-11, 0, 64, 316, 6, 8); + } if (doRefresh) { kchal_send_fb(overlay);