aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/DisplayApp.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \
| * | | | | | 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 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
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-151-2/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | 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
* | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-141-0/+1
|\| | | | | | |
| * | | | | | | Improve metronomeRiku Isokoski2021-08-141-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-031-37/+49
|\| | | | | |
| * | | | | | 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
* | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-07-231-1/+6
|\| | | | | | |
| * | | | | | | Make firmware updating more foolproof (#469)Riku Isokoski2021-07-221-1/+6
| | |_|_|/ / / | |/| | | | |
* / | | | | | Refresh reworkRiku Isokoski2021-07-191-1/+1
|/ / / / / /
* | / / / / Set correct refresh times for lvgl (#488)Riku Isokoski2021-07-141-3/+5
| |/ / / / |/| | | |
* | | | | 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
* | | Fix build issues since Metronome app has been merged.Jean-François Milants2021-06-121-1/+1
* | | add basic metronome app (#409)Bryton Hall2021-06-121-2/+6
* | | Changed the namespace of SystemInfo::sortById to avoid a name conflict (#360)Avamander2021-06-121-2/+0
* | | Move most of the code from the constructor of the objects statically initiali...Jean-François Milants2021-06-121-2/+4
* | | Minor improvements: use std::make_unique when creating unique_ptr, check the ...Jean-François Milants2021-06-101-6/+15
* | | Fix stack corruption when exiting an app (the app was destroyed while it was ...Jean-François Milants2021-06-101-1/+7
* | | Initialize SystemTask, DisplayApp and HeartRateTask as global static variable...Jean-François Milants2021-06-061-12/+20
|/ /
* | Enable various compilation flags to reduce the binary size (#401)JF0022021-06-011-1/+1
* | Timer App (#355)Florian2021-05-201-2/+16
|/
* DisplayApp : returnApp was renamed ReturnApp() (manual fix after multiple mer...Jean-François Milants2021-05-151-1/+1