summaryrefslogtreecommitdiff
path: root/src/displayapp
AgeCommit message (Collapse)Author
2021-09-23Merge pull request #664 from Riksu9000/disable_notif_onlyJF002
Toggle notifications only, keep vibrations.
2021-09-18Merge pull request #669 from ↵JF002
NeroBurner/fix_unsigned_comparison_warning_metronome Fix unsigned/signed comparison warning in Metronome.cpp
2021-09-18Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants
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-16Fixes per Riksu9000's feedbackMark Russell
2021-09-16Fix unsigned/signed comparison warning in Metronome.cppReinhold Gschweicher
`xTaskGetTickCount()` returns a `TickType_t`, which is defined as an `uint32_t`. This is compared to the `bpm` variable, which is a `int16_t` in the range of 40 to 220 as defined in the constructor. ```cpp lv_arc_set_range(bpmArc, 40, 220); ``` Just assume that `bpm` is greater than 0, as this would result in a divison by zero or negative values, which would unintentionally underflow to a very large number.
2021-09-14Merge branch 'develop' into disable_notif_onlyRiku Isokoski
2021-09-13License header fix, add missing bracesMark Russell
2021-09-13Fixes based on code reviews (formatting, UI code)Mark Russell
2021-09-13Fix DisplayAppRecovery : fix include error by forward declaring Controllers ↵Jean-François Milants
in header file.
2021-09-13Merge branch 'develop' into disable_notif_onlyRiku Isokoski
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF002
Remove unused variables
2021-09-12Merge pull request #580 from Riksu9000/timer_battery_readingJF002
Make battery reading periodic
2021-09-12Toggle notifications only, keep vibrations.Riku Isokoski
2021-09-10Created basic alarm appMark Russell
2021-09-02Update Settings.cppItai Nelken
2021-08-31Fix notifications that wouldn't auto close when the timeout elapsed (in ↵Jean-François Milants
preview mode).
2021-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski
2021-08-28Settings : use enums instead of ints to store colors. Group all PTS settings ↵Jean-François Milants
into a struct. PTS/SettingsPTS : Convert to/from LVGL color and Settings::Color, add functions to reduce code duplication. Adapt SettingPineTimeStyle with the last Screen Interface
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 timer_battery_readingRiku Isokoski
2021-08-28Fix recovery firmware since last changes in DisplayApp.Jean-François Milants
2021-08-19Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray
2021-08-19Remove unused variablesRiku Isokoski
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski
2021-08-18Fix music app buttonsRiku Isokoski
2021-08-15Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray
2021-08-15Fix potential edge case of sidebar being set blackKieran Cawthray
2021-08-15More tidying following reviewKieran Cawthray
2021-08-15Avoid setting the sidebar blackKieran Cawthray
2021-08-15Remove duplicate code, minor fixesKieran Cawthray
2021-08-15Merge branch 'develop' into refresh_reworkRiku Isokoski
2021-08-15Add check for randomise button in case colors clashKieran Cawthray
2021-08-15Adjust inner padding in applistRiku Isokoski
2021-08-15Clean up using variablesRiku Isokoski
2021-08-15Adjust previously missed scrollbar and firmware validation buttonsRiku Isokoski
2021-08-15Ui updateRiku Isokoski
2021-08-15Add randomise button to color pickerKieran Cawthray
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-12TidyingKieran Cawthray
2021-08-12Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray
2021-08-10Make diff smaller and revert some changes in DisplayAppRiku Isokoski
2021-08-10Merge branch 'develop' into new_touch_handlerRiku Isokoski