InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Updated to include WatchFaceAnalog and fixed clashes	Niall Cooling	2021-03-22	83	-557/+5369
\|\
\| *	Set version to 0.15.0	Jean-François Milants	2021-03-21	1	-1/+1
\| \|
\| *	Update buildAndProgram.md with info about Debug/Release builds.	Jean-François Milants	2021-03-21	1	-5/+10
\| \|
\| *	Merge pull request #245 from petterhs/fixDisplayErrors	JF002	2021-03-21	2	-8/+4
\| \|\ \| \| \| \| \| \|	fix display driver issues in recovery
\| \| *	fix display driver issues in recovery	petter	2021-03-21	2	-8/+4
\| \| \|
\| * \|	Merge pull request #244 from joaquimorg/LVGL7.11.0	JF002	2021-03-21	1	-0/+0
\| \|\ \ \| \| \| \| \| \| \| \|	Update to LVGL 7.11.0 Final
\| \| * \|	Update to LVGL 7.11.0 Final	Joaquim	2021-03-20	1	-0/+0
\| \| \|/
\| * \|	Merge pull request #231 from Panky-codes/feature/add-stop-watch	JF002	2021-03-21	10	-45/+376
\| \|\ \ \| \| \|/ \| \|/\|	Added stopwatch
\| \| *	Added stopwatch app to readme	panky-codes	2021-03-21	1	-0/+1
\| \| \|
\| \| *	Reverted the paddle app in displayapp.cpp	panky-codes	2021-03-21	1	-2/+2
\| \| \|
\| \| *	Updated lvgl submodule to match with develop branch	panky-codes	2021-03-21	1	-0/+0
\| \| \|
\| \| *	Merged upstream	panky-codes	2021-03-20	76	-525/+4990
\| \| \|\ \| \| \|/ \| \|/\|
\| * \|	Merge pull request #240 from joaquimorg/ScreenCorruptionFIX	JF002	2021-03-20	4	-77/+37
\| \|\ \ \| \| \| \| \| \| \| \|	FIX screen corruption (Issue #213)
\| \| * \|	FIX screen corruption #213	Joaquim	2021-03-18	4	-77/+37
\| \| \| \|
\| * \| \|	Merge pull request #237 from muesli/systeminfo-url	JF002	2021-03-20	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Update project URL in SystemInfo
\| \| * \| \|	Update project URL in SystemInfo	Christian Muehlhaeuser	2021-03-16	1	-1/+1
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Pinetime -> InfiniTime
\| * \| \|	Merge pull request #235 from MFAshby/doc_correction	JF002	2021-03-20	6	-11/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Small correction to git URL in documentation files
\| \| * \| \|	Small correction to git URL in documentation files	Martin Ashby	2021-03-15	6	-11/+11
\| \| \|/ /
\| * \| \|	Merge branch 'develop' of github.com:JF002/Pinetime into develop	Jean-François Milants	2021-03-20	27	-317/+1325
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/main.cpp # src/systemtask/SystemTask.h
\| \| * \ \	Merge pull request #217 from joaquimorg/MultiFaceClock	JF002	2021-03-20	25	-313/+1318
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|	Multi face support, analog clock, 12/24 config
\| \| \| * \|	fix AM/PM	Joaquim José Almeida Pereira	2021-03-08	1	-5/+15
\| \| \| \| \|
\| \| \| * \|	Merge branch 'develop' into MultiFaceClock	joaquim.org	2021-03-06	0	-0/+0
\| \| \| \|\ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	clean up vsc settings	Joaquim	2021-03-06	1	-1/+0
\| \| \| \| \|
\| \| \| * \|	Update from JF comments to PR	Joaquim	2021-03-06	5	-33/+6
\| \| \| \| \|
\| \| \| * \|	Merge from upstream	Joaquim	2021-03-06	6	-11/+25
\| \| \| \| \|
\| \| \| * \|	Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock	Joaquim	2021-02-25	1	-1/+1
\| \| \| \|\ \
\| \| \| * \ \	Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock	Joaquim	2021-02-25	1	-7/+7
\| \| \| \|\ \ \
\| \| \| * \| \| \|	Multi face support, analog clock, 12/24 config	Joaquim	2021-02-24	25	-311/+1333
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Set version to 0.14.1	Jean-François Milants	2021-03-07	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'recovery-firmware' of JF/PineTime into develop	JF	2021-03-07	49	-107/+3623
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	Add submodule again...	Jean-François Milants	2021-03-07	2	-0/+3
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Revert "Add submodule again..."	Jean-François Milants	2021-03-07	3	-27/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 15484d0b34099b50c300b6f76e23f70f171bb409.
\| \| * \| \| \| \|	Add submodule again...	Jean-François Milants	2021-03-07	3	-1/+27
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'develop' into recovery-firmware	Jean-François Milants	2021-03-07	559	-100313/+33634
\| \| \|\ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h
\| \| * \| \| \| \|	Add new cmake option to disable the generation of DFU file (which needs ↵	Jean-François Milants	2021-02-01	4	-10/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	adafruit-nrfutil on the build machine) : BUILD_DFU (disabled by default, enabled in docker build).
\| \| * \| \| \| \|	Remove BLE debug code	Jean-François Milants	2021-01-31	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Generate pinetime-recovery : a light version of InfiniTime design to be used ↵	Jean-François Milants	2021-01-26	45	-80/+3579
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	as a recovery firmware : it only provides basic UI and BLE connectivity for OTA. This new FW is build on the same codebasse than the actual InfiniTime. Only the display task is different (this allows to remove lvgl from the recovery fw, which is very heavy). CMake builds and docker have been modified accordingly. Note than the fw is converted into an image and then into a DFU in the cmake build (previously, it was only done in the
\| \| \| \| \| \| *	Reworked based on PR comments.	panky-codes	2021-03-20	4	-38/+56
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Removed unused variables. Tested.	panky-codes	2021-03-15	3	-9/+8
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Increased the size of the button and realigned the layout a bit. Tested.	panky-codes	2021-03-13	1	-5/+7
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Added some comments for clarity. Ready for review. Tested.	panky-codes	2021-03-13	2	-3/+15
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Stopwatch completed. Ready for PR	panky-codes	2021-03-13	5	-55/+75
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Adding laps completed.	panky-codes	2021-03-13	2	-6/+17
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Laps introduced. Tested. Need to change the icon.	panky-codes	2021-03-12	2	-6/+70
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Added a button for stop lap. Logic works. Need to implement symbol and ↵	panky-codes	2021-03-12	2	-9/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	buffer for lap
\| \| \| \| \| \| *	Added play/pause button.	panky-codes	2021-03-11	2	-9/+55
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Changed the clock source. Stopwatch works. Need to add butttons.	panky-codes	2021-03-11	2	-12/+29
\| \| \| \| \| \| \|
\| \| \| \| \| \| *	Merge branch 'develop' of github.com:JF002/Pinetime into feature/add-stop-watch	panky-codes	2021-03-11	4	-48/+60
\| \| \| \| \| \| \|\ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| \| \| \| \| \| *	Basic logic done. Need to change the timer source to get ms. Also need to ↵	panky-codes	2021-03-11	6	-3/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	replace with paddle app in displayApp.cpp and ApplicationList.cpp later.
* \| \| \| \| \| \|	Resolved C++14 Cmake build issues so correctly building to C99/C++14 standards	Niall Cooling	2021-03-16	4	-23/+16
\|/ / / / / /