diff --git a/usrc/app/dmapp.hpp b/usrc/app/dmapp.hpp index acd9f9b..3c68a62 100644 --- a/usrc/app/dmapp.hpp +++ b/usrc/app/dmapp.hpp @@ -1,6 +1,7 @@ #pragma once #include "board/public_board.hpp" -#include "board_base/board_base.hpp" +#include "module/module.hpp" +#include "board/hal/hal.hpp" /** * @brief diff --git a/usrc/app/ext_ch_selector_app.hpp b/usrc/app/ext_ch_selector_app.hpp index 380f48b..91ee8cc 100644 --- a/usrc/app/ext_ch_selector_app.hpp +++ b/usrc/app/ext_ch_selector_app.hpp @@ -1,6 +1,7 @@ #pragma once #include "board/public_board.hpp" -#include "board_base/board_base.hpp" +#include "module/module.hpp" +#include "board/hal/hal.hpp" /** * @brief diff --git a/usrc/app/exth2o2_sensor.hpp b/usrc/app/exth2o2_sensor.hpp index 8ce7cda..e5c3acb 100644 --- a/usrc/app/exth2o2_sensor.hpp +++ b/usrc/app/exth2o2_sensor.hpp @@ -1,6 +1,7 @@ #pragma once +#include "board/hal/hal.hpp" #include "board/public_board.hpp" -#include "board_base/board_base.hpp" +#include "module/module.hpp" /** * @brief diff --git a/usrc/board_base/baseboard/dbdm_power_ctrl_board.cpp b/usrc/board/hal/dbdm_power_ctrl_board.cpp similarity index 100% rename from usrc/board_base/baseboard/dbdm_power_ctrl_board.cpp rename to usrc/board/hal/dbdm_power_ctrl_board.cpp diff --git a/usrc/board_base/baseboard/dbdm_power_ctrl_board.hpp b/usrc/board/hal/dbdm_power_ctrl_board.hpp similarity index 100% rename from usrc/board_base/baseboard/dbdm_power_ctrl_board.hpp rename to usrc/board/hal/dbdm_power_ctrl_board.hpp diff --git a/usrc/board_base/baseboard/h2o2_ext_board.cpp b/usrc/board/hal/h2o2_ext_board.cpp similarity index 100% rename from usrc/board_base/baseboard/h2o2_ext_board.cpp rename to usrc/board/hal/h2o2_ext_board.cpp diff --git a/usrc/board_base/baseboard/h2o2_ext_board.hpp b/usrc/board/hal/h2o2_ext_board.hpp similarity index 100% rename from usrc/board_base/baseboard/h2o2_ext_board.hpp rename to usrc/board/hal/h2o2_ext_board.hpp diff --git a/usrc/board/hal/hal.hpp b/usrc/board/hal/hal.hpp new file mode 100644 index 0000000..18e2207 --- /dev/null +++ b/usrc/board/hal/hal.hpp @@ -0,0 +1,6 @@ +#pragma once + +#include "dbdm_power_ctrl_board.hpp" +#include "h2o2_ext_board.hpp" +#include "large_space_dm_liquid_ctrl_board_hal.hpp" +#include "large_space_dm_power_ctrl_board.hpp" \ No newline at end of file diff --git a/usrc/board_base/baseboard/large_space_dm_liquid_ctrl_board_hal.cpp b/usrc/board/hal/large_space_dm_liquid_ctrl_board_hal.cpp similarity index 100% rename from usrc/board_base/baseboard/large_space_dm_liquid_ctrl_board_hal.cpp rename to usrc/board/hal/large_space_dm_liquid_ctrl_board_hal.cpp diff --git a/usrc/board_base/baseboard/large_space_dm_liquid_ctrl_board_hal.hpp b/usrc/board/hal/large_space_dm_liquid_ctrl_board_hal.hpp similarity index 100% rename from usrc/board_base/baseboard/large_space_dm_liquid_ctrl_board_hal.hpp rename to usrc/board/hal/large_space_dm_liquid_ctrl_board_hal.hpp diff --git a/usrc/board_base/baseboard/large_space_dm_power_ctrl_board.cpp b/usrc/board/hal/large_space_dm_power_ctrl_board.cpp similarity index 100% rename from usrc/board_base/baseboard/large_space_dm_power_ctrl_board.cpp rename to usrc/board/hal/large_space_dm_power_ctrl_board.cpp diff --git a/usrc/board_base/baseboard/large_space_dm_power_ctrl_board.hpp b/usrc/board/hal/large_space_dm_power_ctrl_board.hpp similarity index 100% rename from usrc/board_base/baseboard/large_space_dm_power_ctrl_board.hpp rename to usrc/board/hal/large_space_dm_power_ctrl_board.hpp diff --git a/usrc/board_base/board_base.hpp b/usrc/board_base/board_base.hpp deleted file mode 100644 index 22970f2..0000000 --- a/usrc/board_base/board_base.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once -// -#include "app_share/air_compressor_controller.hpp" -#include "app_share/blower_controller.hpp" -#include "app_share/h2o2_sensor_driver.hpp" -#include "app_share/heater_controller.hpp" -#include "app_share/proportional_valve_ctrl.hpp" -#include "app_share/pxxpsbus.hpp" -#include "app_share/tmc_motor_group.hpp" -#include "app_share/warning_light_driver.hpp" -// -#include "baseboard/large_space_dm_liquid_ctrl_board_hal.hpp" -#include "baseboard/large_space_dm_power_ctrl_board.hpp" -#include "baseboard/dbdm_power_ctrl_board.hpp" -#include "board_base/baseboard/h2o2_ext_board.hpp" \ No newline at end of file diff --git a/usrc/board_base/app_share/air_compressor_controller.hpp b/usrc/module/air_compressor_controller.hpp similarity index 100% rename from usrc/board_base/app_share/air_compressor_controller.hpp rename to usrc/module/air_compressor_controller.hpp diff --git a/usrc/board_base/app_share/blower_controller.hpp b/usrc/module/blower_controller.hpp similarity index 100% rename from usrc/board_base/app_share/blower_controller.hpp rename to usrc/module/blower_controller.hpp diff --git a/usrc/board_base/app_share/h2o2_sensor_driver.cpp b/usrc/module/h2o2_sensor_driver.cpp similarity index 100% rename from usrc/board_base/app_share/h2o2_sensor_driver.cpp rename to usrc/module/h2o2_sensor_driver.cpp diff --git a/usrc/board_base/app_share/h2o2_sensor_driver.hpp b/usrc/module/h2o2_sensor_driver.hpp similarity index 100% rename from usrc/board_base/app_share/h2o2_sensor_driver.hpp rename to usrc/module/h2o2_sensor_driver.hpp diff --git a/usrc/board_base/app_share/heater_controller.hpp b/usrc/module/heater_controller.hpp similarity index 100% rename from usrc/board_base/app_share/heater_controller.hpp rename to usrc/module/heater_controller.hpp diff --git a/usrc/module/module.hpp b/usrc/module/module.hpp new file mode 100644 index 0000000..eccaf43 --- /dev/null +++ b/usrc/module/module.hpp @@ -0,0 +1,11 @@ +#pragma once +// +#include "air_compressor_controller.hpp" +#include "blower_controller.hpp" +#include "h2o2_sensor_driver.hpp" +#include "heater_controller.hpp" +#include "proportional_valve_ctrl.hpp" +#include "pxxpsbus.hpp" +#include "tmc_motor_group.hpp" +#include "warning_light_driver.hpp" +// diff --git a/usrc/board_base/app_share/proportional_valve_ctrl.hpp b/usrc/module/proportional_valve_ctrl.hpp similarity index 100% rename from usrc/board_base/app_share/proportional_valve_ctrl.hpp rename to usrc/module/proportional_valve_ctrl.hpp diff --git a/usrc/board_base/app_share/pxxpsbus.hpp b/usrc/module/pxxpsbus.hpp similarity index 100% rename from usrc/board_base/app_share/pxxpsbus.hpp rename to usrc/module/pxxpsbus.hpp diff --git a/usrc/board_base/app_share/tmc_motor_group.cpp b/usrc/module/tmc_motor_group.cpp similarity index 100% rename from usrc/board_base/app_share/tmc_motor_group.cpp rename to usrc/module/tmc_motor_group.cpp diff --git a/usrc/board_base/app_share/tmc_motor_group.hpp b/usrc/module/tmc_motor_group.hpp similarity index 100% rename from usrc/board_base/app_share/tmc_motor_group.hpp rename to usrc/module/tmc_motor_group.hpp diff --git a/usrc/board_base/app_share/warning_light_driver.hpp b/usrc/module/warning_light_driver.hpp similarity index 100% rename from usrc/board_base/app_share/warning_light_driver.hpp rename to usrc/module/warning_light_driver.hpp diff --git a/usrc/board_base/app_share/water_sensor_mgr.hpp b/usrc/module/water_sensor_mgr.hpp similarity index 100% rename from usrc/board_base/app_share/water_sensor_mgr.hpp rename to usrc/module/water_sensor_mgr.hpp