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

Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes

Browse Source 
# Conflicts:
#	doc/contribute.md
#	src/displayapp/screens/BatteryInfo.h
This commit is contained in:
Jean-François Milants
2021-11-28 13:53:03 +01:00
parent d5e8e3ca44 3a41bff9ea
commit 298f0f4335
148 changed files with 263 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/displayapp/DisplayApp.cpp
View File

@@ -1,9 +1,9 @@
#include "DisplayApp.h"
#include "displayapp/DisplayApp.h"
#include <libraries/log/nrf_log.h>
#include <displayapp/screens/HeartRate.h>
#include <displayapp/screens/Motion.h>
#include <displayapp/screens/Timer.h>
#include <displayapp/screens/Alarm.h>
#include "displayapp/screens/HeartRate.h"
#include "displayapp/screens/Motion.h"
#include "displayapp/screens/Timer.h"
#include "displayapp/screens/Alarm.h"
#include "components/battery/BatteryController.h"
#include "components/ble/BleController.h"
#include "components/datetime/DateTimeController.h"