aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Set version to 1.6.0Jean-François Milants2021-09-281-1/+1
* Merge pull request #688 from danielgjackson/fix-advertising-18-hoursJF0022021-09-281-1/+1
|\
| * Correctly return the tick at which the RF will be fully enabled.Daniel Jackson2021-09-251-1/+1
* | Set version to 1.5.0Jean-François Milants2021-09-261-1/+1
|/
* Merge pull request #664 from Riksu9000/disable_notif_onlyJF0022021-09-239-43/+19
|\
| * Merge branch 'develop' into disable_notif_onlyRiku Isokoski2021-09-148-69/+121
| |\
| * \ Merge branch 'develop' into disable_notif_onlyRiku Isokoski2021-09-1328-162/+177
| |\ \
| * | | Toggle notifications only, keep vibrations.Riku Isokoski2021-09-129-43/+19
* | | | Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants2021-09-191-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metro...JF0022021-09-181-1/+1
| |\ \ \ \
| | * | | | Fix unsigned/signed comparison warning in Metronome.cppReinhold Gschweicher2021-09-161-1/+1
| | | |_|/ | | |/| |
* | / | | Fix the display of the date after a reset : when the date/time was restored f...Jean-François Milants2021-09-191-0/+1
|/ / / /
* | | | Merge branch 'geekbozu-PersistantStorage' into developJean-François Milants2021-09-189-8/+100
|\ \ \ \
| * | | | Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime into...Jean-François Milants2021-09-189-8/+100
|/| | | |
| * | | | Add some commentsTim Keller2021-09-021-2/+6
| * | | | Move noinit to after BSS segment,Tim Keller2021-08-232-18/+11
| * | | | Add some VSCODE stuff to gitignore...Tim Keller2021-08-192-2/+56
| * | | | Move Backup to the system task.Tim Keller2021-08-194-2/+2
| * | | | Add clearing of noinit segment on bad wordTim Keller2021-08-193-7/+12
| * | | | Add MCUBOOT linker changesTim Keller2021-08-192-5/+16
| * | | | Make Clock Persistant.Tim Keller2021-08-174-3/+28
* | | | | Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants2021-09-182-0/+3
* | | | | Merge pull request #662 from mruss77/basic-alarm-appJF0022021-09-1814-2/+537
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | resolve conflict in src/systemtask/Messages.hMark Russell2021-09-1633-232/+300
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #658 from NeroBurner/patch-2JF0022021-09-141-4/+4
|\ \ \ \ \
| * | | | | Run CI on master and develop branchNeroBurner2021-09-101-4/+4
* | | | | | Merge pull request #668 from NeroBurner/motorcontroller_remove_unused_includeJF0022021-09-141-1/+0
|\ \ \ \ \ \
| * | | | | | Remove unused include in MotoController.hReinhold Gschweicher2021-09-131-1/+0
|/ / / / / /
* | | | | | Fix DisplayAppRecovery : fix include error by forward declaring Controllers i...Jean-François Milants2021-09-132-13/+20
* | | | | | Merge branch 'evergreen22-refactor_adv' into developJean-François Milants2021-09-134-51/+97
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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
| |_|_|_|/ / / / / |/| | | | | | | |