From eea27fc3eedd546c7aed47b9dcf0e9b2d9ed6fb2 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 13 Mar 2024 21:00:03 +0800 Subject: [PATCH 1/2] fix zpwm generator bug --- chip/zpwm_generator.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/chip/zpwm_generator.cpp b/chip/zpwm_generator.cpp index da15939..c005964 100644 --- a/chip/zpwm_generator.cpp +++ b/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); } From abf36c325c378ff2bd500ae4b4b7169c15e1cfd8 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 13 Mar 2024 21:59:38 +0800 Subject: [PATCH 2/2] update --- components/subcanmodule/zcancmder_subboard_initer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/subcanmodule/zcancmder_subboard_initer.cpp b/components/subcanmodule/zcancmder_subboard_initer.cpp index 5488733..7e9bb5c 100644 --- a/components/subcanmodule/zcancmder_subboard_initer.cpp +++ b/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 *