summaryrefslogtreecommitdiff
path: root/src/displayapp/DisplayApp.h
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2021-04-26 21:10:11 +0200
committerGitHub <noreply@github.com>2021-04-26 21:10:11 +0200
commit4706c99db4c1e05f9dd90f152f2dea08d8f22ab2 (patch)
treecf2bea6d67e8d91a7d6222b8e0b55a0075575003 /src/displayapp/DisplayApp.h
parente56ebb8bd621cc8838e86fa032d680a6e7a35ffc (diff)
parent69898545193a82f7d72c9f47c9d9de36167b157b (diff)
Merge pull request #293 from Avamander/patch-5
Reformatted all the files according to clang-format style
Diffstat (limited to 'src/displayapp/DisplayApp.h')
-rw-r--r--src/displayapp/DisplayApp.h135
1 files changed, 67 insertions, 68 deletions
diff --git a/src/displayapp/DisplayApp.h b/src/displayapp/DisplayApp.h
index 85aee0fe..ff5ddac8 100644
--- a/src/displayapp/DisplayApp.h
+++ b/src/displayapp/DisplayApp.h
@@ -35,74 +35,73 @@ namespace Pinetime {
};
namespace Applications {
class DisplayApp {
- public:
- enum class States {Idle, Running};
- enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim };
- enum class TouchModes { Gestures, Polling };
-
- DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Drivers::Cst816S &,
- Controllers::Battery &batteryController, Controllers::Ble &bleController,
- Controllers::DateTime &dateTimeController, Drivers::WatchdogView &watchdog,
- System::SystemTask &systemTask,
- Pinetime::Controllers::NotificationManager& notificationManager,
- Pinetime::Controllers::HeartRateController& heartRateController,
- Controllers::Settings &settingsController,
- Pinetime::Controllers::MotionController& motionController
- );
- void Start();
- void PushMessage(Display::Messages msg);
-
- void StartApp(Apps app, DisplayApp::FullRefreshDirections direction);
-
- void SetFullRefresh(FullRefreshDirections direction);
- void SetTouchMode(TouchModes mode);
-
- private:
-
- Pinetime::Drivers::St7789& lcd;
- Pinetime::Components::LittleVgl& lvgl;
- Pinetime::Drivers::Cst816S& touchPanel;
- Pinetime::Controllers::Battery &batteryController;
- Pinetime::Controllers::Ble &bleController;
- Pinetime::Controllers::DateTime& dateTimeController;
- Pinetime::Drivers::WatchdogView& watchdog;
- Pinetime::System::SystemTask& systemTask;
- Pinetime::Controllers::NotificationManager& notificationManager;
- Pinetime::Controllers::HeartRateController& heartRateController;
- Pinetime::Controllers::Settings& settingsController;
- Pinetime::Controllers::MotionController& motionController;
-
- Pinetime::Controllers::FirmwareValidator validator;
- Controllers::BrightnessController brightnessController;
-
- TaskHandle_t taskHandle;
-
- States state = States::Running;
- QueueHandle_t msgQueue;
-
- static constexpr uint8_t queueSize = 10;
- static constexpr uint8_t itemSize = 1;
-
- std::unique_ptr<Screens::Screen> currentScreen;
-
- Apps currentApp = Apps::None;
- Apps returnToApp = Apps::None;
- FullRefreshDirections returnDirection = FullRefreshDirections::None;
- TouchEvents returnTouchEvent = TouchEvents::None;
-
- TouchModes touchMode = TouchModes::Gestures;
-
- TouchEvents OnTouchEvent();
- void RunningState();
- void IdleState();
- static void Process(void* instance);
- void InitHw();
- void Refresh();
- void returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
- void LoadApp(Apps app, DisplayApp::FullRefreshDirections direction);
-
+ public:
+ enum class States { Idle, Running };
+ enum class FullRefreshDirections { None, Up, Down, Left, Right, LeftAnim, RightAnim };
+ enum class TouchModes { Gestures, Polling };
+
+ DisplayApp(Drivers::St7789& lcd,
+ Components::LittleVgl& lvgl,
+ Drivers::Cst816S&,
+ Controllers::Battery& batteryController,
+ Controllers::Ble& bleController,
+ Controllers::DateTime& dateTimeController,
+ Drivers::WatchdogView& watchdog,
+ System::SystemTask& systemTask,
+ Pinetime::Controllers::NotificationManager& notificationManager,
+ Pinetime::Controllers::HeartRateController& heartRateController,
+ Controllers::Settings& settingsController,
+ Pinetime::Controllers::MotionController& motionController);
+ void Start();
+ void PushMessage(Display::Messages msg);
+
+ void StartApp(Apps app, DisplayApp::FullRefreshDirections direction);
+
+ void SetFullRefresh(FullRefreshDirections direction);
+ void SetTouchMode(TouchModes mode);
+
+ private:
+ Pinetime::Drivers::St7789& lcd;
+ Pinetime::Components::LittleVgl& lvgl;
+ Pinetime::Drivers::Cst816S& touchPanel;
+ Pinetime::Controllers::Battery& batteryController;
+ Pinetime::Controllers::Ble& bleController;
+ Pinetime::Controllers::DateTime& dateTimeController;
+ Pinetime::Drivers::WatchdogView& watchdog;
+ Pinetime::System::SystemTask& systemTask;
+ Pinetime::Controllers::NotificationManager& notificationManager;
+ Pinetime::Controllers::HeartRateController& heartRateController;
+ Pinetime::Controllers::Settings& settingsController;
+ Pinetime::Controllers::MotionController& motionController;
+
+ Pinetime::Controllers::FirmwareValidator validator;
+ Controllers::BrightnessController brightnessController;
+
+ TaskHandle_t taskHandle;
+
+ States state = States::Running;
+ QueueHandle_t msgQueue;
+
+ static constexpr uint8_t queueSize = 10;
+ static constexpr uint8_t itemSize = 1;
+
+ std::unique_ptr<Screens::Screen> currentScreen;
+
+ Apps currentApp = Apps::None;
+ Apps returnToApp = Apps::None;
+ FullRefreshDirections returnDirection = FullRefreshDirections::None;
+ TouchEvents returnTouchEvent = TouchEvents::None;
+
+ TouchModes touchMode = TouchModes::Gestures;
+
+ TouchEvents OnTouchEvent();
+ void RunningState();
+ void IdleState();
+ static void Process(void* instance);
+ void InitHw();
+ void Refresh();
+ void returnApp(Apps app, DisplayApp::FullRefreshDirections direction, TouchEvents touchEvent);
+ void LoadApp(Apps app, DisplayApp::FullRefreshDirections direction);
};
}
}
-
-