scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity
1762 commits 2 branches 1 tag 45 MiB
Commit graph

1228 commits

Author SHA1 Message Date
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
Reinhold Gschweicher 187d99c0f7 SystemMonitor: implement FreeRtosMonitor only if trace facility is set 
Split SystemMonitor into h and cpp file and move the logging code of the
`Process` function into the cpp file.

Depending of the `configUSE_TRACE_FACILITY` define from
`src/FreeRTOSConfig.h` create either a "FreeRtosMonitor" or a
"DummyMonitor".

Make the `Process()` function non-const, as the FreeRtosMonitor changes
the member variable `lastTick`.

In `SystemTask.h` we then only need to use `SystemMonitor`, without
knowledge of the `configUSE_TRACE_FACILITY` define.
 2022-03-08 20:28:54 +01:00
Reinhold Gschweicher 5fe5cee9ef Add missing nrf_log.h includes shadowed by SystemMonitor.h 
Some components were missing a `nrf_log.h` include. This missing
include was accidentally provided by the SystemMonitor.h header, which
was included by Systemtask.h
 2022-03-08 20:28:54 +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
Reinhold Gschweicher 5613449bfb Settings: more specific read and write mode 
For each filesystem interaction be more specific if we want to read from
the file or write to it.

Doing a non-creating read on the loading of the settings file, otherwise
an empty file could be created, and when reading that empty file for the
initial settings I would expect an error (or random data) when reading.
 2022-03-03 21:15:57 +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 b857fdb9f4 SystemTask: forward declare BatteryController to fix of cyclic dependency 
SystemTask.h included BatteryController.h, and BatteryController.h
included SystemTask.h. If unlucky the class SystemTask isn't created yet
when BatteryController wants to use it.

Fix that cyclic dependency by forward declaring the BatteryController
class and including it in the SystemTask.cpp file, where it is needed.
 2022-02-19 13:17:00 +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 a2a70f8eda MotorController: no need to make this function a class function 
The `StopRinging()` function was used just in `Notifications.h` screen.
That screen already has access to a `motorController` object.
 2022-02-19 13:13:36 +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
Reinhold Gschweicher d5b78ecd66 SystemTask: remove unused ble includes 
Remove unused includes. The firmware still compiles fine without the
includes.
 2022-02-19 13:00:50 +01:00
minacode a1db9fca13 remove unused reference 2022-02-16 13:34:14 +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
Zorvalt d967efa197 Fix biased BLE pass key generation 2022-02-12 18:44:05 +01:00
Reinhold Gschweicher 5938b4b208 SystemTask: fix static cast missing brackets syntax 
The static_cast syntax requires brackets around the input variable. The
implementation worked because the used input are defines, which add the
missing brackets like the following:
```cpp
  #define GPIO_PIN_CNF_SENSE_Low (3UL)
```
 2022-02-12 18:38:31 +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 e73a92c29b
Merge pull request #949 from Riksu9000/fix_alarm 
Fix alarm on time change
 2022-01-26 22:03:14 +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 71c895dc71
Merge pull request #531 from hatmajster/heart-rate-gain-setting 
Heart rate sensor - HRS gain changed to x8
 2022-01-26 21:44:23 +01:00
JF 9e9010c725
Merge pull request #876 from yehoshuapw/hrs-driver-changes 
Hrs driver changes
 2022-01-26 21:39:58 +01:00
JF 458f5b8eb8
Merge pull request #903 from Riksu9000/improved_notif_timeout 
Improved notification timeout
 2022-01-26 21:38:07 +01:00
JF bbb823b170
Merge pull request #939 from NeroBurner/buttonHandler_relative_include 
ButtonHandler: includes relative to src dir
 2022-01-26 21:35:03 +01:00
JF a1880ca3b8
Merge pull request #940 from NeroBurner/systemTask_queue_include 
SystemTask: add missing queue.h include for QueueHandle_t
 2022-01-26 21:34:25 +01:00
JF a354650a9c
Merge pull request #944 from NeroBurner/no_generated_files_in_source_dir 
Create Version.h in binary dir instead of src dir
 2022-01-26 21:33:57 +01:00
Reinhold Gschweicher 67f546fa33 StopWatch: cleanup unused includes and use relative to src includes 2022-01-26 08:31:14 +01:00
hatmajster b4e956227e Hrs3300: changed default gain to x8 2022-01-25 17:44:11 +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 470db4ab99 Fix alarm on time change 2022-01-22 12:47:23 +02:00
Riku Isokoski 6bf6bb7e2a PTS and digital watchface code cleanups 2022-01-20 16:04:26 +02:00
Reinhold Gschweicher 688dc2fed7 Create Version.h in binary dir instead of src dir 
Don't use source directory for generated files. Use the binary (build)
directory instead.
 2022-01-17 21:26:40 +01:00
Reinhold Gschweicher bbc5af078d SystemTask: add missing queue.h include for QueueHandle_t 2022-01-16 22:47:16 +01:00
Reinhold Gschweicher 48e9458301 ButtonHandler: includes relative to src dir 2022-01-16 20:59:49 +01: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 6d74820698 Add averaging to wake threshold. Makes it take more then just a "flick" to turn on 2022-01-04 01:59:01 +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 ad42cdf120 Cleanup 2022-01-04 01:57:18 +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 eca0588c23 Optional secure pairing with a passkey 
Support passkey pairing when requested by the central
Fix a comment and reorder warning
 2021-12-21 16:02:01 -06:00
Yehoshua Pesach Wallach 464b689a03
changed ReadHrs and ReadAls to uint32, and did static_cast instead of hidden cast when using it 2021-12-13 12:47:52 +02:00
Yehoshua Pesach Wallach 4cc95091ab
order ReadHrs, ReadAls bitwise according to bit ordering 2021-12-13 12:39:34 +02:00
JF 6a5946c4e3
Merge pull request #874 from evergreen22/alarm-break 
FIX: AlarmTriggered fall through to ShowPairingKey
 2021-12-12 17:40:05 +01:00
James A. Jerkins 645a071b70 FIX: AlarmTriggered fall through to ShowPairingKey 2021-12-11 21:34:51 -06:00
Tim Keller 1470489e7b Fix Failed rebase. 2021-12-10 01:49:03 +00:00
Tim Keller 0a0d1f2703 Fix more initializers 2021-12-10 01:18:57 +00:00
Tim Keller b9a2db1a49 Fix large file support that broke due to a refactor. 2021-12-10 01:18:57 +00:00
Tim Keller d1e9aa1076 Force variable cleanup because LFS makes assumptions about variable initialization state 2021-12-10 01:18:57 +00:00
Tim Keller fdb5e27aea Attempt at a more robust File handler 2021-12-10 01:18:57 +00:00
Tim Keller b62c62ee1f Change read to return LFS return values when reading a directory or nonexistant file 2021-12-10 01:18:57 +00:00
Tim Keller 09b9130244 Fix string nullterminations, 
Expand error codes.
 2021-12-10 01:18:57 +00:00
Tim Keller 362a5ef113 Added move function 2021-12-10 01:18:57 +00:00
Tim Keller 8f46908d38 Fix lvgl_open to respect littlefs open errors 2021-12-10 01:18:57 +00:00
Tim Keller f4322841ff Remove DirDelete, implementation did not work and memory contraints are recursive. Better implemented on client side... 2021-12-10 01:18:57 +00:00
Tim Keller 2e10b0fe64 Remove mount/unmount. No longer needed 2021-12-10 01:18:57 +00:00
Tim Keller c1aa5a5ea7 Write works 2021-12-10 01:18:57 +00:00
Tim Keller 8fb99471c3 Reading Seems to work? 2021-12-10 01:18:57 +00:00
Tim Keller faa05eb57b Actually fix memory corruption, seems stable now 
ListDir MKDIR delete all seem to work
Co-authored-by: Iambian <Iambian@users.noreply.github.com>
 2021-12-10 01:18:57 +00:00
Tim Keller 6393a17d74 List Dir works? 2021-12-10 01:18:57 +00:00
Tim Keller f841b8c984 Revert "More attempted SPI fixes" 
This reverts commit bed7e731b206961117b717adb1031ab3011e7db9.
 2021-12-10 01:18:57 +00:00
Tim Keller a5a64800ed Revert "Workaround for SPI bus being asleep." 
This reverts commit 1edeb5cb65489707c26b7a65f3b54520086d363a.
 2021-12-10 01:18:57 +00:00
Tim Keller d89e38d3bf Focus on getting flash access working properly 2021-12-10 01:18:57 +00:00
Tim Keller 8f6a390c36 Start of read command 2021-12-10 01:18:57 +00:00
Tim Keller 1b4b422ab6 More attempted SPI fixes 2021-12-10 01:18:57 +00:00
Tim Keller 3a8e66a52f Added Delete file 
Added FS Stat.
 2021-12-10 01:18:57 +00:00
Tim Keller eabbbfa373 Fix folder count in output 2021-12-10 01:18:57 +00:00
Tim Keller 2690c274af Workaround for SPI bus being asleep. 
This needs to get cherrypicked to another PR as SPI Sleep needs to use a semaphore or something
 2021-12-10 01:18:57 +00:00
Tim Keller 1dd7174480 More reliable FS listing 2021-12-10 01:18:57 +00:00
Tim Keller 91c644b43c direcetory listings maybe? 
Added LISTDIR command and notify responses.
 2021-12-10 01:18:57 +00:00
Tim Keller f57f797ff5 Added Blank FSService that exposes only version info 2021-12-10 01:18:57 +00:00
Kieran Cawthray 6cf4a933b6 Merge remote-tracking branch 'upstream/develop' into pts-settings 2021-12-09 22:41:29 +01:00
Avamander 42a5cdb5b7 Added QCBOR to pinetime-mcuboot-recovery 2021-12-09 21:57:32 +01:00
Avamander 6354511c20 Hotfix for other build targets 2021-12-09 21:57:32 +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
Reinhold Gschweicher e104f17b1b AlarmController: remove unused app_timer.h include in header 2021-12-09 21:30:33 +01:00
Reinhold Gschweicher 23f318c3d0 TouchHandler: remove unused FreeRTOS.h and task.h includes from header 
FreeRTOS and task.h aren't used in the Header file. Furthermore the
SystemTask forward declaration isn't needed as it isn't used in the
header.
 2021-12-09 21:30:20 +01:00
Avamander 9db5d64441 Fixed unpopped diagnostic 2021-12-09 21:30:04 +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 b946b8d156 Fix assertion failure in ButtonHandler 
FreeRTOS says zero is not a valid value for xTimerPeriodInTicks.
Zero value fires an assertion on line 361 in timers.h
 2021-12-09 21:16:57 +01:00
Tim Keller cd593c3862 Break not return thanks @FintasticMan 2021-12-09 21:15:00 +01:00
Tim Keller f1fc7ee659 Adjust systemtask to respect doNotGoToSleep. 2021-12-09 21:15:00 +01:00
James A. Jerkins 048ecd41e4 Adjust BLE/LL stacks, style, comments, refactoring 
Increase BLE task stack +200 and decrease LL task stack -200
more braces!
 2021-12-09 21:14:16 +01:00
James A. Jerkins 150fa3b661 Persist bond between reboots 
Save bond information in the FS after a disconnect or encryption change
if the bond is not already stored. The bond is restored on boot enabling
automatic reconnection to a previously bonded central.

Two consecutive watch reboots with the central out of range (or BLE off)
will remove the stored bond from the watch.
 2021-12-09 21:14:16 +01: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 3eebe66d65 Updated docs and renamed functions for consistency 2021-12-04 22:03:40 +02:00
Avamander f1f2bc119a Added a note about map key capitalization 2021-12-04 22:03:40 +02:00
Avamander 6879147648 Revert wrong change to DisplayApp 2021-12-04 22:03:40 +02:00
Avamander 7b04ce5eba Added a note about the timestamp having a timezone offset 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 58d454b11f Improved Temperature parsing 2021-12-04 22:03:40 +02:00
Avamander 4a8f72bd1e Fixed a bug in DewPoint decoding 2021-12-04 22:03:40 +02:00
Avamander be7931c4fb Whoops, fixed a wrong type 2021-12-04 22:03:40 +02:00
Avamander 154e3d27ad Added a few helper functions 2021-12-04 22:03:40 +02:00
Avamander 797b60397c Improved documentation 2021-12-04 22:03:40 +02:00
Avamander e0133cec36 Improved documentation 2021-12-04 22:03:40 +02:00
Avamander ffd6c3f095 Removed an instance of shadowing 2021-12-04 22:03:40 +02:00
Avamander b72c6a5bc9 Clarified a few comments 2021-12-04 22:03:40 +02:00
Avamander 9525fc4273 Specified how values should be interpreted better 2021-12-04 22:03:40 +02:00
Avamander b998d5e2a8 Removed unnecessary change in CMakeLists 2021-12-04 22:03:40 +02:00
Avamander abbfb92fa2 Added new precipitation and obscuration types 2021-12-04 22:03:40 +02:00
Avamander 75cf5324ba Fixed an incorrect decode in Humidity 2021-12-04 22:03:40 +02:00
Avamander cccec6e1ab Improved debug UI. 2021-12-04 22:03:40 +02:00
Avamander 9108952e6b Implemented parsing of all defined weather data types 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 48beb7c3b1 Improved error handling and fixed incompatibility with co.nstant.in:cbor library 2021-12-04 22:03:40 +02:00
Avamander df04763ab4 Fixed recovery build 2021-12-04 22:03:40 +02:00
Avamander 900598a7ee Removed versioning because it's not necessary 2021-12-04 22:03:40 +02:00
Avamander 657dc3a9ba Changed UUID so it wouldn't conflict with Motion 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 0ed256ba15 Few formatting fixes 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 b6e9e4171d Switched to non-deprecated math header 2021-12-04 22:03:40 +02:00
Avamander 4b2dcbb4f0 Fixed a few bugs, enabled UsefulBuf library optimizations 2021-12-04 22:03:40 +02:00