fix: fixed bugs

YarikRevich · Jun 8, 2024 · 933aaba · 933aaba
1 parent 3243d68
commit 933aaba
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 40 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/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