Merge branch 'master' of 192.168.1.3:manufacturer_stm32/iflytop_stm32_os_sdk

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

@@ -63,5 +63,8 @@ void SubModbusBoardIniter::loop() {
     ModulebusClient::Inst()->loop();
   }
 }
+<<<<<<< HEAD
+=======
 
+>>>>>>> 187b88da24aed4d0c06bb06e3158b01c2612b57d
 #endif

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.cpp

@@ -60,11 +60,20 @@ int32_t ZCanBoardModule::module_xxx_reg(int32_t param_id, bool read, int32_t &va
     PROCESS_REG(kreg_pwm0_duty, readPwmDuty(0, val), setPwmDuty(0, val));
     PROCESS_REG(kreg_pwm1_duty, readPwmDuty(1, val), setPwmDuty(1, val));
     PROCESS_REG(kreg_pwm2_duty, readPwmDuty(2, val), setPwmDuty(2, val));
-    PROCESS_REG(kreg_pwm3_duty, readPwmDuty(2, val), setPwmDuty(2, val));
-    PROCESS_REG(kreg_pwm4_duty, readPwmDuty(2, val), setPwmDuty(2, val));
-    PROCESS_REG(kreg_pwm5_duty, readPwmDuty(2, val), setPwmDuty(2, val));
-    PROCESS_REG(kreg_pwm6_duty, readPwmDuty(2, val), setPwmDuty(2, val));
-    PROCESS_REG(kreg_pwm7_duty, readPwmDuty(2, val), setPwmDuty(2, val));
+    PROCESS_REG(kreg_pwm3_duty, readPwmDuty(3, val), setPwmDuty(3, val));
+    PROCESS_REG(kreg_pwm4_duty, readPwmDuty(4, val), setPwmDuty(4, val));
+    PROCESS_REG(kreg_pwm5_duty, readPwmDuty(5, val), setPwmDuty(5, val));
+    PROCESS_REG(kreg_pwm6_duty, readPwmDuty(6, val), setPwmDuty(6, val));
+    PROCESS_REG(kreg_pwm7_duty, readPwmDuty(7, val), setPwmDuty(7, val));
+
+    PROCESS_REG(kreg_pwm0_ctrl, getPwmState(0, val), setPwmState(0, val));
+    PROCESS_REG(kreg_pwm1_ctrl, getPwmState(1, val), setPwmState(1, val));
+    PROCESS_REG(kreg_pwm2_ctrl, getPwmState(2, val), setPwmState(2, val));
+    PROCESS_REG(kreg_pwm3_ctrl, getPwmState(3, val), setPwmState(3, val));
+    PROCESS_REG(kreg_pwm4_ctrl, getPwmState(4, val), setPwmState(4, val));
+    PROCESS_REG(kreg_pwm5_ctrl, getPwmState(5, val), setPwmState(5, val));
+    PROCESS_REG(kreg_pwm6_ctrl, getPwmState(6, val), setPwmState(6, val));
+    PROCESS_REG(kreg_pwm7_ctrl, getPwmState(7, val), setPwmState(7, val));
 
     PROCESS_REG(kreg_pwm0_freq, readPwmFreq(0, val), setPwmFreq(0, val));
     PROCESS_REG(kreg_pwm1_freq, readPwmFreq(1, val), setPwmFreq(1, val));
@@ -73,6 +82,7 @@ int32_t ZCanBoardModule::module_xxx_reg(int32_t param_id, bool read, int32_t &va
     PROCESS_REG(kreg_pwm4_freq, readPwmFreq(4, val), setPwmFreq(4, val));
     PROCESS_REG(kreg_pwm5_freq, readPwmFreq(5, val), setPwmFreq(5, val));
     PROCESS_REG(kreg_pwm6_freq, readPwmFreq(6, val), setPwmFreq(6, val));
+    PROCESS_REG(kreg_pwm7_freq, readPwmFreq(7, val), setPwmFreq(7, val));
 
     default:
       return err::kmodule_not_find_config_index;

components/zcancmder/zcan_board_module.hpp

@@ -35,20 +35,20 @@ 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;
 
   hardware_config_t m_cfg;
   int32_t           module_id;
 
-  ZGPIO m_input[16];
-  ZGPIO m_output[16];
+  ZGPIO m_input[32];
+  ZGPIO m_output[32];
 
   int32_t m_input_num  = 0;
   int32_t m_output_num = 0;
 
-  ZITemperatureSensor *temperature_sensor[8];
+  ZITemperature *temperature_sensor[8];
 
  public:
   virtual ~ZCanBoardModule() {}

components/zprotocol_helper/micro_computer_module_device_script_cmder_paser.cpp

@@ -109,7 +109,7 @@ void MicroComputerModuleDeviceScriptCmderPaser::app_dump_reg(int moduleId, const
   if (ecode == 0) {
     if (type == kint) {
       ZLOGI(TAG, "%s(%d)     :%d", configtag, configid, configval);
-    } else if (type == kint) {
+    } else if (type == kbit) {
       ZLOGI(TAG, "%s(%d)     :%s", configtag, configid, dumpbit(configval));
     }
   } else if (ecode != err::kmodule_not_find_config_index) {