diff --git a/Src/PwmCaptureFlagchip.c b/Src/PwmCaptureFlagchip.c index fa5ce4f..ff18e24 100644 --- a/Src/PwmCaptureFlagchip.c +++ b/Src/PwmCaptureFlagchip.c @@ -6,6 +6,7 @@ #include "PwmFlagchip.h" void Get_Set_Tpu_PwmCaptureCallback(tPwmCaptureFlagchip *env) { + if (env->etpu_captureconfig_tbl.eMeasureMode == TPU_PeriodMeasurement) { TPU_CaptureMeasPeriodServiceReq(env->TPU_CAPTURE_CHANNEL, &env->etpu_captureconfig_tbl); } else { @@ -77,30 +78,19 @@ static uint8_t vGetPwm(tPwmCaptureFlagchip *env) { tPwmCaptureData data; - osStatus_t cPeriodActiveTime = osMessageQueueGet(env->q_u32PeriodActiveTime, &data, 0, 1000); + osStatus_t cPeriodActiveTime = osMessageQueueGet(env->q_u32PeriodActiveTime, &data, 0, 100); + cPeriodActiveTime = osMessageQueueGet(env->q_u32PeriodActiveTime, &data, 0, 100); if (cPeriodActiveTime == osOK) { + percent = data.ActiveTime * 100 / data.PeriodTime; - if ((data.ActiveTime == 0) || (data.PeriodTime == 0)) { - - cPeriodActiveTime = osMessageQueueGet(env->q_u32PeriodActiveTime, &data, 0, 1000); - - if (cPeriodActiveTime == osOK) { - percent = data.ActiveTime * 100 / data.PeriodTime; - - // Инверсия для отображения - percent = 100 - percent; - } - - } else { - percent = data.ActiveTime * 100 / data.PeriodTime; - - // Инверсия для отображения - percent = 100 - percent; - } - - } else { + // Инверсия для отображения + percent = 100 - percent; + } + // PWM - Отключен + if (percent == 100) { + percent = 0; } return percent;