InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Create Version.h in binary dir instead of src dir	Reinhold Gschweicher	2022-01-17	1	-0/+2
\| \| \| \| \|	Don't use source directory for generated files. Use the binary (build) directory instead.
*	Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into ↵	Jean-François Milants	2022-01-04	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	geekbozu-ShakeWake # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/screens/settings/Settings.cpp
\| *	Add start of settings app for senstivity.	Tim Keller	2022-01-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \|	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	-16/+58
\|\\|
\| *	Merge pull request #718 from kieranc/pts-settings	JF	2021-12-30	1	-1/+0
\| \|\ \| \| \| \| \| \|	Integrate color picker into PineTimeStyle watchface
\| \| *	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-12-09	1	-15/+52
\| \| \|\
\| \| * \	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-11-07	1	-0/+6
\| \| \|\ \
\| \| * \ \	Merge remote-tracking branch 'upstream/develop' into pts-settings	Kieran Cawthray	2021-10-18	1	-0/+3
\| \| \|\ \ \
\| \| * \| \| \|	Remove old PineTimeStyle settings app	Kieran Cawthray	2021-10-03	1	-1/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Added Blank FSService that exposes only version info	Tim Keller	2021-12-10	1	-0/+3
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Added QCBOR to pinetime-mcuboot-recovery	Avamander	2021-12-09	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Hotfix for other build targets	Avamander	2021-12-09	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Move radio button styling to a single place	Riku Isokoski	2021-12-09	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' into patch-weather	Avamander	2021-12-09	1	-0/+2
\| \|\ \ \ \
\| \| * \| \| \|	Connect and bond with a passkey	James A. Jerkins	2021-12-09	1	-0/+2
\| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit adds the following: Passkey pairing - passkey is displayed on watch Swipe down to clear passkey screen Connection encryption Connection bonding Automatic reconnects to a bonded peripheral Trusted device on Android Note that persisting the bond between reboots is NOT included in this commit. Therefore, rebooting the watch will cause reconnect failures. You must delete the bond from the phone to reconnect/pair.
\| * \| \| \|	Removed unnecessary change in CMakeLists	Avamander	2021-12-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Improved debug UI.	Avamander	2021-12-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Improved error handling and fixed incompatibility with co.nstant.in:cbor library	Avamander	2021-12-04	1	-5/+5
\| \| \| \| \|
\| * \| \| \|	Fixed recovery build	Avamander	2021-12-04	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Few formatting fixes	Avamander	2021-12-04	1	-6/+6
\| \| \| \| \|
\| * \| \| \|	Brace style and whitespace fixes	Avamander	2021-12-04	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Fixed a few bugs, enabled UsefulBuf library optimizations	Avamander	2021-12-04	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Tidied up and added Weather to CMakeLists.txt	Avamander	2021-12-04	1	-0/+6
\| \| \| \| \|
\| * \| \| \|	Added QCBOR dependency	Avamander	2021-12-04	1	-2/+28
\| \|/ / /
\| * \| \|	Newer buttonhandler	Riku Isokoski	2021-10-25	1	-0/+3
\| \| \| \|
* \| \| \|	Chimes option	SteveAmor	2021-11-07	1	-0/+1
\|/ / /
* \| /	Add MotionService : expose step count and RAW X/Y/Z values to the host.	Jean-François Milants	2021-10-17	1	-0/+3
\| \|/ \|/\|
* \|	Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime ↵	Jean-François Milants	2021-10-10	1	-0/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into Riksu9000-update_touch_driver # Conflicts: # src/displayapp/Apps.h
\| * \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-18	1	-0/+5
\| \|\\|
\| * \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-14	1	-4/+11
\| \|\ \
\| * \ \	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-08-28	1	-6/+10
\| \|\ \ \
\| * \| \| \|	Automatic error detection	Riku Isokoski	2021-08-18	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge with develop and fix conflicts from timaios:set-datetime-manually.	Jean-François Milants	2021-10-10	1	-0/+2
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Merge branch 'JF002:develop' into set-datetime-manually	Tim	2021-08-08	1	-4/+25
\| \|\\| \| \|
\| * \| \| \|	Include new screens in CMakeLists.txt	timaios	2021-07-09	1	-0/+2
\| \| \| \| \|
* \| \| \| \|	resolve conflict in src/systemtask/Messages.h	Mark Russell	2021-09-16	1	-4/+8
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime ↵	Jean-François Milants	2021-09-13	1	-4/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into evergreen22-refactor_adv # Conflicts: # src/components/ble/NimbleController.cpp
\| \| * \| \| \|	WIP Refactor ble advertising	James A. Jerkins	2021-08-29	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor ble advertising based on ble standards and conventions. Changes are based on the bleprph example code, bluetooth docs, and nimble docs.
\| * \| \| \| \|	Merge branch 'develop' into pinmap	hubmartin	2021-08-29	1	-0/+7
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge branch 'develop' into pinmap	hubmartin	2021-08-22	1	-6/+6
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	DRAFT: Put gpio pins to separate file	hubmartin	2021-08-02	1	-0/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Revert "Merge upstream"	Mark Russell	2021-09-16	1	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
* \| \| \| \| \|	Merge upstream	Mark Russell	2021-09-16	1	-4/+8
\| \| \| \| \| \|
* \| \| \| \| \|	Created basic alarm app	Mark Russell	2021-09-10	1	-0/+5
\| \|_\|/ / / \|/\| \| \| \|
* \| \| \| \|	Settings : use enums instead of ints to store colors. Group all PTS settings ↵	Jean-François Milants	2021-08-28	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|	Add color picker for PineTimeStyle watchface
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-19	1	-6/+6
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-12	1	-4/+25
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	PineTimeStyle color picker initial commit	Kieran Cawthray	2021-06-24	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	Add step count gauge - replaces heartrate in sidebar	Kieran Cawthray	2021-06-20	1	-0/+2
\| \| \| \| \|