summaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
AgeCommit message (Collapse)AuthorFilesLines
2022-09-11Package resources + a metadata file into a single .zip file.Jean-François Milants1-0/+2
2022-08-16Centralize most color definitions (#1258)Riku Isokoski1-2/+2
2022-08-15Add P8B mirrored version definition.izzeho1-0/+1
2022-08-02Add status icons widgetRiku Isokoski1-0/+2
2022-08-02Use submodule for date libRiku Isokoski1-9/+9
A directory has been renamed
2022-07-08Fix filename of the MCUBoot image and recovery MCUBoot image in CMake files. ↵Jean-François Milants1-11/+15
This will fix the generation of output files at the end of the build process.
2022-07-07Display target build variant in system info screenChristoph Honal1-0/+1
2022-07-07Nimble: Reduce BLE power usageChristoph Honal1-0/+1
This configures Nimble to enable the HFCLOCK and other Bluetooth peripherals only when needed, but 1500 us in advance. This time is recommended by the Mynewt docs.
2022-07-05Add PageIndicator widget to reduce code duplication (#1218)Riku Isokoski1-0/+2
* Move PageIndicator widget to its own files to reduce code duplication * Use uint8_t in PageIndicator
2022-06-27Add basic hardware configuration options for P8Christoph Honal1-0/+29
This enables the configuration of the LFCLK source, as well as the target hardware board pin configuration.
2022-06-19CMake: Fix indentationChristoph Honal1-67/+67
2022-06-19CMake: Extend debug configurationChristoph Honal1-7/+21
Enable debug output for InfiniTime, Nimble and the NRF SDK via SEGGER RTT on debug builds.
2022-06-06Add initial counter widgetRiku Isokoski1-0/+2
2022-06-06src/CMakeLists.txt: use iHEX format for mcuboot image creationIldar Mulyukov1-9/+11
for better control of addresses used by img/fw + fix typo (RECOVERYY)
2022-06-06fix wrong linker scriptIldar Mulyukov1-1/+1
introduced in https://github.com/JF002/InfiniTime/commit/58a2d000c4d49d96121894d6dd6bb861d7564bea
2022-06-06Switch to freertos timers (#1095)Michele Bini1-2/+0
* Use FreeRTOS timer for AlarmController * Use FreeRTOS timer for MotorController * Remove app_timer component from compilation as we now solely use FreeROTS timer * Simplify variable and text names for AlarmController and MotorController timers * Call ScheduleAlarm directly from StopAlerting, for recurring timers Co-authored-by: Riku Isokoski <riksu9000@gmail.com> Co-authored-by: NeroBurner <pyro4hell@gmail.com>
2022-06-05remove unused Meter.cpp and Meter.h (#1171)mabuch1-2/+0
2022-06-05remove unused Brightness App (#1170)mabuch1-2/+0
2022-06-05remove old unused bluetooth icons (#1172)mabuch1-4/+0
2022-05-16generalize lv-font creationReinhold Gschweicher1-14/+15
In https://github.com/InfiniTimeOrg/InfiniTime/pull/1097 new font generation capabilites were added. Generalize the font creation to make it possible to reuse the `displayapp/fonts/CMakeLists.txt` file for `InfiniSim` and just add the new cmake file to the project and link against the new `infinitime_fonts` target. In the following a list of changes. Allow non-global installed `lv_font_conv` executable installed with ```sh npm install lv_font_conv@1.5.2 ``` In CMake we search for `lv_font_conv` executable. Add the found executable to the python script `generate.py`, to remove the need for `lv_font_conv` to be in the path. Search for `python3` executable, if CMake version 3.12 is available. Otherwise use `python` as hard coded executable. Instead of adding the generated fonts to `SOURCE_FILES` variable, create a static library `infinitime_fonts`. Link this library to the executables instead. Use `add_custom_target()` together with `add_custom_command()` to generate the font.c files once (like the original PR does).
2022-05-10fontgen: generate fonts at runtime with CMakeYehoshua Pesach Wallach1-2/+1
2022-04-25New sharper batteryicon. Remove old unused batteryiconsRiku Isokoski1-24/+1
2022-04-18resolved merge conflict after renaming PineTimeStyle to WatchFacePineTimeStylemabuch1-1/+1
2022-04-02Replace airplane mode with a bluetooth toggleRiku Isokoski1-1/+1
2022-03-12Rename PineTimeStyle to WatchFacePineTimeStylemabuch1-1/+1
2022-03-08SystemMonitor: implement FreeRtosMonitor only if trace facility is setReinhold Gschweicher1-0/+2
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-02-20Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime ↵Jean-François Milants1-0/+1
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 Milants1-0/+1
(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-19Remove unused and not compiling DropDownDemoReinhold Gschweicher1-1/+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-01-17Create Version.h in binary dir instead of src dirReinhold Gschweicher1-0/+2
Don't use source directory for generated files. Use the binary (build) directory instead.
2022-01-04Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into ↵Jean-François Milants1-0/+1
geekbozu-ShakeWake # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/screens/settings/Settings.cpp
2022-01-04Add start of settings app for senstivity.Tim Keller1-0/+1
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-02resolves conflictsSteveAmor1-16/+58
2021-12-30Merge pull request #718 from kieranc/pts-settingsJF1-1/+0
Integrate color picker into PineTimeStyle watchface
2021-12-23Add airplane mode featureJames A. Jerkins1-0/+1
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-10Added Blank FSService that exposes only version infoTim Keller1-0/+3
2021-12-09Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray1-15/+52
2021-12-09Added QCBOR to pinetime-mcuboot-recoveryAvamander1-1/+1
2021-12-09Hotfix for other build targetsAvamander1-2/+2
2021-12-09Move radio button styling to a single placeRiku Isokoski1-0/+1
2021-12-09Merge branch 'develop' into patch-weatherAvamander1-0/+2
2021-12-09Connect and bond with a passkeyJames A. Jerkins1-0/+2
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-04Removed unnecessary change in CMakeListsAvamander1-1/+1
2021-12-04Improved debug UI.Avamander1-1/+1
2021-12-04Improved error handling and fixed incompatibility with co.nstant.in:cbor libraryAvamander1-5/+5
2021-12-04Fixed recovery buildAvamander1-1/+2
2021-12-04Few formatting fixesAvamander1-6/+6
2021-12-04Brace style and whitespace fixesAvamander1-1/+1
2021-12-04Fixed a few bugs, enabled UsefulBuf library optimizationsAvamander1-0/+1
2021-12-04Tidied up and added Weather to CMakeLists.txtAvamander1-0/+6