Глобальная переделка. тест сделан по длине импульса и заданной частоте шим, а не меандру
This commit is contained in:
@@ -4,24 +4,24 @@
|
||||
|
||||
#ifdef PWM_OUTPUT_TEST
|
||||
PwmGenerator pwmOutputTest;
|
||||
uint8_t pwmOutputTestDuty = 50;
|
||||
uint32_t pwmOutputTestPulseNs = PWM_OUTPUT_TEST_MIN_PULSE_NS;
|
||||
uint32_t pwmOutputTestUpdatedMs = 0;
|
||||
|
||||
void setup() {
|
||||
Serial.begin(SERIAL_BAUD);
|
||||
delay(200);
|
||||
Serial.printf("\nPWM OUTPUT TEST: GPIO=%u requested=%luHz duty=%u..%u%% sine=%lums safe=%s\n",
|
||||
Serial.printf("\nPWM OUTPUT TEST: GPIO=%u requested=%luHz pulse=%lu..%luns sine=%lums safe=%s\n",
|
||||
GPIO_PWM, PWM_OUTPUT_TEST_FREQUENCY_HZ,
|
||||
PWM_OUTPUT_TEST_MIN_DUTY_PCT, PWM_OUTPUT_TEST_MAX_DUTY_PCT,
|
||||
PWM_OUTPUT_TEST_MIN_PULSE_NS, PWM_OUTPUT_TEST_MAX_PULSE_NS,
|
||||
PWM_OUTPUT_TEST_SWEEP_PERIOD_MS,
|
||||
PWM_SAFE_LEVEL == HIGH ? "HIGH" : "LOW");
|
||||
|
||||
pwmOutputTest.begin();
|
||||
ActualPwm actual = {};
|
||||
if (pwmOutputTest.start(PWM_OUTPUT_TEST_FREQUENCY_HZ,
|
||||
pwmOutputTestDuty, actual)) {
|
||||
Serial.printf("PWM OUTPUT TEST STARTED: actual=%luHz duty=%.2f%% bits=%u\n",
|
||||
actual.actualHz, actual.actualDutyPct, actual.bits);
|
||||
pwmOutputTestPulseNs, actual)) {
|
||||
Serial.printf("PWM OUTPUT TEST STARTED: actual=%luHz pulse=%luns bits=%u\n",
|
||||
actual.actualHz, actual.actualPulseNs, actual.bits);
|
||||
} else {
|
||||
Serial.println("PWM OUTPUT TEST FAILED");
|
||||
}
|
||||
@@ -35,16 +35,16 @@ void loop() {
|
||||
constexpr float PWM_TWO_PI = 6.28318530718f;
|
||||
const float phase = PWM_TWO_PI * (now % PWM_OUTPUT_TEST_SWEEP_PERIOD_MS) /
|
||||
PWM_OUTPUT_TEST_SWEEP_PERIOD_MS;
|
||||
const float center = (PWM_OUTPUT_TEST_MIN_DUTY_PCT + PWM_OUTPUT_TEST_MAX_DUTY_PCT) * 0.5f;
|
||||
const float amplitude = (PWM_OUTPUT_TEST_MAX_DUTY_PCT - PWM_OUTPUT_TEST_MIN_DUTY_PCT) * 0.5f;
|
||||
const uint8_t duty = static_cast<uint8_t>(center + amplitude * sinf(phase) + 0.5f);
|
||||
if (duty == pwmOutputTestDuty) return;
|
||||
const float center = (PWM_OUTPUT_TEST_MIN_PULSE_NS + PWM_OUTPUT_TEST_MAX_PULSE_NS) * 0.5f;
|
||||
const float amplitude = (PWM_OUTPUT_TEST_MAX_PULSE_NS - PWM_OUTPUT_TEST_MIN_PULSE_NS) * 0.5f;
|
||||
const uint32_t pulseNs = static_cast<uint32_t>(center + amplitude * sinf(phase) + 0.5f);
|
||||
if (pulseNs == pwmOutputTestPulseNs) return;
|
||||
|
||||
ActualPwm actual = {};
|
||||
if (pwmOutputTest.start(PWM_OUTPUT_TEST_FREQUENCY_HZ, duty, actual)) {
|
||||
pwmOutputTestDuty = duty;
|
||||
if (pwmOutputTest.start(PWM_OUTPUT_TEST_FREQUENCY_HZ, pulseNs, actual)) {
|
||||
pwmOutputTestPulseNs = pulseNs;
|
||||
} else {
|
||||
Serial.printf("PWM OUTPUT TEST UPDATE FAILED: duty=%u%%\n", duty);
|
||||
Serial.printf("PWM OUTPUT TEST UPDATE FAILED: pulse=%luns\n", pulseNs);
|
||||
delay(100);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user