Riku Isokoski
68a7016080
Replace lv_label_set_text where possible
2022-04-18 19:47:42 +03:00
mabuch
82a4f9aa68
resolved merge conflict after renaming PineTimeStyle to WatchFacePineTimeStyle
2022-04-18 14:35:31 +02:00
Reinhold Gschweicher
2607c3d799
Let TouchHandler return TouchEvents instead of driver specific enum
...
Let the TouchHandler::GestureGet() function return a TouchEvent instead
of the touchpanel-driver specific enum.
This helps to move the driver specific helper function `ConvertGesture`
from `DisplayApp` into `TouchHandler`.
2022-04-13 21:33:58 +02:00
Riku Isokoski
78365548f7
Replace airplane mode with a bluetooth toggle
2022-04-02 16:16:47 +02:00
Jean-François Milants
8f436e1d74
Timer App : add background label to ensure that the app will be displayed correctly after a full refresh (HW scrolling transition).
...
Code cleaning and rename methods.
2022-03-28 21:12:46 +02:00
Jean-François Milants
4761fcb63a
DisplayApp : Call the event handler of the current app before loading the new one. This way, we ensure that lv_task_handler() is called before sending event to the newly loaded app.
2022-03-28 21:12:25 +02:00
JF
1c4a56b05b
Merge pull request #1038 from NeroBurner/analog_local_variables
...
WatchFaceAnalog: local date/time variables
2022-03-14 21:25:46 +01:00
JF
5f2ce53877
Merge pull request #1033 from NeroBurner/music_override_warning
...
Music: fix warning about overridden function
2022-03-14 21:21:33 +01:00
JF
fc374562dd
Merge pull request #1034 from NeroBurner/twos_comparison_warning
...
Twos: fix warning about extra paranthesis
2022-03-14 21:21:11 +01:00
Reinhold Gschweicher
1379b7902f
WatchFaceAnalog: local date/time variables
...
Use local date and time variables. No need to store them in the object.
2022-03-14 21:00:07 +01:00
Reinhold Gschweicher
bebc072e78
WatchFaceAnalog: const ref to dateTimeController
...
The clock app only reads from the dateTimeController, never modifies it.
2022-03-14 20:59:44 +01:00
Reinhold Gschweicher
51716898aa
Twos: fix warning about extra paranthesis
...
We have a comparison like `if (( a == b ))`, which is a parenthesis too
much, which generates the following warning
```
InfiniTime/src/displayapp/screens/Twos.cpp:133:35: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
if ((grid[newRow][newCol].value == grid[oldRow][oldCol].value)) {
~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
InfiniTime/src/displayapp/screens/Twos.cpp:133:35: note: remove extraneous parentheses around the comparison to silence this warning
if ((grid[newRow][newCol].value == grid[oldRow][oldCol].value)) {
~ ^ ~
```
2022-03-13 22:05:25 +01:00
Reinhold Gschweicher
0933d60b16
Music: fix warning about overridden function
...
Clang warns on `OnTouchEvent()` function, which is overridden, but is
missing the `override` keyword
```
In file included from InfiniTime/src/displayapp/screens/Music.cpp:18:
InfiniTime/src/displayapp/screens/Music.h:43:14: warning: 'OnTouchEvent' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
bool OnTouchEvent(TouchEvents event);
^
```
2022-03-13 21:58:53 +01:00
mabuch
ea14c580ca
Rename PineTimeStyle to WatchFacePineTimeStyle
2022-03-12 18:16:09 +01:00
JF
21da5869c5
Merge pull request #1026 from NeroBurner/fix_settings_chimes
...
Fix SettingChimes cbOption array size
2022-03-09 21:59:30 +01:00
JF
dbfcb455fe
Merge pull request #1005 from aveeryy/notifications-as-text
...
Terminal watchface: replace notifications icon with a text entry
2022-03-09 21:33:46 +01:00
Reinhold Gschweicher
f47b04ffd0
Fix SettingChimes cbOption array size
...
There are 3 options, but the array-size is set to 2. This leads to
memory corruption in the initialization of the SettingChimes screen when
assigning the third option object pointer.
Found in https://github.com/InfiniTimeOrg/InfiniSim/issues/11
2022-03-08 23:12:34 +01:00
Riku Isokoski
61a9a97e26
Update navigation font readme section
2022-03-08 21:34:20 +01:00
Riku Isokoski
04d21dcd93
Add ExtraBold font ttf
2022-03-08 21:34:20 +01:00
Riku Isokoski
13c66dd54b
Further updates to font readme.
2022-03-08 21:34:20 +01:00
Riku Isokoski
204ad7ca2a
Update font readme, update fonts, add missing files
2022-03-08 21:34:20 +01:00
avery
8844ea60b1
Remove unnecessary line
2022-03-06 14:01:20 +01:00
avery
452dd12eff
Merge branch 'develop' into notifications-as-text
2022-03-06 13:11:26 +01:00
avery
5d974434ef
Replace notif entry with "You have mail." text
2022-03-05 13:01:50 +01:00
Yehoshua Pesach Wallach
30797b37bc
removed SetClockFace from watchface Constructors
2022-03-03 21:20:22 +01:00
medeyko
dd47ba9782
Update README.md
...
More imperative tone
2022-03-03 21:13:54 +01:00
medeyko
dd28359571
Update README.md
...
remove unnecessary )
2022-03-03 21:13:54 +01:00
medeyko
43399b3832
Update README.md
2022-03-03 21:13:54 +01:00
medeyko
1eaf258a63
Update jetbrains_mono_bold_20.c
...
Fix 0 (zero) symbol. For more details, #988
2022-03-03 21:13:54 +01:00
Riku Isokoski
f1c91e1ce0
terminal watchface: remove icons and other fixes
2022-03-03 21:10:39 +01:00
avery
1bfee61ef9
Replace Airplane mode icon
2022-03-03 21:09:05 +01:00
Reinhold Gschweicher
a29e30c187
Notifications: replace newlines in label-copy because of const char* title
...
The variable `title` is defined as `const char*`, which means, that
`strchr()` returns a `const char*` as well according to
https://www.cplusplus.com/reference/cstring/strchr/
But in the same line the return value is assigned to a non-const
`char*`, which shouldn't be allowed (error with `-pedantic`).
Because the `lv_label` creates an internal copy of the title sting, just
modify that one instead and replace newline in the copied string.
2022-03-03 21:08:45 +01:00
Reinhold Gschweicher
29f0bce46b
Remove unused includes in HearRate and Motion.h
...
The include `bits/unique_ptr.h` isn't used, so remove it.
2022-03-03 21:07:11 +01:00
avery
8dae4c8299
terminal: Replace notification icon with a text entry
2022-02-22 18:42:54 +01:00
avery
2803dd667f
Use Bluetooth brand color for status text
2022-02-22 18:23:26 +01:00
Jean-François Milants
ef44b763d9
Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode
...
Apply a few changes that were requested in the PR during the review.
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/Messages.h
# src/displayapp/screens/settings/Settings.cpp
2022-02-20 15:40:49 +01:00
Jean-François Milants
40cdb54772
Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode
...
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/Messages.h
# src/displayapp/screens/settings/Settings.cpp
2022-02-20 15:25:24 +01:00
Jean-François Milants
69e4ab6be1
Manual squash merge of PR #932 ( https://github.com/InfiniTimeOrg/InfiniTime/pull/932 ) from 13werwolf13 ( https://github.com/13werwolf13 ). This PR adds a new Terminal watchface to InfiniTime!
...
Squashed commit of the following:
commit 23ea840b059c69667c8711265cecaf992791acb6
Author: Jean-François Milants <jf@codingfield.com>
Date: Sun Feb 20 13:14:27 2022 +0100
Terminal watch face : fix includes and a few code cleaning.
commit 3c244def25e3ad8e1f56d708fb0864c122059948
Merge: 40790868
138a6552
Author: Jean-François Milants <jf@codingfield.com>
Date: Sun Feb 20 12:45:54 2022 +0100
Merge branch 'develop' of https://github.com/13werwolf13/InfiniTime into 13werwolf13-develop
commit 138a65528a86799fd5c37f065023a92f222fe044
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:13:00 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.h
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 35156166b2f7589bf005ec7c7192a4226578f6d9
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:12:43 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 757ca2dd438f1f314267a8b81a6034c576f1d6be
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:12:30 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 60b6b4e5824d04faa3efa45173358d04fa68a368
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:12:20 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 6959d8c043013550a7a3e4e6588b234d3bb942b5
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:11:46 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 4d850281bedf342d0856da5eafc22e46d0767c56
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:11:17 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit af483bee33c225fcb03432db1eb14c0453df0ae7
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:10:57 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 6bc6c1a637be4e514ecd0097d1dc9e4aacdba1db
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:10:40 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.h
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 25fdafc6aba0d9e0173103501de3802af261e2ae
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:06:10 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 12e1b0f8c0202a7f62e3e1c297af850ce3526d13
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:05:44 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit e6c0f32056e9fea878d270d761607ac5ddc263b0
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:05:22 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.h
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 342ce8cd114f4af265078bc0cfa6b2d8831706d7
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:05:06 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 265fec5eeca27fcc1152a18e4af0273bcf119c46
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:04:06 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit b4669be38be0df2b6a3505d5f7a770c71636be60
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:03:29 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 471a84390957ded2ac23ebfe1cb99408e3783b0f
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:03:10 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit 6853166cf546a4ce561195eba01f1b1fd6d56420
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Wed Feb 2 09:02:51 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit bba34f69bfdd6b44f142c93644f71c9eda007290
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Sat Jan 22 12:32:41 2022 +0500
some fixes
commit 74eea9f5800f273249846e6e1c887d15ba6eb10b
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Sat Jan 22 12:32:17 2022 +0500
some fixes
commit 1e4a6763d73c3ba39c680ad25f90813e6a6a36d1
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Fri Jan 21 08:59:44 2022 +0500
no errors, no warnings, no work..
commit eb8bd4dc4ecbbf61f1e0f725fd2116ee25319fd6
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 20 23:50:04 2022 +0500
add ble state text output
commit fda1c088becb4a7f9ced451a0291694abe2249dc
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 20 22:25:35 2022 +0500
add ble state text output
commit 68d3d9b343c0f37830bb640fab10b186faf73067
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 20 22:22:20 2022 +0500
add ble state text output
commit 0ed45a9916787f68c0aa6bab9c97b090f2eebdd5
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Tue Jan 18 15:48:15 2022 +0500
typo fix
commit 477a3a7f27c7486be2c8f985afab1f1739608fed
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Tue Jan 18 10:36:19 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit d6849888ea5cc152f04c5bf6fe2631e66296c357
Author: Марков Дмитрий <13werwolf13@mail.ru>
Date: Tue Jan 18 10:36:09 2022 +0500
Update src/displayapp/screens/WatchFaceTerminal.cpp
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
commit e2f7e318298b8a6f4d436cbbb1b92a738dacab7f
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Mon Jan 17 13:34:05 2022 +0500
typo fix
commit fc246beb01d3feac4fd0b2fc9c45b38847e1d950
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Sat Jan 15 15:26:25 2022 +0500
typo fix
commit ebbb31abf10ad9f61a8a7ecfdf29c2aaeaf33c19
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Fri Jan 14 10:08:29 2022 +0500
typo fix
commit 3afedcaa28009f59e6960730e9349097ef455ea8
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 13 12:34:39 2022 +0500
time format
commit 471a4c942f7e3cfd5c52bd61152ede770da5e026
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 13 12:27:10 2022 +0500
time format
commit d3fd348de4b4a89c216a717de84fcc923cc099fe
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 13 12:26:49 2022 +0500
time format
commit e540d103e3204649ff585742f8834d16136372d5
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Thu Jan 13 11:28:31 2022 +0500
add patch
commit 728830178f31f71785c49cdc6b83daea4e0a7df6
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 22:08:07 2022 +0500
add menue item
commit 4c5847669fa083f15ee3fdb404dadfdaef0f82aa
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 21:42:22 2022 +0500
typo fix
commit 79273fe24f9162aca5508f07b17896149ad19839
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 20:48:06 2022 +0500
typo fix
commit 1808a78ad94d0dfe97b6410a93ba30560de22f4b
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 20:17:15 2022 +0500
typo fix
commit 6dfa141dca176789da4e978f008eb842d9ec515a
Author: Дмитрий Марков <markov@promobit.ru>
Date: Wed Jan 12 20:12:09 2022 +0500
typo fix
commit 88f01902325505a9206ced4504aae0762042535d
Author: Дмитрий Марков <13werwolf13@mail.ru>
Date: Wed Jan 12 14:50:54 2022 +0500
add terminal watchface
2022-02-20 13:20:43 +01:00
Reinhold Gschweicher
407908686a
Provide reference to BrightnessController in DisplayApp
...
For the simulator I need a way to get to the brightnessController object
and handle the set brightness-levels accoringly.
This is done by the constructor expecting a brightnessController object
instead of initializing one itself
2022-02-19 20:46:45 +01:00
Reinhold Gschweicher
f829427c41
Remove unused and not compiling DropDownDemo
...
For ease of use the simulator uses a globbing expression to get all
screens source files. This one was picked up as well and lead to a
compilation error.
2022-02-19 13:17:45 +01:00
Reinhold Gschweicher
4aaa3a3b49
SettingShakeThreshold: add missing SystemTask.h, relative include
...
SettingShakeThreshold.h uses SystemTask, but doesn't include the header.
Fixing that for the simulator.
For consistency make the header include a relative to src include.
2022-02-19 13:16:15 +01:00
Reinhold Gschweicher
04eca81a95
Notifications: use motorController object instead of class function
...
We get the motoroController object, so store and use it.
2022-02-19 13:13:36 +01:00
Riku Isokoski
4f649a8544
Improved alarm alert handling
2022-02-13 11:36:51 +01:00
Jean-François Milants
87d882b151
Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime into mruss77-statusBarTimeFormat
...
# Conflicts:
# src/components/datetime/DateTimeController.cpp
2022-02-13 11:23:05 +01:00
Riku Isokoski
32fe7b660c
Make switch disabled state slightly dimmer
2022-02-12 18:36:11 +01:00
Riku Isokoski
76f63ed76a
Fix switch default state
2022-02-12 18:36:11 +01:00
Riku Isokoski
0930a79041
Alarm: Fix missing stop button. Revert alert layout
2022-02-12 18:36:11 +01:00
Riku Isokoski
a9b77ae0d4
Alarm: Change checkable button for a switch
2022-02-12 18:36:11 +01:00
Eli Weiss
2daa5dcbee
Added alarm 12 hour interface
2022-01-31 20:42:48 +01:00
Eli Weiss
ae0724c28c
Corrected capitalization
2022-01-31 20:42:18 +01:00
Eli Weiss
02e94acf18
Corrected code formatting
...
Corrected formatting and removed unnecessary variable time24H
2022-01-31 20:42:18 +01:00
Eli Weiss
d86f81b9ad
Changed setHourLabels function to handle 24H too
...
Changed setHourLabels function to handle 24 hour time labeling, changed to private
2022-01-31 20:42:18 +01:00
Eli Weiss
c8d998e82c
Consolidated label changes, optimizations
...
Consolidated 12 hour label changes to function. Removed use of strings, struct.
2022-01-31 20:42:18 +01:00
Eli Weiss
5be2f57a78
Consolidated time conversion logic
...
Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
2022-01-31 20:42:18 +01:00
Eli Weiss
1813399959
Removed redundant brackets
...
Also corrected orphaned bracket
2022-01-31 20:42:18 +01:00
Eli Weiss
2bc338ceed
Cleaned up redundant if statements, spacing
...
Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
2022-01-31 20:42:18 +01:00
Eli Weiss
698288d822
Added 12 hour set time
2022-01-31 20:42:18 +01:00
JF
f38c559089
Merge pull request #954 from NeroBurner/music_initialize_lastLength
...
Music: initialize totalLength to have non-random data from the start
2022-01-26 22:01:07 +01:00
JF
b12603448c
Merge pull request #959 from NeroBurner/stopwatch_include_cleanup
...
StopWatch: cleanup unused includes and use relative to src includes
2022-01-26 22:00:33 +01:00
JF
458f5b8eb8
Merge pull request #903 from Riksu9000/improved_notif_timeout
...
Improved notification timeout
2022-01-26 21:38:07 +01:00
Reinhold Gschweicher
67f546fa33
StopWatch: cleanup unused includes and use relative to src includes
2022-01-26 08:31:14 +01:00
Reinhold Gschweicher
314c02194a
Music: initialize totalLength to have non-random data from the start
...
In the first `Music::Refresh` call the lastLength and totalLength are
not initialized. The `lastLength` value is read first from the
musicService. Naturally in the first itereation that is changed and
`UpdateLength()` is called. There the variable `totalLength` is used as
well, but that variable isn't initialed to a sensible value yet. This
leads to sometimes the `Music.h` screen segfaulting (depending on the
random uninitialized data in the `lastLength` variable)
2022-01-23 23:39:38 +01:00
Riku Isokoski
6bf6bb7e2a
PTS and digital watchface code cleanups
2022-01-20 16:04:26 +02:00
Riku Isokoski
97cbe34963
Update shakewake menu option
2022-01-06 15:44:39 +02:00
JF
e8fc46ba20
Merge pull request #912 from SteveAmor/chimesradio
...
Updates radio button style for Chimes Option
2022-01-05 10:42:25 +01:00
SteveAmor
b1b9937ff7
Updates radio button style
2022-01-04 21:28:37 +00:00
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
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
JF
fafb998b8c
Merge pull request #655 from NeroBurner/paddle_hor_fix
...
Paddle: compare ballX coordinate with horizontal resolution
2021-10-16 14:09:05 +02:00
mabuch
1d76d9170e
Replaced "JF002" in github URLs with "InfiniTimeOrg"
2021-10-15 18:03:10 +02:00
Quantum-cross
4a59e544ba
fix building of Recovery image.
2021-10-14 23:32:58 -04:00
Riku Isokoski
fd4fbfddb9
Flashlight brightness control
2021-10-13 13:04:40 +03:00
Reinhold Gschweicher
7cd4929bfd
Paddle: compare ballX coordinate with horizontal resolution
...
Fix the comment as the comparison checks if the ball is at the right
side of the screen.
Compare the x coordinate of the ball with the horizontal resolution of
the screen, instead of the vertical resolution. On the PinePhone this
does make no difference as we have square 240x240 screen. Change it
anyways to be completely correct.
2021-10-11 21:46:19 +02: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
f2357b36e5
Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by nullptr and other small cleanings.
2021-10-10 16:18:14 +02:00
Jean-François Milants
cf9e149b33
Merge with develop and fix conflicts from timaios:set-datetime-manually.
2021-10-10 16:01:43 +02:00
JF
4118f97812
Merge pull request #701 from maksalees/close-info-popup-with-back-button-in-alarm
...
Alarm: Close the popup with information about the time until alarm with the back button
2021-10-09 19:50:36 +02:00
Riku Isokoski
f61e88b842
Merge branch 'develop' into update_touch_driver
2021-10-05 12:45:03 +03:00
Kieran Cawthray
7d1da9f1f9
Remove old PineTimeStyle settings app
2021-10-03 21:49:57 +02:00
Kieran Cawthray
3320eae95c
Initial commit
2021-10-03 21:49:57 +02:00
JF
b84a546920
Merge pull request #623 from Riksu9000/lvgl_queuetimeout
...
Let LVGL control queueTimeout
2021-10-03 16:20:20 +02:00
JF
fa6c291d3e
Merge pull request #638 from Riksu9000/detect_full_charge
...
Detect full charge and improve watchface battery display
2021-10-03 16:13:39 +02:00
Maxim Leshchenko
05f8850acf
Fixes based on code reviews
2021-09-29 19:15:48 +03:00
Maxim Leshchenko
d86ae69961
Alarm: Close the popup with information about the time until alarm with the back button
...
Previously, pressing the back button would close the alarm app anyway. Now if you press on it and the popup with information is open, it will first close and the second press will close the application
2021-09-28 22:50:09 +03: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
980ac17388
Show plug icon while plugged in
2021-09-22 13:58:45 +03:00
Riku Isokoski
b210090837
Merge branch 'develop' into detect_full_charge
2021-09-22 12:03:41 +03:00
Riku Isokoski
d7dfe5d4ed
Remove unused variable
2021-09-21 15:36:31 +03:00
JF002
52eb94cfc4
Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metronome
...
Fix unsigned/signed comparison warning in Metronome.cpp
2021-09-18 20:33:45 +02:00
Riku Isokoski
e468acc99e
Merge branch 'develop' into update_touch_driver
2021-09-18 19:22:59 +03:00
Jean-François Milants
7af7db74cd
Fix DisplayAppRecovery : add AlarmController to ctor().
2021-09-18 17:20:33 +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
Reinhold Gschweicher
63477fc096
Fix unsigned/signed comparison warning in Metronome.cpp
...
`xTaskGetTickCount()` returns a `TickType_t`, which is defined as an
`uint32_t`. This is compared to the `bpm` variable, which is a `int16_t`
in the range of 40 to 220 as defined in the constructor.
```cpp
lv_arc_set_range(bpmArc, 40, 220);
```
Just assume that `bpm` is greater than 0, as this
would result in a divison by zero or negative values, which would
unintentionally underflow to a very large number.
2021-09-16 10:47:09 +02:00
Riku Isokoski
8f0771183c
Fix Error screen and optimize GetTouchInfo
2021-09-15 12:25:41 +03: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
2bf339a3f8
License header fix, add missing braces
2021-09-13 16:05:35 -04:00
Mark Russell
bfe13d9d68
Fixes based on code reviews (formatting, UI code)
2021-09-13 15:26:28 -04:00
Jean-François Milants
6356c7f276
Fix DisplayAppRecovery : fix include error by forward declaring Controllers in header file.
2021-09-13 20:35:51 +02:00
Riku Isokoski
40765f1173
Merge branch 'develop' into disable_notif_only
2021-09-13 21:22:53 +03:00
JF002
8728ac2f6a
Merge pull request #602 from Riksu9000/del_unused
...
Remove unused variables
2021-09-12 18:34:11 +02:00
JF002
f0329298ac
Merge pull request #580 from Riksu9000/timer_battery_reading
...
Make battery reading periodic
2021-09-12 18:22:04 +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
Riku Isokoski
b31b2425f8
Use percentage instead of IsFull
2021-09-03 16:57:00 +03:00
Riku Isokoski
ac2ccaeff6
Auto realign battery icon in Analog watch face
2021-09-03 14:57:07 +03:00
Riku Isokoski
fd52ca8fe6
Detect full charge and improve watchface display
2021-09-03 14:35:38 +03:00
Itai Nelken
bd1a571399
Update Settings.cpp
2021-09-02 23:20:25 +03:00
Jean-François Milants
1635bfafb3
Fix notifications that wouldn't auto close when the timeout elapsed (in preview mode).
2021-08-31 21:56:21 +02:00
Riku Isokoski
21d37d1e23
Merge remote-tracking branch 'upstream/develop' into timer_battery_reading
2021-08-30 10:15:19 +03:00
Riku Isokoski
e57ff28231
Let lvgl control queueTimeout
2021-08-29 12:40:48 +03:00
Jean-François Milants
31bc47d1cb
Settings : use enums instead of ints to store colors. Group all PTS settings into a struct.
...
PTS/SettingsPTS : Convert to/from LVGL color and Settings::Color, add functions to reduce code duplication.
Adapt SettingPineTimeStyle with the last Screen Interface
2021-08-28 21:02:11 +02:00
JF002
ef9f809e14
Merge pull request #458 from kieranc/pinetimestyle-colorpicker
...
Add color picker for PineTimeStyle watchface
2021-08-28 20:56:34 +02:00
Riku Isokoski
c2fae47391
Merge branch 'develop' into refresh_rework
2021-08-28 17:25:50 +03:00
Riku Isokoski
d2d97319e0
Merge branch 'develop' into update_touch_driver
2021-08-28 17:19:49 +03:00
Riku Isokoski
c78177eedf
Merge branch 'develop' into fit_more_tasks
2021-08-28 17:10:01 +03:00
Riku Isokoski
085c9ab2e1
Merge branch 'develop' into timer_battery_reading
2021-08-28 16:54:40 +03:00
Jean-François Milants
fab49f8557
Fix recovery firmware since last changes in DisplayApp.
2021-08-28 15:23:13 +02:00
Kieran Cawthray
8ac1ae70cc
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-08-19 15:14:04 +02:00
Riku Isokoski
2b30ff4fc6
Remove unused variables
2021-08-19 11:12:34 +03:00
Riku Isokoski
85c99797da
Merge branch 'develop' into new_touch_handler
2021-08-18 22:07:02 +03:00
Riku Isokoski
b91100573e
Fix music app buttons
2021-08-18 20:19:02 +02:00
Riku Isokoski
780a811f05
Automatic error detection
2021-08-18 15:23:30 +03:00
Riku Isokoski
9c175e2f0c
Fix after merge
2021-08-17 16:01:18 +03:00
Riku Isokoski
5b969ccfa9
Merge branch 'develop' into update_touch_driver
2021-08-17 15:35:29 +03:00
Kieran Cawthray
30b32e4c8a
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-08-15 17:50:56 +02:00
Kieran Cawthray
9851ed33d8
Fix potential edge case of sidebar being set black
2021-08-15 15:28:40 +02:00
Kieran Cawthray
639fd3a9bd
More tidying following review
2021-08-15 15:00:54 +02:00
Kieran Cawthray
5789f1527c
Avoid setting the sidebar black
2021-08-15 14:42:30 +02:00
Kieran Cawthray
16ea069d55
Remove duplicate code, minor fixes
2021-08-15 14:05:21 +02:00
Riku Isokoski
3cef05b745
Merge branch 'develop' into refresh_rework
2021-08-15 13:35:15 +03:00
Kieran Cawthray
c0bb88799c
Add check for randomise button in case colors clash
2021-08-15 12:33:32 +02:00
Riku Isokoski
ee44b6ff49
Adjust inner padding in applist
2021-08-15 11:19:47 +02:00
Riku Isokoski
bc82905371
Clean up using variables
2021-08-15 11:19:47 +02:00
Riku Isokoski
637ed8033b
Adjust previously missed scrollbar and firmware validation buttons
2021-08-15 11:19:47 +02:00
Riku Isokoski
e0d01411d7
Ui update
2021-08-15 11:19:47 +02:00
Kieran Cawthray
477ff32edc
Add randomise button to color picker
2021-08-15 10:41:00 +02:00
Riku Isokoski
044036e884
Merge branch 'develop' into timer_battery_reading
2021-08-14 23:02:23 +03:00
Jean-François Milants
0eeed5ac33
Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime into Riksu9000-call-improvements
...
# Conflicts:
# src/displayapp/screens/Metronome.cpp
2021-08-14 21:54:00 +02:00
Riku Isokoski
c3d8ee14fe
Merge branch 'develop' into refresh_rework
2021-08-14 22:53:35 +03:00
Riku Isokoski
6192775161
Improve metronome
2021-08-14 21:08:42 +02:00
Riku Isokoski
23bde0d18e
Make battery reading periodic. Add events. Disable pullup
2021-08-14 21:18:11 +03:00
Kieran Cawthray
6bffc7d528
Tidying
2021-08-12 21:28:41 +02:00
Kieran Cawthray
52ee25e551
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-08-12 21:26:51 +02:00
Riku Isokoski
6776776421
Make diff smaller and revert some changes in DisplayApp
2021-08-10 22:18:21 +03:00
Riku Isokoski
f1346f098e
Merge branch 'develop' into new_touch_handler
2021-08-10 20:58:42 +03:00
Riku Isokoski
d307c6bd9e
Merge branch 'develop' into refresh_rework
2021-08-10 14:13:58 +03:00
Jean-François Milants
81a143173f
Merge branch 'improve-battery-percentage-to-battery-icon-mapping' of https://github.com/hassless/InfiniTime into hassless-improve-battery-percentage-to-battery-icon-mapping
...
# Conflicts:
# src/displayapp/screens/BatteryIcon.cpp
2021-08-10 12:30:42 +02:00
Jean-François Milants
c086520c97
Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and PineTimeStyle, inspired by PR #232 by nscooling.
2021-08-10 11:39:25 +02:00
Tim
3e9c30a18f
Merge branch 'JF002:develop' into set-datetime-manually
2021-08-08 14:37:48 +02:00
Riku Isokoski
10b5d30ec3
Merge branch 'develop' into refresh_rework
2021-08-03 12:16:40 +03:00
Riku Isokoski
a618f43b4d
Fixes
2021-08-01 14:13:32 +03:00
Riku Isokoski
e6dcb3009f
Improvements
2021-08-01 13:05:48 +03:00
Riku Isokoski
5bdef365f2
Merge branch 'develop' into HEAD
2021-08-01 11:47:26 +03:00
Kieran Cawthray
12aeb46889
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-28 16:07:43 +02:00
Kieran Cawthray
e6bc485679
Increment settings value, remove old hacky fix
2021-07-25 22:18:39 +02:00
Jean-François Milants
514481ef7f
Tile event handler : read the event data only if the event is a "value changed event". LVGL sends many other event and some of them do not set the event data (global static variable) to a valid address, which may cause an invalid read. I noticed that when porting this class on RISC-V platform (BL602).
2021-07-25 19:55:21 +02:00
Riku Isokoski
a1ba187c47
Merge branch 'develop' into new_touch_handler
2021-07-25 20:01:09 +03:00
Riku Isokoski
2e8bc634dc
Merge branch 'develop' into fit_more_tasks
2021-07-25 19:30:27 +03:00
Jonathan Vander Mey
7b75ca591d
Fix compile warnings
2021-07-25 18:01:13 +02:00
Riku Isokoski
574434550a
Fix slow scroll
2021-07-25 17:59:58 +02:00
Riku Isokoski
1ae22f45f9
Fix cases where Get() isn't used
2021-07-25 17:56:07 +02:00
Riku Isokoski
f2f22184b0
Add new unique icons for some apps
2021-07-25 17:55:08 +02:00
Riku Isokoski
a69be1520a
Add task state info to SystemInfo
2021-07-25 17:52:19 +02:00
Riku Isokoski
ec2469a6c1
Code cleanup ( #466 )
...
* Code cleanup
* Remove override again
2021-07-25 16:54:05 +02:00
Riku Isokoski
34949a47c5
Dim screen before sleep ( #464 )
...
* Implement dimming
2021-07-24 20:29:10 +02:00
Riku Isokoski
e4d9636e82
Merge branch 'develop' into new_touch_handler
2021-07-24 20:26:10 +03:00
Jean-François Milants
926553d043
Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime into Riksu9000-fix_touchevent_tap
...
# Conflicts:
# src/displayapp/DisplayApp.cpp
2021-07-24 18:46:52 +02:00
Kieran Cawthray
b3e3d75d0f
Add extra screen in settings to show scrollbar correctly
2021-07-24 14:25:27 +02:00
Riku Isokoski
fc93bdbbba
Merge branch 'develop' into refresh_rework
2021-07-23 22:56:00 +03:00
Riku Isokoski
d666c5004f
Merge branch 'develop' into new_touch_handler
2021-07-23 22:52:08 +03:00
Kieran Cawthray
1ddb1f0832
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-23 15:03:28 +02:00
Riku Isokoski
0a0f28fff4
Make firmware updating more foolproof ( #469 )
...
* 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-22 21:57:45 +02:00
Riku Isokoski
12b14176ec
Fix
2021-07-21 14:46:27 +03:00
Riku Isokoski
93893511f1
Fit more tasks in SystemInfo
2021-07-21 14:41:29 +03:00
Kieran Cawthray
db784fc2fb
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-20 15:30:07 +02:00
Riku Isokoski
331fc2be69
Set remaining default periods to LV_DISP_DEF_REFR_PERIOD
2021-07-19 17:06:20 +03:00
Riku Isokoski
97c761a5c7
Refresh rework
2021-07-19 16:26:12 +03:00
Riku Isokoski
dc2b5f0c6b
Restore Tile.cpp changes
2021-07-19 10:21:42 +03:00
Riku Isokoski
329482f873
Fix remaining known issues
2021-07-16 11:55:29 +03:00
Riku Isokoski
baffa1594f
Fix gestures
2021-07-16 02:17:17 +03:00
Riku Isokoski
93ccbf38e8
Fix touch wakeup and code cleanup
2021-07-16 01:49:20 +03:00
Riku Isokoski
2a3e126390
Fix most issues
2021-07-16 00:07:55 +03:00
Riku Isokoski
fe64176e7b
New touch handler, with issues
2021-07-15 14:11:27 +03:00
Riku Isokoski
7ac6bdfe71
Merge branch 'develop' into update_touch_driver
2021-07-15 01:03:44 +03:00
Kozova1
57b3397078
Multiple wakeup sources ( #290 )
...
* 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-14 20:51:51 +02:00
Riku Isokoski
7133287b76
Set correct refresh times for lvgl ( #488 )
2021-07-14 20:35:21 +02:00
Riku Isokoski
5bc40c9287
Update touchpad driver
2021-07-14 17:11:16 +03:00
Riku Isokoski
95b8a56dd4
Merge branch 'develop' into fix_touchevent_tap
2021-07-14 09:59:56 +03:00
Jean-François Milants
a07b6382ae
Merge branch 'develop' of github.com:JF002/Pinetime into develop
2021-07-13 20:54:49 +02:00
Jean-François Milants
e2efb193c4
Merge branch 'lvgl_use_system_tick' of https://github.com/Riksu9000/InfiniTime into Riksu9000-lvgl_use_system_tick
...
# Conflicts:
# src/displayapp/screens/BatteryInfo.cpp
# src/displayapp/screens/BatteryInfo.h
2021-07-13 20:53:40 +02:00
Riku Isokoski
a5616b0bc8
Adjust displayapp delay to compensate time spent ( #482 )
2021-07-13 20:42:59 +02:00
Jean-François Milants
3e70554844
Merge branch 'develop' into notify-battery-level
...
# Conflicts:
# src/displayapp/screens/BatteryInfo.cpp
2021-07-13 20:31:26 +02:00
Kieran Cawthray
db99ac88d9
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-12 13:01:11 +02:00
Jonathan Vander Mey
4f378e8726
Refactor trig functions into LUT ( #476 )
...
Replaced the use of the standard library trig functions with a LUT-based
implementation instead. The standard library implementations produce
more accurate results but the usage here doesn't need that. This ends up
saving nearly 7kB of binary size.
2021-07-11 20:18:07 +02:00
kieranc
748e31421d
Modify status text in BatteryInfo so it fits on screen ( #437 )
...
* Modify status text in BatteryInfo so it fits on screen
2021-07-11 17:48:16 +02:00
Jean-François Milants
e21f6a7f41
Notify battery level every 10 minutes when connected to a BLE host.
...
Refactor battery percent : only use uint8_t to store the battery % remaining.
2021-07-11 16:55:06 +02:00
kieranc
6a91b83b12
Change step gauge range to 100 and calculate progress as percantage ( #468 )
2021-07-11 15:08:23 +02:00
Tim Taenny
ffa51612fc
Code optimizations in SettingSetDate and SettingSetTime
...
Instead of calling lv_obj_align after each button click, the
labels have their auto_realign property set.
2021-07-09 20:35:48 +02:00
Tim Taenny
da36d4a5a1
Code optimizations in SettingSetTime
...
The positions of the labels are controlled by #define's, just
like in SettingSetDate.
2021-07-09 20:17:47 +02:00
Tim Taenny
0842a13339
Modified Settings menu as per suggestion
...
Moved "Set date" and "Set time" to the second page of the
Settings menu.
2021-07-09 17:49:35 +02:00
Tim Taenny
3e5ad49e3a
Code optimizations in SettingSetDate
...
Using static method of DateTimeController for retrieving month
texts instead of implementing it in SettingSetDate again.
2021-07-09 17:46:17 +02:00
Tim Taenny
06dfe14251
Code optimizations in SettingSetTime
2021-07-09 17:13:29 +02:00
Tim Taenny
f78c9bfcab
Code optimizations in SettingSetDate
2021-07-09 16:57:59 +02:00
timaios
5ae4192d8d
Added new menu entries to Settings page
2021-07-09 14:22:45 +02:00
timaios
f3f5eb5739
Added new screens to DisplayApp.cpp
2021-07-09 14:19:38 +02:00
timaios
6b3be0f5a1
Added new screens to the list of applications
2021-07-09 14:15:50 +02:00
timaios
c396925766
Added new screen: SettingSetDate
2021-07-09 14:12:26 +02:00
timaios
c77634ce32
Added new screen: SettingSetTime
2021-07-09 14:11:20 +02:00
Riku Isokoski
99e26bdd4c
LVGL use system tick
2021-07-07 15:47:47 +03:00
Riku Isokoski
61a4642221
Improve stopwatch ( #432 )
...
* Improve stopwatch more
* Make sure sleep gets reenabled
* Cleanup and clang-format
2021-07-04 20:23:03 +02:00
Avamander
ab59b9b830
Whitespace and brace fixes ( #456 )
...
* Brace style and whitespace fixes
* Additional whitespace fixes
2021-07-04 20:06:50 +02:00
Riku Isokoski
3b0fcc2a73
clang-format
2021-07-04 20:05:39 +02:00
Riku Isokoski
94aefed98f
Condense firmware validation code
2021-07-04 20:05:39 +02:00
Riku Isokoski
217f16d189
Improve paddle game
2021-07-03 10:40:30 +02:00
Bryton Hall
4e435e93e0
and metronome icon ( #439 )
...
* add drum icon for metronome app
2021-07-02 17:34:32 +02:00
Riku Isokoski
38f40034b0
Float voltage to int ( #444 )
...
* Change voltage float to millivolt integer
* Explain the ADC to milliVolts conversion
2021-07-02 17:30:32 +02:00
Riku Isokoski
7075b7f264
Fix call notification button alignment
2021-07-02 17:20:58 +02:00
Avamander
bdb5965f1a
static_cast cleanup
2021-07-02 16:27:41 +02:00
Avamander
2f479e5fc7
Fixed a bunch of format specifiers
2021-07-02 16:27:16 +02:00
Kieran Cawthray
2edf41be8e
Fix bad merge
2021-06-29 21:15:39 +02:00
Kieran Cawthray
9bd180896e
Replace font file
2021-06-29 21:12:39 +02:00
Kieran Cawthray
4f21748aa2
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-06-29 21:10:36 +02:00
kieranc
f317d54218
Add PineTimeStyle watchface ( #334 )
...
* PineTimeStyle
* Move GPL license header
* Add step count gauge - replaces heartrate in sidebar
* Enable 12/24h functionality
* Set step gauge outer to be white when step goal is reached
* Add font source file
* Move static needle_colors array to member variable
* Add documentation on generating a font
* Replace .ttf with Google version, add link to font page
Co-authored-by: JF002 <JF002@users.noreply.github.com>
2021-06-29 20:20:27 +02:00
Kieran Cawthray
660a8597f6
Add reset button, reduce button opacity
2021-06-27 15:24:17 +02:00
Neil O'Fix
0045fb16b6
SPI flash sleep if bootloader >= 1.0.0 ( #322 )
...
* Retrieve and display bootloader version
- Display bootloader version on System Info screen
- Enable SPI flash sleep mode if bootloader version >= 1.0.0
* Wait for SPI flash to wakeup before starting OTA DFU
2021-06-26 20:53:32 +02:00
Kieran Cawthray
6889cf1ed8
Fix the fix, whoops
2021-06-25 21:55:51 +02:00
Kieran Cawthray
800daecf90
Add a check to set default colors if all colors are white
2021-06-25 21:36:55 +02:00
Kieran Cawthray
f3b40cb7a6
Make it loop around when you get to the end of the list of colors
2021-06-25 19:04:29 +02:00
Kieran Cawthray
be22a9b1b8
Fix off-by-one error, reduce step gauge needle width
2021-06-25 15:09:18 +02:00
Kieran Cawthray
878dd1a776
Use colors from settings for PineTimeStyle watchface
2021-06-25 14:58:45 +02:00
Kieran Cawthray
50b92e5dd6
Move array to member variable, retrieve colors from settings for display
2021-06-25 14:47:56 +02:00
Kieran Cawthray
d5d8438b60
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-06-25 08:48:16 +02:00
Kieran Cawthray
8f16574992
PineTimeStyle color picker tidying
2021-06-24 21:51:23 +02:00
Kieran Cawthray
7edfc53481
PineTimeStyle color picker add settings integration
2021-06-24 21:49:04 +02:00