Jean-François Milants bef3e708f6 Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake ...

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/screens/settings/Settings.cpp

2022-01-04 21:48:08 +01:00

..

alarm

AlarmController: remove unused app_timer.h include in header

2021-12-09 21:30:33 +01:00

battery

Switched to non-deprecated math header

2021-12-04 22:03:40 +02:00

ble

Optional secure pairing with a passkey

2021-12-21 16:02:01 -06:00

brightness

Update includes to to be relative to src directory

2021-11-15 22:02:49 +01:00

datetime

resolves conflicts

2022-01-02 22:27:43 +00:00

firmwarevalidator

Update includes to to be relative to src directory

2021-11-15 22:02:49 +01:00

fs

Added move function

2021-12-10 01:18:57 +00:00

gfx

Update includes to to be relative to src directory

2021-11-15 22:02:49 +01:00

heartrate

Move up file header include to top

2021-11-15 22:02:49 +01:00

motion

Fix crash upon leaving app.

2022-01-04 02:00:03 +00:00

motor

Update includes to to be relative to src directory

2021-11-15 22:02:49 +01:00

rle

Update includes to to be relative to src directory

2021-11-15 22:02:49 +01:00

settings

Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake

2022-01-04 21:48:08 +01:00

timer

Update includes to to be relative to src directory

2021-11-15 22:02:49 +01:00