aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/DisplayApp.cpp
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-11-071-0/+14
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-10-231-1/+1
| | |\ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-10-181-4/+25
| | |\ \ \ \ \
| | * | | | | | Remove old PineTimeStyle settings appKieran Cawthray2021-10-031-5/+0
| * | | | | | | FIX: AlarmTriggered fall through to ShowPairingKeyJames A. Jerkins2021-12-111-0/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Style improvementsAvamander2021-12-091-1/+2
| * | | | | | Fix for passkey screen scrambleJames A. Jerkins2021-12-091-3/+3
| * | | | | | Connect and bond with a passkeyJames A. Jerkins2021-12-091-0/+9
| | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'paint-colorchange-vibration' of git://github.com/clemensvonmolo...Jean-François Milants2021-12-021-1/+1
| |\ \ \ \ \
| | * | | | | color rotation using modulo, ran clang-format for InfiniPaintClemens von Molo2021-11-011-1/+1
| | * | | | | InfiniPaint vibrate on colorchange, fix color rotationClemens von Molo2021-10-311-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTi...Jean-François Milants2021-11-281-5/+5
| |\ \ \ \ \
| | * | | | | Update includes to to be relative to src directoryReinhold Gschweicher2021-11-151-5/+5
| | | |_|_|/ | | |/| | |
| * / | | | Fix animation when long pressing on screens adjacent to watch faceRiku Isokoski2021-11-101-1/+7
| |/ / / /
| * / / / Newer buttonhandlerRiku Isokoski2021-10-251-0/+14
| |/ / /
* | | | resolves conflictsSteveAmor2022-01-021-5/+0
* | | | Chimes optionSteveAmor2021-11-071-0/+8
|/ / /
* | | Merge pull request #740 from Riksu9000/flashlight_brightnessJF2021-10-231-1/+1
|\ \ \ | |_|/ |/| |
| * | Flashlight brightness controlRiku Isokoski2021-10-131-1/+1
* | | Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime i...Jean-François Milants2021-10-101-4/+15
|\ \ \ | |/ / |/| |
| * | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-10-051-20/+4
| |\|
| * | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-181-0/+13
| |\ \
| * \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-141-7/+6
| |\ \ \
| * \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-281-41/+29
| |\ \ \ \
| * | | | | Automatic error detectionRiku Isokoski2021-08-181-3/+14
| * | | | | Fix after mergeRiku Isokoski2021-08-171-1/+1
| * | | | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-171-40/+58
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-07-151-3/+5
| |\ \ \ \ \ \
| * | | | | | | Update touchpad driverRiku Isokoski2021-07-141-2/+2
* | | | | | | | Merge with develop and fix conflicts from timaios:set-datetime-manually.Jean-François Milants2021-10-101-0/+10
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Merge branch 'JF002:develop' into set-datetime-manuallyTim2021-08-081-40/+66
| |\ \ \ \ \ \ \
| * | | | | | | | Added new screens to DisplayApp.cpptimaios2021-07-091-0/+10
* | | | | | | | | Merge pull request #623 from Riksu9000/lvgl_queuetimeoutJF2021-10-031-20/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Let lvgl control queueTimeoutRiku Isokoski2021-08-291-20/+4
* | | | | | | | | resolve conflict in src/systemtask/Messages.hMark Russell2021-09-161-6/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #602 from Riksu9000/del_unusedJF0022021-09-121-3/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove unused variablesRiku Isokoski2021-08-191-3/+0
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski2021-08-301-1/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-281-41/+29
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-141-2/+3
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Make battery reading periodic. Add events. Disable pullupRiku Isokoski2021-08-141-3/+0
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Revert "Merge upstream"Mark Russell2021-09-161-0/+6
* | | | | | | | Merge upstreamMark Russell2021-09-161-6/+0
* | | | | | | | Created basic alarm appMark Russell2021-09-101-0/+13
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0022021-08-281-0/+5
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-151-2/+3
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-281-37/+49
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-231-1/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-201-2/+11
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-121-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |