From dc272c23a8300a568bc2b108b7d471032cfb601a Mon Sep 17 00:00:00 2001 From: "Dr. Steven Strange" Date: Mon, 14 Aug 2023 20:25:34 +0200 Subject: [PATCH] feat(library): fixed some issues and increased version to 1.0.1 --- CMakeLists.txt | 31 +++++++++++++++++++ {src => include}/IAllSensors.h | 0 {src => include}/ICapacitiveSensorAdapter.h | 0 {src => include}/IHapticSensorAdapter.h | 0 {src => include}/IMacroKeys.h | 0 {src => include}/IRotaryEncoderAdapter.h | 0 .../ISpaceNavigatorSensorAdapter.h | 0 library.json | 11 +++++-- platformio.ini | 18 +++++++++++ src/.gitkeep | 0 10 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 CMakeLists.txt rename {src => include}/IAllSensors.h (100%) rename {src => include}/ICapacitiveSensorAdapter.h (100%) rename {src => include}/IHapticSensorAdapter.h (100%) rename {src => include}/IMacroKeys.h (100%) rename {src => include}/IRotaryEncoderAdapter.h (100%) rename {src => include}/ISpaceNavigatorSensorAdapter.h (100%) create mode 100644 platformio.ini create mode 100644 src/.gitkeep diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..66f96af --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,31 @@ +# !!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE +# https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags +# +# If you need to override existing CMake configuration or add extra, +# please create `CMakeListsUser.txt` in the root of project. +# The `CMakeListsUser.txt` will not be overwritten by PlatformIO. + +cmake_minimum_required(VERSION 3.13) +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_C_COMPILER_WORKS 1) +set(CMAKE_CXX_COMPILER_WORKS 1) + +project("dialer" C CXX) + +include(CMakeListsPrivate.txt) + +if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeListsUser.txt) + include(CMakeListsUser.txt) +endif () + +add_custom_target( + Production ALL + COMMAND platformio -c clion run "$<$>:-e${CMAKE_BUILD_TYPE}>" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_custom_target( + Debug ALL + COMMAND platformio -c clion debug "$<$>:-e${CMAKE_BUILD_TYPE}>" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +) diff --git a/src/IAllSensors.h b/include/IAllSensors.h similarity index 100% rename from src/IAllSensors.h rename to include/IAllSensors.h diff --git a/src/ICapacitiveSensorAdapter.h b/include/ICapacitiveSensorAdapter.h similarity index 100% rename from src/ICapacitiveSensorAdapter.h rename to include/ICapacitiveSensorAdapter.h diff --git a/src/IHapticSensorAdapter.h b/include/IHapticSensorAdapter.h similarity index 100% rename from src/IHapticSensorAdapter.h rename to include/IHapticSensorAdapter.h diff --git a/src/IMacroKeys.h b/include/IMacroKeys.h similarity index 100% rename from src/IMacroKeys.h rename to include/IMacroKeys.h diff --git a/src/IRotaryEncoderAdapter.h b/include/IRotaryEncoderAdapter.h similarity index 100% rename from src/IRotaryEncoderAdapter.h rename to include/IRotaryEncoderAdapter.h diff --git a/src/ISpaceNavigatorSensorAdapter.h b/include/ISpaceNavigatorSensorAdapter.h similarity index 100% rename from src/ISpaceNavigatorSensorAdapter.h rename to include/ISpaceNavigatorSensorAdapter.h diff --git a/library.json b/library.json index db5d1e4..d795f6d 100644 --- a/library.json +++ b/library.json @@ -1,8 +1,8 @@ { "name": "Dial2AbstractSensors", - "keywords": "sensors, abstract, interfaces", + "keywords": "dial2, sensors, abstract, interfaces", "description": "A simple library containing abstract interfaces for sensor adapters for the AhmsVille Dial 2", - "version": "1.0.0", + "version": "1.0.1", "authors": { "name": "Igor Voronin", "url": "https://github.com/divStar" @@ -11,6 +11,13 @@ "type": "git", "url": "https://github.com/divStar/ahmsville-dial2-abstract-sensors.git" }, + "export": { + "exclude": [ + ".pio", + "cmake-build-*", + "platformio.ini" + ] + }, "frameworks": "*", "platforms": "*", "build": { diff --git a/platformio.ini b/platformio.ini new file mode 100644 index 0000000..760c08a --- /dev/null +++ b/platformio.ini @@ -0,0 +1,18 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[platformio] +description = Abstract sensor interfaces for the AhmsVille Dial2 +default_envs = native + +[env:native] +platform = native +build_flags = -std=gnu++17 +build_unflags = -std=gnu++11 \ No newline at end of file diff --git a/src/.gitkeep b/src/.gitkeep new file mode 100644 index 0000000..e69de29