diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 5a79ae1..1eb30e0 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 8909387..1a9f159 100644 --- a/.vscode/c_cpp_properties.json +++ b/.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/", "./" ], diff --git a/uappbase/base.hpp b/uappbase/base.hpp index b60d096..47cbb07 100644 --- a/uappbase/base.hpp +++ b/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" diff --git a/usrc/config/config.hpp b/usrc/config/config.hpp new file mode 100644 index 0000000..d653bcd --- /dev/null +++ b/usrc/config/config.hpp @@ -0,0 +1,4 @@ +#pragma once +#include "config_index.hpp" +#include "config_service.hpp" +#include "config_service_utils.hpp" diff --git a/uappbase/service/config_index.cpp b/usrc/config/config_index.cpp similarity index 100% rename from uappbase/service/config_index.cpp rename to usrc/config/config_index.cpp diff --git a/uappbase/service/config_index.hpp b/usrc/config/config_index.hpp similarity index 73% rename from uappbase/service/config_index.hpp rename to usrc/config/config_index.hpp index fc82402..8e920b9 100644 --- a/uappbase/service/config_index.hpp +++ b/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, diff --git a/uappbase/service/config_service.cpp b/usrc/config/config_service.cpp similarity index 100% rename from uappbase/service/config_service.cpp rename to usrc/config/config_service.cpp diff --git a/uappbase/service/config_service.hpp b/usrc/config/config_service.hpp similarity index 91% rename from uappbase/service/config_service.hpp rename to usrc/config/config_service.hpp index 84a87c8..3b05e9f 100644 --- a/uappbase/service/config_service.hpp +++ b/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 { diff --git a/uappbase/service/config_service_utils.cpp b/usrc/config/config_service_utils.cpp similarity index 100% rename from uappbase/service/config_service_utils.cpp rename to usrc/config/config_service_utils.cpp diff --git a/uappbase/service/config_service_utils.hpp b/usrc/config/config_service_utils.hpp similarity index 100% rename from uappbase/service/config_service_utils.hpp rename to usrc/config/config_service_utils.hpp diff --git a/usrc/service/app_core.hpp b/usrc/service/app_core.hpp index 2b7e6e2..e9594f5 100644 --- a/usrc/service/app_core.hpp +++ b/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: diff --git a/usrc/service/front_end_controler.hpp b/usrc/service/front_end_controler.hpp index 3f1a3c3..0936213 100644 --- a/usrc/service/front_end_controler.hpp +++ b/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" diff --git a/usrc/service/page/page_processer.hpp b/usrc/service/page/page_processer.hpp index 58592d6..3aae729 100644 --- a/usrc/service/page/page_processer.hpp +++ b/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; diff --git a/usrc/service/page/utils/page_bak_router.hpp b/usrc/service/page/utils/page_bak_router.hpp index 0de399b..bdfa0a3 100644 --- a/usrc/service/page/utils/page_bak_router.hpp +++ b/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); } \ No newline at end of file diff --git a/usrc/service/pump_ctrl_service.hpp b/usrc/service/pump_ctrl_service.hpp index 688da3b..fba66f4 100644 --- a/usrc/service/pump_ctrl_service.hpp +++ b/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() diff --git a/usrc/service/remote_controler.hpp b/usrc/service/remote_controler.hpp index 98e4858..7138085 100644 --- a/usrc/service/remote_controler.hpp +++ b/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() diff --git a/usrc/service/remote_controler_event_processer.hpp b/usrc/service/remote_controler_event_processer.hpp index 1cec6ec..12475d2 100644 --- a/usrc/service/remote_controler_event_processer.hpp +++ b/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; /** diff --git a/usrc/service/remote_controler_state_sync_service.hpp b/usrc/service/remote_controler_state_sync_service.hpp index bcc4314..9648bac 100644 --- a/usrc/service/remote_controler_state_sync_service.hpp +++ b/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 { diff --git a/usrc/service/valve_state_ctrl_service.hpp b/usrc/service/valve_state_ctrl_service.hpp index 0e38878..bec146a 100644 --- a/usrc/service/valve_state_ctrl_service.hpp +++ b/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 {