diff options
| author | JF <jf@codingfield.com> | 2021-05-21 09:38:38 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-05-21 09:38:38 (GMT) |
| commit | de69905c0647997091d9e385538c96de30be93e6 (patch) | |
| tree | 4775001d808da520c93a7552da1bea80e7714a30 /src/displayapp/screens/BatteryInfo.h | |
| parent | a80e782f267cd2424d22da23d809c0c6a8ff8761 (diff) | |
| parent | 7c9513be8a3bf36fda5706cb0fb1bd6232d42ffd (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to 'src/displayapp/screens/BatteryInfo.h')
| -rw-r--r-- | src/displayapp/screens/BatteryInfo.h | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/src/displayapp/screens/BatteryInfo.h b/src/displayapp/screens/BatteryInfo.h index 206f1ab..8805db5 100644 --- a/src/displayapp/screens/BatteryInfo.h +++ b/src/displayapp/screens/BatteryInfo.h @@ -6,7 +6,6 @@ #include "Screen.h" #include <lvgl/lvgl.h> - namespace Pinetime { namespace Controllers { class Battery; @@ -15,34 +14,30 @@ namespace Pinetime { namespace Applications { namespace Screens { - class BatteryInfo : public Screen{ - public: - BatteryInfo(DisplayApp* app, - Pinetime::Controllers::Battery& batteryController); - ~BatteryInfo() override; - - bool Refresh() override; - - - void UpdateScreen(); - void UpdateAnim(); + class BatteryInfo : public Screen { + public: + BatteryInfo(DisplayApp* app, Pinetime::Controllers::Battery& batteryController); + ~BatteryInfo() override; - private: + bool Refresh() override; - Pinetime::Controllers::Battery& batteryController; + void UpdateScreen(); + void UpdateAnim(); - lv_obj_t* voltage; - lv_obj_t* percent; - lv_obj_t* charging_bar; - lv_obj_t* status; + private: + Pinetime::Controllers::Battery& batteryController; - lv_task_t* taskUpdate; - lv_task_t* taskAnim; + lv_obj_t* voltage; + lv_obj_t* percent; + lv_obj_t* charging_bar; + lv_obj_t* status; - int8_t animation = 0; - int8_t batteryPercent = -1; - float batteryVoltage = 0.0f; + lv_task_t* taskUpdate; + lv_task_t* taskAnim; + int8_t animation = 0; + int8_t batteryPercent = -1; + float batteryVoltage = 0.0f; }; } } |
