aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into pinmaphubmartin2021-09-1313-53/+45
|\
| * Merge pull request #617 from ColinKinloch/wake_up_mode_setting_changeJF0022021-09-121-1/+1
| |\
| | * Correct change test for wake up mode settingColin Kinloch2021-08-261-1/+1
| * | Merge pull request #602 from Riksu9000/del_unusedJF0022021-09-124-18/+2
| |\ \
| | * | Remove unused variablesRiku Isokoski2021-08-194-18/+2
| | |/
| * | Merge pull request #580 from Riksu9000/timer_battery_readingJF0022021-09-128-31/+38
| |\ \
| | * \ Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski2021-08-3080-313/+686
| | |\ \
| | * \ \ Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-2835-350/+406
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-1410-165/+167
| | |\ \ \ \
| | * | | | | Make battery reading periodic. Add events. Disable pullupRiku Isokoski2021-08-148-32/+38
| * | | | | | Update Settings.cppItai Nelken2021-09-021-2/+2
| * | | | | | Fix notifications that wouldn't auto close when the timeout elapsed (in previ...Jean-François Milants2021-08-311-1/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'develop' into pinmaphubmartin2021-08-2994-539/+968
|\| | | | |
| * | | | | Fix wake on tap/double tap.Jean-François Milants2021-08-281-6/+8
| * | | | | Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants2021-08-288-116/+144
| * | | | | Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0022021-08-2810-18/+465
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-192-7/+7
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-1519-281/+281
| | |\ \ \ \ \
| | * | | | | | Fix potential edge case of sidebar being set blackKieran Cawthray2021-08-151-1/+1
| | * | | | | | More tidying following reviewKieran Cawthray2021-08-151-85/+88
| | * | | | | | Avoid setting the sidebar blackKieran Cawthray2021-08-151-0/+4
| | * | | | | | Remove duplicate code, minor fixesKieran Cawthray2021-08-151-33/+19
| | * | | | | | Add check for randomise button in case colors clashKieran Cawthray2021-08-151-0/+5
| | * | | | | | Add randomise button to color pickerKieran Cawthray2021-08-152-0/+22
| | * | | | | | TidyingKieran Cawthray2021-08-121-1/+0
| | * | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-1212-210/+80
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-2828-196/+260
| | |\ \ \ \ \ \
| | * | | | | | | Increment settings value, remove old hacky fixKieran Cawthray2021-07-252-21/+9
| | * | | | | | | Add extra screen in settings to show scrollbar correctlyKieran Cawthray2021-07-241-3/+3
| | * | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-235-17/+52
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-2027-158/+156
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-1234-602/+714
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix bad mergeKieran Cawthray2021-06-291-27/+0
| | * | | | | | | | | | Replace font fileKieran Cawthray2021-06-291-0/+0
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-06-298-19/+95
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Add reset button, reduce button opacityKieran Cawthray2021-06-272-12/+37
| | * | | | | | | | | | | Fix the fix, whoopsKieran Cawthray2021-06-251-7/+7
| | * | | | | | | | | | | Add a check to set default colors if all colors are whiteKieran Cawthray2021-06-251-0/+7
| | * | | | | | | | | | | Make it loop around when you get to the end of the list of colorsKieran Cawthray2021-06-251-0/+28
| | * | | | | | | | | | | Fix off-by-one error, reduce step gauge needle widthKieran Cawthray2021-06-252-5/+5
| | * | | | | | | | | | | Use colors from settings for PineTimeStyle watchfaceKieran Cawthray2021-06-252-5/+10
| | * | | | | | | | | | | Move array to member variable, retrieve colors from settings for displayKieran Cawthray2021-06-252-13/+10
| | * | | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-06-257-199/+213
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | PineTimeStyle color picker tidyingKieran Cawthray2021-06-242-56/+5
| | * | | | | | | | | | | | PineTimeStyle color picker add settings integrationKieran Cawthray2021-06-242-45/+84
| | * | | | | | | | | | | | PineTimeStyle color picker initial commitKieran Cawthray2021-06-247-2/+385
| | * | | | | | | | | | | | Move static needle_colors array to member variableKieran Cawthray2021-06-232-1/+1
| | * | | | | | | | | | | | Add font source fileKieran Cawthray2021-06-221-0/+0
| | * | | | | | | | | | | | Set step gauge outer to be white when step goal is reachedKieran Cawthray2021-06-211-2/+6
| | * | | | | | | | | | | | Enable 12/24h functionalityKieran Cawthray2021-06-202-1/+30