Skip to content

Commit 174d606

Browse files
Links2004Links2004
committed
Merge remote-tracking branch 'remotes/esp8266/master' into httpClient
2 parents 8b161ec + 5cd42a0 commit 174d606

File tree

5 files changed

+173
-6
lines changed

5 files changed

+173
-6
lines changed

‎boards.txt

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,3 +691,83 @@ d1_mini.menu.FlashSize.4M1M.build.spiffs_start=0x300000
691691
d1_mini.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
692692
d1_mini.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
693693
d1_mini.menu.FlashSize.4M1M.build.spiffs_pagesize=256
694+
695+
696+
##############################################################
697+
espino.name=ESPino
698+
699+
espino.upload.tool=esptool
700+
espino.upload.speed=115200
701+
espino.upload.resetmethod=ck
702+
espino.upload.maximum_size=1044464
703+
espino.upload.maximum_data_size=81920
704+
espino.upload.wait_for_upload_port=true
705+
espino.serial.disableDTR=true
706+
espino.serial.disableRTS=true
707+
708+
espino.build.mcu=esp8266
709+
espino.build.f_cpu=80000000L
710+
espino.build.board=ESP8266_ESP12
711+
espino.build.core=esp8266
712+
espino.build.variant=espino
713+
espino.build.flash_mode=qio
714+
espino.build.flash_size=4M
715+
espino.build.flash_freq=40
716+
espino.build.spiffs_pagesize=256
717+
718+
espino.menu.UploadTool.esptool=Serial
719+
espino.menu.UploadTool.esptool.upload.tool=esptool
720+
espino.menu.UploadTool.esptool.upload.verbose=-vv
721+
espino.menu.UploadTool.espota=OTA
722+
espino.menu.UploadTool.espota.upload.tool=espota
723+
724+
espino.menu.CpuFrequency.80=80 MHz
725+
espino.menu.CpuFrequency.80.build.f_cpu=80000000L
726+
espino.menu.CpuFrequency.160=160 MHz
727+
espino.menu.CpuFrequency.160.build.f_cpu=160000000L
728+
729+
espino.menu.FlashMode.dio=DIO
730+
espino.menu.FlashMode.dio.build.flash_mode=dio
731+
espino.menu.FlashMode.qio=QIO
732+
espino.menu.FlashMode.qio.build.flash_mode=qio
733+
734+
espino.menu.UploadSpeed.115200=115200
735+
espino.menu.UploadSpeed.115200.upload.speed=115200
736+
espino.menu.UploadSpeed.9600=9600
737+
espino.menu.UploadSpeed.9600.upload.speed=9600
738+
espino.menu.UploadSpeed.57600=57600
739+
espino.menu.UploadSpeed.57600.upload.speed=57600
740+
espino.menu.UploadSpeed.256000.windows=256000
741+
espino.menu.UploadSpeed.256000.upload.speed=256000
742+
espino.menu.UploadSpeed.230400.linux=230400
743+
espino.menu.UploadSpeed.230400.macosx=230400
744+
espino.menu.UploadSpeed.230400.upload.speed=230400
745+
espino.menu.UploadSpeed.460800.linux=460800
746+
espino.menu.UploadSpeed.460800.macosx=460800
747+
espino.menu.UploadSpeed.460800.upload.speed=460800
748+
espino.menu.UploadSpeed.512000.windows=512000
749+
espino.menu.UploadSpeed.512000.upload.speed=512000
750+
espino.menu.UploadSpeed.921600=921600
751+
espino.menu.UploadSpeed.921600.upload.speed=921600
752+
753+
espino.menu.FlashSize.4M1M=4M (1M SPIFFS)
754+
espino.menu.FlashSize.4M1M.build.flash_size=4M
755+
espino.menu.FlashSize.4M1M.build.flash_ld=eagle.flash.4m1m.ld
756+
espino.menu.FlashSize.4M1M.build.spiffs_start=0x300000
757+
espino.menu.FlashSize.4M1M.build.spiffs_end=0x3FB000
758+
espino.menu.FlashSize.4M1M.build.spiffs_blocksize=8192
759+
espino.menu.FlashSize.4M1M.build.spiffs_pagesize=256
760+
espino.menu.FlashSize.4M1M.upload.maximum_size=1044464
761+
762+
espino.menu.FlashSize.4M3M=4M (3M SPIFFS)
763+
espino.menu.FlashSize.4M3M.build.flash_size=4M
764+
espino.menu.FlashSize.4M3M.build.flash_ld=eagle.flash.4m.ld
765+
espino.menu.FlashSize.4M3M.build.spiffs_start=0x100000
766+
espino.menu.FlashSize.4M3M.build.spiffs_end=0x3FB000
767+
espino.menu.FlashSize.4M3M.build.spiffs_blocksize=8192
768+
espino.menu.FlashSize.4M3M.upload.maximum_size=1044464
769+
770+
espino.menu.ResetMethod.ck=ck
771+
espino.menu.ResetMethod.ck.upload.resetmethod=ck
772+
espino.menu.ResetMethod.nodemcu=nodemcu
773+
espino.menu.ResetMethod.nodemcu.upload.resetmethod=nodemcu

‎doc/boards.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ title: Supported Hardware
1111
* [Olimex MOD\-WIFI\-ESP8266](#olimex-mod-wifi-esp8266)
1212
* [SparkFun ESP8266 Thing](#sparkfun-esp8266-thing)
1313
* [SweetPea ESP\-210](#sweetpea-esp-210)
14+
* [ESPino](#espino)
1415
* [Generic ESP8266 modules](#generic-esp8266-modules)
1516
* [Serial Adapter](#serial-adapter)
1617
* [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
9192

9293
*TODO: add notes*
9394

95+
## ESPino
96+
97+
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.
98+
99+
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).
100+
101+
Product page: http://www.espino.io/en
102+
94103
## Generic ESP8266 modules
95104

96105
These modules come in different form factors and pinouts. See the page at ESP8266 community wiki for more info:

‎libraries/ESP8266WiFi/src/WiFiClientSecure.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ extern "C"
5353
uint8_t* default_private_key = 0;
5454
uint32_t default_private_key_len = 0;
5555
static bool default_private_key_dynamic = false;
56-
//
56+
static int s_pk_refcnt = 0;
5757
uint8_t* default_certificate = 0;
5858
uint32_t default_certificate_len = 0;
5959
static bool default_certificate_dynamic = false;
@@ -81,9 +81,6 @@ class SSLContext {
8181
if (_ssl_ctx_refcnt == 0) {
8282
ssl_ctx_free(_ssl_ctx);
8383
}
84-
85-
clear_private_key();
86-
clear_certificate();
8784
}
8885

8986
void ref() {
@@ -186,12 +183,17 @@ int SSLContext::_ssl_ctx_refcnt = 0;
186183

187184

188185
WiFiClientSecure::WiFiClientSecure() {
186+
++s_pk_refcnt;
189187
}
190188

191189
WiFiClientSecure::~WiFiClientSecure() {
192190
if (_ssl) {
193191
_ssl->unref();
194192
}
193+
if (--s_pk_refcnt == 0) {
194+
clear_private_key();
195+
clear_certificate();
196+
}
195197
}
196198

197199
WiFiClientSecure::WiFiClientSecure(const WiFiClientSecure& other)

‎package/package_esp8266com_index.template.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,14 @@
4343
{
4444
"name": "SweetPea ESP-210"
4545
},
46-
{
46+
{
4747
"name": "WeMos D1"
4848
},
49-
{
49+
{
5050
"name": "WeMos D1 mini"
51+
},
52+
{
53+
"name": "ESPino"
5154
}
5255
],
5356
"toolsDependencies": [

‎variants/espino/pins_arduino.h

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
/*
2+
pins_arduino.h - Pin definition functions for Arduino
3+
Part of Arduino - http://www.arduino.cc/
4+
5+
Copyright (c) 2007 David A. Mellis
6+
Modified for ESP8266 platform by Ivan Grokhotkov, 2014-2015.
7+
8+
This library is free software; you can redistribute it and/or
9+
modify it under the terms of the GNU Lesser General Public
10+
License as published by the Free Software Foundation; either
11+
version 2.1 of the License, or (at your option) any later version.
12+
13+
This library is distributed in the hope that it will be useful,
14+
but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16+
Lesser General Public License for more details.
17+
18+
You should have received a copy of the GNU Lesser General
19+
Public License along with this library; if not, write to the
20+
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
21+
Boston, MA 02111-1307 USA
22+
23+
$Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
24+
*/
25+
26+
#ifndef Pins_Arduino_h
27+
#define Pins_Arduino_h
28+
29+
#define EXTERNAL_NUM_INTERRUPTS 16
30+
#define NUM_DIGITAL_PINS 17
31+
#define NUM_ANALOG_INPUTS 1
32+
33+
#define analogInputToDigitalPin(p) ((p > 0)?NOT_A_PIN:0)
34+
#define digitalPinToInterrupt(p) (((p) < EXTERNAL_NUM_INTERRUPTS)?p:NOT_A_PIN)
35+
#define digitalPinHasPWM(p) (((p) < NUM_DIGITAL_PINS)?p:NOT_A_PIN)
36+
37+
static const uint8_t SDA = 4;
38+
static const uint8_t SCL = 5;
39+
40+
static const uint8_t SS = 15;
41+
static const uint8_t MOSI = 13;
42+
static const uint8_t MISO = 12;
43+
static const uint8_t SCK = 14;
44+
45+
static const uint8_t BUILTIN_LED = 2;
46+
static const uint8_t BUILTIN_LEDR = 2;
47+
static const uint8_t BUILTIN_LEDG = 4;
48+
static const uint8_t BUILTIN_LEDB = 5;
49+
static const uint8_t BUILTIN_BUTTON = 0;
50+
51+
static const uint8_t A0 = 17;
52+
53+
// These serial port names are intended to allow libraries and architecture-neutral
54+
// sketches to automatically default to the correct port name for a particular type
55+
// of use. For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN,
56+
// the first hardware serial port whose RX/TX pins are not dedicated to another use.
57+
//
58+
// SERIAL_PORT_MONITOR Port which normally prints to the Arduino Serial Monitor
59+
//
60+
// SERIAL_PORT_USBVIRTUAL Port which is USB virtual serial
61+
//
62+
// SERIAL_PORT_LINUXBRIDGE Port which connects to a Linux system via Bridge library
63+
//
64+
// SERIAL_PORT_HARDWARE Hardware serial port, physical RX & TX pins.
65+
//
66+
// SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX
67+
// pins are NOT connected to anything by default.
68+
#define SERIAL_PORT_MONITOR Serial
69+
#define SERIAL_PORT_USBVIRTUAL Serial
70+
#define SERIAL_PORT_HARDWARE Serial
71+
#define SERIAL_PORT_HARDWARE_OPEN Serial
72+
73+
#endif /* Pins_Arduino_h */

0 commit comments

Comments
 (0)