sync with devt branch

Author: luc-github

.travis.yml

@@ -11,27 +11,15 @@ before_install:
 before_script:
   - "export DISPLAY=:99.0"
   - sleep 3 # give xvfb some time to start
-  - wget http://downloads.arduino.cc/arduino-1.6.5-linux64.tar.xz
-  - tar xf arduino-1.6.5-linux64.tar.xz
-  - mv arduino-1.6.5 $HOME/arduino_ide
+  - wget http://downloads.arduino.cc/arduino-1.6.8-linux64.tar.xz
+  - tar xf arduino-1.6.8-linux64.tar.xz
+  - mv arduino-1.6.8 $HOME/arduino_ide
   - cd $HOME/arduino_ide/hardware
   - mkdir esp8266com
   - cd esp8266com
-  - wget https://github.com/esp8266/Arduino/releases/download/2.1.0/esp8266-2.1.0.zip
-  - unzip esp8266-2.1.0.zip
-  - mv esp8266-2.1.0 esp8266
-  - wget http://arduino.esp8266.com/versions/2.1.0/package_esp8266com_index.json
-  - mkdir esp8266/package
-  - mv package_esp8266com_index.json esp8266/package/package_esp8266com_index.template.json
+  - git clone https://github.com/esp8266/Arduino.git esp8266
   - cd esp8266/tools
   - python get.py
-  - cd ..
-  - head -11 ./platform.txt > pt.txt
-  - echo 'runtime.tools.xtensa-lx106-elf-gcc.path={runtime.platform.path}/tools/xtensa-lx106-elf' >> pt.txt
-  - echo 'runtime.tools.esptool.path={runtime.platform.path}/tools/esptool' >> pt.txt
-  - tail -110 ./platform.txt >> pt.txt
-  - rm -fr platform.txt
-  - mv pt.txt platform.txt
 
 
 script:
@@ -41,7 +29,7 @@ script:
   - arduino --board esp8266com:esp8266:generic --save-prefs
   - arduino --get-pref sketchbook.path
   - build_sketch esp8266/esp8266.ino
-
+  
 notifications:
   email:
     on_success: change

README.md

@@ -0,0 +1,5 @@
+TODO
+MONITORING_FEATURE : temperatures
+INFO_MSG_FEATURE
+ERROR_MSG_FEATURE
+STATUS_MSG_FEATURE

TODO.txt

@@ -236,6 +236,7 @@ void CONFIG::print_config()
 {
     //use biggest size for buffer
     char sbuf[MAX_PASSWORD_LENGTH+1];
+    uint8_t ipbuf[4];
     byte bbuf=0;
     int ibuf=0;
     if (CONFIG::read_byte(EP_WIFI_MODE, &bbuf )) {
@@ -257,7 +258,6 @@ void CONFIG::print_config()
     } else {
         Serial.println(F("Error reading SSID"));
     }
-    //if (CONFIG::read_string(EP_PASSWORD, sbuf , MAX_PASSWORD_LENGTH))Serial.println(sbuf);
 
     if (CONFIG::read_byte(EP_IP_MODE, &bbuf )) {
         Serial.print(F("IP Mode: "));
@@ -272,23 +272,23 @@ void CONFIG::print_config()
         Serial.println(F("Error reading IP mode"));
     }
 
-    if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)sbuf , IP_LENGTH)) {
+    if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)ipbuf , IP_LENGTH)) {
         Serial.print(F("IP: "));
-        Serial.println(wifi_config.ip2str((byte *)sbuf));
+        Serial.println(IPAddress(ipbuf).toString());
     } else {
         Serial.println(F("Error reading IP"));
     }
 
-    if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)sbuf  , IP_LENGTH)) {
+    if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)ipbuf  , IP_LENGTH)) {
         Serial.print(F("Subnet: "));
-        Serial.println(wifi_config.ip2str((byte *)sbuf));
+        Serial.println(IPAddress(ipbuf).toString());
     } else {
         Serial.println(F("Error reading subnet"));
     }
 
-    if (CONFIG::read_buffer(EP_GATEWAY_VALUE, (byte *)sbuf  , IP_LENGTH)) {
+    if (CONFIG::read_buffer(EP_GATEWAY_VALUE, (byte *)ipbuf  , IP_LENGTH)) {
         Serial.print(F("Gateway: "));
-        Serial.println(wifi_config.ip2str((byte *)sbuf));
+        Serial.println(IPAddress(ipbuf).toString());
     } else {
         Serial.println(F("Error reading gateway"));
     }
@@ -443,5 +443,17 @@ void CONFIG::print_config()
     Serial.println(F("Enabled"));
 #else
     Serial.println(F("Disabled"));
+#endif
+    Serial.print(F("Pin 2 Recovery: "));
+#ifdef RECOVERY_FEATURE
+    Serial.println(F("Enabled"));
+#else
+    Serial.println(F("Disabled"));
+#endif
+    Serial.print(F("Authentication: "));
+#ifdef AUTHENTICATION_FEATURE
+    Serial.println(F("Enabled"));
+#else
+    Serial.println(F("Disabled"));
 #endif
 }

keywords.txt renamed to docs/keywords.txt

