jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-21 17:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12910 from s-hadinger/esp32c3_pwm

Browse Source 
Fixed PWM5 on ESP32C3
This commit is contained in:
s-hadinger 2021-08-17 19:13:58 +02:00 committed by GitHub
commit d5b4ce1233
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -10,6 +10,9 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- Berry now compiling in ``strict`` mode to catch more bugs - Berry now compiling in ``strict`` mode to catch more bugs
### Fixed
- Fixed PWM5 on ESP32C3
## [9.5.0.5] 20210815 ## [9.5.0.5] 20210815
### Added ### Added
- Inital support for Wi-Fi extender (#12784) - Inital support for Wi-Fi extender (#12784)

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

@ -32,12 +32,21 @@
* ESP32 analogWrite emulation support * ESP32 analogWrite emulation support
\*********************************************************************************************/ \*********************************************************************************************/
#define PWM_SUPPORTED_CHANNELS 8 #if CONFIG_IDF_TARGET_ESP32C3
#define PWM_CHANNEL_OFFSET 2 // Webcam uses channel 0, so we offset standard PWM #define PWM_SUPPORTED_CHANNELS 6
#define PWM_CHANNEL_OFFSET 1 // Webcam uses channel 0, so we offset standard PWM
uint8_t _pwm_channel[PWM_SUPPORTED_CHANNELS] = { 99, 99, 99, 99, 99, 99, 99, 99 }; uint8_t _pwm_channel[PWM_SUPPORTED_CHANNELS] = { 99, 99, 99, 99, 99, 99 };
uint32_t _pwm_frequency = 977; // Default 977Hz uint32_t _pwm_frequency = 977; // Default 977Hz
uint8_t _pwm_bit_num = 10; // Default 1023 uint8_t _pwm_bit_num = 10; // Default 1023
#else // other ESP32
#define PWM_SUPPORTED_CHANNELS 8
#define PWM_CHANNEL_OFFSET 2 // Webcam uses channel 0, so we offset standard PWM
uint8_t _pwm_channel[PWM_SUPPORTED_CHANNELS] = { 99, 99, 99, 99, 99, 99, 99, 99 };
uint32_t _pwm_frequency = 977; // Default 977Hz
uint8_t _pwm_bit_num = 10; // Default 1023
#endif // CONFIG_IDF_TARGET_ESP32C3 vs ESP32
inline uint32_t _analog_pin2chan(uint32_t pin) { inline uint32_t _analog_pin2chan(uint32_t pin) {
for (uint32_t channel = 0; channel < PWM_SUPPORTED_CHANNELS; channel++) { for (uint32_t channel = 0; channel < PWM_SUPPORTED_CHANNELS; channel++) {