InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\|
*	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
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle	Kieran Cawthray	2021-06-16	1	-4/+4
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle	Kieran Cawthray	2021-06-04	1	-39/+41
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle	Kieran Cawthray	2021-05-21	1	-0/+5
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix it again..	Kieran Cawthray	2021-05-18	1	-0/+2
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Revert "Reset"	Kieran Cawthray	2021-05-18	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 378fa6b4016b65e2d7b128fdc3ce89c4ca779a4d.
\| * \| \| \| \| \| \|	Reset	Kieran Cawthray	2021-05-18	1	-3/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-08-18	1	-6/+6
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add memory print usage	hubmartin	2021-08-18	1	-6/+6
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
* / \| \| \| \| \|	New touch handler, with issues	Riku Isokoski	2021-07-15	1	-0/+4
\|/ / / / / /
* \| \| \| \| /	Using littlefs (#438)	joaquim.org	2021-07-11	1	-4/+25
\| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add submodule littlefs * base fs * Save settings using littlefs * Small fixes and suggestions from PR * More small fixes from PR suggestions * Code clean up * Change SpiNorFlash functions to be private in FS
* \| \| \| \|	Add PineTimeStyle watchface (#334)	kieranc	2021-06-29	1	-0/+4
\| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* PineTimeStyle * Move GPL license header * Add step count gauge - replaces heartrate in sidebar * Enable 12/24h functionality * Set step gauge outer to be white when step goal is reached * Add font source file * Move static needle_colors array to member variable * Add documentation on generating a font * Replace .ttf with Google version, add link to font page Co-authored-by: JF002 <JF002@users.noreply.github.com>
* \| \| \|	Remove infinitime-nb.c from source list	Jonathan Vander Mey	2021-06-12	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Was causing compiler warning for unused constant variable when being compiled. This feel is directly included where it's needed so it doesn't need to be separately compiled anyways.
* \| \| \|	add basic metronome app (#409)	Bryton Hall	2021-06-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add basic metronome app * add bpb, tap to bpm, update widgets * use event pressed for bpm tap * move case statement break to the right place * narrow bpm selection range, override touch events * fix arc knob style * re-enable sleeping in destructor
* \| \| \|	Initialize SystemTask, DisplayApp and HeartRateTask as global static ↵	Jean-François Milants	2021-06-06	1	-2/+2
\| \|_\|/ \|/\| \| \| \| \| \| \| \|	variable instead of variables on the heap. We don't need them on the heap as we know their size at build time, it'll reduce memory fragmentation and it'll make memory analysis easier.