Skip to content

Commit b8691b5

Browse files
krzychbkrzychb
committed
Merge branch 'master' into master
2 parents 9fc5ac4 + bbaed29 commit b8691b5

20 files changed

+2214
-1353
lines changed

‎boards.txt

+67
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,73 @@ generic.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu
180180
# generic.menu.FlashSize.16M.build.spiffs_end=0x1000000
181181
# generic.menu.FlashSize.16M.build.spiffs_blocksize=8192
182182

183+
##############################################################
184+
espduino.name=ESPDuino (ESP-13 Module)
185+
186+
espduino.upload.tool=esptool
187+
espduino.upload.speed=115200
188+
espduino.upload.resetmethod=ck
189+
espduino.upload.maximum_size=1044464
190+
espduino.upload.maximum_data_size=81920
191+
espduino.upload.wait_for_upload_port=true
192+
espduino.serial.disableDTR=true
193+
espduino.serial.disableRTS=true
194+
195+
espduino.build.mcu=esp8266
196+
espduino.build.f_cpu=80000000L
197+
espduino.build.board=ESP8266_ESP13
198+
espduino.build.core=esp8266
199+
espduino.build.variant=espduino
200+
espduino.build.flash_mode=dio
201+
espduino.build.flash_size=4M
202+
espduino.build.flash_freq=40
203+
204+
espduino.menu.CpuFrequency.80=80 MHz
205+
espduino.menu.CpuFrequency.80.build.f_cpu=80000000L
206+
espduino.menu.CpuFrequency.160=160 MHz
207+
espduino.menu.CpuFrequency.160.build.f_cpu=160000000L
208+
209+
espduino.menu.UploadTool.esptool=Serial
210+
espduino.menu.UploadTool.esptool.upload.tool=esptool
211+
espduino.menu.UploadTool.esptool.upload.verbose=-vv
212+
espduino.menu.UploadTool.espota=OTA
213+
espduino.menu.UploadTool.espota.upload.tool=espota
214+
215+
espduino.menu.UploadSpeed.115200=115200
216+
espduino.menu.UploadSpeed.115200.upload.speed=115200
217+
espduino.menu.UploadSpeed.9600=9600
218+
espduino.menu.UploadSpeed.9600.upload.speed=9600
219+
espduino.menu.UploadSpeed.57600=57600
220+
espduino.menu.UploadSpeed.57600.upload.speed=57600
221+
espduino.menu.UploadSpeed.256000.windows=256000
222+
espduino.menu.UploadSpeed.256000.upload.speed=256000
223+
espduino.menu.UploadSpeed.230400.linux=230400
224+
espduino.menu.UploadSpeed.230400.macosx=230400
225+
espduino.menu.UploadSpeed.230400.macosx=230400
226+
espduino.menu.UploadSpeed.230400.upload.speed=230400
227+
espduino.menu.UploadSpeed.460800.linux=460800
228+
espduino.menu.UploadSpeed.460800.macosx=460800
229+
espduino.menu.UploadSpeed.460800.upload.speed=460800
230+
espduino.menu.UploadSpeed.512000.windows=512000
231+
espduino.menu.UploadSpeed.512000.upload.speed=512000
232+
espduino.menu.UploadSpeed.921600=921600
233+
espduino.menu.UploadSpeed.921600.upload.speed=921600
234+
235+
espduino.menu.FlashSize.4M3M=4M (3M SPIFFS)
236+
espduino.menu.FlashSize.4M3M.build.flash_size=4M
237+
espduino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
238+
espduino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
239+
espduino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
240+
espduino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
241+
espduino.menu.FlashSize.4M3M.build.spiffs_pagesize=256
242+
243+
espduino.menu.FlashSize.4M1M=4M (1M SPIFFS)
244+
espduino.menu.FlashSize.4M1M.build.flash_size=4M
245+
espduino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
246+
espduino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
247+
espduino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
248+
espduino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
249+
espduino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
183250
##############################################################
184251
huzzah.name=Adafruit HUZZAH ESP8266
185252

‎cores/esp8266/Arduino.h

+5
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ extern "C" {
3737
#include "binary.h"
3838
#include "esp8266_peri.h"
3939
#include "twi.h"
40+
#include "core_esp8266_features.h"
4041

4142
#define HIGH 0x1
4243
#define LOW 0x0
@@ -247,8 +248,12 @@ void optimistic_yield(uint32_t interval_us);
247248
#include "Updater.h"
248249
#include "debug.h"
249250

251+
#ifndef _GLIBCXX_VECTOR
252+
// arduino is not compatible with std::vector
250253
#define min(a,b) ((a)<(b)?(a):(b))
251254
#define max(a,b) ((a)>(b)?(a):(b))
255+
#endif
256+
252257
#define _min(a,b) ((a)<(b)?(a):(b))
253258
#define _max(a,b) ((a)>(b)?(a):(b))
254259

‎cores/esp8266/IPAddress.h

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ class IPAddress: public Printable {
5656
bool operator==(const IPAddress& addr) const {
5757
return _address.dword == addr._address.dword;
5858
}
59+
bool operator==(uint32_t addr) const {
60+
return _address.dword == addr;
61+
}
5962
bool operator==(const uint8_t* addr) const;
6063

6164
// Overloaded index operator to allow getting and setting individual octets of the address

‎cores/esp8266/core_esp8266_features.h

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
#define CORE_HAS_LIBB64
2929
#define CORE_HAS_BASE64_CLASS
3030

31+
#define WIFI_HAS_EVENT_CALLBACK
32+
3133

3234
#endif
3335

‎doc/filesystem.md

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Olimex MOD-WIFI-ESP8266(-DEV)| 2M | 1M
4949
SparkFun Thing | 512k | 64k
5050
SweetPea ESP-210 | 4M | 1M, 3M
5151
WeMos D1 & D1 mini | 4M | 1M, 3M
52+
ESPDuino | 4M | 1M, 3M
5253

5354
**Note:** to use any of file system functions in the sketch, add the following include to the sketch:
5455

‎libraries/ESP8266WiFi/examples/WiFiClientEvents/WiFiClientEvents.ino

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
* This sketch shows the WiFi event usage
3+
*
4+
*/
5+
6+
#include <ESP8266WiFi.h>
7+
8+
const char* ssid = "your-ssid";
9+
const char* password = "your-password";
10+
11+
12+
void WiFiEvent(WiFiEvent_t event) {
13+
Serial.printf("[WiFi-event] event: %d\n", event);
14+
15+
switch(event) {
16+
case WIFI_EVENT_STAMODE_GOT_IP:
17+
Serial.println("WiFi connected");
18+
Serial.println("IP address: ");
19+
Serial.println(WiFi.localIP());
20+
break;
21+
case WIFI_EVENT_STAMODE_DISCONNECTED:
22+
Serial.println("WiFi lost connection");
23+
break;
24+
}
25+
}
26+
27+
void setup() {
28+
Serial.begin(115200);
29+
30+
// delete old config
31+
WiFi.disconnect(true);
32+
33+
delay(1000);
34+
35+
WiFi.onEvent(WiFiEvent);
36+
37+
WiFi.begin(ssid, password);
38+
39+
Serial.println();
40+
Serial.println();
41+
Serial.println("Wait for WiFi... ");
42+
}
43+
44+
45+
void loop() {
46+
delay(1000);
47+
}
48+

0 commit comments

Comments
 (0)