InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| *	Merge from upstream	Joaquim	2021-03-06	1	-1/+2
\| \| \| \|
\| \| \| *	Multi face support, analog clock, 12/24 config	Joaquim	2021-02-24	16	-306/+1116
\| \| \| \|
\| \| * \|	Merge branch 'develop' into recovery-firmware	Jean-François Milants	2021-03-07	34	-1532/+1413
\| \| \|\ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h
\| \| * \|	Generate pinetime-recovery : a light version of InfiniTime design to be used ↵	Jean-François Milants	2021-01-26	8	-5/+354
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-38/+37
\| \| \| \|
\| * \| \|	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	2	-39/+39
\| \|\ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Basic logic done. Need to change the timer source to get ms. Also need to ↵	panky-codes	2021-03-11	5	-3/+112
\| \| \|/ \| \|/\| \| \| \| \| \| \|	replace with paddle app in displayApp.cpp and ApplicationList.cpp later.
* / \|	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 branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into ↵	Jean-François Milants	2021-02-23	29	-1120/+727
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-30/+1
\| \| \|
\| * \|	Cleanup	Joaquim	2021-02-01	10	-235/+13
\| \| \|
\| * \|	LVGL v7.10.0	Joaquim	2021-01-28	24	-903/+792
\| \|/
* \|	Merge pull request #205 from nscooling/dirtyRefactor	JF002	2021-02-14	1	-13/+13
\|\ \ \| \| \| \| \| \|	refactored class DirtyValue
\| * \|	refactored class DirtyValue	Niall Cooling	2021-02-12	1	-13/+13
\| \|/
* \|	Merge pull request #186 from petterhs/musicUI	JF002	2021-02-14	1	-7/+8
\|\ \ \| \| \| \| \| \|	music: Symbols for the buttons
\| * \|	improve music UI with icons for play/pause/next/prev/ and volume	petter	2021-01-27	1	-7/+8
\| \| \|
\| * \|	update font with icons for music, call and qr	petter	2021-01-27	3	-396/+498
\| \|/
* \|	Fix merge conflict.	Jean-François Milants	2021-02-14	1	-3/+6
\|\ \
\| * \|	add vibration toggle	petter	2021-02-07	1	-0/+4
\| \| \|
\| * \|	trigger vibration from systemtask	petter	2021-02-05	4	-18/+5
\| \| \|
\| * \|	create motorcontroller in main and pass by reference	petter	2021-01-25	4	-7/+20
\| \| \|
\| * \|	Merge branch 'develop' into upstream-dev	The King	2021-01-24	281	-403/+10681
\| \|\\|
\| * \|	add motor to notifs, fix tabs in motorcontroller.h	jlukanc	2021-01-15	2	-0/+6
\| \| \|
* \| \|	add mute button and functionality for call notification + new button icons	petter	2021-01-27	2	-5/+31
\| \| \|
* \| \|	update font with icons for music, call and qr	petter	2021-01-27	3	-396/+498
\| \| \|
* \| \|	Revert invalid changes in Navigation.h and add missing changes in ↵	Jean-François Milants	2021-01-24	2	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \|	Notifications.h.
* \| \|	Handle call notification the same way than other notifications.	Jean-François Milants	2021-01-24	7	-49/+147
\| \| \| \| \| \| \| \| \| \| \| \|	Display the call notifications in the Notification app, with buttons to accept/reject the call.
* \| \|	Add incoming call functionality	Rasmus Schenstrom	2021-01-21	4	-13/+53
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add categories to AlertNotification Add new alert notification screens bases Add Incoming Call Add Modal Add event to AlertNotification Co-authored-by: Robin Karlsson <robin.karlsson@protonmail.com>
* \|	Merge pull request #168 from Panky-codes/fix-erratic-battery	JF002	2021-01-20	3	-7/+7
\|\ \ \| \| \| \| \| \|	Fix erratic battery
\| * \|	Converted all the other float usage to int.	panky-codes	2021-01-16	3	-7/+7
\| \| \|
\| * \|	Converted percent remaining calc to int.	panky-codes	2021-01-16	1	-2/+1
\| \| \|
\| * \|	Adjusted the firmware to display percent instead of gfx.	panky-codes	2021-01-16	1	-1/+2
\| \|/
* \|	Merge branch piggz/nav into develop:	Jean-François Milants	2021-01-20	274	-384/+10486
\| \| \| \| \| \| \| \| \| \|	- fix conflict - add a icon for the navigation app.
* \|	HR Sensor : Add start/stop button to the HeartRate app (the HR sensors stays ↵	Jean-François Milants	2021-01-17	5	-19/+74
\| \| \| \| \| \| \| \|	ON when the app is closed), display the HR value on the Clock app.
* \|	First implementation of the HR sensor using 100% foss code (ported from waspos)	Jean-François Milants	2021-01-10	6	-5/+126
\|/
*	Merge pull request #154 from jedmijares/twos-game	JF002	2021-01-03	5	-2/+309
\|\ \| \| \| \|	Adds 2048 clone game
\| *	adds 2048 clone game	Jed	2021-01-02	5	-2/+309
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	styles table reads touch events allows moving tiles allows merging tiles improves tile movement allows merging tiles adds score display implements color edit comments adjust game logic disallows double merges
* \|	Rename Pinetime in InfiniTime in sysinfo app.	Jean-François Milants	2021-01-02	1	-1/+1
\| \|
* \|	Add source code license and link to github to system app	Michael	2020-12-28	2	-2/+9
\|/
*	Update Paddle.cpp	ZephyrLabs	2020-12-20	1	-1/+0
\| \| \| \|	blankline removal
*	Update Paddle.cpp	ZephyrLabs	2020-12-20	1	-16/+13
\| \| \| \|	fix uppercase