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
Avamander
62bb6b5163
Better cleanup, bugfixes and improvements in weather parsing. UI improvements
2021-12-04 22:03:40 +02:00
Avamander
cccec6e1ab
Improved debug UI.
2021-12-04 22:03:40 +02:00
Avamander
06b022fc4d
Improved UI and fixed a bug
2021-12-04 22:03:40 +02:00
Avamander
c870f8ed30
Bunch of bugs fixed, improved error handling, debug UI addition
2021-12-04 22:03:40 +02:00
Avamander
ffb17357e7
Fixed a few compilation errors, fixed UUID.
2021-12-04 22:03:40 +02:00
Avamander
ed6f0aade4
Implemented a few functions.
2021-12-04 22:03:40 +02:00
Avamander
19c9667a3d
Started initial work on the UI
2021-12-04 22:03:40 +02:00
Avamander
2736fa57bb
Added autodetection for clang-format version
2021-12-04 22:03:40 +02:00
Avamander
3a09b3614c
Brace style and whitespace fixes
2021-12-04 22:03:40 +02:00
Avamander
bda96dc595
Initial Weather service skeleton
2021-12-04 22:03:40 +02:00
Reinhold Gschweicher
85a25302bf
Clock: add missing Settings include
...
Add missing include in `Clock.cpp` for `Settings.h`. The Settings class
is forward declared in the header file, but it needs to be included in
the cpp file.
2021-12-02 21:58:31 +01:00
Steveis
b8dfad40bb
WatchFaceAnalog : move notification icon
...
Standardise notification icon to display in top left.
2021-12-02 21:47:08 +01:00
Reinhold Gschweicher
054a99cf6c
Paddle: add a little randomization in the dy speed
...
To make the game a bit more challenging an less predictable add a little
bit of randomness to the `dy` value. When hitting the right wall add a random
number (one of [-1, 0, 1]) to the `dy` value.
To keep the difficulty level managable limit the dy value to be in the
range from -5 to 5.
2021-12-02 21:46:36 +01:00
Jean-François Milants
1404d0186c
Merge branch 'paint-colorchange-vibration' of git://github.com/clemensvonmolo/InfiniTime into clemensvonmolo-paint-colorchange-vibration
...
# Conflicts:
# src/displayapp/screens/InfiniPaint.h
2021-12-02 21:42:56 +01:00