| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-10-05 | 1 | -3/+5 |
| |\ | |||||
| | * | Merge pull request #664 from Riksu9000/disable_notif_only | JF002 | 2021-09-23 | 1 | -3/+5 |
| | |\ | |||||
| | | * | Merge branch 'develop' into disable_notif_only | Riku Isokoski | 2021-09-14 | 1 | -2/+3 |
| | | |\ | |||||
| | | * \ | Merge branch 'develop' into disable_notif_only | Riku Isokoski | 2021-09-13 | 1 | -25/+32 |
| | | |\ \ | |||||
| | | * | | | Toggle notifications only, keep vibrations. | Riku Isokoski | 2021-09-12 | 1 | -3/+5 |
| * | | | | | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-09-18 | 1 | -0/+14 |
| |\| | | | | |||||
| | * | | | | Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime into... | Jean-François Milants | 2021-09-18 | 1 | -0/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Move Backup to the system task. | Tim Keller | 2021-08-19 | 1 | -0/+1 |
| | * | | | | | resolve conflict in src/systemtask/Messages.h | Mark Russell | 2021-09-16 | 1 | -27/+35 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | | Revert "Merge upstream" | Mark Russell | 2021-09-16 | 1 | -35/+27 |
| | * | | | | | Merge upstream | Mark Russell | 2021-09-16 | 1 | -27/+35 |
| | * | | | | | Fixes per Riksu9000's feedback | Mark Russell | 2021-09-16 | 1 | -1/+1 |
| | * | | | | | Fixes based on code reviews (formatting, UI code) | Mark Russell | 2021-09-13 | 1 | -2/+1 |
| | * | | | | | Created basic alarm app | Mark Russell | 2021-09-10 | 1 | -0/+14 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-09-14 | 1 | -33/+43 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into... | Jean-François Milants | 2021-09-13 | 1 | -2/+3 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | | * | | | Advertise fast for at least 30 secs then slow down | James A. Jerkins | 2021-09-05 | 1 | -0/+3 |
| | | * | | | WIP Refactor ble advertising | James A. Jerkins | 2021-08-29 | 1 | -2/+0 |
| | | | |/ | | |/| | |||||
| | * | | | Merge pull request #549 from hubmartin/pinmap | JF002 | 2021-09-13 | 1 | -9/+11 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'develop' into pinmap | hubmartin | 2021-09-13 | 1 | -15/+20 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'develop' into pinmap | hubmartin | 2021-08-29 | 1 | -26/+22 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | | Merge branch 'develop' into pinmap | hubmartin | 2021-08-22 | 1 | -3/+2 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | | PinMap with namespace and constexpr | hubmartin | 2021-08-03 | 1 | -9/+11 |
| | * | | | | | docs: Fix a few typos (#606) | Tim Gates | 2021-09-13 | 1 | -1/+1 |
| | | |_|_|/ | |/| | | | |||||
| | * | | | | Merge remote-tracking branch 'upstream/develop' into timer_battery_reading | Riku Isokoski | 2021-08-30 | 1 | -6/+8 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Fix wake on tap/double tap. | Jean-François Milants | 2021-08-28 | 1 | -6/+8 |
| | * | | | | Merge branch 'develop' into timer_battery_reading | Riku Isokoski | 2021-08-28 | 1 | -20/+14 |
| | |\| | | | |||||
| | * | | | | Merge branch 'develop' into timer_battery_reading | Riku Isokoski | 2021-08-14 | 1 | -3/+2 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | | Make battery reading periodic. Add events. Disable pullup | Riku Isokoski | 2021-08-14 | 1 | -15/+20 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-08-28 | 1 | -20/+14 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Fix touchinfo typo in SystemTask. | Jean-François Milants | 2021-08-28 | 1 | -1/+1 |
| | * | | | Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime in... | Jean-François Milants | 2021-08-28 | 1 | -16/+5 |
| | |\ \ \ | |||||
| | | * | | | Only enable the bus when needed | Riku Isokoski | 2021-08-10 | 1 | -9/+0 |
| | | |/ / | |||||
| | * | | | Merge branch 'develop' into new_touch_handler | Riku Isokoski | 2021-08-18 | 1 | -3/+2 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Make diff smaller and revert some changes in DisplayApp | Riku Isokoski | 2021-08-10 | 1 | -0/+1 |
| | * | | | Rework TouchHandler into not a task | Riku Isokoski | 2021-08-10 | 1 | -3/+5 |
| | * | | | Merge branch 'develop' into new_touch_handler | Riku Isokoski | 2021-07-25 | 1 | -9/+32 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Merge branch 'develop' into new_touch_handler | Riku Isokoski | 2021-07-23 | 1 | -3/+8 |
| | |\ \ \ | |||||
| | * | | | | Update | Riku Isokoski | 2021-07-18 | 1 | -0/+3 |
| | * | | | | Fix touch wakeup and code cleanup | Riku Isokoski | 2021-07-16 | 1 | -19/+19 |
| | * | | | | Fix most issues | Riku Isokoski | 2021-07-16 | 1 | -1/+1 |
| | * | | | | New touch handler, with issues | Riku Isokoski | 2021-07-15 | 1 | -1/+0 |
| * | | | | | Automatic error detection | Riku Isokoski | 2021-08-18 | 1 | -2/+7 |
| * | | | | | Merge branch 'develop' into update_touch_driver | Riku Isokoski | 2021-08-17 | 1 | -17/+44 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Remove leftover | Riku Isokoski | 2021-08-01 | 1 | -5/+0 |
| | * | | | | Improvements | Riku Isokoski | 2021-08-01 | 1 | -4/+5 |
| | * | | | | Merge branch 'develop' into HEAD | Riku Isokoski | 2021-08-01 | 1 | -66/+144 |
| | |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | | Dim screen before sleep (#464) | Riku Isokoski | 2021-07-24 | 1 | -11/+34 |
| | | | |/ | | |/| | |||||
| | | * | | Make firmware updating more foolproof (#469) | Riku Isokoski | 2021-07-22 | 1 | -3/+8 |
| | | |/ | |||||
| | * | | cleaned up the code and reduced the size of the diff by removing things like ... | Florian Kraupa | 2021-05-16 | 1 | -1/+1 |
 |
index : InfiniTime | |
| My branch of InfiniTime | git daemon user |
| aboutsummaryrefslogtreecommitdiffstats |