CCF_100/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

resolve conflict in src/systemtask/Messages.h

Browse Source
This commit is contained in:
Mark Russell
2021-09-16 16:20:39 -04:00
parent cdf99b08f4 3eb73774a3
commit b9e56843a2
33 changed files with 300 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/displayapp/DisplayApp.cpp
View File

@@ -139,9 +139,6 @@ void DisplayApp::InitHw() {
brightnessController.Set(settingsController.GetBrightness());
}
uint32_t acc = 0;
uint32_t count = 0;
bool toggle = true;
void DisplayApp::Refresh() {
TickType_t queueTimeout;
TickType_t delta;
@@ -197,9 +194,6 @@ void DisplayApp::Refresh() {
// clockScreen.SetBleConnectionState(bleController.IsConnected() ? Screens::Clock::BleConnectionStates::Connected :
// Screens::Clock::BleConnectionStates::NotConnected);
break;
case Messages::UpdateBatteryLevel:
batteryController.Update();
break;
case Messages::NewNotification:
LoadApp(Apps::NotificationsPreview, DisplayApp::FullRefreshDirections::Down);
break;