mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor analogWrite library

This commit is contained in:
Theo Arends 2022-07-22 15:13:41 +02:00
parent bbcf9363e4
commit c17e73aa9b
2 changed files with 22 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.cpp
View File

@ -57,7 +57,7 @@ void _analogInit(void) {
pwm_impl_inited = true; pwm_impl_inited = true;
} }
int32_t _analog_pin2chan(uint32_t pin) { // returns -1 if uallocated int _analog_pin2chan(uint32_t pin) { // returns -1 if uallocated
_analogInit(); // make sure the mapping array is initialized _analogInit(); // make sure the mapping array is initialized
for (uint32_t channel = 0; channel < MAX_PWMS; channel++) { for (uint32_t channel = 0; channel < MAX_PWMS; channel++) {
if ((pwm_channel[channel] < 255) && (pwm_channel[channel] == pin)) { if ((pwm_channel[channel] < 255) && (pwm_channel[channel] == pin)) {
@ -67,16 +67,16 @@ int32_t _analog_pin2chan(uint32_t pin) { // returns -1 if uallocated
return -1; return -1;
} }
void _analogWriteFreqRange(uint8_t pin) { void _analogWriteFreqRange(uint32_t pin) {
_analogInit(); // make sure the mapping array is initialized _analogInit(); // make sure the mapping array is initialized
if (pin == 255) { if (255 == pin) {
for (uint32_t channel = 0; channel < MAX_PWMS; channel++) { for (uint32_t channel = 0; channel < MAX_PWMS; channel++) {
if (pwm_channel[channel] < 255) { if (pwm_channel[channel] < 255) {
ledcSetup(channel, pwm_frequency, pwm_bit_num); ledcSetup(channel, pwm_frequency, pwm_bit_num);
} }
} }
} else { } else {
int32_t channel = _analog_pin2chan(pin); int channel = _analog_pin2chan(pin);
if (channel >= 0) { if (channel >= 0) {
ledcSetup(channel, pwm_frequency, pwm_bit_num); ledcSetup(channel, pwm_frequency, pwm_bit_num);
} }
@ -93,30 +93,20 @@ uint32_t _analogGetResolution(uint32_t x) {
return bits; return bits;
} }
void analogWriteRange(uint32_t range) { void analogWriteRange(uint32_t range, uint32_t pin) {
pwm_bit_num = _analogGetResolution(range);
_analogWriteFreqRange(255);
}
void analogWriteRange(uint32_t range, uint8_t pin) {
pwm_bit_num = _analogGetResolution(range); pwm_bit_num = _analogGetResolution(range);
_analogWriteFreqRange(pin); _analogWriteFreqRange(pin);
} }
void analogWriteFreq(uint32_t freq) { void analogWriteFreq(uint32_t freq, uint32_t pin) {
pwm_frequency = freq;
_analogWriteFreqRange(255);
}
void analogWriteFreq(uint32_t freq, uint8_t pin) {
pwm_frequency = freq; pwm_frequency = freq;
_analogWriteFreqRange(pin); _analogWriteFreqRange(pin);
} }
int32_t analogAttach(uint32_t pin, bool output_invert) { // returns ledc channel used, or -1 if failed int analogAttach(uint32_t pin, bool output_invert) { // returns ledc channel used, or -1 if failed
_analogInit(); // make sure the mapping array is initialized _analogInit(); // make sure the mapping array is initialized
// Find if pin is already attached // Find if pin is already attached
int32_t chan = _analog_pin2chan(pin); int chan = _analog_pin2chan(pin);
if (chan >= 0) { return chan; } if (chan >= 0) { return chan; }
// Find an empty channel // Find an empty channel
for (chan = 0; chan < MAX_PWMS; chan++) { for (chan = 0; chan < MAX_PWMS; chan++) {
@ -154,7 +144,6 @@ extern "C" void __wrap__Z11analogWritehi(uint8_t pin, int val) {
analogWritePhase(pin, val, 0); // if unspecified, use phase = 0 analogWritePhase(pin, val, 0); // if unspecified, use phase = 0
} }
/* /*
The primary goal of this function is to add phase control to PWM ledc The primary goal of this function is to add phase control to PWM ledc
functions. functions.
@ -179,7 +168,7 @@ extern uint8_t channels_resolution[MAX_PWMS];
void analogWritePhase(uint8_t pin, uint32_t duty, uint32_t phase) void analogWritePhase(uint8_t pin, uint32_t duty, uint32_t phase)
{ {
int32_t chan = _analog_pin2chan(pin); int chan = _analog_pin2chan(pin);
if (chan < 0) { // not yet allocated, try to allocate if (chan < 0) { // not yet allocated, try to allocate
chan = analogAttach(pin); chan = analogAttach(pin);
if (chan < 0) { return; } // failed if (chan < 0) { return; } // failed

10
lib/libesp32/ESP32-to-ESP8266-compat/src/esp8266toEsp32.h
View File

@ -25,11 +25,11 @@
// input range is in full range, ledc needs bits // input range is in full range, ledc needs bits
void analogWriteRange(uint32_t range); //void analogWriteRange(uint32_t range);
void analogWriteRange(uint32_t range, uint8_t pin); void analogWriteRange(uint32_t range, uint32_t pin = 255);
void analogWriteFreq(uint32_t freq); //void analogWriteFreq(uint32_t freq);
void analogWriteFreq(uint32_t freq, uint8_t pin); void analogWriteFreq(uint32_t freq, uint32_t pin = 255);
int32_t analogAttach(uint32_t pin, bool output_invert = false); // returns the ledc channel, or -1 if failed. This is implicitly called by analogWrite if the channel was not already allocated int analogAttach(uint32_t pin, bool output_invert = false); // returns the ledc channel, or -1 if failed. This is implicitly called by analogWrite if the channel was not already allocated
void analogWrite(uint8_t pin, int val); void analogWrite(uint8_t pin, int val);
// Extended version that also allows to change phase // Extended version that also allows to change phase