aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Correctly return the tick at which the RF will be fully enabled.Daniel Jackson2021-09-251-1/+1
* Merge pull request #664 from Riksu9000/disable_notif_onlyJF0022021-09-239-43/+19
|\
| * Merge branch 'develop' into disable_notif_onlyRiku Isokoski2021-09-147-65/+117
| |\
| * \ Merge branch 'develop' into disable_notif_onlyRiku Isokoski2021-09-1322-143/+150
| |\ \
| * | | 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 'PersistantStorage' of git://github.com/geekbozu/InfiniTime into...Jean-François Milants2021-09-185-2/+27
|\ \ \ \
| * | | | Add some commentsTim Keller2021-09-021-2/+6
| * | | | 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
| * | | | Make Clock Persistant.Tim Keller2021-08-173-2/+18
* | | | | Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants2021-09-182-0/+3
* | | | | resolve conflict in src/systemtask/Messages.hMark Russell2021-09-1626-209/+268
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 '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-1314-92/+108
| |\ \ \ \
| | * \ \ \ Merge branch 'develop' into pinmaphubmartin2021-09-1313-53/+45
| | |\ \ \ \
| | * \ \ \ \ 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-2220-288/+288
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | * | | | | | Merge branch 'develop' into pinmaphubmartin2021-08-1112-217/+80
| | |\ \ \ \ \ \
| | * | | | | | | 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-132-2/+2
| | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | 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-2835-350/+406
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'develop' into timer_battery_readingRiku Isokoski2021-08-1410-165/+167
| | |\ \ \ \ \ \ \
| | * | | | | | | | Make battery reading periodic. Add events. Disable pullupRiku Isokoski2021-08-148-32/+38
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Update Settings.cppItai Nelken2021-09-021-2/+2
* | | | | | | | | Revert "Merge upstream"Mark Russell2021-09-1626-268/+209
* | | | | | | | | Merge upstreamMark Russell2021-09-1626-209/+268
* | | | | | | | | Fixes per Riksu9000's feedbackMark Russell2021-09-167-30/+27