Merge remote-tracking branch 'origin/master'

.settings/language.settings.xml

@@ -16,7 +16,11 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+<<<<<<< HEAD
 			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1497516560337187160" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+=======
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1661574727031578776" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+>>>>>>> origin/master
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

ucomponents/preportional_valve/preportional_valve_ctrl.cpp

@@ -2,8 +2,13 @@
 
 #include "transmit_disfection_protocol/transmit_disfection_protocol.hpp"
 using namespace iflytop;
+<<<<<<< HEAD
 using namespace transmit_disfection_protocol;
 
+=======
+using namespace zscanprotocol;
+using namespace transmit_disfection_protocol;
+>>>>>>> origin/master
 #define WORK_STATE_REG 0x0000
 #define CTRL_STATE_REG 0x0001
 #define POS_STATE_REG  0x0013