Merge remote-tracking branch 'remotes/esp8266/master' into httpClient

boards.txt

@@ -691,3 +691,83 @@ d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000
 d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
 d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
 d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+
+
+##############################################################
+espino.name=ESPino
+
+espino.upload.tool=esptool
+espino.upload.speed=115200
+espino.upload.resetmethod=ck
+espino.upload.maximum_size=1044464
+espino.upload.maximum_data_size=81920
+espino.upload.wait_for_upload_port=true
+espino.serial.disableDTR=true
+espino.serial.disableRTS=true
+
+espino.build.mcu=esp8266
+espino.build.f_cpu=80000000L
+espino.build.board=ESP8266_ESP12
+espino.build.core=esp8266
+espino.build.variant=espino
+espino.build.flash_mode=qio
+espino.build.flash_size=4M
+espino.build.flash_freq=40
+espino.build.spiffs_pagesize=256
+
+espino.menu.UploadTool.esptool=Serial
+espino.menu.UploadTool.esptool.upload.tool=esptool
+espino.menu.UploadTool.esptool.upload.verbose=-vv
+espino.menu.UploadTool.espota=OTA
+espino.menu.UploadTool.espota.upload.tool=espota
+
+espino.menu.CpuFrequency.80=80 MHz
+espino.menu.CpuFrequency.80.build.f_cpu=80000000L
+espino.menu.CpuFrequency.160=160 MHz
+espino.menu.CpuFrequency.160.build.f_cpu=160000000L
+
+espino.menu.FlashMode.dio=DIO
+espino.menu.FlashMode.dio.build.flash_mode=dio
+espino.menu.FlashMode.qio=QIO
+espino.menu.FlashMode.qio.build.flash_mode=qio
+
+espino.menu.UploadSpeed.115200=115200
+espino.menu.UploadSpeed.115200.upload.speed=115200
+espino.menu.UploadSpeed.9600=9600
+espino.menu.UploadSpeed.9600.upload.speed=9600
+espino.menu.UploadSpeed.57600=57600
+espino.menu.UploadSpeed.57600.upload.speed=57600
+espino.menu.UploadSpeed.256000.windows=256000
+espino.menu.UploadSpeed.256000.upload.speed=256000
+espino.menu.UploadSpeed.230400.linux=230400
+espino.menu.UploadSpeed.230400.macosx=230400
+espino.menu.UploadSpeed.230400.upload.speed=230400
+espino.menu.UploadSpeed.460800.linux=460800
+espino.menu.UploadSpeed.460800.macosx=460800
+espino.menu.UploadSpeed.460800.upload.speed=460800
+espino.menu.UploadSpeed.512000.windows=512000
+espino.menu.UploadSpeed.512000.upload.speed=512000
+espino.menu.UploadSpeed.921600=921600
+espino.menu.UploadSpeed.921600.upload.speed=921600
+
+espino.menu.FlashSize.4M1M=4M (1M SPIFFS)
+espino.menu.FlashSize.4M1M.build.flash_size=4M
+espino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
+espino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
+espino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
+espino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
+espino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
+espino.menu.FlashSize.4M1M.upload.maximum_size=1044464
+
+espino.menu.FlashSize.4M3M=4M (3M SPIFFS)
+espino.menu.FlashSize.4M3M.build.flash_size=4M
+espino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
+espino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
+espino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
+espino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
+espino.menu.FlashSize.4M3M.upload.maximum_size=1044464
+
+espino.menu.ResetMethod.ck=ck
+espino.menu.ResetMethod.ck.upload.resetmethod=ck
+espino.menu.ResetMethod.nodemcu=nodemcu
+espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu

doc/boards.md

