diff options
| author | JF <jf@codingfield.com> | 2020-07-11 19:09:34 (GMT) |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-07-11 19:09:34 (GMT) |
| commit | 64c14274fc2f025fc48d3df47a1640f08eb968cd (patch) | |
| tree | 262cf8b4e84c556748f42bbf778b48a68210921d /src/DisplayApp/Screens/Meter.h | |
| parent | 0bcaf9c22d6183ba8072e10abb9da7aea578b8db (diff) | |
| parent | 6309719a62436fd746a7a8b228205e93b419ca26 (diff) | |
Merge branch 'develop'
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'src/DisplayApp/Screens/Meter.h')
| -rw-r--r-- | src/DisplayApp/Screens/Meter.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/DisplayApp/Screens/Meter.h b/src/DisplayApp/Screens/Meter.h index 1a08b46..ddf8be8 100644 --- a/src/DisplayApp/Screens/Meter.h +++ b/src/DisplayApp/Screens/Meter.h @@ -2,16 +2,10 @@ #include <cstdint> #include <chrono> -#include <Components/Gfx/Gfx.h> #include "Screen.h" #include <bits/unique_ptr.h> #include <libs/lvgl/src/lv_core/lv_style.h> #include <libs/lvgl/src/lv_core/lv_obj.h> -#include <Components/Battery/BatteryController.h> -#include <Components/Ble/BleController.h> -#include "../Fonts/lcdfont14.h" -#include "../Fonts/lcdfont70.h" -#include "../../Version.h" namespace Pinetime { namespace Applications { |