InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Watch face selection with CMake	Jean-François Milants	2023-12-23	1	-1/+1
\| \| \| \|	Move displayapp/Apps.h into a header only library (to make the integration easier in InfiniSim.
*	screens: Remove displayapp parameter from screen	Riku Isokoski	2023-02-25	1	-1/+1
\| \| \| \| \| \| \| \|	The DisplayApp class isn't used in the Screen base class and most screens, so requiring it is pointless. In this commit, DisplayApp pointers were added to screens which use it and the explicit Screen constructor was removed in those screens.
*	Automatically create screens for applist and settings (#1153)	Riku Isokoski	2022-06-16	1	-63/+20
\| \| \| \| \|	Apps and settings are now stored in a single array (two arrays in total). Replace magic values with appsPerScreen and entriesPerScreen.
*	Apply clang-format to all C++ files	Finlay Davidson	2022-06-05	1	-15/+17
\|
*	Replace airplane mode with a bluetooth toggle	Riku Isokoski	2022-04-02	1	-1/+1
\|
*	Replace Airplane mode icon	avery	2022-03-03	1	-1/+1
\|
*	Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime ↵	Jean-François Milants	2022-02-20	1	-11/+26
\| \| \| \| \| \| \| \| \| \| \| \| \|	into evergreen22-airplane-mode Apply a few changes that were requested in the PR during the review. # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/Messages.h # src/displayapp/screens/settings/Settings.cpp
*	Update shakewake menu option	Riku Isokoski	2022-01-06	1	-1/+1
\|
*	Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into ↵	Jean-François Milants	2022-01-04	1	-9/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+3
\| \| \| \| \| \| \| \|	window twice.
\| *	Remove "fancy" settings display and always show ShakeWakeThresholdSetting	Tim Keller	2022-01-04	1	-14/+10
\| \|
\| *	Actually save the threshold	Tim Keller	2022-01-04	1	-1/+1
\| \| \| \| \| \| \| \|	Prevent a few crashes due to an LV task being active when it shouldnt be.
\| *	Add start of settings app for senstivity.	Tim Keller	2022-01-04	1	-1/+3
\| \| \| \| \| \| \| \| \| \|	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.
* \|	resolves conflicts	SteveAmor	2022-01-02	1	-1/+2
\|\\|
\| *	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-12-05	1	-1/+1
\| \|\
\| \| *	Update includes to to be relative to src directory	Reinhold Gschweicher	2021-11-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| * \|	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	1	-0/+12
\| \|\\|
\| * \|	Remove old PineTimeStyle settings app	Kieran Cawthray	2021-10-03	1	-18/+3
\| \| \|
* \| \|	resolves conflicts	SteveAmor	2022-01-02	1	-1/+1
\| \| \|
* \| \|	Chimes option	SteveAmor	2021-11-07	1	-1/+1
\| \|/ \|/\|
* \|	Merge with develop and fix conflicts from timaios:set-datetime-manually.	Jean-François Milants	2021-10-10	1	-5/+5
\|\ \ \| \|/ \|/\|
\| *	Merge branch 'JF002:develop' into set-datetime-manually	Tim	2021-08-08	1	-2/+2
\| \|\
\| * \|	Modified Settings menu as per suggestion	Tim Taenny	2021-07-09	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved "Set date" and "Set time" to the second page of the Settings menu.
\| * \|	Added new menu entries to Settings page	timaios	2021-07-09	1	-2/+15
\| \| \|
* \| \|	Update Settings.cpp	Itai Nelken	2021-09-02	1	-2/+2
\| \| \|
* \| \|	Merge pull request #458 from kieranc/pinetimestyle-colorpicker	JF002	2021-08-28	1	-2/+17
\|\ \ \ \| \| \| \| \| \| \| \|	Add color picker for PineTimeStyle watchface
\| * \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-28	1	-2/+2
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Add extra screen in settings to show scrollbar correctly	Kieran Cawthray	2021-07-24	1	-3/+3
\| \| \| \|
\| * \| \|	PineTimeStyle color picker initial commit	Kieran Cawthray	2021-06-24	1	-0/+15
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'develop' into refresh_rework	Riku Isokoski	2021-08-03	1	-2/+2
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Add new unique icons for some apps	Riku Isokoski	2021-07-25	1	-2/+2
\| \|/
* /	Refresh rework	Riku Isokoski	2021-07-19	1	-7/+0
\|/
*	Minor improvements: use std::make_unique when creating unique_ptr, check the ↵	Jean-François Milants	2021-06-10	1	-2/+2
\| \| \| \|	code is running from an IRQ before calling xQueueSendFromISR or xQueueSend)
*	Merge branch 'develop' of	Joaquim	2021-04-26	1	-34/+27
\|\ \| \| \| \| \| \|	https://github.com/JF002/InfiniTime into StepsApp
\| *	Reformatted all the files according to clang-format style	Avamander	2021-04-24	1	-30/+27
\| \|
* \|	New Steps app	Joaquim	2021-04-19	1	-1/+1
\|/ \| \| \| \| \|	Settings to set the steps goal More detail in Motion app New 42px Font
*	Big UI and navigation Rewrite	Joaquim	2021-04-04	1	-0/+69
	new navigation add some color to the apps redesign menus new settings menu new quick settings code clean up size reduction by converting navigation images to font and more...