@@ -11,6 +11,7 @@ title: Supported Hardware
   * [Olimex MOD\-WIFI\-ESP8266](#olimex-mod-wifi-esp8266)
   * [SparkFun ESP8266 Thing](#sparkfun-esp8266-thing)
   * [SweetPea ESP\-210](#sweetpea-esp-210)
+  * [ESPino](#espino)
   * [Generic ESP8266 modules](#generic-esp8266-modules)
   * [Serial Adapter](#serial-adapter)
   * [Minimal Hardware Setup for Bootloading and Usage](#minimal-hardware-setup-for-bootloading-and-usage)
@@ -91,6 +92,14 @@ Product page: https://www.sparkfun.com/products/13231
 
 *TODO: add notes*
 
+## ESPino
+
+ESPino integrates the ESP-12 module with a 3.3v regulator, CP2104 USB-Serial bridge and a micro USB connector for easy programming. It is designed for fitting in a breadboard and has an RGB Led and two buttons for easy prototyping.
+
+For more information about the hardware, pinout diagram and programming procedures, please see the [datasheet](https://github.com/makerlabmx/ESPino-tools/raw/master/Docs/ESPino-Datasheet-EN.pdf).
+
+Product page: http://www.espino.io/en
+
 ## Generic ESP8266 modules
 
 These modules come in different form factors and pinouts. See the page at ESP8266 community wiki for more info:

libraries/ESP8266WiFi/src/WiFiClientSecure.cpp

@@ -53,7 +53,7 @@ extern "C"
 uint8_t* default_private_key = 0;
 uint32_t default_private_key_len = 0;
 static bool default_private_key_dynamic = false;
-//
+static int s_pk_refcnt = 0;
 uint8_t* default_certificate = 0;
 uint32_t default_certificate_len = 0;
 static bool default_certificate_dynamic = false;
@@ -81,9 +81,6 @@ public:
         if (_ssl_ctx_refcnt == 0) {
             ssl_ctx_free(_ssl_ctx);
         }
-
-        clear_private_key();
-        clear_certificate();
     }
 
     void ref() {
@@ -186,12 +183,17 @@ int SSLContext::_ssl_ctx_refcnt = 0;
 
 
 WiFiClientSecure::WiFiClientSecure() {
+    ++s_pk_refcnt;
 }
 
 WiFiClientSecure::~WiFiClientSecure() {
     if (_ssl) {
         _ssl->unref();
     }
+    if (--s_pk_refcnt == 0) {
+        clear_private_key();
+        clear_certificate();
+    }
 }
 
 WiFiClientSecure::WiFiClientSecure(const WiFiClientSecure& other)

package/package_esp8266com_index.template.json

@@ -43,11 +43,14 @@
             {
               "name": "SweetPea ESP-210"
             },
-			{
+            {
               "name": "WeMos D1"
             },
-			{
+            {
               "name": "WeMos D1 mini"
+            },
+            {
+              "name": "ESPino"
             }
           ],
           "toolsDependencies": [

variants/espino/pins_arduino.h

@@ -0,0 +1,73 @@
+/*
+  pins_arduino.h - Pin definition functions for Arduino
+  Part of Arduino - http://www.arduino.cc/
+
+  Copyright (c) 2007 David A. Mellis
+  Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2015.
+
+  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., 59 Temple Place, Suite 330,
+  Boston, MA  02111-1307  USA
+
+  $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
+*/
+
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#define EXTERNAL_NUM_INTERRUPTS 16
+#define NUM_DIGITAL_PINS        17
+#define NUM_ANALOG_INPUTS       1
+
+#define analogInputToDigitalPin(p)  ((p > 0)?NOT_A_PIN:0)
+#define digitalPinToInterrupt(p)    (((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
+#define digitalPinHasPWM(p)         (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
+
+static const uint8_t SDA = 4;
+static const uint8_t SCL = 5;
+
+static const uint8_t SS    = 15;
+static const uint8_t MOSI  = 13;
+static const uint8_t MISO  = 12;
+static const uint8_t SCK   = 14;
+
+static const uint8_t BUILTIN_LED = 2;
+static const uint8_t BUILTIN_LEDR = 2;
+static const uint8_t BUILTIN_LEDG = 4;
+static const uint8_t BUILTIN_LEDB = 5;
+static const uint8_t BUILTIN_BUTTON = 0;
+
+static const uint8_t A0 = 17;
+
+// These serial port names are intended to allow libraries and architecture-neutral
+// sketches to automatically default to the correct port name for a particular type
+// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
+// the first hardware serial port whose RX/TX pins are not dedicated to another use.
+//
+// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor
+//
+// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial
+//
+// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library
+//
+// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins.
+//
+// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
+//                            pins are NOT connected to anything by default.
+#define SERIAL_PORT_MONITOR        Serial
+#define SERIAL_PORT_USBVIRTUAL     Serial
+#define SERIAL_PORT_HARDWARE       Serial
+#define SERIAL_PORT_HARDWARE_OPEN  Serial
+
+#endif /* Pins_Arduino_h */