Merge branch 'develop' into update_touch_driver

2021-08-17 15:35:29 +03:00
parent 7ac6bdfe71 ee44b6ff49
commit 5b969ccfa9
82 changed files with 1305 additions and 862 deletions
--- a/src/displayapp/screens/SystemInfo.h
+++ b/src/displayapp/screens/SystemInfo.h
@@ -32,12 +32,9 @@ namespace Pinetime {
                            Pinetime::Drivers::Cst816S& touchPanel);
        ~SystemInfo() override;
        bool Refresh() override;
-        bool OnButtonPushed() override;
        bool OnTouchEvent(TouchEvents event) override;

      private:
-        bool running = true;
-
        Pinetime::Controllers::DateTime& dateTimeController;
        Pinetime::Controllers::Battery& batteryController;
        Pinetime::Controllers::BrightnessController& brightnessController;