Fix: project structure (#7)

* fix: project structure * fix: fixed bugs
YarikRevich · Jun 8, 2024 · 7a3f99d · 7a3f99d
1 parent 83dbd23
commit 7a3f99d
Show file tree

Hide file tree

Showing 32 changed files with 53 additions and 46 deletions.
diff --git a/.cproject b/.cproject
@@ -46,27 +46,27 @@
 									<listOptionValue builtIn="false" value="STM32L476xx"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths.1260508736" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../Core/Inc"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Buffer"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Buffer/Request"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Buffer/Response"/>
-									<listOptionValue builtIn="false" value="../Core/External/Sensor"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Helper"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Codec"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Generated"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Generated/Content"/>
-									<listOptionValue builtIn="false" value="../Core/External/Scheduler"/>
-									<listOptionValue builtIn="false" value="../Core/External/Scheduler/Handler"/>
-									<listOptionValue builtIn="false" value="../Core/External/State"/>
-									<listOptionValue builtIn="false" value="../Core/External/Tools/Indicator"/>
-									<listOptionValue builtIn="false" value="../Core/External/Tools/Converter"/>
-									<listOptionValue builtIn="false" value="../Core/External/Tools/Mutex"/>
-									<listOptionValue builtIn="false" value="../Core/External/Tools/Sequence"/>
-									<listOptionValue builtIn="false" value="../ThirdParty/Inc"/>
+									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/STM32L4xx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32L4xx/Include"/>
-									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../ThirdParty/Inc"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Buffer"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Buffer/Request"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Buffer/Response"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Sensor"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Helper"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Codec"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Generated"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Generated/Content"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Scheduler"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Scheduler/Handler"/>
+									<listOptionValue builtIn="false" value="../External/Inc/State"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Tools/Indicator"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Tools/Converter"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Tools/Mutex"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Tools/Sequence"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1702390565" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
 							</tool>
@@ -79,27 +79,27 @@
 									<listOptionValue builtIn="false" value="STM32L476xx"/>
 								</option>
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths.239766328" name="Include paths (-I)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.includepaths" useByScannerDiscovery="false" valueType="includePath">
-									<listOptionValue builtIn="false" value="../Core/Inc"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Buffer"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Buffer/Request"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Buffer/Response"/>
-									<listOptionValue builtIn="false" value="../Core/External/Sensor"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Helper"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Codec"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Generated"/>
-									<listOptionValue builtIn="false" value="../Core/External/Proto/Generated/Content"/>
-									<listOptionValue builtIn="false" value="../Core/External/Scheduler"/>
-									<listOptionValue builtIn="false" value="../Core/External/State"/>
-									<listOptionValue builtIn="false" value="../Core/External/Scheduler/Handler"/>
-									<listOptionValue builtIn="false" value="../Core/External/Tools/Indicator"/>
-									<listOptionValue builtIn="false" value="../Core/External/Tools/Converter"/>
-									<listOptionValue builtIn="false" value="../Core/External/Tools/Mutex"/>
-									<listOptionValue builtIn="false" value="../Core/External/Tools/Sequence"/>
-									<listOptionValue builtIn="false" value="../ThirdParty/Inc"/>
+									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
 									<listOptionValue builtIn="false" value="../Drivers/STM32L4xx_HAL_Driver/Inc"/>
 									<listOptionValue builtIn="false" value="../Drivers/STM32L4xx_HAL_Driver/Inc/Legacy"/>
 									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Device/ST/STM32L4xx/Include"/>
-									<listOptionValue builtIn="false" value="../Drivers/CMSIS/Include"/>
+									<listOptionValue builtIn="false" value="../Core/Inc"/>
+									<listOptionValue builtIn="false" value="../ThirdParty/Inc"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Buffer"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Buffer/Request"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Buffer/Response"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Sensor"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Helper"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Codec"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Generated"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Proto/Generated/Content"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Scheduler"/>
+									<listOptionValue builtIn="false" value="../External/Inc/State"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Scheduler/Handler"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Tools/Indicator"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Tools/Converter"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Tools/Mutex"/>
+									<listOptionValue builtIn="false" value="../External/Inc/Tools/Sequence"/>
 								</option>
 								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.425825475" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
 							</tool>
@@ -129,9 +129,10 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ThirdParty"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="External"/>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="ThirdParty"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,11 +49,11 @@ else ()
     add_compile_options(-Og -g)
 endif ()
 
-include_directories(Core/Inc Core/External/Proto/Buffer Core/External/Proto/Buffer/Request Core/External/Proto/Buffer/Response Core/External/Sensor Core/External/Proto/Helper Core/External/Proto/Codec Core/External/Proto/Generated Core/External/Proto/Generated/Content Core/External/Scheduler Core/External/Scheduler/Handler Core/External/State Core/External/Tools/Indicator Core/External/Tools/Converter Core/External/Tools/Mutex Core/External/Tools/Sequence ThirdParty/Inc Drivers/STM32L4xx_HAL_Driver/Inc Drivers/STM32L4xx_HAL_Driver/Inc/Legacy Drivers/CMSIS/Device/ST/STM32L4xx/Include Drivers/CMSIS/Include)
+include_directories(Drivers/CMSIS/Include Drivers/STM32L4xx_HAL_Driver/Inc Drivers/STM32L4xx_HAL_Driver/Inc/Legacy Drivers/CMSIS/Device/ST/STM32L4xx/Include Core/Inc ThirdParty/Inc External/Inc/Proto/Buffer External/Inc/Proto/Buffer/Request External/Inc/Proto/Buffer/Response External/Inc/Sensor External/Inc/Proto/Helper External/Inc/Proto/Codec External/Inc/Proto/Generated External/Inc/Proto/Generated/Content External/Inc/Scheduler External/Inc/Scheduler/Handler External/Inc/State External/Inc/Tools/Indicator External/Inc/Tools/Converter External/Inc/Tools/Mutex External/Inc/Tools/Sequence)
 
 add_definitions(-DDEBUG -DUSE_HAL_DRIVER -DSTM32L476xx)
 
-file(GLOB_RECURSE SOURCES "ThirdParty/*.*" "Core/*.*" "Drivers/*.*")
+file(GLOB_RECURSE SOURCES "Core/*.*" "Drivers/*.*" "External/*.*" "ThirdParty/*.*")
 
 set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/STM32L476RGTX_FLASH.ld)
 

