aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | Remove leftoverRiku Isokoski2021-08-101-1/+0
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Make diff smaller and revert some changes in DisplayAppRiku Isokoski2021-08-103-57/+62
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Rework TouchHandler into not a taskRiku Isokoski2021-08-106-68/+47
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'unblock_i2c' into develop"Riku Isokoski2021-08-101-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 275a84b3238874d213271f4287e6c1c5bfcb4353, reversing changes made to 9fb37550886f09f6510e99a5b452262c53c3987c.
| * | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-08-1015-226/+106
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'unblock_i2c' into developRiku Isokoski2021-08-101-0/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Set pin before loopRiku Isokoski2021-08-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Better pin configurationRiku Isokoski2021-08-091-1/+6
| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Try to fix bootloopRiku Isokoski2021-08-091-0/+9
| | | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-07-2532-178/+270
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-07-244-5/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-07-236-17/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Restore Tile.cpp changesRiku Isokoski2021-07-192-4/+6
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | UpdateRiku Isokoski2021-07-184-25/+27
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix remaining known issuesRiku Isokoski2021-07-164-10/+17
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix gesturesRiku Isokoski2021-07-164-20/+13
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix touch wakeup and code cleanupRiku Isokoski2021-07-167-53/+43
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix most issuesRiku Isokoski2021-07-1612-63/+40
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Quick fixRiku Isokoski2021-07-152-5/+3
| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | New touch handler, with issuesRiku Isokoski2021-07-1521-102/+230
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-1519-180/+216
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Adjust inner padding in applistRiku Isokoski2021-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Clean up using variablesRiku Isokoski2021-08-151-10/+16
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Adjust previously missed scrollbar and firmware validation buttonsRiku Isokoski2021-08-152-11/+11
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Add image with example layoutsRiku Isokoski2021-08-152-0/+2
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Ui updateRiku Isokoski2021-08-1510-107/+113
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'Riksu9000-call-improvements' into developJean-François Milants2021-08-148-68/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime ↵Jean-François Milants2021-08-148-68/+85
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into Riksu9000-call-improvements # Conflicts: # src/displayapp/screens/Metronome.cpp
| * | | | | | | | | | | | | | | | | | | | | Remove leftoverRiku Isokoski2021-08-011-5/+0
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | FixesRiku Isokoski2021-08-013-12/+21
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | ImprovementsRiku Isokoski2021-08-018-131/+70
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into HEADRiku Isokoski2021-08-01139-1783/+5328
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | NotificationItem now also redefines the start of the timeoutFlorian Kraupa2021-05-162-8/+16
| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | cleaned up the code and reduced the size of the diff by removing things like ↵Florian Kraupa2021-05-166-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additional whitespaces
| * | | | | | | | | | | | | | | | | | | | | only activate the timeout on call notification previews after they have been ↵Florian Kraupa2021-05-163-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interacted with
| * | | | | | | | | | | | | | | | | | | | | implemented continuous vibration pattern for incoming callsFlorian Kraupa2021-05-167-24/+78
| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-1422-210/+616
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Add VSCode ST-link debug config (#567)Martin Hub2021-08-141-1/+19
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Improve metronomeRiku Isokoski2021-08-143-99/+69
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Set pin before loopRiku Isokoski2021-08-141-0/+1
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Better pin configurationRiku Isokoski2021-08-141-1/+6
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Try to fix bootloopRiku Isokoski2021-08-141-0/+9
| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Update contribute.md (#475)Riku Isokoski2021-08-142-51/+40
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update contribute.md * Add newlines and remove spaces * Replace CONTRIBUTING.md with doc/contribute.md
* | | | | | | | | | | | | | | | | | | | | Merge pull request #505 from geekbozu/devconJF0022021-08-1016-59/+473
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | VSCode Devcontainer
| * | | | | | | | | | | | | | | | | | | | Setup plugins for Clang-tidy/formatTim Keller2021-08-093-3/+6
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fix intellisenseTim Keller2021-08-081-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Typos for daysTim Keller2021-08-072-18/+18
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Updated documentationTim Keller2021-08-076-8/+54
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Added cmake variantsTim Keller2021-08-0712-69/+245
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | added extra .sh build filesNiall Cooling2021-08-073-0/+21
| | | | | | | | | | | | | | | | | | | | |