scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'develop' into motion-sensor

Browse source 
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h
This commit is contained in:
Jean-François Milants 2021-04-09 21:16:21 +02:00
commit 15b3b8e282
492 changed files with 58799 additions and 10602 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/displayapp/screens/WatchFaceDigital.h
View file

@ -34,7 +34,7 @@ namespace Pinetime {
~WatchFaceDigital() override;
bool Refresh() override;
bool OnButtonPushed() override;
void OnObjectEvent(lv_obj_t *pObj, lv_event_t i);
private:
@ -78,7 +78,7 @@ namespace Pinetime {
Controllers::HeartRateController& heartRateController;
Controllers::MotionController& motionController;
bool running = true;
};
}