arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-27 21:16:50 +03:00
Code

Merge remote-tracking branch 'remotes/esp8266/master'

Browse Source
This commit is contained in:
Markus Sattler 2016-01-09 16:42:43 +01:00
commit 027d8acbe3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cores/esp8266/core_esp8266_wiring_pwm.c
View File

@ -103,7 +103,7 @@ void ICACHE_RAM_ATTR pwm_timer_isr(){
current_step = 0; current_step = 0;
stepcount = 0; stepcount = 0;
if(pwm_mask == 0) return; if(pwm_mask == 0) return;
T1L = (pwm_steps[current_step+1] * pwm_multiplier); T1L = (pwm_steps[current_step] * pwm_multiplier);
TEIE |= TEIE1; TEIE |= TEIE1;
if(pwm_mask & 0xFFFF) GPOS = pwm_mask & 0xFFFF; if(pwm_mask & 0xFFFF) GPOS = pwm_mask & 0xFFFF;
if(pwm_mask & 0x10000) GP16O = 1; if(pwm_mask & 0x10000) GP16O = 1;

4
libraries/ESP8266WiFi/src/lwip/mem_manager.h
View File

@ -3,7 +3,7 @@
#include "c_types.h" #include "c_types.h"
/*------------------------变量定义------------------------*/ /*------------------------<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>------------------------*/
#define MPU_WRAPPERS_INCLUDED_FROM_API_FILE #define MPU_WRAPPERS_INCLUDED_FROM_API_FILE
#ifndef IOT_SIP_MODE #ifndef IOT_SIP_MODE
@ -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 size_t xFreeBytesRemaining = ( ( size_t ) configADJUSTED_HEAP_SIZE ) & ( ( size_t ) ~portBYTE_ALIGNMENT_MASK );
/*------------------------函数声明-----------------------------------*/ /*------------------------<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-----------------------------------*/
//static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR; //static void prvInsertBlockIntoFreeList( xBlockLink *pxBlockToInsert ) ;//ICACHE_FLASH_ATTR;