aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #658 from NeroBurner/patch-2JF0022021-09-141-4/+4
|\ | | | | Run CI on master and develop branch
| * Run CI on master and develop branchNeroBurner2021-09-101-4/+4
| | | | | | | | | | The documentation https://github.com/JF002/InfiniTime/blob/develop/doc/contribute.md#how-to-submit-a-pull-request- tells us to make pull requests against `develop` branch. Update the CI to run on those pull requests to have a check if the PR breaks something unintentionally.
* | Merge pull request #668 from NeroBurner/motorcontroller_remove_unused_includeJF0022021-09-141-1/+0
|\ \ | | | | | | Remove unused include in MotoController.h
| * | Remove unused include in MotoController.hReinhold Gschweicher2021-09-131-1/+0
|/ / | | | | | | Remove the unused include `app_timer.h` in `MotorController.h`
* | Fix DisplayAppRecovery : fix include error by forward declaring Controllers ↵Jean-François Milants2021-09-132-13/+20
| | | | | | | | in header file.
* | Merge branch 'evergreen22-refactor_adv' into developJean-François Milants2021-09-134-51/+97
|\ \
| * | Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime ↵Jean-François Milants2021-09-134-51/+97
|/| | | | | | | | | | | | | | | | | | | | into evergreen22-refactor_adv # Conflicts: # src/components/ble/NimbleController.cpp
| * | Advertise fast for at least 30 secs then slow downJames A. Jerkins2021-09-053-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On power up, advertise aggressively for at least 30 seconds then switch to a longer interval to conserve battery life. This fast/slow pattern is designed to balance connection response time and battery life. When a disconnect event is received restart the fast/slow pattern. When a failed connect event is received, restart the fast/slow pattern. When the screen is activated and ble is not connected, restart the fast/slow pattern. This pattern is consistent with Apple's BLE developer standards (QA 1931).
| * | Revert "Linear decrease of advert rate to conserve battery"James A. Jerkins2021-09-052-6/+0
| | | | | | | | | | | | This reverts commit c32ba844e04017a3fd31444c384deb3542bd76be.
| * | Linear decrease of advert rate to conserve batteryJames A. Jerkins2021-09-042-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start advertising aggressively when powered on then slow down linearly over 75 seconds. This will conserve battery by not advertising rapidly the whole time we are seeking a connection. The slowest rate is approximately once every 4.5 seconds to balance responsiveness and battery life. We use a fixed advertising duration of 5 seconds and start with a 62.5 ms advertising interval. Every 5 seconds (the advertising duration) we step up to a larger advertising interval (slower advertising). We continue to increase the advertising interval linearly for 75 seconds from the start of advertising. At 75 seconds we have an advertising interval of 4.44 seconds which we keep until connected. A reboot will restart the sequence. When we receive a disconnect event we restart the sequence with fast advertising and then slow down as described above. Note that we are not using the BLE high duty cycle setting to change the advertising rate. The rate is managed by repeatedly setting the minimum and maximum intervals. The linear rate of decrease and the slowest interval size were determined experimentally by the author. The 5.3 Core spec suggests that you not advertise slower than once every 1.2 seconds to preserve responsiveness but we ignored that suggestion.
| * | 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
| | | | | | | | | | | | | | | Refactor ble advertising based on ble standards and conventions. Changes are based on the bleprph example code, bluetooth docs, and nimble docs.
* | | Merge pull request #549 from hubmartin/pinmapJF0022021-09-1316-92/+118
|\ \ \ | | | | | | | | Put all duplicated GPIO pin definitions to a single file
| * | | 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
| |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * docs: Fix a few typos There are small typos in: - doc/versioning.md - src/components/ble/NimbleController.cpp - src/libs/mynewt-nimble/CODING_STANDARDS.md - src/libs/mynewt-nimble/docs/btshell/btshell_GAP.rst - src/systemtask/SystemTask.cpp Fixes: - Should read `milliseconds` rather than `miliseconds`. - Should read `unnecessary` rather than `uncesseray`. - Should read `target` rather than `tharget`. - Should read `project` rather than `projct`. - Should read `preferred` rather than `prefered`. - Should read `functioning` rather than `functionning`. - Should read `forever` rather than `forver`. - Should read `existing` rather than `exisiting`.
* | | | | | Merge pull request #617 from ColinKinloch/wake_up_mode_setting_changeJF0022021-09-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Correct change test for wake up mode setting
| * | | | | | 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 variables
| * | | | | | Remove unused variablesRiku Isokoski2021-08-194-18/+2
| |/ / / / /
* | | | | | Merge pull request #580 from Riksu9000/timer_battery_readingJF0022021-09-128-31/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make battery reading periodic
| * \ \ \ \ \ 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make README more friendly for new users.
| * | | | | | | | 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 flash
| * | | | | | | | Add FW validation note after DFU flashMartin Hub2021-08-031-0/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #550 from hubmartin/patch-2JF0022021-09-121-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add link to WebBLEWatch to sync time
| * | | | | | | | Update ota-gadgetbridge-nrfconnect.mdMartin Hub2021-08-031-0/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #615 from Utopiah/patch-1JF0022021-09-111-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Infini-iOS
| * | | | | | | | Infini-iOSFabien Benetou2021-08-261-0/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-downJF0022021-09-111-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Move PineTimeStyle settings up
| * | | | | | | Update Settings.cppItai Nelken2021-09-021-2/+2
|/ / / / / / /
* | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fix Github Action build Firmware
| * | | | | | | Github Action - update mcuboot versionmabuch2021-08-141-6/+1
| | | | | | | |
| * | | | | | | fix Github Action build Firmwaremabuch2021-08-141-15/+14
| | |_|/ / / / | |/| | | | |