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
Riku Isokoski
5e6868d9eb
Improved notification timeout
2022-01-01 16:22:35 +02: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
319030d9e1
Add airplane mode feature
...
Implements 'Airplane mode' feature to disable and enable bluetooth/ble
Adds airplaneMode as a non-persisted setting
Adds a setting menu for switching airplane mode on and off
Displays an airplane symbol on the Digital watch face and the
PineTimeStyle watch face when airplane mode is enabled
Always enables bluetooth/ble on boot (disable airplane mode)
Alphabetizes the settings menu options
Style cleanups
Closes #632
2021-12-23 20:30:14 -06: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
Reinhold Gschweicher
a17d8bd566
Metronome: add missing include for Screen.h
2021-12-02 21:21:05 +01:00
Reinhold Gschweicher
fe6e4bea8c
WatchFaceDigital: remove unused include for ScreenList.h
2021-12-02 21:18:39 +01:00
Reinhold Gschweicher
0705b74656
WatchFaceDigital: add missing include to Settings.h
2021-12-02 21:18:39 +01:00
Reinhold Gschweicher
e8db73e0e7
WatchFaceAnalog: remove unused ScreenList, add needed includes
...
Remove unused `ScreenList.h` include.
For `std::abs()` add needed include `<cmath>`.
For the forward declared Settings-Controller add the `Settings.h`
include to the cpp file.
2021-12-02 21:17:53 +01:00
Reinhold Gschweicher
4b7f2546bd
PineTimeStyle: remove include and add forward declare
...
Remove unused `ScreenList.h` include and add a forward declaration for
the `MotionController` class.
2021-12-02 21:16:49 +01:00
Reinhold Gschweicher
ec437b1c66
QuickSettings: remove unused imports
2021-12-02 21:14:47 +01:00
Steveis
34511a66ee
About : Remove misleading info
...
Removed Steps which is hard coded to display 0.
Could be misleading and is using up memory.
2021-11-28 14:05:52 +01:00
Jean-François Milants
298f0f4335
Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes
...
# Conflicts:
# doc/contribute.md
# src/displayapp/screens/BatteryInfo.h
2021-11-28 13:53:03 +01:00
JF
dc25e7a887
Merge pull request #820 from Riksu9000/fix-anim-dir
...
Fix animation when long pressing on screens adjacent to watch face
2021-11-28 13:26:36 +01:00
Kieran Cawthray
1b2a8a5a04
Improve notification icon alignment
2021-11-16 18:18:56 +01:00
Kieran Cawthray
bea5c60a11
Revert "Fix notification icon alignment"
...
This reverts commit 29bb359e90
.
2021-11-16 18:10:34 +01:00
Kieran Cawthray
29bb359e90
Fix notification icon alignment
2021-11-16 00:06:13 +01:00
Reinhold Gschweicher
241d36471d
Move up file header include to top
2021-11-15 22:02:49 +01:00
Reinhold Gschweicher
1b937a77b9
remove unused libs/ prefix from lvgl includes as not needed
2021-11-15 22:02:49 +01:00
Reinhold Gschweicher
f2918709d9
Add missing standard includes
2021-11-15 22:02:49 +01:00
Reinhold Gschweicher
ac7b2da611
Update includes to to be relative to src directory
...
Don't use relative imports like `../foo.h` as those depend on the
relative position of both files. Rather than that use imports relative
to the `src` directory, which explicitly is part of the include
directories.
2021-11-15 22:02:49 +01:00
Reinhold Gschweicher
c4f2fb2fa4
BatteryInfo: remove unused FreeRTOS.h and timer.h includes
2021-11-15 21:56:02 +01:00
Kieran Cawthray
5a0cf8e348
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-11-15 19:38:29 +01:00
Riku Isokoski
2e7b51c8e1
clang-format and clang-tidy PineTimeStyle
2021-11-13 13:11:32 +02:00
Riku Isokoski
39157f2f19
Close menu with button
2021-11-13 13:02:00 +02:00
Mark Russell
947ece0bc9
Status bar displays time in 12 or 24 hour format based on settings
2021-11-10 20:11:09 -05:00
Riku Isokoski
bdf7e5293f
Fix animation when long pressing on screens adjacent to watch face
2021-11-10 13:45:49 +02:00
Riku Isokoski
1d6455c289
Fix Alarm app crashing on buttonpress
2021-11-09 11:38:19 +02:00
Kieran Cawthray
18e3cc7038
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-11-07 17:49:54 +01:00
SteveAmor
5932391c8b
Chimes option
2021-11-07 10:50:33 +00:00
JF
4a5b5f954f
Merge pull request #782 from Riksu9000/newer_buttonhandler
...
Newer ButtonHandler
2021-11-06 10:55:37 +01:00
JF
cfc11ea83b
Merge pull request #792 from Riksu9000/memory_saving
...
Memory savings by replacing strings
2021-11-06 10:45:17 +01:00
Clemens von Molo
75f0bbb7ca
change paint vibration to 35ms
2021-11-01 12:10:06 +01:00
Clemens von Molo
2d98530976
color rotation using modulo, ran clang-format for InfiniPaint
2021-11-01 11:46:27 +01:00
Clemens von Molo
5e1f4839da
InfiniPaint vibrate on colorchange, fix color rotation
2021-10-31 21:23:43 +01:00
JF
0aa73c2279
Merge pull request #791 from evergreen22/recovery-boot
...
Fix recovery firmware build
2021-10-31 10:00:19 +01:00
Riku Isokoski
30520d262b
Memory savings by replacing strings
2021-10-29 13:22:14 +03:00
James A. Jerkins
4560844994
Fix recovery firmware build
2021-10-28 20:38:59 -05:00
Riku Isokoski
d5dfa80876
Newer buttonhandler
2021-10-25 12:53:14 +03:00
Kieran Cawthray
85d494a987
Revert "Update GetNext/GetPrevious"
...
This reverts commit 411c10ec31
.
2021-10-23 18:12:41 +02:00
Kieran Cawthray
da97a94a0f
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-10-23 18:00:47 +02:00
JF
6c3f56bb59
Merge pull request #740 from Riksu9000/flashlight_brightness
...
Flashlight brightness control
2021-10-23 10:14:14 +02:00
Kieran Cawthray
411c10ec31
Update GetNext/GetPrevious
2021-10-20 18:07:08 +02:00
Kieran Cawthray
3ed01b33e7
Improve random color selection, disable longpress when settings are visible
2021-10-20 17:44:10 +02:00
Kieran Cawthray
32978b6a06
Restore settings order
2021-10-20 15:36:28 +02:00
Kieran Cawthray
074d3420c8
Ensure needle color is visible on reset/randomize
2021-10-20 11:30:06 +02:00
Kieran Cawthray
994f373a14
Change gauge needle color when background is white
2021-10-19 00:22:45 +02:00
Kieran Cawthray
1c3372b319
Fix settings merge error
2021-10-18 23:29:41 +02:00
Kieran Cawthray
ff1fce18d6
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-10-18 23:14:39 +02:00
Kieran Cawthray
c4ab17f587
Disable DoubleTap when settings buttons are displayed
2021-10-18 23:04:12 +02:00
Kieran Cawthray
1c86796eac
More duplicate color dodging
2021-10-18 22:52:53 +02:00
JF
bf83493c8d
Merge pull request #746 from Quantum-cross/recovery-fix
...
fix building of Recovery image
2021-10-16 14:11:40 +02:00
JF
77e73fea32
Merge pull request #507 from Riksu9000/fit_more_tasks
...
Fit more tasks in SystemInfo
2021-10-16 14:10:09 +02:00