summaryrefslogtreecommitdiff
path: root/src/systemtask/SystemTask.cpp
AgeCommit message (Collapse)AuthorFilesLines
2021-09-18Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime ↵Jean-François Milants1-0/+1
into geekbozu-PersistantStorage # Conflicts: # src/systemtask/SystemTask.cpp
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell1-27/+35
2021-09-16Revert "Merge upstream"Mark Russell1-35/+27
This reverts commit 1d43adcdfa7bd15ba45c0c9d7c59c0ff99176b9c.
2021-09-16Merge upstreamMark Russell1-27/+35
2021-09-16Fixes per Riksu9000's feedbackMark Russell1-1/+1
2021-09-14Merge branch 'develop' into disable_notif_onlyRiku Isokoski1-2/+3
2021-09-14Merge branch 'develop' into update_touch_driverRiku Isokoski1-33/+43
2021-09-13Fixes based on code reviews (formatting, UI code)Mark Russell1-2/+1
2021-09-13Merge branch 'develop' into disable_notif_onlyRiku Isokoski1-25/+32
2021-09-13Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime ↵Jean-François Milants1-2/+3
into evergreen22-refactor_adv # Conflicts: # src/components/ble/NimbleController.cpp
2021-09-13Merge pull request #549 from hubmartin/pinmapJF0021-9/+11
Put all duplicated GPIO pin definitions to a single file
2021-09-13docs: Fix a few typos (#606)Tim Gates1-1/+1
* 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 pinmaphubmartin1-15/+20
2021-09-12Toggle notifications only, keep vibrations.Riku Isokoski1-3/+5
2021-09-10Created basic alarm appMark Russell1-0/+14
2021-09-05Advertise fast for at least 30 secs then slow downJames A. Jerkins1-0/+3
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-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski1-6/+8
2021-08-29WIP Refactor ble advertisingJames A. Jerkins1-2/+0
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 pinmaphubmartin1-26/+22
2021-08-28Fix wake on tap/double tap.Jean-François Milants1-6/+8
2021-08-28Merge branch 'develop' into update_touch_driverRiku Isokoski1-20/+14
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski1-20/+14
2021-08-28Fix touchinfo typo in SystemTask.Jean-François Milants1-1/+1
2021-08-28Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime ↵Jean-François Milants1-16/+5
into Riksu9000-twimaster_rework # Conflicts: # src/systemtask/SystemTask.cpp
2021-08-22Merge branch 'develop' into pinmaphubmartin1-3/+2
2021-08-19Move Backup to the system task.Tim Keller1-0/+1
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski1-3/+2
2021-08-18Automatic error detectionRiku Isokoski1-2/+7
2021-08-17Merge branch 'develop' into update_touch_driverRiku Isokoski1-17/+44
2021-08-14Merge branch 'develop' into timer_battery_readingRiku Isokoski1-3/+2
2021-08-14Make battery reading periodic. Add events. Disable pullupRiku Isokoski1-15/+20
2021-08-10Make diff smaller and revert some changes in DisplayAppRiku Isokoski1-0/+1
2021-08-10Rework TouchHandler into not a taskRiku Isokoski1-3/+5
2021-08-10Only enable the bus when neededRiku Isokoski1-9/+0
2021-08-03PinMap with namespace and constexprhubmartin1-9/+11
2021-08-01Remove leftoverRiku Isokoski1-5/+0
2021-08-01ImprovementsRiku Isokoski1-4/+5
2021-08-01Merge branch 'develop' into HEADRiku Isokoski1-67/+145
2021-07-25Merge branch 'develop' into new_touch_handlerRiku Isokoski1-9/+32
2021-07-24Dim screen before sleep (#464)Riku Isokoski1-11/+34
* Implement dimming
2021-07-23Merge branch 'develop' into new_touch_handlerRiku Isokoski1-3/+8
2021-07-22Make firmware updating more foolproof (#469)Riku Isokoski1-3/+8
* Make firmware updating more foolproof and fix bugs * No need to manually handle overflow * Make startTime TickType_t * Don't process TouchEvents::None * Fix sleep getting re-enabled issue more directly
2021-07-18UpdateRiku Isokoski1-0/+3
2021-07-16Fix touch wakeup and code cleanupRiku Isokoski1-19/+19
2021-07-16Fix most issuesRiku Isokoski1-1/+1
2021-07-15New touch handler, with issuesRiku Isokoski1-1/+0
2021-07-15Merge branch 'develop' into update_touch_driverRiku Isokoski1-9/+9
2021-07-14Multiple wakeup sources (#290)Kozova11-9/+9
* Allow multiple wakeup modes at the same time. This commit adds multiple wakeup modes support. It does so by storing them as a uint8_t bitfield enum. It changes the following functions: Since multiple modes can be on now, older version would not cut it: WakeUpMode getWakeupMode() -> std::bitset<3> getWakeUpModes() Where each bit corresponds to a WakeUpMode We still need a way to check whether a specific wakeup mode is on, so: bool isWakeUpModeOn(const WakeUpMode mode) This function was changed to work correctly with the new implementation. setWakeUpMode(WakeupMode mode, bool enable) Previously, systemtask would exit SystemTask::OnTouchEvent() if the wake up mode was None or RaiseWrist, to prevent waking up when a touch was received. However, after enabling using multiple WakeUpModes, this caused a bug where when RaiseWrist was checked with SingleTap or DoubleTap, the tap detection wouldn't work. This commit fixes that bug. Next commit will update the settings WakeUpMode select UI to reflect these changes. Signed-off-by: Kozova1 <mug66kk@gmail.com> * Updated UI to reflect multiple WakeUp sources being available. Signed-off-by: Kozova1 <mug66kk@gmail.com>
2021-07-14Update touchpad driverRiku Isokoski1-1/+1
2021-07-11Notify battery level every 10 minutes when connected to a BLE host.Jean-François Milants1-0/+5
Refactor battery percent : only use uint8_t to store the battery % remaining.