25f35c7d0e
This new FW is build on the same codebasse than the actual InfiniTime. Only the display task is different (this allows to remove lvgl from the recovery fw, which is very heavy). CMake builds and docker have been modified accordingly. Note than the fw is converted into an image and then into a DFU in the cmake build (previously, it was only done in the
290 lines
11 KiB
C++
290 lines
11 KiB
C++
#include "DisplayApp.h"
|
|
#include <libraries/log/nrf_log.h>
|
|
#include <displayapp/screens/HeartRate.h>
|
|
#include "components/battery/BatteryController.h"
|
|
#include "components/ble/BleController.h"
|
|
#include "components/datetime/DateTimeController.h"
|
|
#include "components/ble/NotificationManager.h"
|
|
#include "displayapp/screens/ApplicationList.h"
|
|
#include "displayapp/screens/Brightness.h"
|
|
#include "displayapp/screens/Clock.h"
|
|
#include "displayapp/screens/FirmwareUpdate.h"
|
|
#include "displayapp/screens/FirmwareValidation.h"
|
|
#include "displayapp/screens/Gauge.h"
|
|
#include "displayapp/screens/InfiniPaint.h"
|
|
#include "displayapp/screens/Paddle.h"
|
|
#include "displayapp/screens/Meter.h"
|
|
#include "displayapp/screens/Music.h"
|
|
#include "displayapp/screens/Navigation.h"
|
|
#include "displayapp/screens/Notifications.h"
|
|
#include "displayapp/screens/SystemInfo.h"
|
|
#include "displayapp/screens/Tile.h"
|
|
#include "displayapp/screens/Twos.h"
|
|
#include "drivers/Cst816s.h"
|
|
#include "drivers/St7789.h"
|
|
#include "drivers/Watchdog.h"
|
|
#include "systemtask/SystemTask.h"
|
|
|
|
using namespace Pinetime::Applications;
|
|
using namespace Pinetime::Applications::Display;
|
|
|
|
DisplayApp::DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Drivers::Cst816S &touchPanel,
|
|
Controllers::Battery &batteryController, Controllers::Ble &bleController,
|
|
Controllers::DateTime &dateTimeController, Drivers::WatchdogView &watchdog,
|
|
System::SystemTask &systemTask,
|
|
Pinetime::Controllers::NotificationManager& notificationManager,
|
|
Pinetime::Controllers::HeartRateController& heartRateController) :
|
|
lcd{lcd},
|
|
lvgl{lvgl},
|
|
batteryController{batteryController},
|
|
bleController{bleController},
|
|
dateTimeController{dateTimeController},
|
|
watchdog{watchdog},
|
|
touchPanel{touchPanel},
|
|
currentScreen{new Screens::Clock(this, dateTimeController, batteryController, bleController, notificationManager, heartRateController) },
|
|
systemTask{systemTask},
|
|
notificationManager{notificationManager},
|
|
heartRateController{heartRateController} {
|
|
msgQueue = xQueueCreate(queueSize, itemSize);
|
|
onClockApp = true;
|
|
modal.reset(new Screens::Modal(this));
|
|
}
|
|
|
|
void DisplayApp::Start() {
|
|
if (pdPASS != xTaskCreate(DisplayApp::Process, "displayapp", 512, this, 0, &taskHandle))
|
|
APP_ERROR_HANDLER(NRF_ERROR_NO_MEM);
|
|
}
|
|
|
|
void DisplayApp::Process(void *instance) {
|
|
auto *app = static_cast<DisplayApp *>(instance);
|
|
NRF_LOG_INFO("displayapp task started!");
|
|
app->InitHw();
|
|
|
|
// Send a dummy notification to unlock the lvgl display driver for the first iteration
|
|
xTaskNotifyGive(xTaskGetCurrentTaskHandle());
|
|
|
|
while (1) {
|
|
|
|
app->Refresh();
|
|
|
|
}
|
|
}
|
|
|
|
void DisplayApp::InitHw() {
|
|
brightnessController.Init();
|
|
}
|
|
|
|
uint32_t acc = 0;
|
|
uint32_t count = 0;
|
|
bool toggle = true;
|
|
void DisplayApp::Refresh() {
|
|
TickType_t queueTimeout;
|
|
switch (state) {
|
|
case States::Idle:
|
|
IdleState();
|
|
queueTimeout = portMAX_DELAY;
|
|
break;
|
|
case States::Running:
|
|
RunningState();
|
|
queueTimeout = 20;
|
|
break;
|
|
default:
|
|
queueTimeout = portMAX_DELAY;
|
|
break;
|
|
}
|
|
|
|
Messages msg;
|
|
if (xQueueReceive(msgQueue, &msg, queueTimeout)) {
|
|
switch (msg) {
|
|
case Messages::GoToSleep:
|
|
brightnessController.Backup();
|
|
while(brightnessController.Level() != Controllers::BrightnessController::Levels::Off) {
|
|
brightnessController.Lower();
|
|
vTaskDelay(100);
|
|
}
|
|
lcd.DisplayOff();
|
|
systemTask.PushMessage(System::SystemTask::Messages::OnDisplayTaskSleeping);
|
|
state = States::Idle;
|
|
break;
|
|
case Messages::GoToRunning:
|
|
lcd.DisplayOn();
|
|
brightnessController.Restore();
|
|
state = States::Running;
|
|
break;
|
|
case Messages::UpdateDateTime:
|
|
// modal->Show();
|
|
break;
|
|
case Messages::UpdateBleConnection:
|
|
// clockScreen.SetBleConnectionState(bleController.IsConnected() ? Screens::Clock::BleConnectionStates::Connected : Screens::Clock::BleConnectionStates::NotConnected);
|
|
break;
|
|
case Messages::UpdateBatteryLevel:
|
|
// clockScreen.SetBatteryPercentRemaining(batteryController.PercentRemaining());
|
|
break;
|
|
case Messages::NewNotification: {
|
|
if(onClockApp) {
|
|
currentScreen.reset(nullptr);
|
|
lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Up);
|
|
onClockApp = false;
|
|
currentScreen.reset(new Screens::Notifications(this, notificationManager, Screens::Notifications::Modes::Preview));
|
|
}
|
|
}
|
|
break;
|
|
case Messages::TouchEvent: {
|
|
if (state != States::Running) break;
|
|
auto gesture = OnTouchEvent();
|
|
if(!currentScreen->OnTouchEvent(gesture)) {
|
|
switch (gesture) {
|
|
case TouchEvents::SwipeUp:
|
|
currentScreen->OnButtonPushed();
|
|
lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Up);
|
|
break;
|
|
case TouchEvents::SwipeDown:
|
|
currentScreen->OnButtonPushed();
|
|
lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
break;
|
|
case Messages::ButtonPushed:
|
|
if(onClockApp)
|
|
systemTask.PushMessage(System::SystemTask::Messages::GoToSleep);
|
|
else {
|
|
auto buttonUsedByApp = currentScreen->OnButtonPushed();
|
|
if (!buttonUsedByApp) {
|
|
systemTask.PushMessage(System::SystemTask::Messages::GoToSleep);
|
|
} else {
|
|
lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Up);
|
|
}
|
|
}
|
|
|
|
// lvgl.SetFullRefresh(components::LittleVgl::FullRefreshDirections::Down);
|
|
// currentScreen.reset(nullptr);
|
|
// if(toggle) {
|
|
// currentScreen.reset(new Screens::Tile(this));
|
|
// toggle = false;
|
|
// } else {
|
|
// currentScreen.reset(new Screens::Clock(this, dateTimeController, batteryController, bleController));
|
|
// toggle = true;
|
|
// }
|
|
|
|
break;
|
|
case Messages::BleFirmwareUpdateStarted:
|
|
lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
|
|
currentScreen.reset(nullptr);
|
|
currentScreen.reset(new Screens::FirmwareUpdate(this, bleController));
|
|
onClockApp = false;
|
|
|
|
break;
|
|
}
|
|
}
|
|
|
|
if(state != States::Idle && touchMode == TouchModes::Polling) {
|
|
auto info = touchPanel.GetTouchInfo();
|
|
if(info.action == 2) {// 2 = contact
|
|
if(!currentScreen->OnTouchEvent(info.x, info.y)) {
|
|
lvgl.SetNewTapEvent(info.x, info.y);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void DisplayApp::RunningState() {
|
|
// clockScreen.SetCurrentDateTime(dateTimeController.CurrentDateTime());
|
|
|
|
if(!currentScreen->Refresh()) {
|
|
currentScreen.reset(nullptr);
|
|
lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Up);
|
|
onClockApp = false;
|
|
switch(nextApp) {
|
|
case Apps::None:
|
|
case Apps::Launcher: currentScreen.reset(new Screens::ApplicationList(this)); break;
|
|
case Apps::Clock:
|
|
currentScreen.reset(new Screens::Clock(this, dateTimeController, batteryController, bleController, notificationManager, heartRateController));
|
|
onClockApp = true;
|
|
break;
|
|
// case Apps::Test: currentScreen.reset(new Screens::Message(this)); break;
|
|
case Apps::SysInfo: currentScreen.reset(new Screens::SystemInfo(this, dateTimeController, batteryController, brightnessController, bleController, watchdog)); break;
|
|
case Apps::Meter: currentScreen.reset(new Screens::Meter(this)); break;
|
|
case Apps::Twos: currentScreen.reset(new Screens::Twos(this)); break;
|
|
case Apps::Gauge: currentScreen.reset(new Screens::Gauge(this)); break;
|
|
case Apps::Paint: currentScreen.reset(new Screens::InfiniPaint(this, lvgl)); break;
|
|
case Apps::Paddle: currentScreen.reset(new Screens::Paddle(this, lvgl)); break;
|
|
case Apps::Brightness : currentScreen.reset(new Screens::Brightness(this, brightnessController)); break;
|
|
case Apps::Music : currentScreen.reset(new Screens::Music(this, systemTask.nimble().music())); break;
|
|
case Apps::Navigation : currentScreen.reset(new Screens::Navigation(this, systemTask.nimble().navigation())); break;
|
|
case Apps::FirmwareValidation: currentScreen.reset(new Screens::FirmwareValidation(this, validator)); break;
|
|
case Apps::Notifications: currentScreen.reset(new Screens::Notifications(this, notificationManager, Screens::Notifications::Modes::Normal)); break;
|
|
case Apps::HeartRate: currentScreen.reset(new Screens::HeartRate(this, heartRateController)); break;
|
|
}
|
|
nextApp = Apps::None;
|
|
}
|
|
lv_task_handler();
|
|
}
|
|
|
|
void DisplayApp::IdleState() {
|
|
|
|
}
|
|
|
|
void DisplayApp::PushMessage(Messages msg) {
|
|
BaseType_t xHigherPriorityTaskWoken;
|
|
xHigherPriorityTaskWoken = pdFALSE;
|
|
xQueueSendFromISR(msgQueue, &msg, &xHigherPriorityTaskWoken);
|
|
if (xHigherPriorityTaskWoken) {
|
|
/* Actual macro used here is port specific. */
|
|
// TODO : should I do something here?
|
|
}
|
|
}
|
|
|
|
TouchEvents DisplayApp::OnTouchEvent() {
|
|
auto info = touchPanel.GetTouchInfo();
|
|
if(info.isTouch) {
|
|
switch(info.gesture) {
|
|
case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
|
|
if(touchMode == TouchModes::Gestures)
|
|
lvgl.SetNewTapEvent(info.x, info.y);
|
|
return TouchEvents::Tap;
|
|
case Pinetime::Drivers::Cst816S::Gestures::LongPress:
|
|
return TouchEvents::LongTap;
|
|
case Pinetime::Drivers::Cst816S::Gestures::DoubleTap:
|
|
return TouchEvents::DoubleTap;
|
|
case Pinetime::Drivers::Cst816S::Gestures::SlideRight:
|
|
return TouchEvents::SwipeRight;
|
|
case Pinetime::Drivers::Cst816S::Gestures::SlideLeft:
|
|
return TouchEvents::SwipeLeft;
|
|
case Pinetime::Drivers::Cst816S::Gestures::SlideDown:
|
|
return TouchEvents::SwipeDown;
|
|
case Pinetime::Drivers::Cst816S::Gestures::SlideUp:
|
|
return TouchEvents::SwipeUp;
|
|
case Pinetime::Drivers::Cst816S::Gestures::None:
|
|
default:
|
|
return TouchEvents::None;
|
|
}
|
|
}
|
|
return TouchEvents::None;
|
|
}
|
|
|
|
void DisplayApp::StartApp(Apps app) {
|
|
nextApp = app;
|
|
}
|
|
|
|
void DisplayApp::SetFullRefresh(DisplayApp::FullRefreshDirections direction) {
|
|
switch(direction){
|
|
case DisplayApp::FullRefreshDirections::Down:
|
|
lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Down);
|
|
break;
|
|
case DisplayApp::FullRefreshDirections::Up:
|
|
lvgl.SetFullRefresh(Components::LittleVgl::FullRefreshDirections::Up);
|
|
break;
|
|
default: break;
|
|
}
|
|
|
|
}
|
|
|
|
void DisplayApp::SetTouchMode(DisplayApp::TouchModes mode) {
|
|
touchMode = mode;
|
|
}
|
|
|