diff --git a/...nal/Proto/Buffer/Request/request_buffer.h → ...Inc/Proto/Buffer/Request/request_buffer.h b/...nal/Proto/Buffer/Request/request_buffer.h → ...Inc/Proto/Buffer/Request/request_buffer.h
diff --git a/...l/Proto/Buffer/Response/response_buffer.h → ...c/Proto/Buffer/Response/response_buffer.h b/...l/Proto/Buffer/Response/response_buffer.h → ...c/Proto/Buffer/Response/response_buffer.h
diff --git a/Core/External/Proto/Codec/proto_codec.h → External/Inc/Proto/Codec/proto_codec.h b/Core/External/Proto/Codec/proto_codec.h → External/Inc/Proto/Codec/proto_codec.h
diff --git a/Core/External/Proto/Generated/Content/data.h → External/Inc/Proto/Generated/Content/data.h b/Core/External/Proto/Generated/Content/data.h → External/Inc/Proto/Generated/Content/data.h
diff --git a/Core/External/Proto/Generated/Content/info.h → External/Inc/Proto/Generated/Content/info.h b/Core/External/Proto/Generated/Content/info.h → External/Inc/Proto/Generated/Content/info.h
diff --git a/...ternal/Proto/Generated/Content/settings.h → ...al/Inc/Proto/Generated/Content/settings.h b/...ternal/Proto/Generated/Content/settings.h → ...al/Inc/Proto/Generated/Content/settings.h
diff --git a/Core/External/Proto/Generated/request.h → External/Inc/Proto/Generated/request.h b/Core/External/Proto/Generated/request.h → External/Inc/Proto/Generated/request.h
diff --git a/Core/External/Proto/Generated/response.h → External/Inc/Proto/Generated/response.h b/Core/External/Proto/Generated/response.h → External/Inc/Proto/Generated/response.h
diff --git a/Core/External/Proto/Helper/proto_helper.h → External/Inc/Proto/Helper/proto_helper.h b/Core/External/Proto/Helper/proto_helper.h → External/Inc/Proto/Helper/proto_helper.h
diff --git a/...nal/Scheduler/Handler/scheduler_handler.h → ...Inc/Scheduler/Handler/scheduler_handler.h b/...nal/Scheduler/Handler/scheduler_handler.h → ...Inc/Scheduler/Handler/scheduler_handler.h
diff --git a/Core/External/Scheduler/scheduler.h → External/Inc/Scheduler/scheduler.h b/Core/External/Scheduler/scheduler.h → External/Inc/Scheduler/scheduler.h
diff --git a/Core/External/Sensor/tsl2591x.h → External/Inc/Sensor/tsl2591x.h b/Core/External/Sensor/tsl2591x.h → External/Inc/Sensor/tsl2591x.h
@@ -83,7 +83,7 @@ class TSL2591X {
      *
      * @return read device id.
      */
-    static bool get_device_id();
+    static uint8_t get_device_id();
 
     /**
      * Resets light sensor to the default state, initializing device with default settings.

diff --git a/Core/External/State/state.h → External/Inc/State/state.h b/Core/External/State/state.h → External/Inc/State/state.h
diff --git a/Core/External/Tools/Converter/Converter.h → External/Inc/Tools/Converter/converter.h b/Core/External/Tools/Converter/Converter.h → External/Inc/Tools/Converter/converter.h
diff --git a/Core/External/Tools/Indicator/indicator.h → External/Inc/Tools/Indicator/indicator.h b/Core/External/Tools/Indicator/indicator.h → External/Inc/Tools/Indicator/indicator.h
diff --git a/Core/External/Tools/Mutex/mutex.h → External/Inc/Tools/Mutex/mutex.h b/Core/External/Tools/Mutex/mutex.h → External/Inc/Tools/Mutex/mutex.h
@@ -21,7 +21,7 @@ class Mutex {
      *
      * @return retrieved state of the mutex.
      */
-    bool is_locked() const;
+    [[nodiscard]] bool is_locked() const;
 private:
     /**
      * Represents current state of the mutex.

diff --git a/Core/External/Tools/Sequence/sequence.h → External/Inc/Tools/Sequence/sequence.h b/Core/External/Tools/Sequence/sequence.h → External/Inc/Tools/Sequence/sequence.h
diff --git a/...l/Proto/Buffer/Request/request_buffer.cpp → ...c/Proto/Buffer/Request/request_buffer.cpp b/...l/Proto/Buffer/Request/request_buffer.cpp → ...c/Proto/Buffer/Request/request_buffer.cpp
diff --git a/...Proto/Buffer/Response/response_buffer.cpp → ...Proto/Buffer/Response/response_buffer.cpp b/...Proto/Buffer/Response/response_buffer.cpp → ...Proto/Buffer/Response/response_buffer.cpp
diff --git a/Core/External/Proto/Codec/proto_codec.cpp → External/Src/Proto/Codec/proto_codec.cpp b/Core/External/Proto/Codec/proto_codec.cpp → External/Src/Proto/Codec/proto_codec.cpp
diff --git a/Core/External/Proto/Helper/proto_helper.cpp → External/Src/Proto/Helper/proto_helper.cpp b/Core/External/Proto/Helper/proto_helper.cpp → External/Src/Proto/Helper/proto_helper.cpp
diff --git a/...l/Scheduler/Handler/scheduler_handler.cpp → ...c/Scheduler/Handler/scheduler_handler.cpp b/...l/Scheduler/Handler/scheduler_handler.cpp → ...c/Scheduler/Handler/scheduler_handler.cpp
@@ -427,8 +427,6 @@ int SchedulerHandler::process_settings_bus_request_content_response(
 
             return EXIT_FAILURE;
         }
-
-
     }
 
     Indicator::toggle_action_success();

diff --git a/Core/External/Scheduler/scheduler.cpp → External/Src/Scheduler/scheduler.cpp b/Core/External/Scheduler/scheduler.cpp → External/Src/Scheduler/scheduler.cpp
diff --git a/Core/External/Sensor/tsl2591x.cpp → External/Src/Sensor/tsl2591x.cpp b/Core/External/Sensor/tsl2591x.cpp → External/Src/Sensor/tsl2591x.cpp
@@ -14,7 +14,7 @@ bool TSL2591X::is_available() {
     return HAL_I2C_IsDeviceReady(&hi2c1, TSL2591X_ADDRESS, 1u, 10u) == HAL_OK;
 }
 
-bool TSL2591X::get_device_id() {
+uint8_t TSL2591X::get_device_id() {
     return read_byte(WHO_AM_I);
 };
 

diff --git a/Core/External/State/state.cpp → External/Src/State/state.cpp b/Core/External/State/state.cpp → External/Src/State/state.cpp
diff --git a/Core/External/Tools/Converter/Converter.cpp → External/Src/Tools/Converter/converter.cpp b/Core/External/Tools/Converter/Converter.cpp → External/Src/Tools/Converter/converter.cpp
diff --git a/Core/External/Tools/Indicator/indicator.cpp → External/Src/Tools/Indicator/indicator.cpp b/Core/External/Tools/Indicator/indicator.cpp → External/Src/Tools/Indicator/indicator.cpp
diff --git a/Core/External/Tools/Mutex/mutex.cpp → External/Src/Tools/Mutex/mutex.cpp b/Core/External/Tools/Mutex/mutex.cpp → External/Src/Tools/Mutex/mutex.cpp
diff --git a/Core/External/Tools/Sequence/sequence.cpp → External/Src/Tools/Sequence/sequence.cpp b/Core/External/Tools/Sequence/sequence.cpp → External/Src/Tools/Sequence/sequence.cpp
@@ -42,7 +42,7 @@ void Sequence<T>::traverse_until_succeed(std::function<int(T)> callback) {
 
         sequence.pop();
     }
-};
+}
 
 template <typename T>
 void Sequence<T>::add(const T& src) {

diff --git a/Makefile b/Makefile
@@ -1,3 +1,5 @@
+plugin := $(or $(plugin), '')
+
 .ONESHELL:
 
 .PHONY: help
@@ -29,6 +31,12 @@ endif
 
 .PHONY: generate
 generate: ## Generate ProtocolBuffers files(used mainly for development)
+ifeq ($(plugin), '')
+	@echo "Plugin is not set!"
+
+	@exit 1
+endif
+
 	@protoc -I./Resources/Proto/Container --pyi_out=./Scripts/cli/src/proto Content/data.proto Content/info.proto Content/settings.proto request.proto response.proto
 	@protoc -I./Resources/Proto/Container --python_out=./Scripts/cli/src/proto Content/data.proto Content/info.proto Content/settings.proto request.proto response.proto
-	@protoc --plugin=/Volumes/Files/embedded/university/techno/project/deps/EmbeddedProto -I./Resources/Proto/Container --eams_out=./Core/External/Proto/Generated Content/data.proto Content/info.proto Content/settings.proto request.proto response.proto
+	@protoc --plugin=$(plugin) -I./Resources/Proto/Container --eams_out=./Core/External/Proto/Generated Content/data.proto Content/info.proto Content/settings.proto request.proto response.proto