summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2021-09-14Merge branch 'develop' into disable_notif_onlyRiku Isokoski8-69/+121
2021-09-14Merge pull request #658 from NeroBurner/patch-2JF0021-4/+4
Run CI on master and develop branch
2021-09-14Merge pull request #668 from NeroBurner/motorcontroller_remove_unused_includeJF0021-1/+0
Remove unused include in MotoController.h
2021-09-13Remove unused include in MotoController.hReinhold Gschweicher1-1/+0
Remove the unused include `app_timer.h` in `MotorController.h`
2021-09-13Fix DisplayAppRecovery : fix include error by forward declaring Controllers ↵Jean-François Milants2-13/+20
in header file.
2021-09-13Merge branch 'develop' into disable_notif_onlyRiku Isokoski28-162/+177
2021-09-13Merge branch 'evergreen22-refactor_adv' into developJean-François Milants4-51/+97
2021-09-13Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime ↵Jean-François Milants4-51/+97
into evergreen22-refactor_adv # Conflicts: # src/components/ble/NimbleController.cpp
2021-09-13Merge pull request #549 from hubmartin/pinmapJF00216-92/+118
Put all duplicated GPIO pin definitions to a single file
2021-09-13docs: Fix a few typos (#606)Tim Gates4-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`.
2021-09-13Add WATCH_COLMI_P8 option to cmake & docshubmartin2-0/+10
2021-09-13Merge branch 'develop' into pinmaphubmartin17-86/+71
2021-09-12Merge pull request #617 from ColinKinloch/wake_up_mode_setting_changeJF0021-1/+1
Correct change test for wake up mode setting
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF0024-18/+2
Remove unused variables
2021-09-12Merge pull request #580 from Riksu9000/timer_battery_readingJF0028-31/+38
Make battery reading periodic
2021-09-12Merge pull request #552 from Riksu9000/new_to_infinitimeJF0021-17/+7
Make README more friendly for new users.
2021-09-12Merge pull request #551 from hubmartin/patch-3JF0021-0/+4
Add FW validation note after DFU flash
2021-09-12Merge pull request #550 from hubmartin/patch-2JF0021-0/+4
Add link to WebBLEWatch to sync time
2021-09-12Toggle notifications only, keep vibrations.Riku Isokoski9-43/+19
2021-09-11Merge pull request #615 from Utopiah/patch-1JF0021-0/+1
Infini-iOS
2021-09-11Merge pull request #636 from Itai-Nelken/move-about-firmware-settings-downJF0021-2/+2
Move PineTimeStyle settings up
2021-09-10Run CI on master and develop branchNeroBurner1-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.
2021-09-05Advertise fast for at least 30 secs then slow downJames A. Jerkins3-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).
2021-09-05Revert "Linear decrease of advert rate to conserve battery"James A. Jerkins2-6/+0
This reverts commit c32ba844e04017a3fd31444c384deb3542bd76be.
2021-09-04Linear decrease of advert rate to conserve batteryJames A. Jerkins2-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.
2021-09-02Update Settings.cppItai Nelken1-2/+2
2021-09-02Set version to 1.4.0.Jean-François Milants1-1/+1
2021-09-01Fix styles issues - no change to functionalityJames A. Jerkins1-6/+6
2021-09-01Fix race condition, connect->disconnect->discoveryJames A. Jerkins1-1/+3
2021-09-01Merge pull request #579 from mabuch/fix-github-buildJF0021-15/+9
fix Github Action build Firmware
2021-08-31Fix notifications that wouldn't auto close when the timeout elapsed (in ↵Jean-François Milants1-1/+0
preview mode).
2021-08-30Completely reset connection state on failJames A. Jerkins1-0/+3
2021-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski80-313/+686
2021-08-29WIP Refactor ble advertisingJames A. Jerkins4-46/+67
Refactor ble advertising based on ble standards and conventions. Changes are based on the bleprph example code, bluetooth docs, and nimble docs.
2021-08-29Merge branch 'develop' into pinmaphubmartin94-540/+969
2021-08-28Fix wake on tap/double tap.Jean-François Milants1-6/+8
2021-08-28Settings : use enums instead of ints to store colors. Group all PTS settings ↵Jean-François Milants8-116/+144
into a struct. PTS/SettingsPTS : Convert to/from LVGL color and Settings::Color, add functions to reduce code duplication. Adapt SettingPineTimeStyle with the last Screen Interface
2021-08-28Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF00210-18/+465
Add color picker for PineTimeStyle watchface
2021-08-28Merge pull request #497 from Riksu9000/refresh_reworkJF00272-287/+182
Rework Refresh
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski29-234/+292
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski37-351/+423
2021-08-28Fix recovery firmware since last changes in DisplayApp.Jean-François Milants3-2/+11
2021-08-28Fix touchinfo typo in SystemTask.Jean-François Milants1-1/+1
2021-08-28Merge branch 'Riksu9000-twimaster_rework' into developJean-François Milants4-88/+49
2021-08-28Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime ↵Jean-François Milants4-88/+49
into Riksu9000-twimaster_rework # Conflicts: # src/systemtask/SystemTask.cpp
2021-08-28Merge pull request #492 from Riksu9000/new_touch_handlerJF00224-151/+239
New touch handler
2021-08-26Correct change test for wake up mode settingColin Kinloch1-1/+1
2021-08-26Infini-iOSFabien Benetou1-0/+1
2021-08-22Update startup SCL toggling pinmap definitionshubmartin1-4/+5
2021-08-22Merge branch 'develop' into pinmaphubmartin25-342/+365
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 16:43:33 +0000