8000 Merge branch 'master' into patch-2 · sadykowich/Arduino-1@c022dfd · GitHub
[go: up one dir, main page]
Skip to content

Commit c022dfd

Browse files
devytedevyte
authored
Merge branch 'master' into patch-2
2 parents 03f594e + bd613be commit c022dfd

File tree

7 files changed

+25
-9
lines changed

7 files changed

+25
-9
lines changed

‎cores/esp8266/Esp.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "interrupts.h"
2626
#include "MD5Builder.h"
2727
#include "umm_malloc/umm_malloc.h"
28+
#include "cont.h"
2829

2930
extern "C" {
3031
#include "user_interface.h"
@@ -177,6 +178,11 @@ uint16_t EspClass::getMaxFreeBlockSize(void)
177178
return umm_max_block_size();
178179
}
179180

181+
uint32_t EspClass::getFreeContStack()
182+
{
183+
return cont_get_free_stack(g_pcont);
184+
}
185+
180186
uint32_t EspClass::getChipId(void)
181187
{
182188
return system_get_chip_id();

‎cores/esp8266/Esp.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ class EspClass {
110110
uint8_t getHeapFragmentation(); // in %
111111
void getHeapStats(uint32_t* free = nullptr, uint16_t* max = nullptr, uint8_t* frag = nullptr);
112112

113+
uint32_t getFreeContStack();
114+
113115
const char * getSdkVersion();
114116
String getCoreVersion();
115117
String getFullVersion();

‎doc/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Requirements file for pip
22
# list of Python packages used in documentation build
3-
sphinx
3+
sphinx==1.7.9
44
sphinx-rtd-theme
55
breathe
66
nbsphinx

‎libraries/TFT_Touch_Shield_V2/library.properties

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name=TFT_Touch_Shield_V2
2+
version=2.0
3+
author=luweicong@seeedstudio.com
4+
maintainer=luweicong@seeedstudio.com
5+
sentence=TFT_Touch_Shield_V2 library
6+
paragraph=This is a multifunctional Arduino/Seeeduino/Arduino Mega compatible resistive touch screen.
7+
category=Communication
8+
url=
9+
architectures=esp8266
10+
dot_a_linkage=true

‎tools/sdk/include/c_types.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,9 @@ typedef enum {
8484
#define SHMEM_ATTR
8585

8686
#ifdef ICACHE_FLASH
87-
#define __ICACHE_STRINGIZE_NX(A) #A
88-
#define __ICACHE_STRINGIZE(A) __ICACHE_STRINGIZE_NX(A)
89-
#define ICACHE_FLASH_ATTR __attribute__((section("\".irom0.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
90-
#define ICACHE_RAM_ATTR __attribute__((section("\".iram.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
91-
#define ICACHE_RODATA_ATTR __attribute__((section("\".irom.text." __FILE__ "." __ICACHE_STRINGIZE(__LINE__) "." __ICACHE_STRINGIZE(__COUNTER__) "\"")))
87+
#define ICACHE_FLASH_ATTR __attribute__((section(".irom0.text")))
88+
#define ICACHE_RAM_ATTR __attribute__((section(".iram.text")))
89+
#define ICACHE_RODATA_ATTR __attribute__((section(".irom.text")))
9290
#else
9391
#define ICACHE_FLASH_ATTR
9492
#define ICACHE_RAM_ATTR

‎tools/sdk/ld/eagle.app.v6.common.ld.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ SECTIONS
127127
*libwpa.a:(.literal.* .text.*)
128128
*libwpa2.a:(.literal.* .text.*)
129129
*libwps.a:(.literal.* .text.*)
130-
*(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom0.text.* .irom.text .irom.text.*)
130+
*(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text .irom.text.*)
131131
_irom0_text_end = ABSOLUTE(.);
132132
_flash_code_end = ABSOLUTE(.);
133133
} >irom0_0_seg :irom0_0_phdr
@@ -164,8 +164,8 @@ SECTIONS
164164
*(.init.literal)
165165
*(.init)
166166
*(.literal .text .literal.* .text.* .stub .gnu.warning .gnu.linkonce.literal.* .gnu.linkonce.t.*.literal .gnu.linkonce.t.*)
167-
*.cpp.o(.iram.text .iram.text.*)
168-
*.c.o(.iram.text .iram.text.*)
167+
*.cpp.o(.iram.text)
168+
*.c.o(.iram.text)
169169
#ifdef VTABLES_IN_IRAM
170170
*(.rodata._ZTV*) /* C++ vtables */
171171
#endif

‎tools/sdk/lib/libaxtls.a

8.36 KB
Binary file not shown.

0 commit comments

Comments
 (0)
0