Merge branch 'develop' into update_touch_driver

2021-09-14 15:34:09 +03:00
parent d2d97319e0 6356c7f276
commit f221f5d744
105 changed files with 988 additions and 554 deletions
--- a/src/displayapp/screens/SystemInfo.h
+++ b/src/displayapp/screens/SystemInfo.h
@@ -31,7 +31,6 @@ namespace Pinetime {
                            Pinetime::Controllers::MotionController& motionController,
                            Pinetime::Drivers::Cst816S& touchPanel);
        ~SystemInfo() override;
-        bool Refresh() override;
        bool OnTouchEvent(TouchEvents event) override;

      private: