Commit graph

1540 commits

Author SHA1 Message Date
Jean-François Milants 1df3d1a14d Copy the memory manager heap_4.c from the FreeRTOS distribution to the InfiniTime project codebase. This will allow to implement custom functionalities that are not available in the original implementation. 2023-05-18 19:58:09 +02:00
Max Friedrich 020a7fd11d
Refactor watch face to enum (#1339)
change watch face from int to enum

---------

Co-authored-by: minacode <minamoto9@web.de>
2023-04-30 17:03:46 +02:00
JF 5f19f689f9
Refactor, document and fix the Watchdog driver (#1710)
* Refactor and document the Watchdog driver to make it more readable.

Fix the configuration of the behaviours configuration that was not properly implemented (but it didn't cause any side effect since the correct value was eventually set in NRF_WDT->CONFIG).

Fix the wrong interpretation of the reset reasons caused by implicit conversions of int to bool.
2023-04-30 15:56:13 +02:00
Ceimour c22e30a4a6
Refactored Ppg for frequency based algorithm. (#1486)
New implementation of the heart rate sensor data processing using a frequency based PPG algorithm.
The HRS3300 settings are fine-tuned for better signal to noise at 10Hz.
The measurement delay is now set to 100ms.
Enable and use the ambient light sensor.
FFT implementation based on ArduinoFFT (https://github.com/kosme/arduinoFFT, GPLv3.0).
2023-04-30 15:50:18 +02:00
Riku Isokoski 40f7e1c7be TimerController: Rename to Timer 2023-04-16 14:33:23 +00:00
Riku Isokoski 661ffbeb1e TimerController: Make TimerController reusable
TimerController instance was moved to DisplayApp.
2023-04-16 14:33:23 +00:00
Riku Isokoski 4d93ae6d27 MotionController: Remove IsOk variable
We should be able to assume MotionController is safe to use.
2023-04-16 14:15:49 +00:00
Riku Isokoski 348d3de60b Watchfaces: Assume motionsensor is ok
The watch face shouldn't and doesn't start before the sensor is ready.
2023-04-16 14:15:49 +00:00
Finlay Davidson e4a6f6ad77 fonts: Make patching silent
The generate script should only output anything if there are errors.
2023-04-16 15:57:18 +02:00
fossison d472a71078
stopwatch: Add hours tracking (#1692)
Stopwatch application : add hours tracking

---------

Co-authored-by: fossison <fossison@mailbox.org>
Co-authored-by: Jean-François Milants <jf@codingfield.com>
2023-04-16 15:55:49 +02:00
Riku Isokoski 5d45392453 lvgl: Use InfiniTime fork of LVGL 2023-04-03 09:46:41 +00:00
Riku Isokoski 56fe2e4c43 WatchFaceTerminal: Simplify time update check 2023-04-02 18:19:10 +00:00
Riku Isokoski d251a47828 WatchFaceG7710: Simplify time update check 2023-04-02 18:14:42 +00:00
Riku Isokoski 8d089b1429 WatchFaceInfineat: Simplify time update check 2023-04-02 18:07:29 +00:00
Riku Isokoski c5c3e81e15 WatchFaceDigital: Simplify update check 2023-04-02 17:56:51 +00:00
Finlay Davidson 616aa91b4c dirtyvalue: Move to src/utility 2023-03-27 22:12:32 +00:00
Finlay Davidson 47931f41d5 staticstack: Move to src/utility 2023-03-27 22:12:32 +00:00
Finlay Davidson 2ba8b17967 linearapproximation: Move to src/utility 2023-03-27 22:12:32 +00:00
Riku Isokoski 0a4f015783 WeatherService: const DateTimeController reference 2023-03-19 12:41:01 +02:00
Riku Isokoski 829ab86f37 HeartRateService: Remove SystemTask dependency 2023-03-19 12:41:01 +02:00
Riku Isokoski 7c98f26f12 MotionService: Remove SystemTask dependency 2023-03-19 12:41:01 +02:00
Riku Isokoski ca5e7d1adf NavigationService: Remove unused SystemTask ref 2023-03-19 12:41:01 +02:00
Riku Isokoski 7e15a1e340 WeatherService: Remove unused SystemTask reference 2023-03-19 12:41:01 +02:00
Riku Isokoski c7a9b3d7d3 MusicService: Remove SystemTask dependency 2023-03-19 12:41:01 +02:00
Riku Isokoski 310ea81eec inactivity: Use LVGL inactivity timers
Replace custom FreeRTOS inactivity timers with LVGL inactivity timers.

DisplayApp: Trigger display activity on timer done.

inactivity: Add additional checks
The backlight could be turned on by RestoreBrightness() on ble connect
event.

inactivity: Trigger activity on screen switch

A notification timing out could put the watch to sleep immediately.
While this could be ideal behaviour, it was caused by delay in
processing the EnableSleeping event and pushing RestoreBrightness to
DisplayApp.
2023-03-18 01:15:33 +02:00
Riku Isokoski 11ade64166 WatchFaceAnalog: Simplify date update check 2023-03-15 08:30:03 +02:00
Finlay Davidson e55a76f740 raisewake: Change names in line with the style guide 2023-03-09 10:17:03 +02:00
Finlay Davidson 49ad5be742 motioncontroller: Fix clang-tidy warnings
Also move one-line functions to header.
2023-03-09 10:17:03 +02:00
Finlay Davidson 76e79df375 shakewake: Switch to more generic timekeeping
Could be used for other motion-based algorithms in the future.
2023-03-09 10:17:03 +02:00
Finlay Davidson a43463762c shakewake: Simplify return code 2023-03-09 10:17:03 +02:00
Finlay Davidson 6cf6455313 shakewake: Switch to more generic last* vars
These could be used for other motion-based algorithms in the future.
Also fix includes.
2023-03-09 10:17:03 +02:00
Finlay Davidson f993311830 shakewake: Fix names according to style guide 2023-03-09 10:17:03 +02:00
kieranc ada182336f
PTS: Fix double tap behaviour on settings screen (#1669)
Fixes #1467 "Double tapping PineTimeStyle steps style button sends watch to sleep"
Double tap is disabled on the color settings screen by checking if the Rnd button is visible, but this didn't work for the options screen as the Rnd button isn't visible. I've changed it to check if the Close button is visible instead, which is used on both settings screens, and resolves the bug. I also changed the button used to disable the long press behaviour which was an as-yet-undiscovered bug which would have allowed the long press action to be used when the options screen was visible.
2023-03-04 09:16:10 +02:00
Riku Isokoski 08b4cfbb50 Add low battery indicator to StatusIcons, digital and analog watchfaces
Define deepOrange color in InfiniTimeTheme
2023-03-02 13:38:31 +02:00
Riku Isokoski fff0a00a4a Revert "added low battery message"
This reverts PR https://github.com/InfiniTimeOrg/InfiniTime/pull/1352
2023-03-02 13:38:31 +02:00
Jean-François Milants 9bbd2ddbc4 LVGL / FS : Initialize the LVGL FS driver in LittleVgl (instead of FS).
Previously, the LVGL driver for the filesystem was initialized in the class FS. However, since 6f942e2, the order of the initializations was incorrect  : the driver was initialized (FS::LVGLFileSystemInit()) before LVGL (LittleVgl.Init()), which means that the driver registration was probably dropped when LVGL was initialized.

The LVGL driver is now initialized in LittleVgl.Init(), which seems to make much more sense, since all LVGL drivers are initialized there. This way, we ensure that the initialization of the drivers is consistent.
2023-02-26 22:10:03 +02:00
Riku Isokoski ce2277cbca infineat: Create colors at compile time.
lv_color_hex can't be evaluated at compile time, but LV_COLOR_MAKE can.
2023-02-26 19:53:14 +02:00
Riku Isokoski dd8a9a274f warnings: Treat warnings as error
This way warnings will be taken seriously, and will cause PR checks to
fail when they throw warnings.
2023-02-26 19:32:30 +02:00
Riku Isokoski 77f9f6d6fd Apps: Remove Weather from app enum
Weather app is not fully implemented and is causing a warning
2023-02-26 19:32:30 +02:00
Riku Isokoski 6b11d0700a QCBOR: Update to v1.0
Fixes a compiler warning
2023-02-26 19:32:30 +02:00
Riku Isokoski bf8dca202c DateTimeController: Fix integer overflow 2023-02-26 17:30:01 +02:00
Riku Isokoski a5eac74fb5 motion: Disable Motion app
This is a debugging app, not useful for most people.
Also remove the app icon.
2023-02-25 18:06:37 +02:00
Riku Isokoski 0d074ee6e9 screens: Add notes about using C++20 features 2023-02-25 17:44:06 +02:00
Riku Isokoski 8baa317e7e date: Remove date lib
DateTimeController can provide everything we need.
2023-02-25 17:44:06 +02:00
Riku Isokoski 959778d770 DateTimeController: Use std::tm for storing date 2023-02-25 17:37:56 +02:00
Riku Isokoski b63bb798ac DateTimeController: Remove SetTime tick parameter
The systick doesn't need to be updated when setting time.

Also removed unused nrf_rtc.h includes.
2023-02-25 17:22:25 +02:00
Riku Isokoski eccea5ab9f SystemTask: Move lcd to DisplayApp
SystemTask should never write to the lcd
2023-02-25 16:58:31 +02:00
Riku Isokoski 6f942e20ed LittleVgl: Instantiate in DisplayApp
LVGL is only a part of the main DisplayApp. Other "DisplayApps" can be
implemented without LVGL.

DummyLittleVgl isn't needed anymore and has been removed
2023-02-25 16:58:10 +02:00
Riku Isokoski ff34cf196e watchdog: Replace WatchdogView with const Watchdog 2023-02-25 16:57:12 +02:00
Riku Isokoski 26478d9006 screens: Remove unused DisplayApp parameters 2023-02-25 16:56:03 +02:00
Riku Isokoski c78211952e screens: Remove explicit Screen constructors
This constructor didn't do anything since DisplayApp reference was
removed from the Screen base class.
2023-02-25 16:56:03 +02:00
Riku Isokoski 7c7a8602c4 screens: Remove displayapp parameter from screen
The DisplayApp class isn't used in the Screen base class and most
screens, so requiring it is pointless.

In this commit, DisplayApp pointers were added to screens which use it
and the explicit Screen constructor was removed in those screens.
2023-02-25 16:56:03 +02:00
Riku Isokoski 5ab255b26b SystemTask: Move MotorController to DisplayApp
Vibrations should be associated with something happening on the UI.
Therefore SystemTask should not be controlling the motor.
2023-02-25 12:15:00 +02:00
Riku Isokoski 255b07094b displayapp: Make Ble references const 2023-02-24 17:41:41 +02:00
Riku Isokoski 76f07de64b displayapp: Make Cst816S references const 2023-02-24 17:41:41 +02:00
Riku Isokoski 1c4b97382a displayapp: Make Battery class references const 2023-02-24 17:41:41 +02:00
Riku Isokoski 1516b082fd TouchHandler: Do not store touch panel reference 2023-02-24 00:05:21 +02:00
Riku Isokoski 7066ff5aba touchhandler: Remove LVGL dependency
Move LVGL specific code to the LittleVgl class
2023-02-24 00:05:21 +02:00
Riku Isokoski 6542f255cd libs: Disable clang-format and -tidy 2023-02-23 23:55:48 +02:00
Riku Isokoski 0d494136c9 LittleVgl: Remove unused Cst816S reference 2023-02-23 23:43:24 +02:00
Riku Isokoski 05f404950a TimerController: Use chrono for durations 2023-02-23 23:17:18 +02:00
Itai Nelken 56b6291ab7
WatchfaceAnalog: add ble icon (#1430) 2023-02-21 20:48:42 +02:00
Riku Isokoski 6dc49e5bdb clang-format: Always break template declarations
I find this format easier to read, because the definitions are at the
expected indentation, making it easier to find what I'm looking for.
2023-02-16 09:13:58 +02:00
Riku Isokoski 27c241c7ee SettingSteps: Update UI
Bigger buttons, use new color.
2023-02-12 17:07:45 +02:00
Riku Isokoski d4eb24b7f8 SettingSteps: Improve goal setting
Long pressing will change the value by 1000, whereas clicks will change
it by 500. This allows setting more precise values, while also making it
easier to set any value.
2023-02-12 17:07:45 +02:00
Riku Isokoski 049fbba516 Steps: Update UI 2023-02-01 10:13:57 +02:00
Riku Isokoski 822f857d9e stopwatch: Update UI
The time used to be yellow while paused. Changing it to white made the
paused state less distinct. Blinking the time while paused makes the
state distinct again.
2023-02-01 09:52:04 +02:00
Jean-François Milants 9b2e1b3250 Merge branch 'aleexxzeero-proper-mcuboot-app-size' into develop 2023-01-29 12:47:12 +01:00
Riku Isokoski 97123d99c9 SettingChimes: Use CheckboxList 2023-01-29 09:55:54 +02:00
Riku Isokoski 32875944f9 SettingBluetooth: Use CheckboxList 2023-01-29 09:55:54 +02:00
Riku Isokoski 4b2a61ea4a LittleVgl: Small cleanup 2023-01-29 08:51:37 +02:00
Riku Isokoski 8e8215d360 theme: Replace LV_DPX with a constexpr variant 2023-01-29 08:51:37 +02:00
Riku Isokoski 547c46a588 theme: Cleanup unused styles
Condensed paddings with pad_all
No visual changes
2023-01-29 08:51:37 +02:00
Riku Isokoski 7aa215fcfa theme: Remove unused parameters 2023-01-29 08:51:37 +02:00
Riku Isokoski 5feccb382a infineat: Fix 12-hour time
Missing characters
2023-01-26 10:58:47 +02:00
Riku Isokoski 7bd215bc06 infineat: Remove use with builtin fonts
The watchface cannot be enabled without the correct font anyway.
2023-01-26 10:58:47 +02:00
Riku Isokoski 52bc0cd623 infineat: Battery display simplification 2023-01-26 10:58:47 +02:00
Riku Isokoski a3a4091e03 infineat: Use set_text_static where applicable 2023-01-26 10:58:47 +02:00
Riku Isokoski eae60b6a3d infineat: Remove batterystyle
Setting local style is more efficient
2023-01-26 10:58:47 +02:00
Riku Isokoski a7a1dcbf23 infineat: Remove unnecessary background colorization 2023-01-26 10:58:47 +02:00
Riku Isokoski 1feb01b25f infineat: Optimize lv_lines
Reduce code duplication massively
2023-01-26 10:58:47 +02:00
Riku Isokoski a3e14c012d src: Enable unused parameter warning
Fix warnings.
Some clang-formatting was necessary.
DebugPins is unused and was removed.
2023-01-24 10:43:17 +02:00
Finlay Davidson 8b0d888952 batt: Improve discharge curve values
Values calculated using multiple tests on 3 PineTimes
2023-01-23 21:48:29 +01:00
John Quigley a7f8b59bfb
Combine Date and Time Settings (#1465)
Replace separate SettingSetDate and SettingSetTime with a combined screenlist.
Add DotIndicators. Similar to PageIndicator, but for use when separating screens instead of pages of a list.

Co-authored-by: Riku Isokoski <riksu9000@gmail.com>
2023-01-14 21:50:21 +02:00
Riku Isokoski c5fb41beb7 List: Update list style and make it gray 2023-01-12 22:39:38 +02:00
Riku Isokoski 3c9b3435a5 SetingTimeFormat use CheckboxList, reduce duplication 2023-01-12 22:02:32 +02:00
Finlay Davidson 96165a8541 Format header files
In my PR updating clang-format, I forgot to also format the headers.
2023-01-09 21:41:21 +01:00
Riku Isokoski fb19c491b6 Fix returning to the same screen 2023-01-05 15:13:05 +01:00
Riku Isokoski 5ef3c0d3be Implement a return app stack
Each opened app (screen) is pushed on a stack, which is then popped from
when returning instead of hard coded "previous apps". Return swipe and
refresh directions are automatically determined from the app transition.
2023-01-05 15:13:05 +01:00
Finlay Davidson eda96ffadc Update clang-{format,tidy} to 14
Also add configuration options only available in 13 and 14.
Fixes warning about -fstack-usage in clang-tidy check.
2023-01-04 17:15:33 +01:00
Riku Isokoski 318a243df1 Revert "prepare cmake unity build"
This reverts commit 21f3bd7082.
2022-12-31 12:41:45 +01:00
Alex Dolzhenkov cfc86d7d85 #1463 Updated CMakeLists.txt for building images with expected alignment 2022-12-29 18:11:24 +13:00
tnixeu 21f3bd7082 prepare cmake unity build
Exclude files from unity build which currently cause compile erros because of redefinitions.
2022-12-27 12:17:46 +01:00
Jean-François Milants 298f80d504 Include algorithm and cstring for std::memcpy and std::min 2022-12-27 12:13:52 +01:00
Max Friedrich fdc89f1a20 Update src/systemtask/SystemTask.cpp
Co-authored-by: JF <JF002@users.noreply.github.com>
2022-12-27 12:13:52 +01:00
minacode dbbbbfd1ac hopefully fixed crash on notification 2022-12-27 12:13:52 +01:00
minacode c02b505998 format 2022-12-27 12:13:52 +01:00
minacode d62402cb3f removed magic number 2022-12-27 12:13:52 +01:00
minacode a82a34cd11 format 2022-12-27 12:13:52 +01:00
minacode 557a328409 changed to bool 2022-12-27 12:13:52 +01:00
minacode 51d818b774 fixed a comment, set threshold to 15% 2022-12-27 12:13:52 +01:00
minacode 60027f217c cutout scaling hack 2022-12-27 12:13:52 +01:00
minacode 276b17979e added punctuation 2022-12-27 12:13:52 +01:00
minacode 08fa6bd4e4 format 2022-12-27 12:13:52 +01:00
minacode cad58f190f added message, changed UI 2022-12-27 12:13:52 +01:00
minacode 59ee0ad1aa add percentage rescaling 2022-12-27 12:13:52 +01:00
minacode 5f5c771752 format 2022-12-27 12:13:52 +01:00
minacode ccc8cee07a added low battery message 2022-12-27 12:13:52 +01:00
tgc-dk 29673892c2 Fix formatting 2022-12-26 22:18:50 +01:00
Tomas Groth 861ed3584c Put common code into DismissToBlack helper function 2022-12-26 22:18:50 +01:00
Tomas Groth bef65bcd55 Make it possible to dismiss new notifications 2022-12-26 22:18:50 +01:00
Riku Isokoski b071422f91 Small fixup for cmake cleanup 2022-12-26 20:46:39 +01:00
Jonathan Vander Mey 44ba4dd470 Clean up target compile option assignments
Removed/simplified some generator expressions that had more repeated
elements than they needed to. Extracted some repeated sets of options
into separate variables as well.
2022-12-26 20:46:39 +01:00
Jonathan Vander Mey 91851d191e Split warning flags from common
Only enable the warning flags when building InfiniTime firmware, not
when building third-party libraries.
2022-12-26 20:46:39 +01:00
Riku Isokoski afea7ca0d1
Update clang-tidy configuration and fix some warnings (#1474)
Don't enable coding conventions from unrelated projects. Only enable
generic checks.
2022-12-18 18:14:36 +01:00
Riku Isokoski bfedf47d1a Optimize SettingWatchFace 2022-12-18 16:39:34 +01:00
Riku Isokoski 99b5b49993 Optimize SettingWakeUp 2022-12-18 16:39:34 +01:00
Riku Isokoski 9c5b1437ec Optimize SettingTimeFormat 2022-12-18 16:39:34 +01:00
NeroBurner 23a68ba45a PineTimeStyle: use "" for our includes
Small fix to be consistent: use "" for our includes and <> for system
includes or packages by others.
2022-12-18 16:32:16 +01:00
cybuzuma 1062fec5f2
compiler warnings, #1035 and #notreported (#1481) 2022-12-12 22:28:39 +02:00
uli 02116a2fd4 BLE CTS: fixed signedness of timezone 2022-11-25 20:14:26 +01:00
kieranc f1d2a8ee50
WeatherService daily min/max temperature fixes (#1455)
* Min/Max function fixes
* Faster way to calculate day start
2022-11-25 18:45:33 +01:00
Alex Dolzhenkov 7376c02bbf Add linear approximation and use it for improving battery percentage
Add linear approximation class and use it to better model the non-linear
discharge curve of the battery.

Changed the minimum voltage level to 3.5V and the maximum to 4.18V. For
reference the maximum observed voltage is 4.21V during charging.
2022-11-19 16:34:03 +01:00
hassless a67f401b30 Update BatteryController.h with non-linear discharge curve 2022-11-19 16:34:03 +01:00
Elements6007 559b555d47 Fix
Co-authored-by: NeroBurner <pyro4hell@gmail.com>
2022-11-19 10:39:02 +01:00
Elements6007 80369f7e4b Clang format 2022-11-19 10:39:02 +01:00
Elements6007 e6cf685eb8 Update SettingChimes.h 2022-11-19 10:39:02 +01:00
minacode e0969c4ed6 removed line 2022-11-19 10:37:48 +01:00
uli 38092fcb40 add CTS local time characteristic and use it to provide UTC in DateTimeController 2022-11-11 21:44:00 +01:00
Riku Isokoski 9b2221173c Use PageIndicator in CheckboxList 2022-10-16 10:31:41 +02:00
Jean-François Milants c9e836a02e G7710 and Infineat : close the files after having verified that they exist. 2022-10-15 16:52:55 +02:00
Jean-François Milants eb0af22ecf Watch face settings : disable watch faces that are not available (external resources are not installed). 2022-10-11 21:36:31 +02:00
Jean-François Milants 8c7be1fbb1 CheckboxList : fix formatting. 2022-10-11 21:16:33 +02:00
Jean-François Milants 4ec49bde8a CheckBoxList : rename newValue -> value. 2022-10-11 21:16:33 +02:00
Jean-François Milants cf8b422899 Checkbox list now receives a function pointer to call when the setting has changed. This allow to remove the dependency between CheckBoxList (UI component) with SettingController. 2022-10-11 21:16:33 +02:00
Riku Isokoski 964f065de4 Fix clang-tidy warnings 2022-10-10 17:52:36 +02:00
mashuptwice 668820ef5a Edit all occurences of "watchface" to "watch face" 2022-10-10 12:43:11 +02:00
kieranc 0f1d0bbd1d
Fix button labels (#1361) 2022-10-06 16:00:35 +03:00
kieranc a0089e4fd0
Fix steps style button label (#1358) 2022-10-06 08:24:03 +03:00
Jean-François Milants 738c012a73 Merge branch 'pts-options' of github.com:kieranc/InfiniTime into kieranc-pts-options
# Conflicts:
#	src/components/settings/Settings.h
2022-10-02 18:30:41 +02:00
Jean-François Milants 7b115fe42c Merge branch 'develop' of github.com:JF002/Pinetime into develop 2022-10-02 18:06:16 +02:00
Jean-François Milants c9b1fb8244 Brightness management in DisplayApp : do not allow the brightness level OFF when loading app and going to running mode. Such issue could occur in case of inconsistent or corrupted settings. 2022-10-02 18:04:09 +02:00
Galdor Takacs 1439dfd912 motorController: Fix infinite vibration on RunForDuration(0) 2022-10-02 15:58:17 +02:00
Jean-François Milants 8f5df5385c Fix typo in Clock.cpp. 2022-10-01 21:11:58 +02:00
Jean-François Milants f9f8d7eead Merge branch 'ITCactus-watchface-casio-digital-G7710' into develop 2022-10-01 21:11:05 +02:00
Jean-François Milants d6b4ef38f6 Infineat & G7710 : always close files when they are not needed anymore. 2022-10-01 21:03:28 +02:00
Jean-François Milants 9bf43c380e Fix typo in Clock.cpp. 2022-10-01 19:49:41 +02:00
Jean-François Milants d3363baf69 Do not save settings in CheckboxList. This will be done by the caller. 2022-09-28 21:45:52 +02:00
Jean-François Milants 26af507e16 G7710 : free fonts in dtor(). 2022-09-28 21:09:00 +02:00
minacode 79728730d7 fix typo 2022-09-28 20:53:02 +02:00