diff --git a/.gitignore b/.gitignore index 468e7613c..765f332bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,8 @@ .idea/ .DS_Store -build/ -buildsim/ -build-*/ -cmake-*/ +build*/ +cmake*/ CMakeCache.txt *.cbp CMakeFiles @@ -26,4 +24,4 @@ sdkconfig.board.*.dev .tactility/ .caveman.json -.ai/mcp \ No newline at end of file +.ai/mcp diff --git a/Buildscripts/release-sdk.py b/Buildscripts/release-sdk.py index 3c39cbdc5..338546621 100644 --- a/Buildscripts/release-sdk.py +++ b/Buildscripts/release-sdk.py @@ -200,6 +200,7 @@ def main(): add_module(target_path, "lvgl-module") add_module(target_path, "crypt-module") add_module(target_path, "gps-module") + add_module(target_path, "service-module") # Drivers - only ones actually built for this target (chip-restricted drivers like # sc2356-module won't have a .a outside ESP32-P4) diff --git a/CMakeLists.txt b/CMakeLists.txt index c16d65582..02965b4be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,6 +98,7 @@ if (NOT DEFINED ENV{ESP_IDF_VERSION}) add_subdirectory(Modules/lvgl-module) add_subdirectory(Modules/crypt-module) add_subdirectory(Modules/gps-module) + add_subdirectory(Modules/service-module) add_subdirectory(Drivers/gps-generic-module) add_subdirectory(Drivers/gps-meshtastic-module) diff --git a/Firmware/CMakeLists.txt b/Firmware/CMakeLists.txt index ba289a95f..5efbbefe6 100644 --- a/Firmware/CMakeLists.txt +++ b/Firmware/CMakeLists.txt @@ -100,6 +100,7 @@ else () gps-module gps-generic-module gps-meshtastic-module + service-module SDL2::SDL2-static SDL2-static ) diff --git a/Modules/gps-module/CMakeLists.txt b/Modules/gps-module/CMakeLists.txt index 1bd923a9a..3e49f8612 100644 --- a/Modules/gps-module/CMakeLists.txt +++ b/Modules/gps-module/CMakeLists.txt @@ -8,5 +8,5 @@ tactility_add_module(gps-module SRCS ${SOURCE_FILES} PRIV_INCLUDE_DIRS private/ INCLUDE_DIRS include/ - REQUIRES TactilityKernel minmea + REQUIRES TactilityKernel service-module minmea ) diff --git a/Modules/gps-module/source/gps_settings.cpp b/Modules/gps-module/source/gps_settings.cpp index ca46229dc..7023f75e0 100644 --- a/Modules/gps-module/source/gps_settings.cpp +++ b/Modules/gps-module/source/gps_settings.cpp @@ -2,9 +2,10 @@ #include #include +#include + #include #include -#include #include diff --git a/Modules/service-module/CMakeLists.txt b/Modules/service-module/CMakeLists.txt new file mode 100644 index 000000000..11e419d2a --- /dev/null +++ b/Modules/service-module/CMakeLists.txt @@ -0,0 +1,11 @@ +cmake_minimum_required(VERSION 3.20) + +include("${CMAKE_CURRENT_LIST_DIR}/../../Buildscripts/module.cmake") + +file(GLOB_RECURSE SOURCE_FILES "source/*.c*") + +tactility_add_module(service-module + SRCS ${SOURCE_FILES} + INCLUDE_DIRS include/ + REQUIRES TactilityKernel +) diff --git a/Modules/service-module/LICENSE-Apache-2.0.md b/Modules/service-module/LICENSE-Apache-2.0.md new file mode 100644 index 000000000..f5f4b8b5e --- /dev/null +++ b/Modules/service-module/LICENSE-Apache-2.0.md @@ -0,0 +1,195 @@ +Apache License +============== + +_Version 2.0, January 2004_ +_<>_ + +### Terms and Conditions for use, reproduction, and distribution + +#### 1. Definitions + +“License” shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +“Licensor” shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +“Legal Entity” shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, “control” means **(i)** the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the +outstanding shares, or **(iii)** beneficial ownership of such entity. + +“You” (or “Your”) shall mean an individual or Legal Entity exercising +permissions granted by this License. + +“Source” form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +“Object” form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +“Work” shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +“Derivative Works” shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +“Contribution” shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +“submitted” means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as “Not a Contribution.” + +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +#### 2. Grant of Copyright License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +#### 3. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +#### 4. Redistribution + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +* **(a)** You must give any other recipients of the Work or Derivative Works a copy of +this License; and +* **(b)** You must cause any modified files to carry prominent notices stating that You +changed the files; and +* **(c)** You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. + +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +#### 5. Submission of Contributions + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +#### 6. Trademarks + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +#### 7. Disclaimer of Warranty + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +#### 8. Limitation of Liability + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +#### 9. Accepting Warranty or Additional Liability + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +_END OF TERMS AND CONDITIONS_ + +### APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets `[]` replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same “printed page” as the copyright notice for easier identification within +third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/Modules/service-module/devicetree.yaml b/Modules/service-module/devicetree.yaml new file mode 100644 index 000000000..6bbb24367 --- /dev/null +++ b/Modules/service-module/devicetree.yaml @@ -0,0 +1,2 @@ +dependencies: + - TactilityKernel diff --git a/TactilityKernel/include/tactility/service/service_instance.h b/Modules/service-module/include/service/instance.h similarity index 98% rename from TactilityKernel/include/tactility/service/service_instance.h rename to Modules/service-module/include/service/instance.h index 9a1adb678..e136d0073 100644 --- a/TactilityKernel/include/tactility/service/service_instance.h +++ b/Modules/service-module/include/service/instance.h @@ -2,8 +2,9 @@ #pragma once +#include + #include -#include #ifdef __cplusplus extern "C" { diff --git a/TactilityKernel/include/tactility/service/service_manager.h b/Modules/service-module/include/service/manager.h similarity index 95% rename from TactilityKernel/include/tactility/service/service_manager.h rename to Modules/service-module/include/service/manager.h index 299dcfbf4..f76eaf70f 100644 --- a/TactilityKernel/include/tactility/service/service_manager.h +++ b/Modules/service-module/include/service/manager.h @@ -3,9 +3,9 @@ #pragma once #include +#include +#include #include -#include -#include #ifdef __cplusplus extern "C" { diff --git a/TactilityKernel/include/tactility/service/service_manifest.h b/Modules/service-module/include/service/manifest.h similarity index 100% rename from TactilityKernel/include/tactility/service/service_manifest.h rename to Modules/service-module/include/service/manifest.h diff --git a/TactilityKernel/include/tactility/service/service_paths.h b/Modules/service-module/include/service/paths.h similarity index 100% rename from TactilityKernel/include/tactility/service/service_paths.h rename to Modules/service-module/include/service/paths.h diff --git a/TactilityKernel/source/service/service_instance.cpp b/Modules/service-module/source/instance.cpp similarity index 97% rename from TactilityKernel/source/service/service_instance.cpp rename to Modules/service-module/source/instance.cpp index 525d30e19..0c6593892 100644 --- a/TactilityKernel/source/service/service_instance.cpp +++ b/Modules/service-module/source/instance.cpp @@ -1,6 +1,7 @@ // SPDX-License-Identifier: Apache-2.0 -#include +#include + #include #include diff --git a/TactilityKernel/source/service/service_manager.cpp b/Modules/service-module/source/manager.cpp similarity index 98% rename from TactilityKernel/source/service/service_manager.cpp rename to Modules/service-module/source/manager.cpp index 648190b25..e13c4f0c9 100644 --- a/TactilityKernel/source/service/service_manager.cpp +++ b/Modules/service-module/source/manager.cpp @@ -1,11 +1,10 @@ // SPDX-License-Identifier: Apache-2.0 -#include - -#include "tactility/system_event.h" +#include #include #include +#include #include #include diff --git a/TactilityKernel/source/service/service_paths.cpp b/Modules/service-module/source/paths.cpp similarity index 97% rename from TactilityKernel/source/service/service_paths.cpp rename to Modules/service-module/source/paths.cpp index b3156d286..558af2654 100644 --- a/TactilityKernel/source/service/service_paths.cpp +++ b/Modules/service-module/source/paths.cpp @@ -1,6 +1,6 @@ // SPDX-License-Identifier: Apache-2.0 -#include +#include #include #include diff --git a/Modules/service-module/source/symbols.cpp b/Modules/service-module/source/symbols.cpp new file mode 100644 index 000000000..f54c4b3c9 --- /dev/null +++ b/Modules/service-module/source/symbols.cpp @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: Apache-2.0 +#include +#include +#include +#include + +const ModuleSymbol service_module_symbols[] = { + // service/service_instance + DEFINE_MODULE_SYMBOL(service_instance_construct), + DEFINE_MODULE_SYMBOL(service_instance_destruct), + DEFINE_MODULE_SYMBOL(service_instance_get_manifest), + DEFINE_MODULE_SYMBOL(service_instance_get_data), + DEFINE_MODULE_SYMBOL(service_instance_get_state), + // service/service_manager + DEFINE_MODULE_SYMBOL(service_manager_add), + DEFINE_MODULE_SYMBOL(service_manager_remove), + DEFINE_MODULE_SYMBOL(service_manager_find_manifest), + DEFINE_MODULE_SYMBOL(service_manager_start), + DEFINE_MODULE_SYMBOL(service_manager_stop), + DEFINE_MODULE_SYMBOL(service_manager_get_state), + DEFINE_MODULE_SYMBOL(service_manager_find_instance), + // service/service_paths + DEFINE_MODULE_SYMBOL(service_paths_get_user_data_directory), + DEFINE_MODULE_SYMBOL(service_paths_get_user_data_path), + DEFINE_MODULE_SYMBOL(service_paths_get_assets_directory), + DEFINE_MODULE_SYMBOL(service_paths_get_assets_path), + // terminator + MODULE_SYMBOL_TERMINATOR +}; + +Module service_module = { + .name = "service", + .drivers = nullptr, + .symbols = service_module_symbols, + .internal = nullptr +}; diff --git a/Tactility/CMakeLists.txt b/Tactility/CMakeLists.txt index d6f090ec5..e1668da93 100644 --- a/Tactility/CMakeLists.txt +++ b/Tactility/CMakeLists.txt @@ -12,6 +12,7 @@ list(APPEND REQUIRES_LIST gps-module gps-generic-module gps-meshtastic-module + service-module lv_screenshot minitar ) diff --git a/Tactility/Include/Tactility/service/Service.h b/Tactility/Include/Tactility/service/Service.h index 670090a96..104c14ea3 100644 --- a/Tactility/Include/Tactility/service/Service.h +++ b/Tactility/Include/Tactility/service/Service.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include diff --git a/Tactility/Include/Tactility/service/ServiceContext.h b/Tactility/Include/Tactility/service/ServiceContext.h index 3f9555ec9..1b5ca3b79 100644 --- a/Tactility/Include/Tactility/service/ServiceContext.h +++ b/Tactility/Include/Tactility/service/ServiceContext.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include struct ServiceInstance; diff --git a/Tactility/Include/Tactility/service/ServicePaths.h b/Tactility/Include/Tactility/service/ServicePaths.h index 04be7db87..8ecffc4c8 100644 --- a/Tactility/Include/Tactility/service/ServicePaths.h +++ b/Tactility/Include/Tactility/service/ServicePaths.h @@ -2,8 +2,9 @@ #include #include -#include -#include + +#include +#include #include #include diff --git a/Tactility/Source/service/ServiceContext.cpp b/Tactility/Source/service/ServiceContext.cpp index b500f3c37..0b94da930 100644 --- a/Tactility/Source/service/ServiceContext.cpp +++ b/Tactility/Source/service/ServiceContext.cpp @@ -1,8 +1,7 @@ #include #include - -#include +#include namespace tt::service { diff --git a/Tactility/Source/service/ServiceRegistration.cpp b/Tactility/Source/service/ServiceRegistration.cpp index ea9aeeccc..030669e82 100644 --- a/Tactility/Source/service/ServiceRegistration.cpp +++ b/Tactility/Source/service/ServiceRegistration.cpp @@ -1,12 +1,12 @@ -#include +#include +#include #include #include #include #include #include -#include #include #include diff --git a/TactilityKernel/source/symbols.c b/TactilityKernel/source/symbols.c index 9f1091015..48c500737 100644 --- a/TactilityKernel/source/symbols.c +++ b/TactilityKernel/source/symbols.c @@ -41,9 +41,6 @@ #include #include #include -#include -#include -#include #include #ifndef ESP_PLATFORM @@ -473,25 +470,6 @@ const struct ModuleSymbol KERNEL_SYMBOLS[] = { DEFINE_MODULE_SYMBOL(module_is_started), DEFINE_MODULE_SYMBOL(module_resolve_symbol), DEFINE_MODULE_SYMBOL(module_resolve_symbol_global), - // service/service_instance - DEFINE_MODULE_SYMBOL(service_instance_construct), - DEFINE_MODULE_SYMBOL(service_instance_destruct), - DEFINE_MODULE_SYMBOL(service_instance_get_manifest), - DEFINE_MODULE_SYMBOL(service_instance_get_data), - DEFINE_MODULE_SYMBOL(service_instance_get_state), - // service/service_manager - DEFINE_MODULE_SYMBOL(service_manager_add), - DEFINE_MODULE_SYMBOL(service_manager_remove), - DEFINE_MODULE_SYMBOL(service_manager_find_manifest), - DEFINE_MODULE_SYMBOL(service_manager_start), - DEFINE_MODULE_SYMBOL(service_manager_stop), - DEFINE_MODULE_SYMBOL(service_manager_get_state), - DEFINE_MODULE_SYMBOL(service_manager_find_instance), - // service/service_paths - DEFINE_MODULE_SYMBOL(service_paths_get_user_data_directory), - DEFINE_MODULE_SYMBOL(service_paths_get_user_data_path), - DEFINE_MODULE_SYMBOL(service_paths_get_assets_directory), - DEFINE_MODULE_SYMBOL(service_paths_get_assets_path), // terminator MODULE_SYMBOL_TERMINATOR }; diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 250a6514d..e11ad29d8 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -3,12 +3,14 @@ project(tests) set(DOCTESTINC ${PROJECT_SOURCE_DIR}/Doctest/Include) enable_testing() +add_subdirectory(service-module) add_subdirectory(TactilityFreeRtos) add_subdirectory(TactilityKernel) add_subdirectory(Tactility) add_subdirectory(crypt-module) add_custom_target(build-tests) +add_dependencies(build-tests ServiceModuleTests) add_dependencies(build-tests TactilityFreeRtosTests) add_dependencies(build-tests TactilityTests) add_dependencies(build-tests TactilityKernelTests) diff --git a/Tests/Tactility/CMakeLists.txt b/Tests/Tactility/CMakeLists.txt index 56072eb75..db87316c0 100644 --- a/Tests/Tactility/CMakeLists.txt +++ b/Tests/Tactility/CMakeLists.txt @@ -19,6 +19,7 @@ target_link_libraries(TactilityTests PRIVATE gps-module gps-generic-module gps-meshtastic-module + service-module lvgl SDL2::SDL2-static SDL2-static ) diff --git a/Tests/TactilityKernel/CMakeLists.txt b/Tests/TactilityKernel/CMakeLists.txt index b57060f36..b4da56944 100644 --- a/Tests/TactilityKernel/CMakeLists.txt +++ b/Tests/TactilityKernel/CMakeLists.txt @@ -13,4 +13,5 @@ add_test(NAME TactilityKernelTests COMMAND TactilityKernelTests) target_link_libraries(TactilityKernelTests PUBLIC TactilityKernel platform-posix + service-module ) diff --git a/Tests/service-module/CMakeLists.txt b/Tests/service-module/CMakeLists.txt new file mode 100644 index 000000000..e77262c6c --- /dev/null +++ b/Tests/service-module/CMakeLists.txt @@ -0,0 +1,18 @@ +project(ServiceModuleTests) + +enable_language(C CXX ASM) + + +file(GLOB_RECURSE TEST_SOURCES ${PROJECT_SOURCE_DIR}/Source/*.cpp) +add_executable(ServiceModuleTests EXCLUDE_FROM_ALL ${TEST_SOURCES}) + +target_include_directories(ServiceModuleTests PRIVATE ${DOCTESTINC}) + +add_test(NAME ServiceModuleTests COMMAND ServiceModuleTests) + +target_link_libraries(ServiceModuleTests PUBLIC + TactilityKernel + service-module + platform-posix + freertos_kernel +) diff --git a/Tests/service-module/LICENSE-Apache-2.0.md b/Tests/service-module/LICENSE-Apache-2.0.md new file mode 100644 index 000000000..f5f4b8b5e --- /dev/null +++ b/Tests/service-module/LICENSE-Apache-2.0.md @@ -0,0 +1,195 @@ +Apache License +============== + +_Version 2.0, January 2004_ +_<>_ + +### Terms and Conditions for use, reproduction, and distribution + +#### 1. Definitions + +“License” shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +“Licensor” shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +“Legal Entity” shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, “control” means **(i)** the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the +outstanding shares, or **(iii)** beneficial ownership of such entity. + +“You” (or “Your”) shall mean an individual or Legal Entity exercising +permissions granted by this License. + +“Source” form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +“Object” form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +“Work” shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +“Derivative Works” shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +“Contribution” shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +“submitted” means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as “Not a Contribution.” + +“Contributor” shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +#### 2. Grant of Copyright License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +#### 3. Grant of Patent License + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +#### 4. Redistribution + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +* **(a)** You must give any other recipients of the Work or Derivative Works a copy of +this License; and +* **(b)** You must cause any modified files to carry prominent notices stating that You +changed the files; and +* **(c)** You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. + +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +#### 5. Submission of Contributions + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +#### 6. Trademarks + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +#### 7. Disclaimer of Warranty + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +#### 8. Limitation of Liability + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +#### 9. Accepting Warranty or Additional Liability + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +_END OF TERMS AND CONDITIONS_ + +### APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets `[]` replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same “printed page” as the copyright notice for easier identification within +third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/Tests/service-module/Source/Main.cpp b/Tests/service-module/Source/Main.cpp new file mode 100644 index 000000000..acd1df905 --- /dev/null +++ b/Tests/service-module/Source/Main.cpp @@ -0,0 +1,51 @@ +#define DOCTEST_CONFIG_IMPLEMENT +#include "doctest.h" +#include + +#include "FreeRTOS.h" +#include "task.h" + +typedef struct { + int argc; + char** argv; + int result; +} TestTaskData; + +void test_task(void* parameter) { + auto* data = (TestTaskData*)parameter; + + doctest::Context context; + + context.applyCommandLine(data->argc, data->argv); + + // overrides + context.setOption("no-breaks", true); // don't break in the debugger when assertions fail + + data->result = context.run(); + + vTaskEndScheduler(); + + vTaskDelete(nullptr); +} + +int main(int argc, char** argv) { + TestTaskData data = { + .argc = argc, + .argv = argv, + .result = 0 + }; + + BaseType_t task_result = xTaskCreate( + test_task, + "test_task", + 8192, + &data, + 1, + nullptr + ); + assert(task_result == pdPASS); + + vTaskStartScheduler(); + + return data.result; +} diff --git a/Tests/TactilityKernel/Source/ServicePathsTest.cpp b/Tests/service-module/Source/ServicePathsTest.cpp similarity index 98% rename from Tests/TactilityKernel/Source/ServicePathsTest.cpp rename to Tests/service-module/Source/ServicePathsTest.cpp index 289994e8d..ff197e9ee 100644 --- a/Tests/TactilityKernel/Source/ServicePathsTest.cpp +++ b/Tests/service-module/Source/ServicePathsTest.cpp @@ -1,6 +1,8 @@ #include "doctest.h" + +#include + #include -#include #include #include diff --git a/Tests/TactilityKernel/Source/ServiceTest.cpp b/Tests/service-module/Source/ServiceTest.cpp similarity index 99% rename from Tests/TactilityKernel/Source/ServiceTest.cpp rename to Tests/service-module/Source/ServiceTest.cpp index ec8797dc2..f7662cb93 100644 --- a/Tests/TactilityKernel/Source/ServiceTest.cpp +++ b/Tests/service-module/Source/ServiceTest.cpp @@ -1,5 +1,6 @@ #include "doctest.h" -#include + +#include // Defined in service_instance.cpp. Internal-only, exposed here to test try_get/put gating. extern "C" void service_instance_set_state(ServiceInstance* instance, ServiceState state);