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

Update BLE and battery icons from https://gitlab.com/arteeh/pinetimeos : it saves ~60KB of flash!

Browse Source
This commit is contained in:
JF
2020-04-05 18:54:04 +02:00
parent 932c0479ee
commit d5c2a58914
53 changed files with 1123 additions and 3701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/DisplayApp/Screens/BatteryIcon.cpp
View File

@@ -3,60 +3,60 @@
using namespace Pinetime::Applications::Screens;
extern lv_img_dsc_t os_battery_error;
extern lv_img_dsc_t os_batterycharging_100;
extern lv_img_dsc_t os_batterycharging_090;
extern lv_img_dsc_t os_batterycharging_080;
extern lv_img_dsc_t os_batterycharging_070;
extern lv_img_dsc_t os_batterycharging_060;
extern lv_img_dsc_t os_batterycharging_050;
extern lv_img_dsc_t os_batterycharging_040;
extern lv_img_dsc_t os_batterycharging_030;
extern lv_img_dsc_t os_batterycharging_020;
extern lv_img_dsc_t os_batterycharging_010;
extern lv_img_dsc_t os_batterycharging_005;
extern lv_img_dsc_t ck_os_battery_error;
extern lv_img_dsc_t ck_os_batterycharging_100;
extern lv_img_dsc_t ck_os_batterycharging_090;
extern lv_img_dsc_t ck_os_batterycharging_080;
extern lv_img_dsc_t ck_os_batterycharging_070;
extern lv_img_dsc_t ck_os_batterycharging_060;
extern lv_img_dsc_t ck_os_batterycharging_050;
extern lv_img_dsc_t ck_os_batterycharging_040;
extern lv_img_dsc_t ck_os_batterycharging_030;
extern lv_img_dsc_t ck_os_batterycharging_020;
extern lv_img_dsc_t ck_os_batterycharging_010;
extern lv_img_dsc_t ck_os_batterycharging_005;
extern lv_img_dsc_t os_battery_100;
extern lv_img_dsc_t os_battery_090;
extern lv_img_dsc_t os_battery_080;
extern lv_img_dsc_t os_battery_070;
extern lv_img_dsc_t os_battery_060;
extern lv_img_dsc_t os_battery_050;
extern lv_img_dsc_t os_battery_040;
extern lv_img_dsc_t os_battery_030;
extern lv_img_dsc_t os_battery_020;
extern lv_img_dsc_t os_battery_010;
extern lv_img_dsc_t os_battery_005;
extern lv_img_dsc_t ck_os_battery_100;
extern lv_img_dsc_t ck_os_battery_090;
extern lv_img_dsc_t ck_os_battery_080;
extern lv_img_dsc_t ck_os_battery_070;
extern lv_img_dsc_t ck_os_battery_060;
extern lv_img_dsc_t ck_os_battery_050;
extern lv_img_dsc_t ck_os_battery_040;
extern lv_img_dsc_t ck_os_battery_030;
extern lv_img_dsc_t ck_os_battery_020;
extern lv_img_dsc_t ck_os_battery_010;
extern lv_img_dsc_t ck_os_battery_005;
lv_img_dsc_t *BatteryIcon::GetIcon(bool isCharging, float batteryPercent) {
if(isCharging) {
if(batteryPercent > 90.0f) return &os_batterycharging_100;
else if(batteryPercent > 80.0f) return &os_batterycharging_090;
else if(batteryPercent > 70.0f) return &os_batterycharging_080;
else if(batteryPercent > 60.0f) return &os_batterycharging_070;
else if(batteryPercent > 50.0f) return &os_batterycharging_060;
else if(batteryPercent > 40.0f) return &os_batterycharging_050;
else if(batteryPercent > 30.0f) return &os_batterycharging_040;
else if(batteryPercent > 20.0f) return &os_batterycharging_030;
else if(batteryPercent > 10.0f) return &os_batterycharging_020;
else if(batteryPercent > 5.0f) return &os_batterycharging_010;
else return &os_batterycharging_005;
if(batteryPercent > 90.0f) return &ck_os_batterycharging_100;
else if(batteryPercent > 80.0f) return &ck_os_batterycharging_090;
else if(batteryPercent > 70.0f) return &ck_os_batterycharging_080;
else if(batteryPercent > 60.0f) return &ck_os_batterycharging_070;
else if(batteryPercent > 50.0f) return &ck_os_batterycharging_060;
else if(batteryPercent > 40.0f) return &ck_os_batterycharging_050;
else if(batteryPercent > 30.0f) return &ck_os_batterycharging_040;
else if(batteryPercent > 20.0f) return &ck_os_batterycharging_030;
else if(batteryPercent > 10.0f) return &ck_os_batterycharging_020;
else if(batteryPercent > 5.0f) return &ck_os_batterycharging_010;
else return &ck_os_batterycharging_005;
} else {
if(batteryPercent > 90.0f) return &os_battery_100;
else if(batteryPercent > 80.0f) return &os_battery_090;
else if(batteryPercent > 70.0f) return &os_battery_080;
else if(batteryPercent > 60.0f) return &os_battery_070;
else if(batteryPercent > 50.0f) return &os_battery_060;
else if(batteryPercent > 40.0f) return &os_battery_050;
else if(batteryPercent > 30.0f) return &os_battery_040;
else if(batteryPercent > 20.0f) return &os_battery_030;
else if(batteryPercent > 10.0f) return &os_battery_020;
else if(batteryPercent > 5.0f) return &os_battery_010;
else return &os_battery_005;
if(batteryPercent > 90.0f) return &ck_os_battery_100;
else if(batteryPercent > 80.0f) return &ck_os_battery_090;
else if(batteryPercent > 70.0f) return &ck_os_battery_080;
else if(batteryPercent > 60.0f) return &ck_os_battery_070;
else if(batteryPercent > 50.0f) return &ck_os_battery_060;
else if(batteryPercent > 40.0f) return &ck_os_battery_050;
else if(batteryPercent > 30.0f) return &ck_os_battery_040;
else if(batteryPercent > 20.0f) return &ck_os_battery_030;
else if(batteryPercent > 10.0f) return &ck_os_battery_020;
else if(batteryPercent > 5.0f) return &ck_os_battery_010;
else return &ck_os_battery_005;
}
}
lv_img_dsc_t *BatteryIcon::GetUnknownIcon() {
return &os_battery_error;
return &ck_os_battery_error;
}

8
src/DisplayApp/Screens/BleIcon.cpp
View File

@@ -3,10 +3,10 @@
using namespace Pinetime::Applications::Screens;
extern lv_img_dsc_t os_bt_connected;
extern lv_img_dsc_t os_bt_disconnected;
extern lv_img_dsc_t ck_os_bt_connected;
extern lv_img_dsc_t ck_os_bt_disconnected;
lv_img_dsc_t *BleIcon::GetIcon(bool isConnected) {
if(isConnected) return &os_bt_connected;
else return &os_bt_disconnected;
if(isConnected) return &ck_os_bt_connected;
else return &ck_os_bt_disconnected;
}