summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-09-11Merge pull request #615 from Utopiah/patch-1JF0021-0/+1
Infini-iOS
2021-09-11Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-downJF0021-2/+2
Move PineTimeStyle settings up
2021-09-02Update Settings.cppItai Nelken1-2/+2
2021-09-02Set version to 1.4.0.Jean-François Milants1-1/+1
2021-09-01Merge pull request #579 from mabuch/fix-github-buildJF0021-15/+9
fix Github Action build Firmware
2021-08-31Fix notifications that wouldn't auto close when the timeout elapsed (in ↵Jean-François Milants1-1/+0
preview mode).
2021-08-28Fix wake on tap/double tap.Jean-François Milants1-6/+8
2021-08-28Settings : use enums instead of ints to store colors. Group all PTS settings ↵Jean-François Milants8-116/+144
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-colorpickerJF00210-18/+465
Add color picker for PineTimeStyle watchface
2021-08-28Merge pull request #497 from Riksu9000/refresh_reworkJF00272-287/+182
Rework Refresh
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski29-234/+292
2021-08-28Fix recovery firmware since last changes in DisplayApp.Jean-François Milants3-2/+11
2021-08-28Fix touchinfo typo in SystemTask.Jean-François Milants1-1/+1
2021-08-28Merge branch 'Riksu9000-twimaster_rework' into developJean-François Milants4-88/+49
2021-08-28Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime ↵Jean-François Milants4-88/+49
into Riksu9000-twimaster_rework # Conflicts: # src/systemtask/SystemTask.cpp
2021-08-28Merge pull request #492 from Riksu9000/new_touch_handlerJF00224-151/+239
New touch handler
2021-08-26Infini-iOSFabien Benetou1-0/+1
2021-08-19Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2-7/+7
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski40-400/+836
2021-08-18Use highest frequency and move mutex creation to InitRiku Isokoski2-3/+6
2021-08-18Add memory print usagehubmartin1-6/+6
2021-08-18Fix music app buttonsRiku Isokoski1-1/+1
2021-08-16Simplify parameters and cleanupRiku Isokoski3-48/+19
2021-08-15Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray24-335/+358
2021-08-15Fix potential edge case of sidebar being set blackKieran Cawthray1-1/+1
2021-08-15More tidying following reviewKieran Cawthray1-85/+88
2021-08-15Avoid setting the sidebar blackKieran Cawthray1-0/+4
2021-08-15Remove duplicate code, minor fixesKieran Cawthray1-33/+19
2021-08-15Merge branch 'develop' into refresh_reworkRiku Isokoski19-182/+218
2021-08-15Add check for randomise button in case colors clashKieran Cawthray1-0/+5
2021-08-15Adjust inner padding in applistRiku Isokoski1-1/+1
2021-08-15Clean up using variablesRiku Isokoski1-10/+16
2021-08-15Adjust previously missed scrollbar and firmware validation buttonsRiku Isokoski2-11/+11
2021-08-15Add image with example layoutsRiku Isokoski2-0/+2
2021-08-15Ui updateRiku Isokoski10-107/+113
2021-08-15Add randomise button to color pickerKieran Cawthray2-0/+22
2021-08-14Merge branch 'Riksu9000-call-improvements' into developJean-François Milants8-70/+87
2021-08-14Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime ↵Jean-François Milants8-70/+87
into Riksu9000-call-improvements # Conflicts: # src/displayapp/screens/Metronome.cpp
2021-08-14Merge branch 'develop' into refresh_reworkRiku Isokoski22-210/+616
2021-08-14Add VSCode ST-link debug config (#567)Martin Hub1-1/+19
2021-08-14Improve metronomeRiku Isokoski3-99/+69
2021-08-14Set pin before loopRiku Isokoski1-0/+1
2021-08-14Better pin configurationRiku Isokoski1-1/+6
2021-08-14Try to fix bootloopRiku Isokoski1-0/+9
2021-08-14Update contribute.md (#475)Riku Isokoski2-51/+40
* Update contribute.md * Add newlines and remove spaces * Replace CONTRIBUTING.md with doc/contribute.md
2021-08-14Github Action - update mcuboot versionmabuch1-6/+1
2021-08-14fix Github Action build Firmwaremabuch1-15/+14
2021-08-12TidyingKieran Cawthray1-1/+0
2021-08-12Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray28-270/+554
2021-08-12Don't reconfigure pinsRiku Isokoski1-6/+1