InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #664 from Riksu9000/disable_notif_only	JF002	2021-09-23	2	-7/+3
\|\ \| \| \| \|	Toggle notifications only, keep vibrations.
\| *	Merge branch 'develop' into disable_notif_only	Riku Isokoski	2021-09-14	2	-13/+20
\| \|\
\| * \	Merge branch 'develop' into disable_notif_only	Riku Isokoski	2021-09-13	5	-18/+1
\| \|\ \
\| * \| \|	Toggle notifications only, keep vibrations.	Riku Isokoski	2021-09-12	2	-7/+3
\| \| \| \|
* \| \| \|	Merge pull request #669 from ↵	JF002	2021-09-18	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	NeroBurner/fix_unsigned_comparison_warning_metronome Fix unsigned/signed comparison warning in Metronome.cpp
\| * \| \| \|	Fix unsigned/signed comparison warning in Metronome.cpp	Reinhold Gschweicher	2021-09-16	1	-1/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`xTaskGetTickCount()` returns a `TickType_t`, which is defined as an `uint32_t`. This is compared to the `bpm` variable, which is a `int16_t` in the range of 40 to 220 as defined in the constructor. ```cpp lv_arc_set_range(bpmArc, 40, 220); ``` Just assume that `bpm` is greater than 0, as this would result in a divison by zero or negative values, which would unintentionally underflow to a very large number.
* \| \| \|	Fix DisplayAppRecovery : add AlarmController to ctor().	Jean-François Milants	2021-09-18	2	-0/+3
\| \| \| \|
* \| \| \|	resolve conflict in src/systemtask/Messages.h	Mark Russell	2021-09-16	8	-33/+23
\|\\| \| \|
\| * \| \|	Fix DisplayAppRecovery : fix include error by forward declaring Controllers ↵	Jean-François Milants	2021-09-13	2	-13/+20
\| \| \|/ \| \|/\| \| \| \| \| \| \|	in header file.
\| * \|	Merge pull request #602 from Riksu9000/del_unused	JF002	2021-09-12	3	-12/+1
\| \|\ \ \| \| \| \| \| \| \| \|	Remove unused variables
\| \| * \|	Remove unused variables	Riku Isokoski	2021-08-19	3	-12/+1
\| \| \| \|
\| * \| \|	Merge pull request #580 from Riksu9000/timer_battery_reading	JF002	2021-09-12	3	-6/+0
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	Make battery reading periodic
\| \| * \|	Merge remote-tracking branch 'upstream/develop' into timer_battery_reading	Riku Isokoski	2021-08-30	77	-304/+635
\| \| \|\ \
\| \| * \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-28	25	-216/+182
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-14	6	-152/+116
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Make battery reading periodic. Add events. Disable pullup	Riku Isokoski	2021-08-14	3	-7/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update Settings.cpp	Itai Nelken	2021-09-02	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Revert "Merge upstream"	Mark Russell	2021-09-16	8	-23/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
* \| \| \| \| \| \|	Merge upstream	Mark Russell	2021-09-16	8	-33/+23
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fixes per Riksu9000's feedback	Mark Russell	2021-09-16	2	-15/+19
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	License header fix, add missing braces	Mark Russell	2021-09-13	2	-2/+10
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fixes based on code reviews (formatting, UI code)	Mark Russell	2021-09-13	2	-52/+92
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Created basic alarm app	Mark Russell	2021-09-10	7	-2/+277
\|/ / / / / /
* \| \| \| / /	Fix notifications that wouldn't auto close when the timeout elapsed (in ↵	Jean-François Milants	2021-08-31	1	-1/+0
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	preview mode).
* \| \| \| \|	Settings : use enums instead of ints to store colors. Group all PTS settings ↵	Jean-François Milants	2021-08-28	6	-96/+116
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into a struct. PTS/SettingsPTS : Convert to/from LVGL color and Settings::Color, add functions to reduce code duplication. Adapt SettingPineTimeStyle with the last Screen Interface
* \| \| \| \|	Merge pull request #458 from kieranc/pinetimestyle-colorpicker	JF002	2021-08-28	8	-17/+432
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add color picker for PineTimeStyle watchface
\| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-19	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-15	15	-268/+230
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Fix potential edge case of sidebar being set black	Kieran Cawthray	2021-08-15	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	More tidying following review	Kieran Cawthray	2021-08-15	1	-85/+88
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Avoid setting the sidebar black	Kieran Cawthray	2021-08-15	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove duplicate code, minor fixes	Kieran Cawthray	2021-08-15	1	-33/+19
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add check for randomise button in case colors clash	Kieran Cawthray	2021-08-15	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add randomise button to color picker	Kieran Cawthray	2021-08-15	2	-0/+22
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Tidying	Kieran Cawthray	2021-08-12	1	-1/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-12	9	-143/+54
\| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-28	25	-182/+221
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Increment settings value, remove old hacky fix	Kieran Cawthray	2021-07-25	1	-20/+8
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add extra screen in settings to show scrollbar correctly	Kieran Cawthray	2021-07-24	1	-3/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-23	3	-9/+40
\| \|\ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-20	15	-105/+73
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-12	20	-390/+264
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix bad merge	Kieran Cawthray	2021-06-29	1	-27/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Replace font file	Kieran Cawthray	2021-06-29	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-06-29	3	-4/+52
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Add reset button, reduce button opacity	Kieran Cawthray	2021-06-27	2	-12/+37
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix the fix, whoops	Kieran Cawthray	2021-06-25	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add a check to set default colors if all colors are white	Kieran Cawthray	2021-06-25	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make it loop around when you get to the end of the list of colors	Kieran Cawthray	2021-06-25	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix off-by-one error, reduce step gauge needle width	Kieran Cawthray	2021-06-25	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \|