@@ -121,9 +121,9 @@ void ICACHE_FLASH_ATTR
121
121
pwm_start (void ) {
122
122
uint8 i , j ;
123
123
PWM_DBG ("--Function pwm_start() is called\n" );
124
- PWM_DBG ("pwm_gpio:%x,pwm_channel_num:%d\n" ,pwm_gpio ,pwm_channel_num );
125
- PWM_DBG ("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n" ,pwm_out_io_num [0 ],pwm_out_io_num [1 ],pwm_out_io_num [2 ]);
126
- PWM_DBG ("pwm.period:%d,pwm.duty[0]:%d,[1]:%d,[2]:%d\n" ,pwm .period ,pwm .duty [0 ],pwm .duty [1 ],pwm .duty [2 ]);
124
+ PWM_DBG ("pwm_gpio:%x,pwm_channel_num:%d\n" , pwm_gpio , pwm_channel_num );
125
+ PWM_DBG ("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n" , pwm_out_io_num [0 ], pwm_out_io_num [1 ], pwm_out_io_num [2 ]);
126
+ PWM_DBG ("pwm.period:%d,pwm.duty[0]:%d,[1]:%d,[2]:%d\n" , pwm .period , pwm .duty [0 ], pwm .duty [1 ], pwm .duty [2 ]);
127
127
128
128
LOCK_PWM (critical ); // enter critical
129
129
@@ -137,20 +137,20 @@ pwm_start(void) {
137
137
for (i = 0 ; i < pwm_channel_num ; i ++ ) {
138
138
uint32 us = pwm .period * pwm .duty [i ] / PWM_DEPTH ;
139
139
local_single [i ].h_time = US_TO_RTC_TIMER_TICKS (us );
140
- PWM_DBG ("i:%d us:%d ht:%d\n" ,i , us ,local_single [i ].h_time );
140
+ PWM_DBG ("i:%d us:%d ht:%d\n" , i , us , local_single [i ].h_time );
141
141
local_single [i ].gpio_set = 0 ;
142
142
local_single [i ].gpio_clear = 1 << pin_num [pwm_out_io_num [i ]];
143
143
}
144
144
145
145
local_single [pwm_channel_num ].h_time = US_TO_RTC_TIMER_TICKS (pwm .period );
146
146
local_single [pwm_channel_num ].gpio_set = pwm_gpio ;
147
147
local_single [pwm_channel_num ].gpio_clear = 0 ;
148
- PWM_DBG ("i:%d period:%d ht:%d\n" ,pwm_channel_num ,pwm .period ,local_single [pwm_channel_num ].h_time );
148
+ PWM_DBG ("i:%d period:%d ht:%d\n" , pwm_channel_num , pwm .period , local_single [pwm_channel_num ].h_time );
149
149
// step 2: sort, small to big
150
150
pwm_insert_sort (local_single , pwm_channel_num + 1 );
151
151
152
152
* local_channel = pwm_channel_num + 1 ;
153
- PWM_DBG ("1channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n" ,* local_channel ,local_single [0 ].h_time ,local_single [1 ].h_time ,local_single [2 ].h_time ,local_single [3 ].h_time );
153
+ PWM_DBG ("1channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n" , * local_channel , local_single [0 ].h_time , local_single [1 ].h_time , local_single [2 ].h_time , local_single [3 ].h_time );
154
154
// step 3: combine same duty channels
155
155
for (i = pwm_channel_num ; i > 0 ; i -- ) {
156
156
if (local_single [i ].h_time == local_single [i - 1 ].h_time ) {
@@ -164,7 +164,7 @@ pwm_start(void) {
164
164
(* local_channel )-- ;
165
165
}
166
166
}
167
- PWM_DBG ("2channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n" ,* local_channel ,local_single [0 ].h_time ,local_single [1 ].h_time ,local_single [2 ].h_time ,local_single [3 ].h_time );
167
+ PWM_DBG ("2channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n" , * local_channel , local_single [0 ].h_time , local_single [1 ].h_time , local_single [2 ].h_time , local_single [3 ].h_time );
168
168
// step 4: cacl delt time
169
169
for (i = * local_channel - 1 ; i > 0 ; i -- ) {
170
170
local_single [i ].h_time -= local_single [i - 1 ].h_time ;
@@ -203,7 +203,7 @@ pwm_start(void) {
203
203
}
204
204
205
205
UNLOCK_PWM (critical ); // leave critical
206
- PWM_DBG ("3channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n" ,* local_channel ,local_single [0 ].h_time ,local_single [1 ].h_time ,local_single [2 ].h_time ,local_single [3 ].h_time );
206
+ PWM_DBG ("3channel:%d,single[0]:%d,[1]:%d,[2]:%d,[3]:%d\n" , * local_channel , local_single [0 ].h_time , local_single [1 ].h_time , local_single [2 ].h_time , local_single [3 ].h_time );
207
207
}
208
208
209
209
/******************************************************************************
@@ -365,9 +365,9 @@ pwm_init(void) {
365
365
int ICACHE_FLASH_ATTR
366
366
pwm_add (uint8_t pin_id , uint32_t pin_mux , uint32_t pin_func ) {
367
367
PWM_DBG ("--Function pwm_add() is called. channel:%d\n" , channel );
368
- PWM_DBG ("pwm_gpio:%x,pwm_channel_num:%d\n" ,pwm_gpio ,pwm_channel_num );
369
- PWM_DBG ("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n" ,pwm_out_io_num [0 ],pwm_out_io_num [1 ],pwm_out_io_num [2 ]);
370
- PWM_DBG ("pwm.duty[0]:%d,[1]:%d,[2]:%d\n" ,pwm .duty [0 ],pwm .duty [1 ],pwm .duty [2 ]);
368
+ PWM_DBG ("pwm_gpio:%x,pwm_channel_num:%d\n" , pwm_gpio , pwm_channel_num );
369
+ PWM_DBG ("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n" , pwm_out_io_num [0 ], pwm_out_io_num [1 ], pwm_out_io_num [2 ]);
370
+ PWM_DBG ("pwm.duty[0]:%d,[1]:%d,[2]:%d\n" , pwm .duty [0 ], pwm .duty [1 ], pwm .duty [2 ]);
371
371
int channel = -1 ;
372
372
for (int i = 0 ; i < PWM_CHANNEL ; ++ i ) {
373
373
if (pin_num [i ] == pin_id ) {
@@ -401,10 +401,10 @@ pwm_add(uint8_t pin_id, uint32_t pin_mux, uint32_t pin_func) {
401
401
bool ICACHE_FLASH_ATTR
402
402
pwm_delete (uint8 channel ) {
403
403
PWM_DBG ("--Function pwm_delete() is called. channel:%d\n" , channel );
404
- PWM_DBG ("pwm_gpio:%x,pwm_channel_num:%d\n" ,pwm_gpio ,pwm_channel_num );
405
- PWM_DBG ("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n" ,pwm_out_io_num [0 ],pwm_out_io_num [1 ],pwm_out_io_num [2 ]);
406
- PWM_DBG ("pwm.duty[0]:%d,[1]:%d,[2]:%d\n" ,pwm .duty [0 ],pwm .duty [1 ],pwm .duty [2 ]);
407
- uint8 i ,j ;
404
+ PWM_DBG ("pwm_gpio:%x,pwm_channel_num:%d\n" , pwm_gpio , pwm_channel_num );
405
+ PWM_DBG ("pwm_out_io_num[0]:%d,[1]:%d,[2]:%d\n" , pwm_out_io_num [0 ], pwm_out_io_num [1 ], pwm_out_io_num [2 ]);
406
+ PWM_DBG ("pwm.duty[0]:%d,[1]:%d,[2]:%d\n" , pwm .duty [0 ], pwm .duty [1 ], pwm .duty [2 ]);
407
+ uint8 i , j ;
408
408
for (i = 0 ; i < pwm_channel_num ; i ++ ) {
409
409
if (pwm_out_io_num [i ] == channel ) { // exist
410
410
LOCK_PWM (critical ); // enter critical
0 commit comments