InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	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
\| \| \| \| \| \|\ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #223 from hubmartin/patch-1	JF002	2021-03-06	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to README.md to WebBLEWatch to update time from web browser
\| * \| \| \| \| \|	Add WebBLEWatch option to update time	Martin Hub	2021-03-04	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #222 from nscooling/refactor-clock-private-statics	JF002	2021-03-06	2	-39/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved private statics into unnamed namespace in cpp file
\| * \| \| \| \| \| \|	Moved private statics into unnamed namespace in cpp file to reduce coupling ↵	Niall Cooling	2021-03-03	2	-39/+39
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and uncessar in header
* \| \| \| \| \| \|	Merge pull request #221 from nscooling/C++14	JF002	2021-03-06	1	-9/+20
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|	Refactored src/CMakelist to support C++14
\| * \| \| \| \| \|	Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ↵	Niall Cooling	2021-03-03	1	-9/+20
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	-std= directives
\| \| \| \| \| *	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.
* \| \| \| \|	Update pictures in the main README.md file.	Jean-François Milants	2021-02-25	4	-1/+2
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Set version to 0.14.0	Jean-François Milants	2021-02-24	1	-1/+1
\|/ / /
* \| \|	Merge pull request #211 from roblabla/fix-flashing	JF002	2021-02-24	1	-7/+7
\|\ \ \ \| \|_\|/ \|/\| \|	Flash correct file name
\| * \|	Flash correct file name	roblabla	2021-02-19	1	-7/+7
\| \| \|
* \| \|	Update doc : init git submodule before build.	Jean-François Milants	2021-02-23	1	-0/+1
\| \| \|
* \| \|	Fix LVGL submodule (sorry!)	Jean-François Milants	2021-02-23	294	-241414/+0
\| \| \|
* \| \|	Merge branch 'joaquimorg-LVGL7' into develop	Jean-François Milants	2021-02-23	373	-51933/+203919
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Remove LVGL folder (it's now a submodule)	Jean-François Milants	2021-02-23	340	-50598/+202756
\| \| \|
\| * \|	Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into ↵	Jean-François Milants	2021-02-23	33	-1335/+1163
\|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	joaquimorg-LVGL7 # Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.cpp # src/displayapp/screens/Modal.cpp # src/displayapp/screens/Modal.h # src/displayapp/screens/Notifications.cpp # src/displayapp/screens/Tile.h
\| * \|	Fix delay in button actions	Joaquim	2021-02-22	2	-30/+1
\| \| \|
\| * \|	Cleanup	Joaquim	2021-02-01	12	-241/+13
\| \| \|