Skip to content

fix pwm first step getting skipped #1391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Jan 9, 2016
Merged

fix pwm first step getting skipped #1391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0fd1201
fix tcp status redefinition and bad mem definitions in lwip
Dec 21, 2015
bcfdfb6
more bad definitions
Dec 21, 2015
f553467
add aligned wraps for pvPortMalloc and pvPortRealloc
Dec 21, 2015
f24ce1d
Merge remote-tracking branch 'esp8266/master'
Dec 21, 2015
c1711aa
Merge remote-tracking branch 'esp8266/master'
Dec 22, 2015
7e8e535
revert some changes and fix wl_definitions
Dec 22, 2015
2067152
Merge remote-tracking branch 'esp8266/master'
Dec 22, 2015
f0f9114
fix extra endif
Dec 22, 2015
b28be23
Merge remote-tracking branch 'esp8266/master'
Dec 28, 2015
7b297d2
Merge remote-tracking branch 'esp8266/master'
Jan 3, 2016
d67763a
Merge remote-tracking branch 'esp8266/master'
Jan 4, 2016
7615966
Merge remote-tracking branch 'esp8266/master'
Jan 4, 2016
897a475
Merge remote-tracking branch 'esp8266/master'
Jan 7, 2016
1d2237b
fix pwm first step getting skipped
Jan 8, 2016
cccff08
revert change, though signatures are wrong
me-no-dev Jan 8, 2016
377864f
Merge remote-tracking branch 'esp8266/master'
Jan 9, 2016
a143e61
Merge remote-tracking branch 'origin/master'
Jan 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cores/esp8266/core_esp8266_wiring_pwm.c
View file
Open in desktop
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
View file
Open in desktop
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