Skip to content

AnalogWrite - frequency and resolution log errors + returns #7471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 8, 2022
Merged

AnalogWrite - frequency and resolution log errors + returns #7471

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e04c322
Added log errors + returns
P-R-O-C-H-Y Nov 14, 2022
a6dc813
fixed missing functions in header file
P-R-O-C-H-Y Nov 14, 2022
0cab4b3
Update LEDC docs
P-R-O-C-H-Y Nov 14, 2022
55ff85d
Revert "fixed missing functions in header file"
P-R-O-C-H-Y Nov 14, 2022
f438da2
Merge branch 'master' into analogWriteResolution-update
SuGlider Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions cores/esp32/esp32-hal-ledc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,9 +222,12 @@ void analogWrite(uint8_t pin, int value) {
log_e("No more analogWrite channels available! You can have maximum %u", LEDC_CHANNELS);
return;
}
if(ledcSetup(cnt_channel - 1, analog_frequency, analog_resolution) == 0){
log_e("analogWrite setup failed (freq = %u, resolution = %u). Try setting different resolution or frequency");
return;
}
ledcAttachPin(pin, cnt_channel - 1);
pin_to_channel[pin] = cnt_channel--;
ledcSetup(cnt_channel, analog_frequency, analog_resolution);
ledcAttachPin(pin, cnt_channel);
}
ledcWrite(pin_to_channel[pin] - 1, value);
}
Expand All @@ -237,7 +240,10 @@ int8_t analogGetChannel(uint8_t pin) {
void analogWriteFrequency(uint32_t freq) {
if (cnt_channel != LEDC_CHANNELS) {
for (int channel = LEDC_CHANNELS - 1; channel >= cnt_channel; channel--) {
ledcChangeFrequency(channel, freq, analog_resolution);
if (ledcChangeFrequency(channel, freq, analog_resolution) == 0){
log_e("analogWrite frequency cant be set due to selected resolution! Try to adjust resolution first");
return;
}
}
}
analog_frequency = freq;
Expand All @@ -250,7 +256,10 @@ void analogWriteResolution(uint8_t bits) {
}
if (cnt_channel != LEDC_CHANNELS) {
for (int channel = LEDC_CHANNELS - 1; channel >= cnt_channel; channel--) {
ledcChangeFrequency(channel, analog_frequency, bits);
if (ledcChangeFrequency(channel, analog_frequency, bits) == 0){
log_e("analogWrite resolution cant be set due to selected frequency! Try to adjust frequency first");
return;
}
}
}
analog_resolution = bits;
Expand Down
22 changes: 22 additions & 0 deletions docs/source/api/ledc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,28 @@ It is compatible with Arduinos analogWrite function.
* ``value`` select the duty cycle of pwm.
* range is from 0 (always off) to 255 (always on).

analogWriteResolution
*********************

This function is used to set resolution for all analogWrite channels.

.. code-block:: arduino

void analogWriteResolution(uint8_t bits);

* ``bits`` select resolution for analog channels.

analogWriteFrequency
********************

This function is used to set frequency for all analogWrite channels.

.. code-block:: arduino

void analogWriteFrequency(uint32_t freq);

* ``freq`` select frequency of pwm.

Example Applications
********************

Expand Down