aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into...Jean-François Milants2021-09-134-51/+97
|/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Advertise fast for at least 30 secs then slow downJames A. Jerkins2021-09-053-1/+20
| * | | | | | | | | | | | | | Revert "Linear decrease of advert rate to conserve battery"James A. Jerkins2021-09-052-6/+0
| * | | | | | | | | | | | | | Linear decrease of advert rate to conserve batteryJames A. Jerkins2021-09-042-0/+6
| * | | | | | | | | | | | | | Fix styles issues - no change to functionalityJames A. Jerkins2021-09-011-6/+6
| * | | | | | | | | | | | | | Fix race condition, connect->disconnect->discoveryJames A. Jerkins2021-09-011-1/+3
| * | | | | | | | | | | | | | Completely reset connection state on failJames A. Jerkins2021-08-301-0/+3
| * | | | | | | | | | | | | | WIP Refactor ble advertisingJames A. Jerkins2021-08-294-46/+67
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #549 from hubmartin/pinmapJF0022021-09-1316-92/+118
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add WATCH_COLMI_P8 option to cmake & docshubmartin2021-09-132-0/+10
| * | | | | | | | | | | | | | Merge branch 'develop' into pinmaphubmartin2021-09-1317-86/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into pinmaphubmartin2021-08-2994-539/+968
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update startup SCL toggling pinmap definitionshubmartin2021-08-221-4/+5
| * | | | | | | | | | | | | | | Merge branch 'develop' into pinmaphubmartin2021-08-2225-340/+363
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' into pinmaphubmartin2021-08-1128-276/+553
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Rename backlight level pinshubmartin2021-08-042-18/+18
| * | | | | | | | | | | | | | | | Cleanup, set Pinetime as defaulthubmartin2021-08-033-42/+18
| * | | | | | | | | | | | | | | | PinMap with namespace and constexprhubmartin2021-08-0313-87/+96
| * | | | | | | | | | | | | | | | DRAFT: Put gpio pins to separate filehubmartin2021-08-025-3/+32
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | docs: Fix a few typos (#606)Tim Gates2021-09-134-4/+4
| |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #617 from ColinKinloch/wake_up_mode_setting_changeJF0022021-09-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Correct change test for wake up mode settingColin Kinloch2021-08-261-1/+1
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #602 from Riksu9000/del_unusedJF0022021-09-124-18/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Remove unused variablesRiku Isokoski2021-08-194-18/+2
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #580 from Riksu9000/timer_battery_readingJF0022021-09-128-31/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski2021-08-3080-313/+686
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-2837-350/+422
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-1413-217/+226
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Make battery reading periodic. Add events. Disable pullupRiku Isokoski2021-08-148-32/+38
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #552 from Riksu9000/new_to_infinitimeJF0022021-09-121-17/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Move getting started slightly lowerRiku Isokoski2021-08-031-5/+5
| * | | | | | | | | | | | | | | | Make it easier for new people to find instructionsRiku Isokoski2021-08-031-16/+6
| | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #551 from hubmartin/patch-3JF0022021-09-121-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add FW validation note after DFU flashMartin Hub2021-08-031-0/+4
| |/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #550 from hubmartin/patch-2JF0022021-09-121-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update ota-gadgetbridge-nrfconnect.mdMartin Hub2021-08-031-0/+4
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #615 from Utopiah/patch-1JF0022021-09-111-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Infini-iOSFabien Benetou2021-08-261-0/+1
| | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-downJF0022021-09-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Update Settings.cppItai Nelken2021-09-021-2/+2
|/ / / / / / / / / / / / / /
| | | | | | | * | | | | | | Revert "Merge upstream"Mark Russell2021-09-1633-300/+232
| | | | | | | * | | | | | | Merge upstreamMark Russell2021-09-1633-232/+300
| | | | | | | * | | | | | | Fixes per Riksu9000's feedbackMark Russell2021-09-167-30/+27
| | | | | | | * | | | | | | License header fix, add missing bracesMark Russell2021-09-134-5/+22
| | | | | | | * | | | | | | Fixes based on code reviews (formatting, UI code)Mark Russell2021-09-135-89/+133
| | | | | | | * | | | | | | Created basic alarm appMark Russell2021-09-1016-3/+480
| |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Set version to 1.4.0.Jean-François Milants2021-09-021-1/+1
* | | | | | | | | | | | | Merge pull request #579 from mabuch/fix-github-buildJF0022021-09-011-15/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Github Action - update mcuboot versionmabuch2021-08-141-6/+1
| * | | | | | | | | | | | | fix Github Action build Firmwaremabuch2021-08-141-15/+14
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |