summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2022-03-08Add missing nrf_log.h includes shadowed by SystemMonitor.hReinhold Gschweicher5-0/+5
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-03removed SetClockFace from watchface ConstructorsYehoshua Pesach Wallach2-2/+0
2022-03-03Settings: more specific read and write modeReinhold Gschweicher1-2/+2
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-03Update README.mdmedeyko1-2/+1
More imperative tone
2022-03-03Update README.mdmedeyko1-1/+1
remove unnecessary )
2022-03-03Update README.mdmedeyko1-0/+17
2022-03-03Update jetbrains_mono_bold_20.cmedeyko1-2/+2
Fix 0 (zero) symbol. For more details, #988
2022-03-03terminal watchface: remove icons and other fixesRiku Isokoski2-31/+9
2022-03-03Replace Airplane mode iconavery1-1/+1
2022-03-03Notifications: replace newlines in label-copy because of const char* titleReinhold Gschweicher2-12/+11
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-03Remove unused includes in HearRate and Motion.hReinhold Gschweicher2-2/+0
The include `bits/unique_ptr.h` isn't used, so remove it.
2022-03-03Add ITD as a companion appArsen63311-0/+1
2022-02-20Merge branch 'evergreen22-airplane-mode' into developJean-François Milants26-107/+370
2022-02-20Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime ↵Jean-François Milants21-124/+179
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-20Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime ↵Jean-François Milants22-87/+295
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-20Manual squash merge of PR #932 ↵Jean-François Milants8-9/+303
(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-19Provide reference to BrightnessController in DisplayAppReinhold Gschweicher5-1/+10
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-19Remove unused and not compiling DropDownDemoReinhold Gschweicher3-85/+0
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-19SystemTask: forward declare BatteryController to fix of cyclic dependencyReinhold Gschweicher2-1/+2
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-19SettingShakeThreshold: add missing SystemTask.h, relative includeReinhold Gschweicher2-1/+2
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-19MotorController: no need to make this function a class functionReinhold Gschweicher1-1/+1
The `StopRinging()` function was used just in `Notifications.h` screen. That screen already has access to a `motorController` object.
2022-02-19Notifications: use motorController object instead of class functionReinhold Gschweicher2-10/+19
We get the motoroController object, so store and use it.
2022-02-19SystemTask: remove unused ble includesReinhold Gschweicher1-9/+0
Remove unused includes. The firmware still compiles fine without the includes.
2022-02-13Improved alarm alert handlingRiku Isokoski3-10/+41
2022-02-13Merge branch 'mruss77-statusBarTimeFormat' into developJean-François Milants6-10/+38
2022-02-13Merge branch 'statusBarTimeFormat' of https://github.com/mruss77/InfiniTime ↵Jean-François Milants6-10/+38
into mruss77-statusBarTimeFormat # Conflicts: # src/components/datetime/DateTimeController.cpp
2022-02-12Fix biased BLE pass key generationZorvalt1-1/+22
2022-02-12SystemTask: fix static cast missing brackets syntaxReinhold Gschweicher1-2/+2
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-12Make switch disabled state slightly dimmerRiku Isokoski1-1/+2
2022-02-12Fix switch default stateRiku Isokoski1-0/+2
2022-02-12Alarm: Fix missing stop button. Revert alert layoutRiku Isokoski1-4/+6
2022-02-12Alarm: Change checkable button for a switchRiku Isokoski5-33/+52
2022-02-12Add issue linksRiku Isokoski1-0/+8
2022-01-31Added alarm 12 hour interfaceEli Weiss3-8/+39
2022-01-31Corrected capitalizationEli Weiss2-5/+5
2022-01-31Corrected code formattingEli Weiss2-28/+30
Corrected formatting and removed unnecessary variable time24H
2022-01-31Changed setHourLabels function to handle 24H tooEli Weiss2-36/+28
Changed setHourLabels function to handle 24 hour time labeling, changed to private
2022-01-31Consolidated label changes, optimizationsEli Weiss1-36/+15
Consolidated 12 hour label changes to function. Removed use of strings, struct.
2022-01-31Consolidated time conversion logicEli Weiss2-87/+94
Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
2022-01-31Removed redundant bracketsEli Weiss1-5/+3
Also corrected orphaned bracket
2022-01-31Cleaned up redundant if statements, spacingEli Weiss2-47/+43
Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
2022-01-31Added 12 hour set timeEli Weiss3-8/+80
2022-01-26Merge pull request #949 from Riksu9000/fix_alarmJF2-0/+5
Fix alarm on time change
2022-01-26Merge pull request #954 from NeroBurner/music_initialize_lastLengthJF1-1/+1
Music: initialize totalLength to have non-random data from the start
2022-01-26Merge pull request #959 from NeroBurner/stopwatch_include_cleanupJF2-7/+4
StopWatch: cleanup unused includes and use relative to src includes
2022-01-26Merge pull request #531 from hatmajster/heart-rate-gain-settingJF1-2/+2
Heart rate sensor - HRS gain changed to x8
2022-01-26Merge pull request #876 from yehoshuapw/hrs-driver-changesJF3-8/+7
Hrs driver changes
2022-01-26Merge pull request #903 from Riksu9000/improved_notif_timeoutJF4-18/+49
Improved notification timeout
2022-01-26Merge pull request #939 from NeroBurner/buttonHandler_relative_includeJF2-2/+2
ButtonHandler: includes relative to src dir
2022-01-26Merge pull request #940 from NeroBurner/systemTask_queue_includeJF1-0/+1
SystemTask: add missing queue.h include for QueueHandle_t
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-20 20:40:36 +0000