aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/DisplayApp.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-141-7/+6
|\
| * 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 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
| | | |\ \ \ \ \
| | | * | | | | | PineTimeStyle color picker initial commitKieran Cawthray2021-06-241-0/+5
| | * | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-281-41/+29
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-151-2/+2
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-141-0/+1
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-031-37/+49
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-07-231-1/+6
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | Refresh reworkRiku Isokoski2021-07-191-1/+1
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | 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
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-281-41/+29
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-08-181-2/+2
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Make diff smaller and revert some changes in DisplayAppRiku Isokoski2021-08-101-57/+60
| * | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-07-251-6/+17
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-07-231-0/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Fix remaining known issuesRiku Isokoski2021-07-161-1/+3
| * | | | | | | | Fix most issuesRiku Isokoski2021-07-161-9/+2
| * | | | | | | | New touch handler, with issuesRiku Isokoski2021-07-151-64/+60
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | 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 'call-improvements' of https://github.com/Riksu9000/InfiniTime i...Jean-François Milants2021-08-141-2/+2
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | FixesRiku Isokoski2021-08-011-2/+2
| | * | | | | | ImprovementsRiku Isokoski2021-08-011-2/+2
| | * | | | | | Merge branch 'develop' into HEADRiku Isokoski2021-08-011-63/+130
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | implemented continuous vibration pattern for incoming callsFlorian Kraupa2021-05-161-2/+2
| * | | | | | | Improve metronomeRiku Isokoski2021-08-141-0/+1
| | |/ / / / / | |/| | | | |
| * | | | | | Code cleanup (#466)Riku Isokoski2021-07-251-6/+6
| * | | | | | Dim screen before sleep (#464)Riku Isokoski2021-07-241-1/+12
| * | | | | | Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime in...Jean-François Milants2021-07-241-30/+31
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Merge branch 'develop' into fix_touchevent_tapRiku Isokoski2021-07-141-29/+63
| | |\ \ \ \ \
| | * | | | | | Fix regressionRiku Isokoski2021-06-111-1/+3
| | * | | | | | Fix touchevent tapRiku Isokoski2021-06-111-6/+5
| * | | | | | | Make firmware updating more foolproof (#469)Riku Isokoski2021-07-221-1/+6
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-07-151-3/+5
|\| | | | | |
| * | | | | | Set correct refresh times for lvgl (#488)Riku Isokoski2021-07-141-3/+5
| | |/ / / / | |/| | | |
* / | | | | Update touchpad driverRiku Isokoski2021-07-141-2/+2
|/ / / / /
* | | | / Adjust displayapp delay to compensate time spent (#482)Riku Isokoski2021-07-131-2/+9
| |_|_|/ |/| | |
* | | | Improve stopwatch (#432)Riku Isokoski2021-07-041-1/+1
| |_|/ |/| |
* | | Add support for BMA425 acceleration sensor. (#440)JF0022021-06-191-1/+1