Merge remote-tracking branch 'origin/master'

chip/zpwm_generator.cpp

@@ -50,15 +50,12 @@ void ZPWMGenerator::startPWM(float freq, float duty) {
     Error_Handler();
   }
   HAL_TIM_PWM_Stop(m_htim, m_channel);
+  __HAL_TIM_SET_COUNTER(m_htim, 0);
   if (HAL_TIM_PWM_Start(m_htim, m_channel) != HAL_OK) {
     Error_Handler();
   }
 }
 void ZPWMGenerator::stopPWM() {
   float duty = 0;
-  if (!m_polarity) {
-    duty = 100.0 - duty;
-  }
-  //  HAL_TIM_PWM_Stop(m_htim, m_channel);
   startPWM(duty);
 }

components/subcanmodule/zcancmder_subboard_initer.cpp

@@ -30,7 +30,7 @@ void ZCancmderSubboardIniter::init(cfg_t* cfg) {
   zos_cfg_t zoscfg;
   zos_init(&zoscfg);
 
-  ZLOGI(TAG, "boardId:%d", m_cfg.deviceId);
+  ZLOGI(TAG, "boardId:%d,version:%d", m_cfg.deviceId, PC_VERSION);
 
   /*******************************************************************************
    *                                   NVSINIT                                   *