summaryrefslogtreecommitdiff
path: root/src/displayapp/DisplayApp.cpp
AgeCommit message (Collapse)Author
2021-11-28Merge branch 'restructure_includes' of ↵Jean-François Milants
https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes # Conflicts: # doc/contribute.md # src/displayapp/screens/BatteryInfo.h
2021-11-15Update includes to to be relative to src directoryReinhold Gschweicher
Don't use relative imports like `../foo.h` as those depend on the relative position of both files. Rather than that use imports relative to the `src` directory, which explicitly is part of the include directories.
2021-11-10Fix animation when long pressing on screens adjacent to watch faceRiku Isokoski
2021-10-25Newer buttonhandlerRiku Isokoski
2021-10-23Merge pull request #740 from Riksu9000/flashlight_brightnessJF
Flashlight brightness control
2021-10-13Flashlight brightness controlRiku Isokoski
2021-10-10Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime ↵Jean-François Milants
into Riksu9000-update_touch_driver # Conflicts: # src/displayapp/Apps.h
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-03Merge pull request #623 from Riksu9000/lvgl_queuetimeoutJF
Let LVGL control queueTimeout
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
This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
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
Remove unused variables
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
Add color picker for PineTimeStyle watchface
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
2021-08-15Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray
2021-08-15Merge branch 'develop' into refresh_reworkRiku Isokoski
2021-08-14Merge branch 'develop' into timer_battery_readingRiku Isokoski
2021-08-14Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime ↵Jean-François Milants
into Riksu9000-call-improvements # Conflicts: # src/displayapp/screens/Metronome.cpp
2021-08-14Merge branch 'develop' into refresh_reworkRiku Isokoski
2021-08-14Improve metronomeRiku Isokoski
2021-08-14Make battery reading periodic. Add events. Disable pullupRiku Isokoski
2021-08-10Make diff smaller and revert some changes in DisplayAppRiku Isokoski
2021-08-08Merge branch 'JF002:develop' into set-datetime-manuallyTim
2021-08-03Merge branch 'develop' into refresh_reworkRiku Isokoski
2021-08-01FixesRiku Isokoski
2021-08-01ImprovementsRiku Isokoski
2021-08-01Merge branch 'develop' into HEADRiku Isokoski
2021-07-28Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray
2021-07-25Merge branch 'develop' into new_touch_handlerRiku Isokoski
2021-07-25Code cleanup (#466)Riku Isokoski
* Code cleanup * Remove override again
2021-07-24Dim screen before sleep (#464)Riku Isokoski
* Implement dimming
2021-07-24Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime ↵Jean-François Milants
into Riksu9000-fix_touchevent_tap # Conflicts: # src/displayapp/DisplayApp.cpp
2021-07-23Merge branch 'develop' into refresh_reworkRiku Isokoski
2021-07-23Merge branch 'develop' into new_touch_handlerRiku Isokoski
2021-07-23Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray
2021-07-22Make firmware updating more foolproof (#469)Riku Isokoski
* Make firmware updating more foolproof and fix bugs * No need to manually handle overflow * Make startTime TickType_t * Don't process TouchEvents::None * Fix sleep getting re-enabled issue more directly
generated by cgit v0.10.2 at 2026-01-10 11:05:15 (GMT)