update

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;
 };

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

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

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;
 

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() {}

components/zprotocols/zcancmder_v2

@@ -1 +1 @@
-Subproject commit fe25a1425a38ddf33fc8b5bde11414425e993611
+Subproject commit a7f08c437c511fee6176ebd704ae24464d23917f