InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #497 from Riksu9000/refresh_rework	JF002	2021-08-28	72	-287/+182
\|\ \| \| \| \|	Rework Refresh
\| *	Merge branch 'develop' into refresh_rework	Riku Isokoski	2021-08-28	29	-233/+291
\| \|\ \| \|/ \|/\|
* \|	Fix recovery firmware since last changes in DisplayApp.	Jean-François Milants	2021-08-28	3	-2/+11
\| \|
* \|	Fix touchinfo typo in SystemTask.	Jean-François Milants	2021-08-28	1	-1/+1
\| \|
* \|	Merge branch 'Riksu9000-twimaster_rework' into develop	Jean-François Milants	2021-08-28	4	-87/+48
\|\ \
\| * \|	Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime ↵	Jean-François Milants	2021-08-28	4	-87/+48
\|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into Riksu9000-twimaster_rework # Conflicts: # src/systemtask/SystemTask.cpp
\| * \|	Use highest frequency and move mutex creation to Init	Riku Isokoski	2021-08-18	2	-3/+6
\| \| \|
\| * \|	Simplify parameters and cleanup	Riku Isokoski	2021-08-16	3	-48/+19
\| \| \|
\| * \|	Don't reconfigure pins	Riku Isokoski	2021-08-12	1	-6/+1
\| \| \|
\| * \|	Explicitly disable pullup	Riku Isokoski	2021-08-10	1	-0/+2
\| \| \|
\| * \|	Only enable the bus when needed	Riku Isokoski	2021-08-10	2	-11/+4
\| \| \|
\| * \|	Optimize twiMaster	Riku Isokoski	2021-08-09	2	-22/+21
\| \| \|
* \| \|	Merge pull request #492 from Riksu9000/new_touch_handler	JF002	2021-08-28	24	-151/+239
\|\ \ \ \| \| \| \| \| \| \| \|	New touch handler
\| * \ \	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-08-18	40	-398/+834
\| \|\ \ \ \| \|/ / / \|/\| \| \|
* \| \| \|	Add memory print usage	hubmartin	2021-08-18	1	-6/+6
\| \| \| \|
* \| \| \|	Fix music app buttons	Riku Isokoski	2021-08-18	1	-1/+1
\| \| \| \|
\| * \| \|	Fix longpress gesture	Riku Isokoski	2021-08-11	2	-5/+6
\| \| \| \|
\| * \| \|	Remove leftover	Riku Isokoski	2021-08-10	1	-1/+0
\| \| \| \|
\| * \| \|	Make diff smaller and revert some changes in DisplayApp	Riku Isokoski	2021-08-10	3	-57/+62
\| \| \| \|
\| * \| \|	Rework TouchHandler into not a task	Riku Isokoski	2021-08-10	6	-68/+47
\| \| \| \|
\| * \| \|	Revert "Merge branch 'unblock_i2c' into develop"	Riku Isokoski	2021-08-10	1	-15/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 275a84b3238874d213271f4287e6c1c5bfcb4353, reversing changes made to 9fb37550886f09f6510e99a5b452262c53c3987c.
\| * \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-08-10	15	-226/+106
\| \|\ \ \
\| \| * \ \	Merge branch 'unblock_i2c' into develop	Riku Isokoski	2021-08-10	1	-0/+15
\| \| \|\ \ \
\| \| \| * \| \|	Set pin before loop	Riku Isokoski	2021-08-09	1	-0/+1
\| \| \| \| \| \|
\| \| \| * \| \|	Better pin configuration	Riku Isokoski	2021-08-09	1	-1/+6
\| \| \| \| \| \|
\| \| \| * \| \|	Try to fix bootloop	Riku Isokoski	2021-08-09	1	-0/+9
\| \| \| \|/ /
\| * \| \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-07-25	32	-178/+270
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-07-24	4	-5/+31
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-07-23	6	-17/+48
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Restore Tile.cpp changes	Riku Isokoski	2021-07-19	2	-4/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update	Riku Isokoski	2021-07-18	4	-25/+27
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix remaining known issues	Riku Isokoski	2021-07-16	4	-10/+17
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix gestures	Riku Isokoski	2021-07-16	4	-20/+13
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix touch wakeup and code cleanup	Riku Isokoski	2021-07-16	7	-53/+43
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix most issues	Riku Isokoski	2021-07-16	12	-63/+40
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Quick fix	Riku Isokoski	2021-07-15	2	-5/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	New touch handler, with issues	Riku Isokoski	2021-07-15	21	-102/+230
\| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| *	Merge branch 'develop' into refresh_rework	Riku Isokoski	2021-08-15	19	-180/+216
\| \| \| \| \| \| \| \|\ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Adjust inner padding in applist	Riku Isokoski	2021-08-15	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Clean up using variables	Riku Isokoski	2021-08-15	1	-10/+16
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Adjust previously missed scrollbar and firmware validation buttons	Riku Isokoski	2021-08-15	2	-11/+11
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Add image with example layouts	Riku Isokoski	2021-08-15	2	-0/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Ui update	Riku Isokoski	2021-08-15	10	-107/+113
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'Riksu9000-call-improvements' into develop	Jean-François Milants	2021-08-14	8	-68/+85
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime ↵	Jean-François Milants	2021-08-14	8	-68/+85
\|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into Riksu9000-call-improvements # Conflicts: # src/displayapp/screens/Metronome.cpp
\| * \| \| \| \| \| \| \|	Remove leftover	Riku Isokoski	2021-08-01	1	-5/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fixes	Riku Isokoski	2021-08-01	3	-12/+21
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improvements	Riku Isokoski	2021-08-01	8	-131/+70
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into HEAD	Riku Isokoski	2021-08-01	139	-1783/+5328
\| \|\ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	NotificationItem now also redefines the start of the timeout	Florian Kraupa	2021-05-16	2	-8/+16
\| \| \| \| \| \| \| \| \|