aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-189-2/+332
|\
| * Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants2021-09-182-0/+3
| * resolve conflict in src/systemtask/Messages.hMark Russell2021-09-168-33/+23
| |\
| * | Revert "Merge upstream"Mark Russell2021-09-168-23/+33
| * | Merge upstreamMark Russell2021-09-168-33/+23
| * | Fixes per Riksu9000's feedbackMark Russell2021-09-162-15/+19
| * | License header fix, add missing bracesMark Russell2021-09-132-2/+10
| * | Fixes based on code reviews (formatting, UI code)Mark Russell2021-09-132-52/+92
| * | Created basic alarm appMark Russell2021-09-107-2/+277
* | | Fix Error screen and optimize GetTouchInfoRiku Isokoski2021-09-152-5/+0
* | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-1480-334/+653
|\ \ \ | | |/ | |/|
| * | Fix DisplayAppRecovery : fix include error by forward declaring Controllers i...Jean-François Milants2021-09-132-13/+20
| * | Merge pull request #602 from Riksu9000/del_unusedJF0022021-09-123-12/+1
| |\ \
| | * | Remove unused variablesRiku Isokoski2021-08-193-12/+1
| * | | Merge pull request #580 from Riksu9000/timer_battery_readingJF0022021-09-123-6/+0
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski2021-08-3077-304/+635
| | |\ \ \
| | * \ \ \ Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-2825-216/+182
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-146-152/+116
| | |\ \ \ \ \
| | * | | | | | Make battery reading periodic. Add events. Disable pullupRiku Isokoski2021-08-143-7/+0
| * | | | | | | 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
| | |_|_|/ / | |/| | | |
| * | | | | Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants2021-08-286-96/+116
| * | | | | Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0022021-08-288-17/+432
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-191-1/+1
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-1515-268/+230
| | |\ \ \ \ \
| | * | | | | | 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-129-143/+54
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-2825-182/+221
| | |\ \ \ \ \ \
| | * | | | | | | Increment settings value, remove old hacky fixKieran Cawthray2021-07-251-20/+8
| | * | | | | | | 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-233-9/+40
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-2015-105/+73
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-1220-390/+264
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | 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-293-4/+52
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | 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-256-198/+211
| | |\ \ \ \ \ \ \ \ \ \ \