InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-10-05	1	-3/+5
\|\
\| *	Merge pull request #664 from Riksu9000/disable_notif_only	JF002	2021-09-23	1	-3/+5
\| \|\ \| \| \| \| \| \|	Toggle notifications only, keep vibrations.
\| \| *	Merge branch 'develop' into disable_notif_only	Riku Isokoski	2021-09-14	1	-2/+3
\| \| \|\
\| \| * \	Merge branch 'develop' into disable_notif_only	Riku Isokoski	2021-09-13	1	-25/+32
\| \| \|\ \
\| \| * \| \|	Toggle notifications only, keep vibrations.	Riku Isokoski	2021-09-12	1	-3/+5
\| \| \| \| \|
* \| \| \| \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-18	1	-0/+14
\|\\| \| \| \|
\| * \| \| \|	Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime ↵	Jean-François Milants	2021-09-18	1	-0/+1
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into geekbozu-PersistantStorage # Conflicts: # src/systemtask/SystemTask.cpp
\| \| * \| \| \|	Move Backup to the system task.	Tim Keller	2021-08-19	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	resolve conflict in src/systemtask/Messages.h	Mark Russell	2021-09-16	1	-27/+35
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Revert "Merge upstream"	Mark Russell	2021-09-16	1	-35/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
\| * \| \| \| \|	Merge upstream	Mark Russell	2021-09-16	1	-27/+35
\| \| \| \| \| \|
\| * \| \| \| \|	Fixes per Riksu9000's feedback	Mark Russell	2021-09-16	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixes based on code reviews (formatting, UI code)	Mark Russell	2021-09-13	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Created basic alarm app	Mark Russell	2021-09-10	1	-0/+14
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-09-14	1	-33/+43
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime ↵	Jean-François Milants	2021-09-13	1	-2/+3
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into evergreen22-refactor_adv # Conflicts: # src/components/ble/NimbleController.cpp
\| \| * \| \|	Advertise fast for at least 30 secs then slow down	James A. Jerkins	2021-09-05	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	On power up, advertise aggressively for at least 30 seconds then switch to a longer interval to conserve battery life. This fast/slow pattern is designed to balance connection response time and battery life. When a disconnect event is received restart the fast/slow pattern. When a failed connect event is received, restart the fast/slow pattern. When the screen is activated and ble is not connected, restart the fast/slow pattern. This pattern is consistent with Apple's BLE developer standards (QA 1931).
\| \| * \| \|	WIP Refactor ble advertising	James A. Jerkins	2021-08-29	1	-2/+0
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor ble advertising based on ble standards and conventions. Changes are based on the bleprph example code, bluetooth docs, and nimble docs.
\| * \| \|	Merge pull request #549 from hubmartin/pinmap	JF002	2021-09-13	1	-9/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Put all duplicated GPIO pin definitions to a single file
\| \| * \ \	Merge branch 'develop' into pinmap	hubmartin	2021-09-13	1	-15/+20
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'develop' into pinmap	hubmartin	2021-08-29	1	-26/+22
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Merge branch 'develop' into pinmap	hubmartin	2021-08-22	1	-3/+2
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	PinMap with namespace and constexpr	hubmartin	2021-08-03	1	-9/+11
\| \| \| \| \| \|
\| * \| \| \| \|	docs: Fix a few typos (#606)	Tim Gates	2021-09-13	1	-1/+1
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* docs: Fix a few typos There are small typos in: - doc/versioning.md - src/components/ble/NimbleController.cpp - src/libs/mynewt-nimble/CODING_STANDARDS.md - src/libs/mynewt-nimble/docs/btshell/btshell_GAP.rst - src/systemtask/SystemTask.cpp Fixes: - Should read `milliseconds` rather than `miliseconds`. - Should read `unnecessary` rather than `uncesseray`. - Should read `target` rather than `tharget`. - Should read `project` rather than `projct`. - Should read `preferred` rather than `prefered`. - Should read `functioning` rather than `functionning`. - Should read `forever` rather than `forver`. - Should read `existing` rather than `exisiting`.
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into timer_battery_reading	Riku Isokoski	2021-08-30	1	-6/+8
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Fix wake on tap/double tap.	Jean-François Milants	2021-08-28	1	-6/+8
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-28	1	-20/+14
\| \|\\| \| \|
\| * \| \| \|	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-14	1	-3/+2
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Make battery reading periodic. Add events. Disable pullup	Riku Isokoski	2021-08-14	1	-15/+20
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-08-28	1	-20/+14
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Fix touchinfo typo in SystemTask.	Jean-François Milants	2021-08-28	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime ↵	Jean-François Milants	2021-08-28	1	-16/+5
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into Riksu9000-twimaster_rework # Conflicts: # src/systemtask/SystemTask.cpp
\| \| * \| \|	Only enable the bus when needed	Riku Isokoski	2021-08-10	1	-9/+0
\| \| \|/ /
\| * \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-08-18	1	-3/+2
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Make diff smaller and revert some changes in DisplayApp	Riku Isokoski	2021-08-10	1	-0/+1
\| \| \| \|
\| * \| \|	Rework TouchHandler into not a task	Riku Isokoski	2021-08-10	1	-3/+5
\| \| \| \|
\| * \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-07-25	1	-9/+32
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge branch 'develop' into new_touch_handler	Riku Isokoski	2021-07-23	1	-3/+8
\| \|\ \ \
\| * \| \| \|	Update	Riku Isokoski	2021-07-18	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Fix touch wakeup and code cleanup	Riku Isokoski	2021-07-16	1	-19/+19
\| \| \| \| \|
\| * \| \| \|	Fix most issues	Riku Isokoski	2021-07-16	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	New touch handler, with issues	Riku Isokoski	2021-07-15	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Automatic error detection	Riku Isokoski	2021-08-18	1	-2/+7
\| \| \| \| \|
* \| \| \| \|	Merge branch 'develop' into update_touch_driver	Riku Isokoski	2021-08-17	1	-17/+44
\|\ \ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Remove leftover	Riku Isokoski	2021-08-01	1	-5/+0
\| \| \| \| \|
\| * \| \| \|	Improvements	Riku Isokoski	2021-08-01	1	-4/+5
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' into HEAD	Riku Isokoski	2021-08-01	1	-66/+144
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Dim screen before sleep (#464)	Riku Isokoski	2021-07-24	1	-11/+34
\| \| \| \|/ \| \| \|/\| \| \| \| \|	* Implement dimming
\| \| * \|	Make firmware updating more foolproof (#469)	Riku Isokoski	2021-07-22	1	-3/+8
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Make firmware updating more foolproof and fix bugs * No need to manually handle overflow * Make startTime TickType_t * Don't process TouchEvents::None * Fix sleep getting re-enabled issue more directly
\| * \|	cleaned up the code and reduced the size of the diff by removing things like ↵	Florian Kraupa	2021-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	additional whitespaces