Обновление платы на V2
This commit is contained in:
parent
0fdb76157d
commit
542c456092
|
|
@ -6,6 +6,7 @@
|
||||||
#include "PwmFlagchip.h"
|
#include "PwmFlagchip.h"
|
||||||
|
|
||||||
void Get_Set_Tpu_PwmCaptureCallback(tPwmCaptureFlagchip *env) {
|
void Get_Set_Tpu_PwmCaptureCallback(tPwmCaptureFlagchip *env) {
|
||||||
|
|
||||||
if (env->etpu_captureconfig_tbl.eMeasureMode == TPU_PeriodMeasurement) {
|
if (env->etpu_captureconfig_tbl.eMeasureMode == TPU_PeriodMeasurement) {
|
||||||
TPU_CaptureMeasPeriodServiceReq(env->TPU_CAPTURE_CHANNEL, &env->etpu_captureconfig_tbl);
|
TPU_CaptureMeasPeriodServiceReq(env->TPU_CAPTURE_CHANNEL, &env->etpu_captureconfig_tbl);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -77,13 +78,8 @@ static uint8_t vGetPwm(tPwmCaptureFlagchip *env) {
|
||||||
|
|
||||||
tPwmCaptureData data;
|
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) {
|
|
||||||
|
|
||||||
if ((data.ActiveTime == 0) || (data.PeriodTime == 0)) {
|
|
||||||
|
|
||||||
cPeriodActiveTime = osMessageQueueGet(env->q_u32PeriodActiveTime, &data, 0, 1000);
|
|
||||||
|
|
||||||
if (cPeriodActiveTime == osOK) {
|
if (cPeriodActiveTime == osOK) {
|
||||||
percent = data.ActiveTime * 100 / data.PeriodTime;
|
percent = data.ActiveTime * 100 / data.PeriodTime;
|
||||||
|
|
@ -92,15 +88,9 @@ static uint8_t vGetPwm(tPwmCaptureFlagchip *env) {
|
||||||
percent = 100 - percent;
|
percent = 100 - percent;
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
// PWM - Отключен
|
||||||
percent = data.ActiveTime * 100 / data.PeriodTime;
|
if (percent == 100) {
|
||||||
|
percent = 0;
|
||||||
// Инверсия для отображения
|
|
||||||
percent = 100 - percent;
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return percent;
|
return percent;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue