InfiniTime - My branch of InfiniTime

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'develop' into pinmap	hubmartin	2021-09-13	3	-8/+12
\|\
\| *	Merge pull request #617 from ColinKinloch/wake_up_mode_setting_change	JF002	2021-09-12	1	-1/+1
\| \|\ \| \| \| \| \| \|	Correct change test for wake up mode setting
\| \| *	Correct change test for wake up mode setting	Colin Kinloch	2021-08-26	1	-1/+1
\| \| \|
\| * \|	Merge remote-tracking branch 'upstream/develop' into timer_battery_reading	Riku Isokoski	2021-08-30	1	-3/+40
\| \|\ \
\| * \ \	Merge branch 'develop' into timer_battery_reading	Riku Isokoski	2021-08-14	2	-10/+34
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Make battery reading periodic. Add events. Disable pullup	Riku Isokoski	2021-08-14	2	-7/+11
\| \| \| \|
* \| \| \|	Merge branch 'develop' into pinmap	hubmartin	2021-08-29	1	-3/+40
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	Settings : use enums instead of ints to store colors. Group all PTS settings ↵	Jean-François Milants	2021-08-28	1	-20/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-15	2	-10/+34
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-08-12	3	-67/+26
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Increment settings value, remove old hacky fix	Kieran Cawthray	2021-07-25	1	-1/+1
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-23	1	-5/+4
\| \|\ \ \
\| * \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-20	7	-29/+60
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-07-12	8	-194/+399
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker	Kieran Cawthray	2021-06-29	1	-0/+5
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	PineTimeStyle color picker add settings integration	Kieran Cawthray	2021-06-24	1	-0/+31
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' into pinmap	hubmartin	2021-08-22	2	-10/+34
\|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime ↵	Jean-François Milants	2021-08-14	2	-10/+34
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into Riksu9000-call-improvements # Conflicts: # src/displayapp/screens/Metronome.cpp
\| \| * \| \| \| \| \|	Improvements	Riku Isokoski	2021-08-01	2	-28/+24
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'develop' into HEAD	Riku Isokoski	2021-08-01	28	-372/+665
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	cleaned up the code and reduced the size of the diff by removing things like ↵	Florian Kraupa	2021-05-16	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	additional whitespaces
\| \| * \| \| \| \| \|	implemented continuous vibration pattern for incoming calls	Florian Kraupa	2021-05-16	2	-8/+35
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop' into pinmap	hubmartin	2021-08-11	3	-67/+26
\|\\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge pull request #483 from Riksu9000/fix_adc	JF002	2021-08-10	2	-57/+16
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix misconfigured ADC and remove now unnecessary filtering
\| \| * \| \| \| \| \| \|	Remove floating point calculation	Riku Isokoski	2021-08-01	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Increase ADC precision	Riku Isokoski	2021-07-27	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'develop' into fix_adc	Riku Isokoski	2021-07-27	2	-13/+35
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|/ / / / / \| \| \| \|/\| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'develop' into fix_adc	Riku Isokoski	2021-07-13	6	-17/+28
\| \| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Fix misconfigured ADC and remove now unnecessary filtering	Riku Isokoski	2021-07-12	2	-48/+4
\| \| \| \|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and PineTimeStyle, ↵	Jean-François Milants	2021-08-10	1	-10/+10
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	inspired by PR #232 by nscooling.
* \| \| \| \| \| \| \|	Rename backlight level pins	hubmartin	2021-08-04	1	-15/+15
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Cleanup, set Pinetime as default	hubmartin	2021-08-03	2	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	PinMap with namespace and constexpr	hubmartin	2021-08-03	6	-29/+24
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	DRAFT: Put gpio pins to separate file	hubmartin	2021-08-02	1	-1/+2
\|/ / / / / / /
* \| \| \| \| \| /	Make firmware updating more foolproof (#469)	Riku Isokoski	2021-07-22	1	-5/+4
\| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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
* \| \| \| \| \|	Multiple wakeup sources (#290)	Kozova1	2021-07-14	1	-8/+31
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Allow multiple wakeup modes at the same time. This commit adds multiple wakeup modes support. It does so by storing them as a uint8_t bitfield enum. It changes the following functions: Since multiple modes can be on now, older version would not cut it: WakeUpMode getWakeupMode() -> std::bitset<3> getWakeUpModes() Where each bit corresponds to a WakeUpMode We still need a way to check whether a specific wakeup mode is on, so: bool isWakeUpModeOn(const WakeUpMode mode) This function was changed to work correctly with the new implementation. setWakeUpMode(WakeupMode mode, bool enable) Previously, systemtask would exit SystemTask::OnTouchEvent() if the wake up mode was None or RaiseWrist, to prevent waking up when a touch was received. However, after enabling using multiple WakeUpModes, this caused a bug where when RaiseWrist was checked with SingleTap or DoubleTap, the tap detection wouldn't work. This commit fixes that bug. Next commit will update the settings WakeUpMode select UI to reflect these changes. Signed-off-by: Kozova1 <mug66kk@gmail.com> * Updated UI to reflect multiple WakeUp sources being available. Signed-off-by: Kozova1 <mug66kk@gmail.com>
* \| \| \| \|	Notify battery level every 10 minutes when connected to a BLE host.	Jean-François Milants	2021-07-11	6	-21/+29
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Refactor battery percent : only use uint8_t to store the battery % remaining.
* \| \| \|	Using littlefs (#438)	joaquim.org	2021-07-11	4	-112/+314
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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
* \| \| \|	Whitespace and brace fixes (#456)	Avamander	2021-07-04	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Brace style and whitespace fixes * Additional whitespace fixes
* \| \| \|	Inititialize members in class declaration	Jonathan Vander Mey	2021-07-02	2	-22/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also added initializers for previously unintialized members.
* \| \| \|	Move local-only function into anonymous namespace	Jonathan Vander Mey	2021-07-02	1	-4/+3
\| \| \| \|
* \| \| \|	Make MusicService UUID objects static constexpr	Jonathan Vander Mey	2021-07-02	2	-22/+31
\| \| \| \|
* \| \| \|	Eliminate reinterpret_casting	Jonathan Vander Mey	2021-07-02	1	-26/+26
\| \| \| \|
* \| \| \|	Float voltage to int (#444)	Riku Isokoski	2021-07-02	2	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Change voltage float to millivolt integer * Explain the ADC to milliVolts conversion
* \| \| \|	static_cast cleanup	Avamander	2021-07-02	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	SPI flash sleep if bootloader >= 1.0.0 (#322)	Neil O'Fix	2021-06-26	1	-0/+5
\| \|/ \|/\| \| \| \| \| \| \| \| \|	* Retrieve and display bootloader version - Display bootloader version on System Info screen - Enable SPI flash sleep mode if bootloader version >= 1.0.0 * Wait for SPI flash to wakeup before starting OTA DFU
* \|	Add support for BMA425 acceleration sensor. (#440)	JF002	2021-06-19	2	-0/+21
\| \| \| \| \| \|	* Add support for BMA425 acceleration sensor.
* \|	Fix signed/unsigned comparison warning	Jonathan Vander Mey	2021-06-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Changed type of encodedBufferIndex to size_t to eliminate warning. It is fine as a size_t as its only ever compared to another size_t and used as an array index.
* \|	Merge pull request #359 from Avamander/patch-2	JF002	2021-06-12	2	-157/+95
\|\ \ \| \| \| \| \| \|	Used a macro for UUID generation, switched from C-style casts to reinterpret_cast, renamed callback
\| * \|	Updated license header year	Avamander	2021-05-17	2	-2/+2
\| \| \|