lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Ardi Loot 2022-11-26 17:56:34 +02:00
parent 7f5a5cfa8e
commit 1a14222d97
1 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
usermods/pwm_outputs/usermod_pwm_outputs.h
View File

@ -14,8 +14,22 @@ class PwmOutput {
} }
PwmOutput(int8_t pin, uint32_t freq) : pin_(pin), freq_(freq) { PwmOutput(int8_t pin, uint32_t freq) : pin_(pin), freq_(freq) {
DEBUG_PRINTF("pwm_output[%d]: setup at freq %d\n", pin_, freq_); DEBUG_PRINTF("pwm_output[%d]: setup to freq %d\n", pin_, freq_);
open(); if (pin_ < 0 || !pinManager.allocatePin(pin_, true, PinOwner::UM_PWM_OUTPUTS)) {
return;
}
channel_ = pinManager.allocateLedc(1);
if (channel_ == 255) {
DEBUG_PRINTF("pwm_output[%d]: failed to quire ledc\n", pin_);
pinManager.deallocatePin(pin_, PinOwner::UM_PWM_OUTPUTS);
return;
}
ledcSetup(channel_, freq_, bit_depth_);
ledcAttachPin(pin_, channel_);
DEBUG_PRINTF("pwm_output[%d]: init successful\n", pin_);
enabled_ = true;
} }
void close() { void close() {
@ -62,29 +76,7 @@ class PwmOutput {
uint8_t bit_depth_ = 12; uint8_t bit_depth_ = 12;
uint8_t channel_ {255}; uint8_t channel_ {255};
bool enabled_ {false}; bool enabled_ {false};
float duty_ {-1.0f}; // Unknown duty float duty_ {0.0f};
void open() {
DEBUG_PRINTF("pwm_output[%d]: open...\n", pin_);
if (enabled_)
return;
if (pin_ < 0 || !pinManager.allocatePin(pin_, true, PinOwner::UM_PWM_OUTPUTS)) {
return;
}
channel_ = pinManager.allocateLedc(1);
if (channel_ == 255) {
DEBUG_PRINTF("pwm_output[%d]: failed to quire ledc\n", pin_);
pinManager.deallocatePin(pin_, PinOwner::UM_PWM_OUTPUTS);
return;
}
ledcSetup(channel_, freq_, bit_depth_);
ledcAttachPin(pin_, channel_);
DEBUG_PRINTF("pwm_output[%d]: open successful\n", pin_);
enabled_ = true;
}
}; };
@ -139,7 +131,7 @@ class PwmOutputsUsermod : public Usermod {
const PwmOutput& pwm = pwms_[i]; const PwmOutput& pwm = pwms_[i];
if (!pwm.isEnabled()) if (!pwm.isEnabled())
continue; continue;
JsonArray data = user.createNestedArray("pwm_" + String(i)); JsonArray data = user.createNestedArray("PWM pin " + String(pwm.getPin()));
data.add(1e2f * pwm.getDuty()); data.add(1e2f * pwm.getDuty());
data.add(F("%")); data.add(F("%"));
} }