will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Application selection at build time

Browse Source 
Fix DisplayAppRecovery so it builds with -std=c++20.
This commit is contained in:
Jean-François Milants 2023-10-23 21:43:05 +02:00 committed by JF
parent 63e0c4f4ef
commit 02af09d943
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/gfx/Gfx.cpp
View File

@ -141,7 +141,7 @@ void Gfx::SetBackgroundColor(uint16_t color) {
bool Gfx::GetNextBuffer(uint8_t** data, size_t& size) { bool Gfx::GetNextBuffer(uint8_t** data, size_t& size) {
if (!state.busy) if (!state.busy)
return false; return false;
state.remainingIterations--; state.remainingIterations = state.remainingIterations-1;
if (state.remainingIterations == 0) { if (state.remainingIterations == 0) {
state.busy = false; state.busy = false;
NotifyEndOfTransfer(state.taskToNotify); NotifyEndOfTransfer(state.taskToNotify);
@ -170,7 +170,7 @@ bool Gfx::GetNextBuffer(uint8_t** data, size_t& size) {
size = bytes_in_line * 8 * 2; size = bytes_in_line * 8 * 2;
} }
state.currentIteration++; state.currentIteration = state.currentIteration + 1;
return true; return true;
} }

9
src/displayapp/DisplayAppRecovery.cpp
View File

@ -121,3 +121,12 @@ void DisplayApp::PushMessage(Display::Messages msg) {
void DisplayApp::Register(Pinetime::System::SystemTask* /*systemTask*/) { void DisplayApp::Register(Pinetime::System::SystemTask* /*systemTask*/) {
} }
void DisplayApp::Register(Pinetime::Controllers::WeatherService* /*weatherService*/) {
}
void DisplayApp::Register(Pinetime::Controllers::MusicService* /*musicService*/) {
}
void DisplayApp::Register(Pinetime::Controllers::NavigationService* /*NavigationService*/) {
}

7
src/displayapp/DisplayAppRecovery.h
View File

@ -34,6 +34,9 @@ namespace Pinetime {
class AlarmController; class AlarmController;
class BrightnessController; class BrightnessController;
class FS; class FS;
class WeatherService;
class MusicService;
class NavigationService;
} }
namespace System { namespace System {
@ -66,6 +69,10 @@ namespace Pinetime {
void PushMessage(Pinetime::Applications::Display::Messages msg); void PushMessage(Pinetime::Applications::Display::Messages msg);
void Register(Pinetime::System::SystemTask* systemTask); void Register(Pinetime::System::SystemTask* systemTask);
void Register(Pinetime::Controllers::WeatherService* weatherService);
void Register(Pinetime::Controllers::MusicService* musicService);
void Register(Pinetime::Controllers::NavigationService* NavigationService);
private: private:
TaskHandle_t taskHandle; TaskHandle_t taskHandle;