@@ -21,7 +21,7 @@
 //comment to disable
 //MDNS_FEATURE: this feature allow  type the name defined
 //in web browser by default: http:\\esp8266.local and connect
-#define MDNS_FEATURE
+//#define MDNS_FEATURE
 
 //SSDD_FEATURE: this feature is a discovery protocol, supported on Windows out of the box
 #define SSDP_FEATURE
@@ -41,16 +41,16 @@
 //TCP_IP_DATA_FEATURE: allow to connect serial from TCP/IP
 #define TCP_IP_DATA_FEATURE
 
+//RECOVERY_FEATURE: allow to use GPIO2 pin as hardware reset for EEPROM, add 8s to boot time to let user to jump GPIO2 to GND
+#define RECOVERY_FEATURE
+
 #ifndef CONFIG_h
 #define CONFIG_h
 
 #include <Arduino.h>
 #include "wifi.h"
-extern "C" {
-#include "user_interface.h"
-}
 //version and sources location
-#define FW_VERSION "0.6.0"
+#define FW_VERSION "0.6.1"
 #define REPOSITORY "https://github.com/luc-github/ESP8266"
 
 
@@ -99,8 +99,8 @@ const byte DEFAULT_MASK_VALUE[]  =	        {255, 255, 255, 0};
 #define DEFAULT_GATEWAY_VALUE   	        DEFAULT_IP_VALUE
 const long DEFAULT_BAUD_RATE =			9600;
 const char M117_[] PROGMEM =		"M117 ";
-#define DEFAULT_PHY_MODE			PHY_MODE_11G
-#define DEFAULT_SLEEP_MODE			MODEM_SLEEP_T
+#define DEFAULT_PHY_MODE			WIFI_PHY_MODE_11G
+#define DEFAULT_SLEEP_MODE			WIFI_MODEM_SLEEP
 #define DEFAULT_CHANNEL				11
 #define DEFAULT_AUTH_TYPE			AUTH_WPA_PSK
 #define DEFAULT_SSID_VISIBLE			1

esp8266/config.cpp

@@ -7,7 +7,7 @@
 <BR><BR>
 if not redirected, <a href='http://$WEB_ADDRESS$'>click here</a>
 <BR><BR>
-<PROGRESS name='prg' id='prg'>
+<PROGRESS name='prg' id='prg'></PROGRESS>
 
 <script>
 var i = 0; 

esp8266/config.h

@@ -10,7 +10,7 @@ $INCLUDE[css.inc]$
 <body>
 <div class="container"><table class="nav">
 <tr width=100%>
-	<td class="$MENU_HOME$"><a href="http://$WEB_ADDRESS$">Home</a></td>
+	<td class="$MENU_HOME$"><a href="http://$WEB_ADDRESS$/HOME">Home</a></td>
 	<td class="$MENU_SYSTEM$"><a href="http://$WEB_ADDRESS$/CONFIGSYS">System</a></td>
 	<td class="$MENU_AP$"><a href="http://$WEB_ADDRESS$/CONFIGAP">Access Point</a></td>
 	<td class="$MENU_STA$"><a href="http://$WEB_ADDRESS$/CONFIGSTA">Station</a></td>

esp8266/data/404.tpl

@@ -5,7 +5,7 @@
 <BODY>
 <CENTER>Restarting, please wait....
 <BR>
-<PROGRESS name='prg' id='prg'>
+<PROGRESS name='prg' id='prg'></PROGRESS>
 </CENTER>
 <script>
 var i = 0;

esp8266/data/header.inc

@@ -26,7 +26,7 @@ $SLEEP_MODE_OPTIONS_LIST$
 </select></div>
 <div class="form-group $WEB_PORT_STATUS$"><label class="control-label" for="CONFIG3">Web port:</label><br>
 <input type="number" class="form-control" id="CONFIG3" name="WEBPORT" min="1" max="65000" step="1" placeholder="1~65000" value="$WEB_PORT$" style="width: auto;"></div>
-<div class="form-group $DATA_PORT_STATUS$" style="$DATA_PORT_VISIBILITY$"><label class="control-label" for="CONFIG4">Data port:</label><br>
+<div id='dataport' class="form-group $DATA_PORT_STATUS$" style="$DATA_PORT_VISIBILITY$"><label class="control-label" for="CONFIG4">Data port:</label><br>
 <input type="number" class="form-control" id="CONFIG4" name="DATAPORT" min="1" max="65000" step="1" placeholder="1~65000" value="$DATA_PORT$" style="width: auto;"></div>
 <div class="alert alert-danger" role="alert" style="$ERROR_MSG_VISIBILITY$" >
 $ERROR_MSG$
@@ -69,6 +69,8 @@ document.getElementById('upload-button').style.visibility = 'hidden';
 document.getElementById('upload-button').style.width = '0px';
 document.getElementById('system').style.visibility = 'hidden';
 document.getElementById('system').style.height = '0px';
+document.getElementById('dataport').style.visibility = 'hidden';
+document.getElementById('dataport').style.height = '0px';
 document.getElementById('msg').style.visibility = "visible";
 document.getElementById('file-select').value="";
 document.getElementById('file-select').style.visibility = 'hidden';