diff --git a/chip/api/zi_temperature.hpp b/chip/api/zi_temperature.hpp index b40ae68..4c2a4ca 100644 --- a/chip/api/zi_temperature.hpp +++ b/chip/api/zi_temperature.hpp @@ -3,9 +3,9 @@ namespace iflytop { using namespace std; -class ZITemperatureSensor { +class ZITemperature { public: - virtual ~ZITemperatureSensor(){}; + virtual ~ZITemperature(){}; virtual int32_t getTemperature(int32_t& sensorval) = 0; }; diff --git a/components/sub_modbus_module/sub_modbus_board_initer.cpp b/components/sub_modbus_module/sub_modbus_board_initer.cpp index 23570b9..7f79080 100644 --- a/components/sub_modbus_module/sub_modbus_board_initer.cpp +++ b/components/sub_modbus_module/sub_modbus_board_initer.cpp @@ -8,6 +8,7 @@ using namespace iflytop; #define TAG "main" +#ifdef PC_MODBUS_UART extern DMA_HandleTypeDef PC_DEBUG_UART_DMA_HANDLER; extern DMA_HandleTypeDef PC_MODBUS_UART_DMA_HANDLER; @@ -61,3 +62,4 @@ void SubModbusBoardIniter::loop() { ModulebusClient::Inst()->loop(); } } +#endif \ No newline at end of file diff --git a/components/sub_modbus_module/sub_modbus_board_initer.hpp b/components/sub_modbus_module/sub_modbus_board_initer.hpp index e748380..cb8298d 100644 --- a/components/sub_modbus_module/sub_modbus_board_initer.hpp +++ b/components/sub_modbus_module/sub_modbus_board_initer.hpp @@ -12,6 +12,7 @@ #include "sdk\components\modbus\modbus_client.hpp" namespace iflytop { +#ifdef PC_MODBUS_UART class SubModbusBoardIniter { public: @@ -23,4 +24,5 @@ class SubModbusBoardIniter { private: }; +#endif } // namespace iflytop \ No newline at end of file diff --git a/components/subcanmodule/zcancmder_subboard_initer.hpp b/components/subcanmodule/zcancmder_subboard_initer.hpp index 3c8055a..5c225b5 100644 --- a/components/subcanmodule/zcancmder_subboard_initer.hpp +++ b/components/subcanmodule/zcancmder_subboard_initer.hpp @@ -17,7 +17,7 @@ class ZCancmderSubboardIniter { int32_t deviceId; ZGPIO::InputGpioCfg_t input_gpio[32]; ZGPIO::OutputGpioCfg_t output_gpio[32]; - ZITemperatureSensor* temperature_sensor[8]; + ZITemperature* temperature_sensor[8]; ZIPWMCtrl* pwmctrl[8]; } cfg_t; diff --git a/components/zcancmder/zcan_board_module.hpp b/components/zcancmder/zcan_board_module.hpp index 490beb3..3524f10 100644 --- a/components/zcancmder/zcan_board_module.hpp +++ b/components/zcancmder/zcan_board_module.hpp @@ -35,7 +35,7 @@ class ZCanBoardModule : public ZIModule { typedef struct { ZGPIO::InputGpioCfg_t input[32]; ZGPIO::OutputGpioCfg_t output[32]; - ZITemperatureSensor *temperature_sensor[8]; + ZITemperature *temperature_sensor[8]; ZIPWMCtrl *pwmctrl[8]; } hardware_config_t; @@ -48,7 +48,7 @@ class ZCanBoardModule : public ZIModule { int32_t m_input_num = 0; int32_t m_output_num = 0; - ZITemperatureSensor *temperature_sensor[8]; + ZITemperature *temperature_sensor[8]; public: virtual ~ZCanBoardModule() {} diff --git a/components/zprotocols/zcancmder_v2 b/components/zprotocols/zcancmder_v2 index fe25a14..a7f08c4 160000 --- a/components/zprotocols/zcancmder_v2 +++ b/components/zprotocols/zcancmder_v2 @@ -1 +1 @@ -Subproject commit fe25a1425a38ddf33fc8b5bde11414425e993611 +Subproject commit a7f08c437c511fee6176ebd704ae24464d23917f