CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'lvgl_use_system_tick' of https://github.com/Riksu9000/InfiniTime into Riksu9000-lvgl_use_system_tick

Browse Source 
# Conflicts:
#	src/displayapp/screens/BatteryInfo.cpp
#	src/displayapp/screens/BatteryInfo.h
This commit is contained in:
Jean-François Milants
2021-07-13 20:53:40 +02:00
parent af10747c94 99e26bdd4c
commit e2efb193c4
7 changed files with 11 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/displayapp/screens/BatteryInfo.h
View File

@@ -22,7 +22,6 @@ namespace Pinetime {
bool Refresh() override;
void UpdateScreen();
void UpdateAnim();
private:
Pinetime::Controllers::Battery& batteryController;
@@ -33,9 +32,7 @@ namespace Pinetime {
lv_obj_t* status;
lv_task_t* taskUpdate;
lv_task_t* taskAnim;
int8_t animation = 0;
uint8_t batteryPercent = 0;
uint16_t batteryVoltage = 0;
};