arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-15 00:02:49 +03:00
Code Activity

Merge branch 'me-no-dev-master'

Browse Source 
* me-no-dev-master:
  fix identation
  optimize pwm interrupt handler for better precision
This commit is contained in:
Ivan Grokhotkov
2015-12-22 11:17:33 +03:00
parent 81c315046b a33dba099f
commit d460de8879
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cores/esp8266/core_esp8266_wiring_pwm.c
View File

@ -94,18 +94,19 @@ void ICACHE_RAM_ATTR pwm_timer_isr(){
static uint16_t steps[17]; static uint16_t steps[17];
static uint32_t masks[17]; static uint32_t masks[17];
if(current_step < stepcount){ if(current_step < stepcount){
GPOC = masks[current_step] & 0xFFFF; T1L = (pwm_steps[current_step+1] * pwm_multiplier);
if(masks[current_step] & 0x10000) GP16O &= ~1; TEIE |= TEIE1;
if(masks[current_step] & 0xFFFF) GPOC = masks[current_step] & 0xFFFF;
if(masks[current_step] & 0x10000) GP16O = 0;
current_step++; current_step++;
timer1_write(pwm_steps[current_step] * pwm_multiplier);
} else { } else {
current_step = 0; current_step = 0;
stepcount = 0; stepcount = 0;
if(pwm_mask == 0) return; if(pwm_mask == 0) return;
GPOS = pwm_mask & 0xFFFF; T1L = (pwm_steps[current_step+1] * pwm_multiplier);
if(pwm_mask & 0x10000) GP16O |= 1; TEIE |= TEIE1;
timer1_write(pwm_steps[0] * pwm_multiplier); if(pwm_mask & 0xFFFF) GPOS = pwm_mask & 0xFFFF;
if(pwm_mask & 0x10000) GP16O = 1;
stepcount = pwm_steps_len; stepcount = pwm_steps_len;
memcpy(steps, pwm_steps, (stepcount + 1) * 2); memcpy(steps, pwm_steps, (stepcount + 1) * 2);
memcpy(masks, pwm_steps_mask, stepcount * 4); memcpy(masks, pwm_steps_mask, stepcount * 4);