10000 Merge pull request #1 from esp8266/esp8266 · esp8266/Arduino@c1dbf28 · GitHub
[go: up one dir, main page]
Skip to content

Commit c1dbf28

Browse files
MakunaMakuna
committed
Merge pull request #1 from esp8266/esp8266
merge esp8266/Arduino
2 parents 775e9d4 + 49c25b9 commit c1dbf28

File tree

5 files changed

+105
-4
lines changed

5 files changed

+105
-4
lines changed

‎build/build_board_manager_package.sh

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,20 @@ cat << EOF > package_esp8266com_index.json
5252
"help":{
5353
"online":"http://esp8266.com"
5454
},
55-
"boards":[ {
55+
"boards":[
56+
{
5657
"name":"Generic ESP8266 Module"
58+
},
59+
{
60+
"name":"Olimex MOD-WIFI-ESP8266(-DEV)"
61+
},
62+
{
63+
"name":"NodeMCU 0.9 (ESP-12 Module)"
64+
},
65+
{
66+
"name":"NodeMCU 1.0 (ESP-12E Module)"
5767
}
68+
5869
],
5970
"toolsDependencies":[ {
6071
"packager":"esp8266",

‎hardware/esp8266com/esp8266/boards.txt

Lines changed: 56 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ modwifi.name=Olimex MOD-WIFI-ESP8266(-DEV)
134134
modwifi.upload.tool=esptool
135135
modwifi.upload.speed=115200
136136
modwifi.upload.resetmethod=ck
137-
modwifi.upload.maximum_size=2097152
137+
modwifi.upload.maximum_size=983040
138+
modwifi.upload.maximum_data_size=81920
138139
modwifi.upload.wait_for_upload_port=true
139140
modwifi.serial.disableDTR=true
140141
modwifi.serial.disableRTS=true
@@ -180,12 +181,13 @@ modwifi.menu.UploadSpeed.921600=921600
180181
modwifi.menu.UploadSpeed.921600.upload.speed=921600
181182

182183
##############################################################
183-
nodemcu.name=NodeMCU (ESP8266 ESP-12 Module)
184+
nodemcu.name=NodeMCU 0.9 (ESP-12 Module)
184185

185186
nodemcu.upload.tool=esptool
186187
nodemcu.upload.speed=115200
187188
nodemcu.upload.resetmethod=ck
188-
nodemcu.upload.maximum_size=4194304
189+
nodemcu.upload.maximum_size=983040
190+
nodemcu.upload.maximum_data_size=81920
189191
nodemcu.upload.wait_for_upload_port=true
190192
nodemcu.serial.disableDTR=true
191193
nodemcu.serial.disableRTS=true
@@ -229,6 +231,57 @@ nodemcu.menu.UploadSpeed.512000.upload.speed=512000
229231
nodemcu.menu.UploadSpeed.921600=921600
230232
nodemcu.menu.UploadSpeed.921600.upload.speed=921600
231233

234+
##############################################################
235+
nodemcuv2.name=NodeMCU 1.0 (ESP-12E Module)
236+
237+
nodemcuv2.upload.tool=esptool
238+
nodemcuv2.upload.speed=115200
239+
nodemcuv2.upload.resetmethod=ck
240+
nodemcuv2.upload.maximum_size=983040
241+
nodemcuv2.upload.maximum_data_size=81920
242+
nodemcuv2.upload.wait_for_upload_port=true
243+
nodemcuv2.serial.disableDTR=true
244+
nodemcuv2.serial.disableRTS=true
245+
246+
nodemcuv2.build.mcu=esp8266
247+
nodemcuv2.build.f_cpu=80000000L
248+
nodemcuv2.build.board=ESP8266_ESP12
249+
nodemcuv2.build.core=esp8266
250+
nodemcuv2.build.variant=nodemcu
251+
nodemcuv2.build.flash_mode=dio
252+
nodemcuv2.build.flash_size=4M
253+
nodemcuv2.build.flash_freq=40
254+
nodemcuv2.build.flash_ld=eagle.flash.4m.ld
255+
nodemcuv2.build.spiffs_start=0x100000
256+
nodemcuv2.build.spiffs_end=0x3FB000
257+
nodemcuv2.build.spiffs_pagesize=256
258+
nodemcuv2.build.spiffs_blocksize=8192
259+
260+
nodemcuv2.menu.CpuFrequency.80=80 MHz
261+
nodemcuv2.menu.CpuFrequency.80.build.f_cpu=80000000L
262+
nodemcuv2.menu.CpuFrequency.160=160 MHz
263+
nodemcuv2.menu.CpuFrequency.160.build.f_cpu=160000000L
264+
265+
nodemcuv2.menu.UploadSpeed.115200=115200
266+
nodemcuv2.menu.UploadSpeed.115200.upload.speed=115200
267+
nodemcuv2.menu.UploadSpeed.9600=9600
268+
nodemcuv2.menu.UploadSpeed.9600.upload.speed=9600
269+
nodemcuv2.menu.UploadSpeed.57600=57600
270+
nodemcuv2.menu.UploadSpeed.57600.upload.speed=57600
271+
nodemcuv2.menu.UploadSpeed.256000.windows=256000
272+
nodemcuv2.menu.UploadSpeed.256000.upload.speed=256000
273+
nodemcuv2.menu.UploadSpeed.230400.linux=230400
274+
nodemcuv2.menu.UploadSpeed.230400.macosx=230400
275+
nodemcuv2.menu.UploadSpeed.230400.macosx=230400
276+
nodemcuv2.menu.UploadSpeed.230400.upload.speed=230400
277+
nodemcuv2.menu.UploadSpeed.460800.linux=460800
278+
nodemcuv2.menu.UploadSpeed.460800.macosx=460800
279+
nodemcuv2.menu.UploadSpeed.460800.upload.speed=460800
280+
nodemcuv2.menu.UploadSpeed.512000.windows=512000
281+
nodemcuv2.menu.UploadSpeed.512000.upload.speed=512000
282+
nodemcuv2.menu.UploadSpeed.921600=921600
283+
nodemcuv2.menu.UploadSpeed.921600.upload.speed=921600
284+
232285
##############################################################
233286
# wifio.name=Wifio
234287
#

‎hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/WiFiClient.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ extern "C"
4040
#include "include/ClientContext.h"
4141
#include "c_types.h"
4242

43+
uint16_t WiFiClient::_localPort = 0;
44+
4345
ICACHE_FLASH_ATTR WiFiClient::WiFiClient()
4446
: _client(0)
4547
{
@@ -93,6 +95,10 @@ int ICACHE_FLASH_ATTR WiFiClient::connect(IPAddress ip, uint16_t port)
9395
if (!pcb)
9496
return 0;
9597

98+
if (_localPort > 0) {
99+
pcb->local_port = _localPort++;
100+
}
101+
96102
ip_addr_t addr;
97103
addr.addr = ip;
98104
tcp_arg(pcb, this);

‎hardware/esp8266com/esp8266/libraries/ESP8266WiFi/src/WiFiClient.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ class WiFiClient : public Client {
6161
uint16_t remotePort();
6262
bool getNoDelay();
6363
void setNoDelay(bool nodelay);
64+
static void setLocalPortStart(uint16_t port) { _localPort = port; }
6465

6566
template<typename T> size_t write(T &src){
6667
uint8_t obuf[1460];
@@ -97,6 +98,7 @@ class WiFiClient : public Client {
9798
void _err(int8_t err);
9899

99100
ClientContext* _client;
101+
static uint16_t _localPort;
100102

101103
};
102104

‎hardware/esp8266com/esp8266/tools/sdk/ld/eagle.app.v6.common.ld

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ PHDRS
1313

1414
/* Default entry point: */
1515
ENTRY(call_user_start)
16+
EXTERN(_DebugExceptionVector)
17+
EXTERN(_DoubleExceptionVector)
18+
EXTERN(_KernelExceptionVector)
19+
EXTERN(_NMIExceptionVector)
20+
EXTERN(_UserExceptionVector)
1621
PROVIDE(_memmap_vecbase_reset = 0x40000000);
1722
/* Various memory-map dependent cache attribute settings: */
1823
_memmap_cacheattr_wb_base = 0x00000110;
@@ -158,6 +163,30 @@ SECTIONS
158163
{
159164
_stext = .;
160165
_text_start = ABSOLUTE(.);
166+
*(.UserEnter.text)
167+
. = ALIGN(16);
168+
*(.DebugExceptionVector.text)
169+
. = ALIGN(16);
170+
*(.NMIExceptionVector.text)
171+
. = ALIGN(16);
172+
*(.KernelExceptionVector.text)
173+
LONG(0)
174+
LONG(0)
175+
LONG(0)
176+
LONG(0)
177+
. = ALIGN(16);
178+
*(.UserExceptionVector.text)
179+
LONG(0)
180+
LONG(0)
181+
LONG(0)
182+
LONG(0)
183+
. = ALIGN(16);
184+
*(.DoubleExceptionVector.text)
185+
LONG(0)
186+
LONG(0)
187+
LONG(0)
188+
LONG(0)
189+
. = ALIGN (16);
161190
*(.entry.text)
162191
*(.init.literal)
163192
*(.init)

0 commit comments

Comments
 (0)
0