summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2021-09-18Merge pull request #669 from ↵JF0021-1/+1
NeroBurner/fix_unsigned_comparison_warning_metronome Fix unsigned/signed comparison warning in Metronome.cpp
2021-09-18Merge branch 'develop' into update_touch_driverRiku Isokoski19-5/+567
2021-09-18Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime ↵Jean-François Milants5-2/+27
into geekbozu-PersistantStorage # Conflicts: # src/systemtask/SystemTask.cpp
2021-09-18Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants2-0/+3
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell26-209/+268
2021-09-16Revert "Merge upstream"Mark Russell26-268/+209
This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
2021-09-16Merge branch 'develop' into wake-timehubmartin106-740/+1228
2021-09-16Merge upstreamMark Russell26-209/+268
2021-09-16Fixes per Riksu9000's feedbackMark Russell7-30/+27
2021-09-16Fix unsigned/signed comparison warning in Metronome.cppReinhold Gschweicher1-1/+1
`xTaskGetTickCount()` returns a `TickType_t`, which is defined as an `uint32_t`. This is compared to the `bpm` variable, which is a `int16_t` in the range of 40 to 220 as defined in the constructor. ```cpp lv_arc_set_range(bpmArc, 40, 220); ``` Just assume that `bpm` is greater than 0, as this would result in a divison by zero or negative values, which would unintentionally underflow to a very large number.
2021-09-15Fix Error screen and optimize GetTouchInfoRiku Isokoski4-15/+8
2021-09-14Merge branch 'develop' into disable_notif_onlyRiku Isokoski7-65/+117
2021-09-14Merge branch 'develop' into update_touch_driverRiku Isokoski98-518/+949
2021-09-13Remove unused include in MotoController.hReinhold Gschweicher1-1/+0
Remove the unused include `app_timer.h` in `MotorController.h`
2021-09-13License header fix, add missing bracesMark Russell4-5/+22
2021-09-13Fixes based on code reviews (formatting, UI code)Mark Russell5-89/+133
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 Isokoski22-143/+150
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/pinmapJF00214-92/+108
Put all duplicated GPIO pin definitions to a single file
2021-09-13docs: Fix a few typos (#606)Tim Gates2-2/+2
* 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-13Merge branch 'develop' into pinmaphubmartin13-53/+45
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-12Toggle notifications only, keep vibrations.Riku Isokoski9-43/+19
2021-09-10Created basic alarm appMark Russell16-3/+480
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-03Use percentage instead of IsFullRiku Isokoski2-5/+1
2021-09-03Auto realign battery icon in Analog watch faceRiku Isokoski1-0/+1
2021-09-03Detect full charge and improve watchface displayRiku Isokoski9-26/+75
2021-09-02Add some commentsTim Keller1-2/+6
2021-09-02Update Settings.cppItai Nelken1-2/+2
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-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-29Let lvgl control queueTimeoutRiku Isokoski2-22/+4
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 branch 'develop' into refresh_reworkRiku Isokoski29-234/+292
2021-08-28Merge branch 'develop' into update_touch_driverRiku Isokoski30-209/+273
2021-08-28Merge branch 'develop' into fit_more_tasksRiku Isokoski50-743/+666
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski35-351/+407