aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp
Commit message (Expand)AuthorAgeFilesLines
* Replaced "JF002" in github URLs with "InfiniTimeOrg"mabuch2021-10-152-2/+3
* Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime i...Jean-François Milants2021-10-107-10/+103
|\
| * Merge branch 'develop' into update_touch_driverRiku Isokoski2021-10-0512-54/+67
| |\
| * \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-189-2/+332
| |\ \
| * | | Fix Error screen and optimize GetTouchInfoRiku Isokoski2021-09-152-5/+0
| * | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-1480-334/+653
| |\ \ \
| * \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-2820-100/+68
| |\ \ \ \
| * | | | | Automatic error detectionRiku Isokoski2021-08-185-5/+96
| * | | | | Fix after mergeRiku Isokoski2021-08-171-1/+1
| * | | | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-1742-606/+542
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-07-153-35/+38
| |\ \ \ \ \ \
| * | | | | | | Update touchpad driverRiku Isokoski2021-07-143-7/+15
* | | | | | | | Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by nu...Jean-François Milants2021-10-104-85/+61
* | | | | | | | Merge with develop and fix conflicts from timaios:set-datetime-manually.Jean-François Milants2021-10-107-6/+468
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'JF002:develop' into set-datetime-manuallyTim2021-08-0836-331/+381
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Code optimizations in SettingSetDate and SettingSetTimeTim Taenny2021-07-092-13/+7
| * | | | | | | | | Code optimizations in SettingSetTimeTim Taenny2021-07-091-9/+17
| * | | | | | | | | Modified Settings menu as per suggestionTim Taenny2021-07-091-4/+4
| * | | | | | | | | Code optimizations in SettingSetDateTim Taenny2021-07-091-41/+2
| * | | | | | | | | Code optimizations in SettingSetTimeTim Taenny2021-07-091-24/+10
| * | | | | | | | | Code optimizations in SettingSetDateTim Taenny2021-07-091-28/+12
| * | | | | | | | | Added new menu entries to Settings pagetimaios2021-07-092-3/+17
| * | | | | | | | | Added new screens to DisplayApp.cpptimaios2021-07-091-0/+10
| * | | | | | | | | Added new screens to the list of applicationstimaios2021-07-091-1/+3
| * | | | | | | | | Added new screen: SettingSetDatetimaios2021-07-092-0/+317
| * | | | | | | | | Added new screen: SettingSetTimetimaios2021-07-092-0/+212
* | | | | | | | | | Merge pull request #701 from maksalees/close-info-popup-with-back-button-in-a...JF2021-10-092-4/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Fixes based on code reviewsMaxim Leshchenko2021-09-292-8/+9
| * | | | | | | | | Alarm: Close the popup with information about the time until alarm with the b...Maxim Leshchenko2021-09-282-0/+12
* | | | | | | | | | Merge pull request #623 from Riksu9000/lvgl_queuetimeoutJF2021-10-032-23/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused variableRiku Isokoski2021-09-211-1/+0
| * | | | | | | | | | Let lvgl control queueTimeoutRiku Isokoski2021-08-292-22/+4
* | | | | | | | | | | Merge pull request #638 from Riksu9000/detect_full_chargeJF2021-10-037-22/+59
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Show plug icon while plugged inRiku Isokoski2021-09-222-4/+4
| * | | | | | | | | | Merge branch 'develop' into detect_full_chargeRiku Isokoski2021-09-2214-36/+356
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use percentage instead of IsFullRiku Isokoski2021-09-031-1/+1
| * | | | | | | | | | | Auto realign battery icon in Analog watch faceRiku Isokoski2021-09-031-0/+1
| * | | | | | | | | | | Detect full charge and improve watchface displayRiku Isokoski2021-09-037-23/+59
* | | | | | | | | | | | Merge pull request #664 from Riksu9000/disable_notif_onlyJF0022021-09-232-7/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into disable_notif_onlyRiku Isokoski2021-09-142-13/+20
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'develop' into disable_notif_onlyRiku Isokoski2021-09-135-18/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Toggle notifications only, keep vibrations.Riku Isokoski2021-09-122-7/+3
* | | | | | | | | | | | | Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metro...JF0022021-09-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix unsigned/signed comparison warning in Metronome.cppReinhold Gschweicher2021-09-161-1/+1
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants2021-09-182-0/+3
* | | | | | | | | | | | resolve conflict in src/systemtask/Messages.hMark Russell2021-09-168-33/+23
|\| | | | | | | | | | |
| * | | | | | | | | | | Fix DisplayAppRecovery : fix include error by forward declaring Controllers i...Jean-François Milants2021-09-132-13/+20
| | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #602 from Riksu9000/del_unusedJF0022021-09-123-12/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Remove unused variablesRiku Isokoski2021-08-193-12/+1
| * | | | | | | | | | | Merge pull request #580 from Riksu9000/timer_battery_readingJF0022021-09-123-6/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |