espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2026-05-04 11:55:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/mcpwm_cpp_reserved_word' into 'master'

Browse Source 
bugfix/mcpwm: rename invalid keyword 'operator'

Closes IDFGH-5840

See merge request espressif/esp-idf!15159
This commit is contained in:
morris
2021-09-13 03:10:04 +00:00
parent 10ccfbe4ff d9f4ae02f1
commit 9d97d01679
4 changed files with 216 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/soc/esp32/include/soc/mcpwm_struct.h
+1 -1
View File
@@ -1440,7 +1440,7 @@ typedef struct {
volatile mcpwm_timer_regs_t timer[3];
volatile mcpwm_timer_synci_cfg_reg_t timer_synci_cfg;
volatile mcpwm_operator_timersel_reg_t operator_timersel;
volatile mcpwm_operator_reg_t operator[3];
volatile mcpwm_operator_reg_t operators[3];
volatile mcpwm_fault_detect_reg_t fault_detect;
volatile mcpwm_cap_timer_cfg_reg_t cap_timer_cfg;
volatile mcpwm_cap_timer_phase_reg_t cap_timer_phase;