summaryrefslogtreecommitdiff
path: root/src/displayapp/DisplayApp.cpp
AgeCommit message (Collapse)Author
2022-02-20Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime ↵Jean-François Milants
into evergreen22-airplane-mode Apply a few changes that were requested in the PR during the review. # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/Messages.h # src/displayapp/screens/settings/Settings.cpp
2022-02-20Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime ↵Jean-François Milants
into evergreen22-airplane-mode # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/Messages.h # src/displayapp/screens/settings/Settings.cpp
2022-02-19Provide reference to BrightnessController in DisplayAppReinhold Gschweicher
For the simulator I need a way to get to the brightnessController object and handle the set brightness-levels accoringly. This is done by the constructor expecting a brightnessController object instead of initializing one itself
2022-02-13Improved alarm alert handlingRiku Isokoski
2022-01-31Added alarm 12 hour interfaceEli Weiss
2022-01-31Added 12 hour set timeEli Weiss
2022-01-26Merge pull request #903 from Riksu9000/improved_notif_timeoutJF
Improved notification timeout
2022-01-04Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into ↵Jean-François Milants
geekbozu-ShakeWake # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/screens/settings/Settings.cpp
2022-01-04Better Sensitivity UI, Calibration button addedTim Keller
2022-01-04Add start of settings app for senstivity.Tim Keller
really just debugging. I want to make it more configurable then high med low. Position of setting needs a new location...dynamicly adding it currently at the end. Which honestly im fine with.
2022-01-02resolve conflictsSteveAmor
2022-01-02resolves conflictsSteveAmor
2022-01-02resolves conflictsSteveAmor
2022-01-01Improved notification timeoutRiku Isokoski
2021-12-30Merge pull request #718 from kieranc/pts-settingsJF
Integrate color picker into PineTimeStyle watchface
2021-12-24Add airplane mode featureJames A. Jerkins
Implements 'Airplane mode' feature to disable and enable bluetooth/ble Adds airplaneMode as a non-persisted setting Adds a setting menu for switching airplane mode on and off Displays an airplane symbol on the Digital watch face and the PineTimeStyle watch face when airplane mode is enabled Always enables bluetooth/ble on boot (disable airplane mode) Alphabetizes the settings menu options Style cleanups Closes #632
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
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. Jerkins
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-05Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray
2021-12-02Merge branch 'paint-colorchange-vibration' of ↵Jean-François Milants
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 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-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
Flashlight brightness control
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 ↵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-03Remove old PineTimeStyle settings appKieran Cawthray
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
generated by cgit v0.10.2 at 2026-01-10 05:48:26 (GMT)