Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2021-12-02 | Merge branch 'paint-colorchange-vibration' of ↵ | Jean-François Milants | 1 | -1/+1 | |
git://github.com/clemensvonmolo/InfiniTime into clemensvonmolo-paint-colorchange-vibration # Conflicts: # src/displayapp/screens/InfiniPaint.h | |||||
2021-11-28 | Merge branch 'restructure_includes' of ↵ | Jean-François Milants | 1 | -5/+5 | |
https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes # Conflicts: # doc/contribute.md # src/displayapp/screens/BatteryInfo.h | |||||
2021-11-15 | Update includes to to be relative to src directory | Reinhold Gschweicher | 1 | -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-10 | Fix animation when long pressing on screens adjacent to watch face | Riku Isokoski | 1 | -1/+7 | |
2021-11-01 | color rotation using modulo, ran clang-format for InfiniPaint | Clemens von Molo | 1 | -1/+1 | |
2021-10-31 | InfiniPaint vibrate on colorchange, fix color rotation | Clemens von Molo | 1 | -1/+1 | |
2021-10-25 | Newer buttonhandler | Riku Isokoski | 1 | -0/+14 | |
2021-10-23 | Merge pull request #740 from Riksu9000/flashlight_brightness | JF | 1 | -1/+1 | |
Flashlight brightness control | |||||
2021-10-13 | Flashlight brightness control | Riku Isokoski | 1 | -1/+1 | |
2021-10-10 | Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime ↵ | Jean-François Milants | 1 | -4/+15 | |
into Riksu9000-update_touch_driver # Conflicts: # src/displayapp/Apps.h | |||||
2021-10-10 | Merge with develop and fix conflicts from timaios:set-datetime-manually. | Jean-François Milants | 1 | -0/+10 | |
2021-10-05 | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 1 | -20/+4 | |
2021-10-03 | Merge pull request #623 from Riksu9000/lvgl_queuetimeout | JF | 1 | -20/+4 | |
Let LVGL control queueTimeout | |||||
2021-09-18 | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 1 | -0/+13 | |
2021-09-16 | resolve conflict in src/systemtask/Messages.h | Mark Russell | 1 | -6/+0 | |
2021-09-16 | Revert "Merge upstream" | Mark Russell | 1 | -0/+6 | |
This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c. | |||||
2021-09-16 | Merge upstream | Mark Russell | 1 | -6/+0 | |
2021-09-14 | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 1 | -7/+6 | |
2021-09-12 | Merge pull request #602 from Riksu9000/del_unused | JF002 | 1 | -3/+0 | |
Remove unused variables | |||||
2021-09-10 | Created basic alarm app | Mark Russell | 1 | -0/+13 | |
2021-08-30 | Merge remote-tracking branch 'upstream/develop' into timer_battery_reading | Riku Isokoski | 1 | -1/+6 | |
2021-08-29 | Let lvgl control queueTimeout | Riku Isokoski | 1 | -20/+4 | |
2021-08-28 | Merge pull request #458 from kieranc/pinetimestyle-colorpicker | JF002 | 1 | -0/+5 | |
Add color picker for PineTimeStyle watchface | |||||
2021-08-28 | Merge branch 'develop' into refresh_rework | Riku Isokoski | 1 | -41/+29 | |
2021-08-28 | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 1 | -41/+29 | |
2021-08-28 | Merge branch 'develop' into timer_battery_reading | Riku Isokoski | 1 | -41/+29 | |
2021-08-19 | Remove unused variables | Riku Isokoski | 1 | -3/+0 | |
2021-08-18 | Merge branch 'develop' into new_touch_handler | Riku Isokoski | 1 | -2/+2 | |
2021-08-18 | Automatic error detection | Riku Isokoski | 1 | -3/+14 | |
2021-08-17 | Fix after merge | Riku Isokoski | 1 | -1/+1 | |
2021-08-17 | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 1 | -40/+58 | |
2021-08-15 | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker | Kieran Cawthray | 1 | -2/+3 | |
2021-08-15 | Merge branch 'develop' into refresh_rework | Riku Isokoski | 1 | -2/+2 | |
2021-08-14 | Merge branch 'develop' into timer_battery_reading | Riku Isokoski | 1 | -2/+3 | |
2021-08-14 | Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime ↵ | Jean-François Milants | 1 | -2/+2 | |
into Riksu9000-call-improvements # Conflicts: # src/displayapp/screens/Metronome.cpp | |||||
2021-08-14 | Merge branch 'develop' into refresh_rework | Riku Isokoski | 1 | -0/+1 | |
2021-08-14 | Improve metronome | Riku Isokoski | 1 | -0/+1 | |
2021-08-14 | Make battery reading periodic. Add events. Disable pullup | Riku Isokoski | 1 | -3/+0 | |
2021-08-10 | Make diff smaller and revert some changes in DisplayApp | Riku Isokoski | 1 | -57/+60 | |
2021-08-08 | Merge branch 'JF002:develop' into set-datetime-manually | Tim | 1 | -40/+66 | |
2021-08-03 | Merge branch 'develop' into refresh_rework | Riku Isokoski | 1 | -37/+49 | |
2021-08-01 | Fixes | Riku Isokoski | 1 | -2/+2 | |
2021-08-01 | Improvements | Riku Isokoski | 1 | -2/+2 | |
2021-08-01 | Merge branch 'develop' into HEAD | Riku Isokoski | 1 | -63/+130 | |
2021-07-28 | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker | Kieran Cawthray | 1 | -37/+49 | |
2021-07-25 | Merge branch 'develop' into new_touch_handler | Riku Isokoski | 1 | -6/+17 | |
2021-07-25 | Code cleanup (#466) | Riku Isokoski | 1 | -6/+6 | |
* Code cleanup * Remove override again | |||||
2021-07-24 | Dim screen before sleep (#464) | Riku Isokoski | 1 | -1/+12 | |
* Implement dimming | |||||
2021-07-24 | Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime ↵ | Jean-François Milants | 1 | -30/+31 | |
into Riksu9000-fix_touchevent_tap # Conflicts: # src/displayapp/DisplayApp.cpp | |||||
2021-07-23 | Merge branch 'develop' into refresh_rework | Riku Isokoski | 1 | -1/+6 | |