Skip to content

Commit d5e9501

Browse files
committed
Merge branch 'release/v1.6.0' into develop
2 parents 3613a12 + 491fe52 commit d5e9501

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

examples/arduino-webserver/src/HelloServer.ino

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
#include <Arduino.h>
21
#include <ESP8266WiFi.h>
32
#include <WiFiClient.h>
43
#include <ESP8266WebServer.h>
54
#include <ESP8266mDNS.h>
65

7-
const char* ssid = "******";
8-
const char* password = "******";
9-
MDNSResponder mdns;
6+
const char* ssid = "........";
7+
const char* password = "........";
108

119
ESP8266WebServer server(80);
1210

@@ -39,6 +37,7 @@ void setup(void){
3937
pinMode(led, OUTPUT);
4038
digitalWrite(led, 0);
4139
Serial.begin(115200);
40+
WiFi.mode(WIFI_STA);
4241
WiFi.begin(ssid, password);
4342
Serial.println("");
4443

@@ -53,7 +52,7 @@ void setup(void){
5352
Serial.print("IP address: ");
5453
Serial.println(WiFi.localIP());
5554

56-
if (mdns.begin("esp8266", WiFi.localIP())) {
55+
if (MDNS.begin("esp8266")) {
5756
Serial.println("MDNS responder started");
5857
}
5958

@@ -71,4 +70,4 @@ void setup(void){
7170

7271
void loop(void){
7372
server.handleClient();
74-
}
73+
}

examples/arduino-wifiscan/src/WiFiScan.ino

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
/*
2-
* This sketch demonstrates how to scan WiFi networks.
3-
* The API is almost the same as with the WiFi Shield library,
2+
* This sketch demonstrates how to scan WiFi networks.
3+
* The API is almost the same as with the WiFi Shield library,
44
* the most obvious difference being the different file you need to include:
55
*/
6-
#include <Arduino.h>
76
#include "ESP8266WiFi.h"
87

98
void setup() {

platform.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "espressif8266",
3-
"title": "Espressif 8266 (Stage)",
3+
"title": "Espressif 8266",
44
"description": "Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.",
55
"url": "https://espressif.com/",
66
"homepage": "http://platformio.org/platforms/espressif8266",
@@ -12,7 +12,7 @@
1212
"type": "git",
1313
"url": "https://github.com/platformio/platform-espressif8266.git"
1414
},
15-
"version": "1.6.0-alpha.1",
15+
"version": "1.6.0",
1616
"packageRepositories": [
1717
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
1818
"http://dl.platformio.org/packages/manifest.json",

0 commit comments

Comments
 (0)