重构config文件目录

.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<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"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1324296782879874877" 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="1290452739804114664" 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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<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"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1312690375029265710" 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="1305946972399269591" 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">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

.vscode/c_cpp_properties.json

@@ -12,7 +12,6 @@
                 "./Middlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM4F",
                 "./Drivers/CMSIS/Device/ST/STM32F4xx/Include",
                 "./Drivers/CMSIS/Include",
-                "C:/ST/STM32CubeIDE_1.13.0/STM32CubeIDE/plugins/com.st.stm32cube.ide.mcu.externaltools.gnu-tools-for-stm32.11.3.rel1.win32_1.1.0.202305231506/tools/arm-none-eabi/include",
                 "./usrc/",
                 "./"
             ],

uappbase/base.hpp

@@ -6,7 +6,5 @@
 #include "service/app_core.hpp"
 #include "service/app_event_bus.hpp"
 #include "service/gstate_mgr.hpp"
-#include "service/config_service.hpp"
-#include "service/config_service_utils.hpp"
 //
 #include "apphal/apphal.hpp"

usrc/config/config.hpp

@@ -0,0 +1,4 @@
+#pragma once
+#include "config_index.hpp"
+#include "config_service.hpp"
+#include "config_service_utils.hpp"

uappbase/service/config_index.hpp → usrc/config/config_index.hpp

@@ -1,9 +1,5 @@
 #pragma once
-#include "../appdep.hpp"
-#include "uappbase/appcfg/appcfg.hpp"
-#include "uappbase/bean/bean.hpp"
-#include "uappbase/bean/config_index_enum.hpp"
-
+#include "uappbase/base.hpp"
 namespace iflytop {
 typedef enum {
   kcfgt_float,

uappbase/service/config_service.hpp → usrc/config/config_service.hpp

@@ -1,9 +1,7 @@
 #pragma once
-#include "../appdep.hpp"
+#include "uappbase/base.hpp"
+
 #include "config_index.hpp"
-#include "uappbase/appcfg/appcfg.hpp"
-#include "uappbase/apphal/apphal.hpp"
-#include "uappbase/bean/bean.hpp"
 #include "ucomponents/eeprom/m24m02_i2c_eeprom.hpp"
 
 namespace iflytop {

usrc/service/app_core.hpp

@@ -2,7 +2,7 @@
 
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
-
+#include "config/config.hpp"
 namespace iflytop {
 class AppCore {
  private:

usrc/service/front_end_controler.hpp

@@ -1,7 +1,7 @@
 #pragma once
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
-
+#include "config/config.hpp"
 //
 #include "tjc/tjc.hpp"
 

usrc/service/page/page_processer.hpp

@@ -4,7 +4,7 @@
 #include "uappbase/base.hpp"
 #include "service\front_end_controler.hpp"
 #include "utils/page_bak_router.hpp"
-
+#include "config/config.hpp"
 #include "ui/ui.h"
 namespace iflytop {
 using namespace std;

usrc/service/page/utils/page_bak_router.hpp

@@ -2,7 +2,7 @@
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
 #include "service\front_end_controler.hpp"
-
+#include "config/config.hpp"
 namespace iflytop {
 int getBakPage(int nowPage);
 }

usrc/service/pump_ctrl_service.hpp

@@ -1,6 +1,7 @@
 #pragma once
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
+#include "config/config.hpp"
 namespace iflytop {
 using namespace std;
 #define PUMPCS PumpCtrlService::ins()

usrc/service/remote_controler.hpp

@@ -1,6 +1,7 @@
 #pragma once
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
+#include "config/config.hpp"
 namespace iflytop {
 using namespace std;
 #define RCTRL RemoteControlerUpper::ins()

usrc/service/remote_controler_event_processer.hpp

@@ -2,6 +2,7 @@
 
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
+#include "config/config.hpp"
 namespace iflytop {
 using namespace std;
 /**

usrc/service/remote_controler_state_sync_service.hpp

@@ -2,6 +2,7 @@
 
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
+#include "config/config.hpp"
 namespace iflytop {
 using namespace std;
 class RemoteControlerStateSyncService {

usrc/service/valve_state_ctrl_service.hpp

@@ -3,7 +3,7 @@
 #include "apphardware/apphardware.hpp"
 #include "uappbase/base.hpp"
 #include "ucomponents/zcan/zcan.hpp"
-
+#include "config/config.hpp"
 namespace iflytop {
 using namespace std;
 class ValveStateSyncService {