Federico Igne
59ce48a3f3
Make new notifications refresh idle timer
2021-10-14 21:21:01 +01:00
Jean-François Milants
6d0e68d626
Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime into Riksu9000-update_touch_driver
...
# Conflicts:
# src/displayapp/Apps.h
2021-10-10 16:48:45 +02:00
Jean-François Milants
977faebcb8
Remove call to batteryController.Update(); which was replaced by batteryController.MeasureVoltage().
2021-10-09 21:17:59 +02:00
JF
9a831a6fe4
Merge pull request #715 from hubmartin/gpiote-fix
...
Fix GPIOTE not calling ISR when button is held during boot
2021-10-09 20:36:49 +02:00
JF
b969272c90
Merge pull request #719 from Riksu9000/improve_battery_reporting
...
Improve battery percentage calculation and reporting
2021-10-09 20:11:31 +02:00
Riku Isokoski
1777b9dee8
Don't measure and notify percentage on charging event.
2021-10-09 13:39:27 +03:00
hubmartin
98e74a3217
Call also ReloadIdleTimer
2021-10-08 17:01:27 +02:00
hubmartin
fc2241fbf4
Add wake on charge event
2021-10-08 16:53:49 +02:00
Riku Isokoski
f61e88b842
Merge branch 'develop' into update_touch_driver
2021-10-05 12:45:03 +03:00
Riku Isokoski
a9f7153fdf
Improve battery percentage calculation and reporting
...
While charging, percentage should only go up, and while discharging,
percentage should only go down.
2021-10-04 01:41:38 +03:00
hubmartin
9ef1babb9d
Code cleanup
2021-10-03 17:03:08 +02:00
hubmartin
f5725714d1
Call battery controller update
2021-10-03 17:00:38 +02:00
hubmartin
2aebbe3f47
GPIOTE fix of button and power detection experiment
2021-10-03 16:47:01 +02:00
JF002
8a2b86dc83
Merge pull request #664 from Riksu9000/disable_notif_only
...
Toggle notifications only, keep vibrations.
2021-09-23 20:13:42 +02:00
Riku Isokoski
e468acc99e
Merge branch 'develop' into update_touch_driver
2021-09-18 19:22:59 +03:00
Jean-François Milants
f556003de3
Merge branch 'PersistantStorage' of git://github.com/geekbozu/InfiniTime into geekbozu-PersistantStorage
...
# Conflicts:
# src/systemtask/SystemTask.cpp
2021-09-18 17:37:37 +02:00
Mark Russell
b9e56843a2
resolve conflict in src/systemtask/Messages.h
2021-09-16 16:20:39 -04:00
Mark Russell
cdf99b08f4
Revert "Merge upstream"
...
This reverts commit 1d43adcdfa
2021-09-16 16:12:20 -04:00
Mark Russell
1d43adcdfa
Merge upstream
2021-09-16 16:01:25 -04:00
Mark Russell
f857a757a7
Fixes per Riksu9000's feedback
2021-09-16 15:38:31 -04:00
Riku Isokoski
93d240a23b
Merge branch 'develop' into disable_notif_only
2021-09-14 23:38:42 +03:00
Riku Isokoski
f221f5d744
Merge branch 'develop' into update_touch_driver
2021-09-14 15:34:09 +03:00
Mark Russell
bfe13d9d68
Fixes based on code reviews (formatting, UI code)
2021-09-13 15:26:28 -04:00
Riku Isokoski
40765f1173
Merge branch 'develop' into disable_notif_only
2021-09-13 21:22:53 +03:00
Jean-François Milants
9afa412a2a
Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into evergreen22-refactor_adv
...
# Conflicts:
# src/components/ble/NimbleController.cpp
2021-09-13 20:22:27 +02:00
JF002
b0bdd2be1c
Merge pull request #549 from hubmartin/pinmap
...
Put all duplicated GPIO pin definitions to a single file
2021-09-13 20:05:43 +02:00
Tim Gates
84a93b5441
docs: Fix a few typos ( #606 )
...
* 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-13 20:02:53 +02:00
hubmartin
73d3e41cea
Merge branch 'develop' into pinmap
2021-09-13 10:19:07 +02:00
Riku Isokoski
3ee4876214
Toggle notifications only, keep vibrations.
2021-09-12 11:08:25 +03:00
Mark Russell
1fb5757655
Created basic alarm app
2021-09-10 18:40:13 -04:00
James A. Jerkins
22571d4b38
Advertise fast for at least 30 secs then slow down
...
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-05 15:53:20 -05:00
Riku Isokoski
21d37d1e23
Merge remote-tracking branch 'upstream/develop' into timer_battery_reading
2021-08-30 10:15:19 +03:00
James A. Jerkins
be31f417db
WIP Refactor ble advertising
...
Refactor ble advertising based on ble standards and conventions.
Changes are based on the bleprph example code, bluetooth docs, and nimble docs.
2021-08-29 15:50:04 -05:00
hubmartin
8390d0ef72
Merge branch 'develop' into pinmap
2021-08-29 11:43:50 +02:00
Jean-François Milants
6c023785e5
Fix wake on tap/double tap.
2021-08-28 21:30:31 +02:00
Riku Isokoski
d2d97319e0
Merge branch 'develop' into update_touch_driver
2021-08-28 17:19:49 +03:00
Riku Isokoski
085c9ab2e1
Merge branch 'develop' into timer_battery_reading
2021-08-28 16:54:40 +03:00
Jean-François Milants
0313277ae6
Fix touchinfo typo in SystemTask.
2021-08-28 15:10:14 +02:00
Jean-François Milants
45e7638fc2
Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime into Riksu9000-twimaster_rework
...
# Conflicts:
# src/systemtask/SystemTask.cpp
2021-08-28 15:08:50 +02:00
hubmartin
2a299fe275
Merge branch 'develop' into pinmap
2021-08-22 22:11:57 +02:00
Tim Keller
4f6d7e2c63
Move Backup to the system task.
2021-08-19 00:51:12 +00:00
Riku Isokoski
85c99797da
Merge branch 'develop' into new_touch_handler
2021-08-18 22:07:02 +03:00
Riku Isokoski
780a811f05
Automatic error detection
2021-08-18 15:23:30 +03:00
Riku Isokoski
5b969ccfa9
Merge branch 'develop' into update_touch_driver
2021-08-17 15:35:29 +03:00
Riku Isokoski
044036e884
Merge branch 'develop' into timer_battery_reading
2021-08-14 23:02:23 +03:00
Riku Isokoski
23bde0d18e
Make battery reading periodic. Add events. Disable pullup
2021-08-14 21:18:11 +03:00
Riku Isokoski
6776776421
Make diff smaller and revert some changes in DisplayApp
2021-08-10 22:18:21 +03:00
Riku Isokoski
8a694adb09
Rework TouchHandler into not a task
2021-08-10 22:03:34 +03:00
Riku Isokoski
2194a339cf
Only enable the bus when needed
2021-08-10 11:26:43 +03:00
hubmartin
b7aa04e1f5
PinMap with namespace and constexpr
2021-08-03 20:32:23 +02:00
