InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime ↵	Jean-François Milants	2022-02-13	1	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	into mruss77-statusBarTimeFormat # Conflicts: # src/components/datetime/DateTimeController.cpp
\| *	Status bar displays time in 12 or 24 hour format based on settings	Mark Russell	2021-11-10	1	-2/+2
\| \|
* \|	Corrected capitalization	Eli Weiss	2022-01-31	2	-5/+5
\| \|
* \|	Corrected code formatting	Eli Weiss	2022-01-31	2	-28/+30
\| \| \| \| \| \| \| \|	Corrected formatting and removed unnecessary variable time24H
* \|	Changed setHourLabels function to handle 24H too	Eli Weiss	2022-01-31	2	-36/+28
\| \| \| \| \| \| \| \|	Changed setHourLabels function to handle 24 hour time labeling, changed to private
* \|	Consolidated label changes, optimizations	Eli Weiss	2022-01-31	1	-36/+15
\| \| \| \| \| \| \| \|	Consolidated 12 hour label changes to function. Removed use of strings, struct.
* \|	Consolidated time conversion logic	Eli Weiss	2022-01-31	2	-87/+94
\| \| \| \| \| \| \| \|	Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
* \|	Removed redundant brackets	Eli Weiss	2022-01-31	1	-5/+3
\| \| \| \| \| \| \| \|	Also corrected orphaned bracket
* \|	Cleaned up redundant if statements, spacing	Eli Weiss	2022-01-31	2	-47/+43
\| \| \| \| \| \| \| \|	Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
* \|	Added 12 hour set time	Eli Weiss	2022-01-31	2	-7/+79
\| \|
* \|	Update shakewake menu option	Riku Isokoski	2022-01-06	1	-1/+1
\| \|
* \|	Merge pull request #912 from SteveAmor/chimesradio	JF	2022-01-05	1	-0/+4
\|\ \ \| \| \| \| \| \|	Updates radio button style for Chimes Option
\| * \|	Updates radio button style	SteveAmor	2022-01-04	1	-0/+4
\| \| \|
* \| \|	Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into ↵	Jean-François Milants	2022-01-04	5	-10/+188
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	geekbozu-ShakeWake # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/screens/settings/Settings.cpp
\| * \|	Fix setting removing it self from wake settings when opening calibration ↵	Tim Keller	2022-01-04	2	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \|	window twice.
\| * \|	Made calibration window enable Accel wakeups for setting and calibration ↵	Tim Keller	2022-01-04	2	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \|	even when wake mode is inactive.
\| * \|	Remove "fancy" settings display and always show ShakeWakeThresholdSetting	Tim Keller	2022-01-04	1	-14/+10
\| \| \|
\| * \|	Fixed button color changing	Tim Keller	2022-01-04	2	-9/+9
\| \| \|
\| * \|	Added visual aide for shake strength	Tim Keller	2022-01-04	2	-37/+60
\| \| \| \| \| \| \| \| \| \| \| \|	Added delay to starting calibration
\| * \|	Raise calibration timeout to 7.5 seconds	Tim Keller	2022-01-04	1	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \|	Added button toggle state for cleaner user interaction
\| * \|	Fix crash upon leaving app.	Tim Keller	2022-01-04	2	-27/+20
\| \| \| \| \| \| \| \| \| \| \| \|	Code formatting
\| * \|	Make arc moveable, and clear previous setting on calibrate	Tim Keller	2022-01-04	1	-2/+5
\| \| \|
\| * \|	Actually save the threshold	Tim Keller	2022-01-04	2	-7/+18
\| \| \| \| \| \| \| \| \| \| \| \|	Prevent a few crashes due to an LV task being active when it shouldnt be.
\| * \|	Better Sensitivity UI, Calibration button added	Tim Keller	2022-01-04	2	-58/+76
\| \| \|
\| * \|	Add start of settings app for senstivity.	Tim Keller	2022-01-04	3	-1/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	really just debugging. I want to make it more configurable then high med low. Position of setting needs a new location...dynamicly adding it currently at the end. Which honestly im fine with.
\| * \|	Added Shake to wake	Tim Keller	2022-01-04	2	-1/+9
\| \| \|
* \| \|	Adds enum class for chimes option	SteveAmor	2022-01-04	1	-4/+12
\| \| \|
* \| \|	resolves conflicts	SteveAmor	2022-01-02	15	-490/+75
\|\\| \|
\| * \|	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-12-09	7	-105/+65
\| \|\ \
\| \| * \|	Organize includes	Riku Isokoski	2021-12-09	3	-6/+9
\| \| \| \|
\| \| * \|	Move radio button styling to a single place	Riku Isokoski	2021-12-09	3	-18/+6
\| \| \| \|
\| \| * \|	Optimize arrays	Riku Isokoski	2021-12-09	6	-9/+15
\| \| \| \|
\| \| * \|	Fix too small array	Riku Isokoski	2021-12-09	1	-1/+1
\| \| \| \|
\| \| * \|	Style checkboxes as radio buttons	Riku Isokoski	2021-12-09	6	-99/+63
\| \| \| \|
\| \| * \|	Added autodetection for clang-format version	Avamander	2021-12-04	1	-8/+7
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-12-05	10	-11/+9
\| \|\\| \|
\| \| * \|	QuickSettings: remove unused imports	Reinhold Gschweicher	2021-12-02	1	-2/+0
\| \| \| \|
\| \| * \|	Update includes to to be relative to src directory	Reinhold Gschweicher	2021-11-15	10	-10/+10
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use relative imports like `../foo.h` as those depend on the relative position of both files. Rather than that use imports relative to the `src` directory, which explicitly is part of the include directories.
\| * \|	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-10-23	1	-1/+1
\| \|\\|
\| * \|	Restore settings order	Kieran Cawthray	2021-10-20	1	-2/+2
\| \| \|
\| * \|	Fix settings merge error	Kieran Cawthray	2021-10-18	1	-2/+5
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-10-18	5	-0/+438
\| \|\ \
\| * \| \|	Remove old PineTimeStyle settings app	Kieran Cawthray	2021-10-03	3	-392/+3
\| \| \| \|
* \| \| \|	resolves conflicts	SteveAmor	2022-01-02	2	-2/+2
\| \| \| \|
* \| \| \|	Chimes option	SteveAmor	2021-11-07	3	-1/+116
\| \|_\|/ \|/\| \|
* \| \|	Flashlight brightness control	Riku Isokoski	2021-10-13	1	-1/+1
\| \|/ \|/\|
* \|	Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by ↵	Jean-François Milants	2021-10-10	4	-85/+61
\| \| \| \| \| \| \| \|	nullptr and other small cleanings.
* \|	Merge with develop and fix conflicts from timaios:set-datetime-manually.	Jean-François Milants	2021-10-10	5	-5/+455
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'JF002:develop' into set-datetime-manually	Tim	2021-08-08	6	-51/+40
\| \|\
\| * \|	Code optimizations in SettingSetDate and SettingSetTime	Tim Taenny	2021-07-09	2	-13/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of calling lv_obj_align after each button click, the labels have their auto_realign property set.