summaryrefslogtreecommitdiff
path: root/src/displayapp/DisplayApp.cpp
AgeCommit message (Collapse)AuthorFilesLines
2021-12-11FIX: AlarmTriggered fall through to ShowPairingKeyJames A. Jerkins1-0/+1
2021-12-09Style improvementsAvamander1-1/+2
2021-12-09Fix for passkey screen scrambleJames A. Jerkins1-3/+3
When a passkey is displayed, screen on or off, and another passkey is displayed the screen may become scrambled. Fix the issue by insuring the whole screen is drawn every time.
2021-12-09Connect and bond with a passkeyJames A. Jerkins1-0/+9
This commit adds the following: Passkey pairing - passkey is displayed on watch Swipe down to clear passkey screen Connection encryption Connection bonding Automatic reconnects to a bonded peripheral Trusted device on Android Note that persisting the bond between reboots is NOT included in this commit. Therefore, rebooting the watch will cause reconnect failures. You must delete the bond from the phone to reconnect/pair.
2021-12-02Merge branch 'paint-colorchange-vibration' of ↵Jean-François Milants1-1/+1
git://github.com/clemensvonmolo/InfiniTime into clemensvonmolo-paint-colorchange-vibration # Conflicts: # src/displayapp/screens/InfiniPaint.h
2021-11-28Merge branch 'restructure_includes' of ↵Jean-François Milants1-5/+5
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 Gschweicher1-5/+5
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 Isokoski1-1/+7
2021-11-01color rotation using modulo, ran clang-format for InfiniPaintClemens von Molo1-1/+1
2021-10-31InfiniPaint vibrate on colorchange, fix color rotationClemens von Molo1-1/+1
2021-10-25Newer buttonhandlerRiku Isokoski1-0/+14
2021-10-23Merge pull request #740 from Riksu9000/flashlight_brightnessJF1-1/+1
Flashlight brightness control
2021-10-13Flashlight brightness controlRiku Isokoski1-1/+1
2021-10-10Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime ↵Jean-François Milants1-4/+15
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 Milants1-0/+10
2021-10-05Merge branch 'develop' into update_touch_driverRiku Isokoski1-20/+4
2021-10-03Merge pull request #623 from Riksu9000/lvgl_queuetimeoutJF1-20/+4
Let LVGL control queueTimeout
2021-09-18Merge branch 'develop' into update_touch_driverRiku Isokoski1-0/+13
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell1-6/+0
2021-09-16Revert "Merge upstream"Mark Russell1-0/+6
This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
2021-09-16Merge upstreamMark Russell1-6/+0
2021-09-14Merge branch 'develop' into update_touch_driverRiku Isokoski1-7/+6
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF0021-3/+0
Remove unused variables
2021-09-10Created basic alarm appMark Russell1-0/+13
2021-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski1-1/+6
2021-08-29Let lvgl control queueTimeoutRiku Isokoski1-20/+4
2021-08-28Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0021-0/+5
Add color picker for PineTimeStyle watchface
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski1-41/+29
2021-08-28Merge branch 'develop' into update_touch_driverRiku Isokoski1-41/+29
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski1-41/+29
2021-08-19Remove unused variablesRiku Isokoski1-3/+0
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski1-2/+2
2021-08-18Automatic error detectionRiku Isokoski1-3/+14
2021-08-17Fix after mergeRiku Isokoski1-1/+1
2021-08-17Merge branch 'develop' into update_touch_driverRiku Isokoski1-40/+58
2021-08-15Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray1-2/+3
2021-08-15Merge branch 'develop' into refresh_reworkRiku Isokoski1-2/+2
2021-08-14Merge branch 'develop' into timer_battery_readingRiku Isokoski1-2/+3
2021-08-14Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime ↵Jean-François Milants1-2/+2
into Riksu9000-call-improvements # Conflicts: # src/displayapp/screens/Metronome.cpp
2021-08-14Merge branch 'develop' into refresh_reworkRiku Isokoski1-0/+1
2021-08-14Improve metronomeRiku Isokoski1-0/+1
2021-08-14Make battery reading periodic. Add events. Disable pullupRiku Isokoski1-3/+0
2021-08-10Make diff smaller and revert some changes in DisplayAppRiku Isokoski1-57/+60
2021-08-08Merge branch 'JF002:develop' into set-datetime-manuallyTim1-40/+66
2021-08-03Merge branch 'develop' into refresh_reworkRiku Isokoski1-37/+49
2021-08-01FixesRiku Isokoski1-2/+2
2021-08-01ImprovementsRiku Isokoski1-2/+2
2021-08-01Merge branch 'develop' into HEADRiku Isokoski1-63/+130
2021-07-28Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray1-37/+49
2021-07-25Merge branch 'develop' into new_touch_handlerRiku Isokoski1-6/+17
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 17:54:46 +0000