Skip to content

Commit 0cf576c

Browse files
committed
Merge pull request esp8266#12 from esp8266/esp8266
master
2 parents 79c2042 + ea302aa commit 0cf576c

File tree

9 files changed

+84
-6
lines changed

9 files changed

+84
-6
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ ADC_MODE(ADC_VCC);
177177
```
178178
TOUT pin has to be disconnected in this mode.
179179

180-
Note that by default ADC is configured to read from TOUT pin using ```analogRead(A0)```, and
180+
Note that by default ADC is configured to read from TOUT pin using ```analogRead(A0)```, and
181181
```ESP.getVCC()``` is not available.
182182

183183
#### OneWire (from https://www.pjrc.com/teensy/td_libs_OneWire.html) ####
@@ -210,7 +210,7 @@ Libraries that don't rely on low-level access to AVR registers should work well.
210210
- [aREST](https://github.com/marcoschwartz/aREST) REST API handler library.
211211
- [Blynk](https://github.com/blynkkk/blynk-library) - easy IoT framework for Makers (check out the [Kickstarter page](http://tiny.cc/blynk-kick)).
212212
- [DallasTemperature](https://github.com/milesburton/Arduino-Temperature-Control-Library.git)
213-
- [DHT11](https://github.com/adafruit/DHT-sensor-library) - initialize DHT as follows: ```DHT dht(DHTPIN, DHTTYPE, 15);```
213+
- [DHT11](https://github.com/adafruit/DHT-sensor-library) - Download latest v1.1.0 library and no changes are necessary. Older versions should initialize DHT as follows: ```DHT dht(DHTPIN, DHTTYPE, 15);```
214214
- [NeoPixelBus](https://github.com/Makuna/NeoPixelBus) - Arduino NeoPixel library compatible with esp8266.
215215
- [PubSubClient](https://github.com/Imroy/pubsubclient) MQTT library by @Imroy.
216216
- [RTC](https://github.com/Makuna/Rtc) - Arduino Library for Ds1307 & Ds3231 compatible with esp8266.

hardware/esp8266com/esp8266/boards.txt

+48
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,54 @@ huzzah.menu.UploadSpeed.256000.upload.speed=256000
330330
huzzah.menu.UploadSpeed.921600=921600
331331
huzzah.menu.UploadSpeed.921600.upload.speed=921600
332332

333+
##############################################################
334+
esp210.name=SweetPea ESP-210
335+
336+
esp210.upload.tool=esptool
337+
esp210.upload.speed=115200
338+
esp210.upload.resetmethod=ck
339+
esp210.upload.maximum_size=1044464
340+
esp210.upload.wait_for_upload_port=true
341+
esp210.serial.disableDTR=true
342+
esp210.serial.disableRTS=true
343+
344+
esp210.build.mcu=esp8266
345+
esp210.build.f_cpu=80000000L
346+
esp210.build.board=ESP8266_ESP210
347+
esp210.build.core=esp8266
348+
esp210.build.variant=generic
349+
esp210.build.flash_mode=qio
350+
esp210.build.flash_size=4M
351+
esp210.build.flash_freq=40
352+
esp210.build.flash_ld=eagle.flash.4m.ld
353+
esp210.build.spiffs_start=0x100000
354+
esp210.build.spiffs_end=0x3FB000
355+
esp210.build.spiffs_pagesize=256
356+
esp210.build.spiffs_blocksize=8192
357+
358+
esp210.menu.CpuFrequency.80=80 MHz
359+
esp210.menu.CpuFrequency.80.build.f_cpu=80000000L
360+
esp210.menu.CpuFrequency.160=160 MHz
361+
esp210.menu.CpuFrequency.160.build.f_cpu=160000000L
362+
363+
esp210.menu.UploadSpeed.57600=57600
364+
esp210.menu.UploadSpeed.57600.upload.speed=57600
365+
esp210.menu.UploadSpeed.115200=115200
366+
esp210.menu.UploadSpeed.115200.upload.speed=115200
367+
esp210.menu.UploadSpeed.256000.windows=256000
368+
esp210.menu.UploadSpeed.256000.upload.speed=256000
369+
esp210.menu.UploadSpeed.230400.linux=230400
370+
esp210.menu.UploadSpeed.230400.macosx=230400
371+
esp210.menu.UploadSpeed.230400.macosx=230400
372+
esp210.menu.UploadSpeed.230400.upload.speed=230400
373+
esp210.menu.UploadSpeed.460800.linux=460800
374+
esp210.menu.UploadSpeed.460800.macosx=460800
375+
esp210.menu.UploadSpeed.460800.upload.speed=460800
376+
esp210.menu.UploadSpeed.512000.windows=512000
377+
esp210.menu.UploadSpeed.512000.upload.speed=512000
378+
esp210.menu.UploadSpeed.921600=921600
379+
esp210.menu.UploadSpeed.921600.upload.speed=921600
380+
333381
##############################################################
334382
# wifio.name=Wifio
335383
#

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ void ESP8266WiFiClass::softAP(const char* ssid)
173173
}
174174

175175

176-
void ESP8266WiFiClass::softAP(const char* ssid, const char* passphrase, int channel)
176+
void ESP8266WiFiClass::softAP(const char* ssid, const char* passphrase, int channel, int ssid_hidden)
177177
{
178178
_useApMode = true;
179179
if(_useClientMode) {
@@ -199,7 +199,7 @@ void ESP8266WiFiClass::softAP(const char* ssid, const char* passphrase, int chan
199199
strcpy(reinterpret_cast<char*>(conf.ssid), ssid);
200200
conf.channel = channel;
201201
conf.ssid_len = strlen(ssid);
202-
conf.ssid_hidden = 0;
202+
conf.ssid_hidden = ssid_hidden;
203203
conf.max_connection = 4;
204204
conf.beacon_interval = 100;
205205

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ class ESP8266WiFiClass
7575
* param ssid: Pointer to the SSID string.
7676
* param passphrase: Pointer to passphrase, 8 characters min.
7777
* param channel: WiFi channel number, 1 - 13.
78+
* param ssid_hidden: Network cloaking? 0 = broadcast SSID, 1 = hide SSID
7879
*/
79-
void softAP(const char* ssid, const char* passphrase, int channel = 1);
80+
void softAP(const char* ssid, const char* passphrase, int channel = 1, int ssid_hidden = 0);
8081

8182
/* Change Ip configuration settings disabling the dhcp client
8283
*

hardware/esp8266com/esp8266/tools/sdk/changelog.txt

+29
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
esp_iot_sdk_1.1.2_15_06_25_p2 Release Note
2+
-------------------------------------------
3+
4+
Here is a patch based on SDK_v1.1.2 solved problem of abnormal current during modem-sleep.
5+
Please replace the lib in \esp_iot_sdk_v1.1.2\lib
6+
7+
Sorry for the inconvenience.
8+
9+
esp_iot_sdk_v1.1.2_15_06_24_p1.1 Release Note
10+
-------------------------------------------
11+
12+
Here is a patch for AT firmware based on SDK_v1.1.2 resolved issue that AT user parameter area was located in wrong address,it may cause WiFi configuration goes wrong.
13+
14+
Please update to this new AT bin files and call "AT+RESTORE" to factory reset. If you call “AT+CIPUPDATE” to upgrade,please also call "AT+RESTORE" to factory reset once.
15+
16+
“AT_bin_v0.25_1024+KB_flash_can_upgrade.zip”
17+
- normal AT bin,runs with boot.bin,can FOTA upgrade,need to use 1024KB flash
18+
19+
“AT_bin_v0.25_for_512KB_flash_cannot_upgrade.zip”
20+
- for old version module which flash size is 512KB
21+
eagle.flash.bin downloads to flash 0x00000
22+
eagle.irom0text.bin downloads to flash 0x40000
23+
can not FOTA upgrade,please don‘t call “AT+CIPUPDATE”
24+
25+
"SDK_v1.1.2_AT_patch_01.zip"
26+
- libs for users who need to compile their own AT firmware,replace libs in \esp_iot_sdk_v1.1.2\lib
27+
28+
So sorry for the inconvenience.
29+
130
esp_iot_sdk_v1.1.2_15_06_16_p1 Release Note
231
-------------------------------------------
332
Here is a patch based on SDK_v1.1.2 resolved issue that "wifi_station_scan" cause loss of wireless connectivity.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.2_15_06_16_p1
1+
1.1.2_15_06_25_p2

0 commit comments

Comments
 (0)