Merge branch 'ficeto-esp8266' into esp8266

* ficeto-esp8266:
  remove qsort dependency and add TelnetToSerial example
  add TCP_NODELAY control

cores/esp8266/core_esp8266_wiring_pwm.c

@@ -33,18 +33,19 @@ uint16_t pwm_steps[17];
 uint8_t pwm_steps_len = 0;
 uint32_t pwm_steps_mask[17];
 
-int pwm_sort_asc(const void* a, const void* b){
-     return (*((uint16_t*)a) > *((uint16_t*)b)) - (*((uint16_t*)a) < *((uint16_t*)b));
-}
-
 int pwm_sort_array(uint16_t a[], uint16_t al){
-	qsort(a, al, sizeof(uint16_t), pwm_sort_asc);
+  uint16_t i, j;
-	int i;
+  for (i = 1; i < al; i++) {
-	int bl = 1;
+    uint16_t tmp = a[i];
-	for(i = 1; i < al; i++){
+    for (j = i; j >= 1 && tmp < a[j-1]; j--)
-		if(a[i] != a[i-1]) a[bl++] = a[i];
+      a[j] = a[j-1];
-	}
+    a[j] = tmp;
-	return bl;
+  }
+  int bl = 1;
+  for(i = 1; i < al; i++){
+    if(a[i] != a[i-1]) a[bl++] = a[i];
+  }
+  return bl;
 }
 
 uint32_t pwm_get_mask(uint16_t value){

libraries/ESP8266WiFi/examples/WiFiTelnetToSerial/WiFiTelnetToSerial.ino

@@ -0,0 +1,90 @@
+/* 
+  WiFiTelnetToSerial - Example Transparent UART to Telnet Server for esp8266
+
+  Copyright (c) 2015 Hristo Gochkov. All rights reserved.
+  This file is part of the ESP8266WiFi library for Arduino environment.
+ 
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+#include <ESP8266WiFi.h>
+
+//how many clients should be able to telnet to this ESP8266
+#define MAX_SRV_CLIENTS 1
+const char* ssid = "**********";
+const char* password = "**********";
+
+WiFiServer server(21);
+WiFiClient serverClients[MAX_SRV_CLIENTS];
+
+void setup() {
+  Serial1.begin(115200);
+  WiFi.begin(ssid, password);
+  Serial1.print("\nConnecting to "); Serial1.println(ssid);
+  uint8_t i = 0;
+  while (WiFi.status() != WL_CONNECTED && i++ < 20) delay(500);
+  if(i == 21){
+    Serial1.print("Could not connect to"); Serial1.println(ssid);
+    while(1) delay(500);
+  }
+  //start UART and the server
+  Serial.begin(115200);
+  server.begin();
+  server.setNoDelay(true);
+  
+  Serial1.print("Ready! Use 'telnet ");
+  Serial1.print(WiFi.localIP());
+  Serial1.println(" 21' to connect");
+}
+
+void loop() {
+  uint8_t i;
+  //check if there are any new clients
+  if (server.hasClient()){
+    for(i = 0; i < MAX_SRV_CLIENTS; i++){
+      //find free/disconnected spot
+      if (!serverClients[i] || !serverClients[i].connected()){
+        if(serverClients[i]) serverClients[i].stop();
+        serverClients[i] = server.available();
+        Serial1.print("New client: "); Serial1.print(i);
+        continue;
+      }
+    }
+    //no free/disconnected spot so reject
+    WiFiClient serverClient = server.available();
+    serverClient.stop();
+  }
+  //check clients for data
+  for(i = 0; i < MAX_SRV_CLIENTS; i++){
+    if (serverClients[i] && serverClients[i].connected()){
+      if(serverClients[i].available()){
+        //get data from the telnet client and push it to the UART
+        while(serverClients[i].available()) Serial.write(serverClients[i].read());
+      }
+    }
+  }
+  //check UART for data
+  if(Serial.available()){
+    size_t len = Serial.available();
+    uint8_t sbuf[len];
+    Serial.readBytes(sbuf, len);
+    //push UART data to all connected telnet clients
+    for(i = 0; i < MAX_SRV_CLIENTS; i++){
+      if (serverClients[i] && serverClients[i].connected()){
+        serverClients[i].write(sbuf, len);
+        delay(1);
+      }
+    }
+  }
+}

libraries/ESP8266WiFi/src/WiFiServer.cpp

@@ -73,6 +73,17 @@ void WiFiServer::begin()
     tcp_arg(listen_pcb, (void*) this);
 }
 
+void WiFiServer::setNoDelay(bool nodelay){
+  if(!_pcb) return;
+  if(nodelay) tcp_nagle_disable(_pcb);
+  else tcp_nagle_enable(_pcb);
+}
+
+bool WiFiServer::getNoDelay(){
+  if(!_pcb) return false;
+  return tcp_nagle_disabled(_pcb);
+}
+
 extern "C" uint32_t esp_micros_at_task_start();
 
 bool WiFiServer::hasClient(){

libraries/ESP8266WiFi/src/WiFiServer.h

@@ -46,6 +46,8 @@ public:
   WiFiClient available(uint8_t* status = NULL);
   bool hasClient();
   void begin();
+  void setNoDelay(bool nodelay);
+  bool getNoDelay();
   virtual size_t write(uint8_t);
   virtual size_t write(const uint8_t *buf, size_t size);
   uint8_t status();

libraries/ESP8266WiFi/src/include/ClientContext.h

@@ -98,7 +98,18 @@ class ClientContext {
                 delete this;
             }
         }
-
+        
+        void setNoDelay(bool nodelay){
+          if(!_pcb) return;
+          if(nodelay) tcp_nagle_disable(_pcb);
+          else tcp_nagle_enable(_pcb);
+        }
+        
+        bool getNoDelay(){
+          if(!_pcb) return false;
+          return tcp_nagle_disabled(_pcb);
+        }
+        
         uint32_t getRemoteAddress() {
             if(!_pcb) return 0;