| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | Merge remote-tracking branch 'upstream/develop' into pts-settings | Kieran Cawthray | 2021-11-07 | 1 | -0/+14 | |
| | | |\ \ \ | ||||||
| | | * \ \ \ | Merge remote-tracking branch 'upstream/develop' into pts-settings | Kieran Cawthray | 2021-10-23 | 1 | -1/+1 | |
| | | |\ \ \ \ | ||||||
| | | * \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into pts-settings | Kieran Cawthray | 2021-10-18 | 1 | -4/+25 | |
| | | |\ \ \ \ \ | ||||||
| | | * | | | | | | Remove old PineTimeStyle settings app | Kieran Cawthray | 2021-10-03 | 1 | -5/+0 | |
| | | | | | | | | | ||||||
| | * | | | | | | | FIX: AlarmTriggered fall through to ShowPairingKey | James A. Jerkins | 2021-12-11 | 1 | -0/+1 | |
| | | |_|_|_|_|/ | |/| | | | | | ||||||
| | * | | | | | | Style improvements | Avamander | 2021-12-09 | 1 | -1/+2 | |
| | | | | | | | | ||||||
| | * | | | | | | Fix for passkey screen scramble | James A. Jerkins | 2021-12-09 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | | Connect and bond with a passkey | James A. Jerkins | 2021-12-09 | 1 | -0/+9 | |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | | Merge branch 'paint-colorchange-vibration' of ↵ | Jean-François Milants | 2021-12-02 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://github.com/clemensvonmolo/InfiniTime into clemensvonmolo-paint-colorchange-vibration # Conflicts: # src/displayapp/screens/InfiniPaint.h | |||||
| | | * | | | | | color rotation using modulo, ran clang-format for InfiniPaint | Clemens von Molo | 2021-11-01 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| | | * | | | | | InfiniPaint vibrate on colorchange, fix color rotation | Clemens von Molo | 2021-10-31 | 1 | -1/+1 | |
| | | | |_|/ / | | |/| | | | ||||||
| | * | | | | | Merge branch 'restructure_includes' of ↵ | Jean-François Milants | 2021-11-28 | 1 | -5/+5 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes # Conflicts: # doc/contribute.md # src/displayapp/screens/BatteryInfo.h | |||||
| | | * | | | | | Update includes to to be relative to src directory | Reinhold Gschweicher | 2021-11-15 | 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. | |||||
| | * / | | | | Fix animation when long pressing on screens adjacent to watch face | Riku Isokoski | 2021-11-10 | 1 | -1/+7 | |
| | |/ / / / | ||||||
| | * / / / | Newer buttonhandler | Riku Isokoski | 2021-10-25 | 1 | -0/+14 | |
| | |/ / / | ||||||
| * | | | | resolves conflicts | SteveAmor | 2022-01-02 | 1 | -5/+0 | |
| | | | | | ||||||
| * | | | | Chimes option | SteveAmor | 2021-11-07 | 1 | -0/+8 | |
| |/ / / | ||||||
| * | | | Merge pull request #740 from Riksu9000/flashlight_brightness | JF | 2021-10-23 | 1 | -1/+1 | |
| |\ \ \ | |_|/ |/| | | Flashlight brightness control | |||||
| | * | | Flashlight brightness control | Riku Isokoski | 2021-10-13 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime ↵ | Jean-François Milants | 2021-10-10 | 1 | -4/+15 | |
| |\ \ \ | |/ / |/| | | | | | | | | | | | | | | into Riksu9000-update_touch_driver # Conflicts: # src/displayapp/Apps.h | |||||
| | * | | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-10-05 | 1 | -20/+4 | |
| | |\| | ||||||
| | * | | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-09-18 | 1 | -0/+13 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-09-14 | 1 | -7/+6 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-08-28 | 1 | -41/+29 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Automatic error detection | Riku Isokoski | 2021-08-18 | 1 | -3/+14 | |
| | | | | | | | ||||||
| | * | | | | | Fix after merge | Riku Isokoski | 2021-08-17 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-08-17 | 1 | -40/+58 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-07-15 | 1 | -3/+5 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Update touchpad driver | Riku Isokoski | 2021-07-14 | 1 | -2/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge with develop and fix conflicts from timaios:set-datetime-manually. | Jean-François Milants | 2021-10-10 | 1 | -0/+10 | |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
| | * | | | | | | | Merge branch 'JF002:develop' into set-datetime-manually | Tim | 2021-08-08 | 1 | -40/+66 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Added new screens to DisplayApp.cpp | timaios | 2021-07-09 | 1 | -0/+10 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge pull request #623 from Riksu9000/lvgl_queuetimeout | JF | 2021-10-03 | 1 | -20/+4 | |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | Let LVGL control queueTimeout | |||||
| | * | | | | | | | | Let lvgl control queueTimeout | Riku Isokoski | 2021-08-29 | 1 | -20/+4 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | resolve conflict in src/systemtask/Messages.h | Mark Russell | 2021-09-16 | 1 | -6/+0 | |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
| | * | | | | | | | | Merge pull request #602 from Riksu9000/del_unused | JF002 | 2021-09-12 | 1 | -3/+0 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove unused variables | |||||
| | | * | | | | | | | | Remove unused variables | Riku Isokoski | 2021-08-19 | 1 | -3/+0 | |
| | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into timer_battery_reading | Riku Isokoski | 2021-08-30 | 1 | -1/+6 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | | Merge branch 'develop' into timer_battery_reading | Riku Isokoski | 2021-08-28 | 1 | -41/+29 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | | Merge branch 'develop' into timer_battery_reading | Riku Isokoski | 2021-08-14 | 1 | -2/+3 | |
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||||
| | * | | | | | | | | Make battery reading periodic. Add events. Disable pullup | Riku Isokoski | 2021-08-14 | 1 | -3/+0 | |
| | | |_|_|_|/ / / | |/| | | | | | | ||||||
| * | | | | | | | | Revert "Merge upstream" | Mark Russell | 2021-09-16 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c. | |||||
| * | | | | | | | | Merge upstream | Mark Russell | 2021-09-16 | 1 | -6/+0 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Created basic alarm app | Mark Russell | 2021-09-10 | 1 | -0/+13 | |
| | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | | Merge pull request #458 from kieranc/pinetimestyle-colorpicker | JF002 | 2021-08-28 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add color picker for PineTimeStyle watchface | |||||
| | * \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker | Kieran Cawthray | 2021-08-15 | 1 | -2/+3 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker | Kieran Cawthray | 2021-07-28 | 1 | -37/+49 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||||
| | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker | Kieran Cawthray | 2021-07-23 | 1 | -1/+6 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker | Kieran Cawthray | 2021-07-20 | 1 | -2/+11 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | ||||||
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker | Kieran Cawthray | 2021-07-12 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
 |
index : InfiniTime | |
| My branch of InfiniTime | git daemon user |
| aboutsummaryrefslogtreecommitdiffstats |