summaryrefslogtreecommitdiff
path: root/src/displayapp/DisplayApp.cpp
AgeCommit message (Expand)Author
2022-01-04Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekb...Jean-François Milants
2022-01-04Better Sensitivity UI, Calibration button addedTim Keller
2022-01-04Add start of settings app for senstivity.Tim Keller
2022-01-02resolve conflictsSteveAmor
2022-01-02resolves conflictsSteveAmor
2022-01-02resolves conflictsSteveAmor
2021-12-30Merge pull request #718 from kieranc/pts-settingsJF
2021-12-12FIX: AlarmTriggered fall through to ShowPairingKeyJames A. Jerkins
2021-12-09Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray
2021-12-09Style improvementsAvamander
2021-12-09Fix for passkey screen scrambleJames A. Jerkins
2021-12-09Connect and bond with a passkeyJames A. Jerkins
2021-12-05Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray
2021-12-02Merge branch 'paint-colorchange-vibration' of git://github.com/clemensvonmolo...Jean-François Milants
2021-11-28Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTi...Jean-François Milants
2021-11-15Update includes to to be relative to src directoryReinhold Gschweicher
2021-11-13Close menu with buttonRiku Isokoski
2021-11-10Fix animation when long pressing on screens adjacent to watch faceRiku Isokoski
2021-11-07Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray
2021-11-07Chimes optionSteveAmor
2021-11-01color rotation using modulo, ran clang-format for InfiniPaintClemens von Molo
2021-10-31InfiniPaint vibrate on colorchange, fix color rotationClemens von Molo
2021-10-25Newer buttonhandlerRiku Isokoski
2021-10-23Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray
2021-10-23Merge pull request #740 from Riksu9000/flashlight_brightnessJF
2021-10-18Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray
2021-10-13Flashlight brightness controlRiku Isokoski
2021-10-10Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime i...Jean-François Milants
2021-10-10Merge with develop and fix conflicts from timaios:set-datetime-manually.Jean-François Milants
2021-10-05Merge branch 'develop' into update_touch_driverRiku Isokoski
2021-10-03Remove old PineTimeStyle settings appKieran Cawthray
2021-10-03Merge pull request #623 from Riksu9000/lvgl_queuetimeoutJF
2021-09-18Merge branch 'develop' into update_touch_driverRiku Isokoski
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell
2021-09-16Revert "Merge upstream"Mark Russell
2021-09-16Merge upstreamMark Russell
2021-09-14Merge branch 'develop' into update_touch_driverRiku Isokoski
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF002
2021-09-10Created basic alarm appMark Russell
2021-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski
2021-08-29Let lvgl control queueTimeoutRiku Isokoski
2021-08-28Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF002
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski
2021-08-28Merge branch 'develop' into update_touch_driverRiku Isokoski
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski
2021-08-19Remove unused variablesRiku Isokoski
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski
2021-08-18Automatic error detectionRiku Isokoski
2021-08-17Fix after mergeRiku Isokoski
2021-08-17Merge branch 'develop' into update_touch_driverRiku Isokoski