InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #623 from Riksu9000/lvgl_queuetimeout	JF	2021-10-03	1	-20/+4
\|\ \| \| \| \|	Let LVGL control queueTimeout
\| *	Let lvgl control queueTimeout	Riku Isokoski	2021-08-29	1	-20/+4
\| \|
* \|	resolve conflict in src/systemtask/Messages.h	Mark Russell	2021-09-16	1	-6/+0
\|\ \
\| * \	Merge pull request #602 from Riksu9000/del_unused	JF002	2021-09-12	1	-3/+0
\| \|\ \ \| \| \| \| \| \| \| \|	Remove unused variables
\| \| * \|	Remove unused variables	Riku Isokoski	2021-08-19	1	-3/+0
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'upstream/develop' into timer_battery_reading	Riku Isokoski	2021-08-30	1	-1/+6
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-28	1	-41/+29
\| \|\ \ \
\| * \ \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-14	1	-2/+3
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Make battery reading periodic. Add events. Disable pullup	Riku Isokoski	2021-08-14	1	-3/+0
\| \| \| \| \|
* \| \| \| \|	Revert "Merge upstream"	Mark Russell	2021-09-16	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
* \| \| \| \|	Merge upstream	Mark Russell	2021-09-16	1	-6/+0
\| \| \| \| \|
* \| \| \| \|	Created basic alarm app	Mark Russell	2021-09-10	1	-0/+13
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge pull request #458 from kieranc/pinetimestyle-colorpicker	JF002	2021-08-28	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Add color picker for PineTimeStyle watchface
\| * \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-15	1	-2/+3
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-28	1	-37/+49
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-23	1	-1/+6
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-20	1	-2/+11
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-12	1	-1/+1
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	PineTimeStyle color picker initial commit	Kieran Cawthray	2021-06-24	1	-0/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' into refresh_rework	Riku Isokoski	2021-08-28	1	-41/+29
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-08-18	1	-2/+2
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Make diff smaller and revert some changes in DisplayApp	Riku Isokoski	2021-08-10	1	-57/+60
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-07-25	1	-6/+17
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-07-23	1	-0/+1
\| \|\ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Fix remaining known issues	Riku Isokoski	2021-07-16	1	-1/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Fix most issues	Riku Isokoski	2021-07-16	1	-9/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	New touch handler, with issues	Riku Isokoski	2021-07-15	1	-64/+60
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'develop' into refresh_rework	Riku Isokoski	2021-08-15	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime ↵	Jean-François Milants	2021-08-14	1	-2/+2
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into Riksu9000-call-improvements # Conflicts: # src/displayapp/screens/Metronome.cpp
\| \| * \| \| \| \| \|	Fixes	Riku Isokoski	2021-08-01	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Improvements	Riku Isokoski	2021-08-01	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'develop' into HEAD	Riku Isokoski	2021-08-01	1	-63/+130
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	implemented continuous vibration pattern for incoming calls	Florian Kraupa	2021-05-16	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' into refresh_rework	Riku Isokoski	2021-08-14	1	-0/+1
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Improve metronome	Riku Isokoski	2021-08-14	1	-0/+1
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'develop' into refresh_rework	Riku Isokoski	2021-08-03	1	-37/+49
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Code cleanup (#466)	Riku Isokoski	2021-07-25	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Code cleanup * Remove override again
\| * \| \| \| \| \|	Dim screen before sleep (#464)	Riku Isokoski	2021-07-24	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Implement dimming
\| * \| \| \| \| \|	Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime ↵	Jean-François Milants	2021-07-24	1	-30/+31
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into Riksu9000-fix_touchevent_tap # Conflicts: # src/displayapp/DisplayApp.cpp
\| \| * \| \| \| \|	Merge branch 'develop' into fix_touchevent_tap	Riku Isokoski	2021-07-14	1	-29/+63
\| \| \|\ \ \ \ \
\| \| * \| \| \| \| \|	Fix regression	Riku Isokoski	2021-06-11	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix touchevent tap	Riku Isokoski	2021-06-11	1	-6/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' into refresh_rework	Riku Isokoski	2021-07-23	1	-1/+6
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make firmware updating more foolproof (#469)	Riku Isokoski	2021-07-22	1	-1/+6
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Make firmware updating more foolproof and fix bugs * No need to manually handle overflow * Make startTime TickType_t * Don't process TouchEvents::None * Fix sleep getting re-enabled issue more directly
* / \| \| \| \| \|	Refresh rework	Riku Isokoski	2021-07-19	1	-1/+1
\|/ / / / / /
* \| / / / /	Set correct refresh times for lvgl (#488)	Riku Isokoski	2021-07-14	1	-3/+5
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Adjust displayapp delay to compensate time spent (#482)	Riku Isokoski	2021-07-13	1	-2/+9
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Improve stopwatch (#432)	Riku Isokoski	2021-07-04	1	-1/+1
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Improve stopwatch more * Make sure sleep gets reenabled * Cleanup and clang-format
* \| \|	Add support for BMA425 acceleration sensor. (#440)	JF002	2021-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \|	* Add support for BMA425 acceleration sensor.
* \| \|	Fix build issues since Metronome app has been merged.	Jean-François Milants	2021-06-12	1	-1/+1
\| \| \|