Jean-François Milants
bef3e708f6
Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake
...
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/screens/settings/Settings.cpp
2022-01-04 21:48:08 +01:00
SteveAmor
15c3807a76
Adds enum class for chimes option
2022-01-04 19:32:29 +00:00
Tim Keller
e82469bffa
Fix setting removing it self from wake settings when opening calibration window twice.
2022-01-04 02:06:16 +00:00
Tim Keller
f86c71b2bb
Made calibration window enable Accel wakeups for setting and calibration even when wake mode is inactive.
2022-01-04 02:02:01 +00:00
Tim Keller
92b1e83e3e
Remove "fancy" settings display and always show ShakeWakeThresholdSetting
2022-01-04 02:01:31 +00:00
Tim Keller
98ac447bdb
Fixed button color changing
2022-01-04 02:00:03 +00:00
Tim Keller
b9c40100f6
Added visual aide for shake strength
...
Added delay to starting calibration
2022-01-04 02:00:03 +00:00
Tim Keller
8f38bd911b
Raise calibration timeout to 7.5 seconds
...
Added button toggle state for cleaner user interaction
2022-01-04 02:00:03 +00:00
Tim Keller
5c13200238
Fix crash upon leaving app.
...
Code formatting
2022-01-04 02:00:03 +00:00
Tim Keller
d6b22645e3
Make arc moveable, and clear previous setting on calibrate
2022-01-04 02:00:02 +00:00
Tim Keller
f780ac999a
Actually save the threshold
...
Prevent a few crashes due to an LV task being active when it shouldnt be.
2022-01-04 02:00:02 +00:00
Tim Keller
d2510d7926
Better Sensitivity UI, Calibration button added
2022-01-04 02:00:02 +00:00
Tim Keller
3ebf002f9d
Add start of settings app for senstivity.
...
really just debugging. I want to make it more configurable then high med low.
Position of setting needs a new location...dynamicly adding it currently at the end. Which honestly im fine with.
2022-01-04 01:59:01 +00:00
Tim Keller
d270275bd2
Added Shake to wake
2022-01-04 01:57:18 +00:00
SteveAmor
7a0f72ed8b
resolve conflicts
2022-01-02 22:33:23 +00:00
SteveAmor
cc259b6a4a
resolves conflicts
2022-01-02 22:27:43 +00:00
SteveAmor
94561b2331
resolves conflicts
2022-01-02 21:49:18 +00:00
Stephanie
e0013e7304
Ran clang-format
2021-12-30 21:51:43 +01:00
Stephanie
a65f173e3c
Renamed confusing variables and general cleanup
2021-12-30 21:51:43 +01:00
Stephanie
7eff1dbcc6
Changed text to left pad
2021-12-30 21:51:43 +01:00
Stephanie
f7d1b3f368
Moved trip meter update to MotionController and changed trip meter logic
2021-12-30 21:51:43 +01:00
Stephanie
fb87fdb2d9
Changed lap counter to trip meter
2021-12-30 21:51:43 +01:00
Stephanie
d034bd131e
Added "lap" button to step counter
2021-12-30 21:51:43 +01:00
Riku Isokoski
54f588ce63
Add missing break
2021-12-30 21:41:17 +01:00
Riku Isokoski
86d180a855
Improve gesture consistency across the firmware
2021-12-30 21:41:17 +01:00
JF
395590d2d8
Merge pull request #718 from kieranc/pts-settings
...
Integrate color picker into PineTimeStyle watchface
2021-12-30 21:36:43 +01:00
Reinhold Gschweicher
5b7915b5c9
InfiniPaint: add missing include algorithm for std::fill
2021-12-30 20:58:00 +01:00
hubmartin
204fc56672
Use Bluetooth brand color for BLE logo #0082FC
2021-12-30 20:50:05 +01:00
hubmartin
f52d6bfa67
Real white now
2021-12-30 20:50:05 +01:00
hubmartin
86ee7a70b7
WatchFaceDigital - BLE symbol changed to white color
2021-12-30 20:50:05 +01:00
James A. Jerkins
645a071b70
FIX: AlarmTriggered fall through to ShowPairingKey
2021-12-11 21:34:51 -06:00
Kieran Cawthray
6cf4a933b6
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-12-09 22:41:29 +01:00
Riku Isokoski
32ea01b2e9
Organize includes
2021-12-09 21:32:07 +01:00
Riku Isokoski
ec9b5a0bd2
Move radio button styling to a single place
2021-12-09 21:32:07 +01:00
Riku Isokoski
736ae08fcd
Optimize arrays
2021-12-09 21:32:07 +01:00
Riku Isokoski
494448b7cc
Fix too small array
2021-12-09 21:32:07 +01:00
Riku Isokoski
9ffd28f735
Style checkboxes as radio buttons
2021-12-09 21:32:07 +01:00
Avamander
589733d11e
Style improvements
2021-12-09 21:31:13 +01:00
Avamander
6a442b90a1
Improved format specifiers, bracing, removed C-style casts, whitespace fixes and removed Tiles shadowing
2021-12-09 21:30:04 +01:00
Kieran Cawthray
645f6f43dc
Remove commented code
2021-12-09 21:29:31 +01:00
Kieran Cawthray
f4daf63679
Adjust icon alignment only on IsUpdated()
2021-12-09 21:29:31 +01:00
Kieran Cawthray
8539db0884
Alignment fixes
2021-12-09 21:29:31 +01:00
Avamander
e8c1302cd6
Merge branch 'develop' into patch-weather
2021-12-09 22:20:29 +02:00
James A. Jerkins
1e4130a9cf
Fix for passkey screen scramble
...
When a passkey is displayed, screen on or off, and another
passkey is displayed the screen may become scrambled. Fix
the issue by insuring the whole screen is drawn every time.
2021-12-09 21:14:16 +01:00
James A. Jerkins
62dbcbfc95
Connect and bond with a passkey
...
This commit adds the following:
Passkey pairing - passkey is displayed on watch
Swipe down to clear passkey screen
Connection encryption
Connection bonding
Automatic reconnects to a bonded peripheral
Trusted device on Android
Note that persisting the bond between reboots is NOT included in
this commit. Therefore, rebooting the watch will cause reconnect failures.
You must delete the bond from the phone to reconnect/pair.
2021-12-09 21:14:16 +01:00
Kieran Cawthray
ae4b9e0f2e
Include Colors.h
2021-12-06 10:29:14 +01:00
Kieran Cawthray
c00ad4af35
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-12-05 20:32:29 +01:00
Avamander
5f50f0e538
Fixed air quality amounts being off by a few orders of magnitude
2021-12-04 22:03:40 +02:00
Avamander
6879147648
Revert wrong change to DisplayApp
2021-12-04 22:03:40 +02:00
Avamander
0df49bd43d
Removed float usage from display
2021-12-04 22:03:40 +02:00