Skip to content

Commit 027d8ac

Browse files
committed
Merge remote-tracking branch 'remotes/esp8266/master'
2 parents df47f0d + c61587f commit 027d8ac

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cores/esp8266/core_esp8266_wiring_pwm.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ void ICACHE_RAM_ATTR pwm_timer_isr(){
103103
current_step = 0;
104104
stepcount = 0;
105105
if(pwm_mask == 0) return;
106-
T1L = (pwm_steps[current_step+1] * pwm_multiplier);
106+
T1L = (pwm_steps[current_step] * pwm_multiplier);
107107
TEIE |= TEIE1;
108108
if(pwm_mask & 0xFFFF) GPOS = pwm_mask & 0xFFFF;
109109
if(pwm_mask & 0x10000) GP16O = 1;

libraries/ESP8266WiFi/src/lwip/mem_manager.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "c_types.h"
55

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

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

6363

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

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

0 commit comments

Comments
 (0)