Skip to content

Commit

Permalink
Merge pull request esp8266#1391 from me-no-dev/master
Browse files Browse the repository at this point in the history
fix pwm first step getting skipped
  • Loading branch information
Links2004 committed Jan 9, 2016
2 parents 3fda5f7 + a143e61 commit c61587f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cores/esp8266/core_esp8266_wiring_pwm.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ void ICACHE_RAM_ATTR pwm_timer_isr(){
current_step = 0;
stepcount = 0;
if(pwm_mask == 0) return;
T1L = (pwm_steps[current_step+1] * pwm_multiplier);
T1L = (pwm_steps[current_step] * pwm_multiplier);
TEIE |= TEIE1;
if(pwm_mask & 0xFFFF) GPOS = pwm_mask & 0xFFFF;
if(pwm_mask & 0x10000) GP16O = 1;
Expand Down
4 changes: 2 additions & 2 deletions libraries/ESP8266WiFi/src/lwip/mem_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "c_types.h"

/*------------------------±äÁ¿¶¨Òå------------------------*/
/*------------------------��������------------------------*/

#define MPU_WRAPPERS_INCLUDED_FROM_API_FILE
#ifndef IOT_SIP_MODE
Expand Down Expand Up @@ -61,7 +61,7 @@ static const unsigned short heapSTRUCT_SIZE = ( sizeof( xBlockLink ) + portBYTE_
//static size_t xFreeBytesRemaining = ( ( size_t ) configADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );


/*------------------------º¯ÊýÉùÃ÷-----------------------------------*/
/*------------------------��������-----------------------------------*/

//static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR;

Expand Down

0 comments on commit c61587f

Please sign in to comment.