Skip to content

Commit

Permalink
Merge pull request #520 from brentru/bump-semver
Browse files Browse the repository at this point in the history
Test/Release Beta 74
  • Loading branch information
brentru authored Dec 11, 2023
2 parents 908eae0 + fc6309f commit af60e82
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Adafruit WipperSnapper
version=1.0.0-alpha.75
version=1.0.0-beta.74
author=Adafruit
maintainer=Adafruit <[email protected]>
sentence=Arduino application for Adafruit.io WipperSnapper
Expand Down
2 changes: 1 addition & 1 deletion src/Wippersnapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
#endif

#define WS_VERSION \
"1.0.0-alpha.75" ///< WipperSnapper app. version (semver-formatted)
"1.0.0-beta.74" ///< WipperSnapper app. version (semver-formatted)

// Reserved Adafruit IO MQTT topics
#define TOPIC_IO_THROTTLE "/throttle" ///< Adafruit IO Throttle MQTT Topic
Expand Down
13 changes: 8 additions & 5 deletions src/display/ws_display_ui_helper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -349,18 +349,21 @@ void ws_display_ui_helper::build_scr_monitor() {
lv_canvas_draw_rect(canvas, 0, 0, 240, 25, &rect_dsc);

// Add battery icon to status bar
// Future TODO: Optional timer to check battery level on some boards
// Note: FunHouse won't require this and should always be have a full battery
// displayed
statusbar_icon_bat = lv_label_create(lv_scr_act());
lv_label_set_text(statusbar_icon_bat, LV_SYMBOL_BATTERY_FULL);
static lv_style_t styleIconBat;
lv_style_init(&styleIconBat);
lv_style_set_text_color(&styleIconBat, lv_color_hex(0x000000));
lv_obj_add_style(statusbar_icon_bat, &styleIconBat, LV_PART_MAIN);
lv_obj_align(statusbar_icon_bat, LV_ALIGN_TOP_RIGHT, -5, 6);

// Add WiFi icon to status bar
// Future TODO: Timer to check if we are still connected to WiFi levels every
// 2000ms
statusbar_icon_wifi = lv_label_create(lv_scr_act());
lv_label_set_text(statusbar_icon_wifi, LV_SYMBOL_WIFI);
static lv_style_t styleIconWiFiStatusbar;
lv_style_init(&styleIconWiFiStatusbar);
lv_style_set_text_color(&styleIconWiFiStatusbar, lv_color_hex(0x000000));
lv_obj_add_style(statusbar_icon_wifi, &styleIconWiFiStatusbar, LV_PART_MAIN);
lv_obj_align(statusbar_icon_wifi, LV_ALIGN_TOP_RIGHT, -30, 5);

// Add Turtle icon to status bar
Expand Down

0 comments on commit af60e82

Please sign in to comment.