From 14b70e9328e78c94ba0c0042766a11854ac389de Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Fri, 4 Dec 2015 19:02:46 +0300
Subject: [PATCH 01/41] Allow setting client side TLS key and certificate

---
 .../examples/HTTPSRequest/HTTPSRequest.ino    |   4 +-
 .../ESP8266WiFi/src/WiFiClientSecure.cpp      |  74 ++++++++++++++++++
 libraries/ESP8266WiFi/src/WiFiClientSecure.h  |  16 ++++
 tools/sdk/lib/libaxtls.a                      | Bin 556130 -> 554486 bytes
 4 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/libraries/ESP8266WiFi/examples/HTTPSRequest/HTTPSRequest.ino b/libraries/ESP8266WiFi/examples/HTTPSRequest/HTTPSRequest.ino
index 975fe13ef..6d10d5115 100644
--- a/libraries/ESP8266WiFi/examples/HTTPSRequest/HTTPSRequest.ino
+++ b/libraries/ESP8266WiFi/examples/HTTPSRequest/HTTPSRequest.ino
@@ -4,7 +4,7 @@
  *  This example demonstrates how to use
  *  WiFiClientSecure class to access HTTPS API.
  *  We fetch and display the status of
- *  esp8266/Arduino project continous integration
+ *  esp8266/Arduino project continuous integration
  *  build.
  *
  *  Created by Ivan Grokhotkov, 2015.
@@ -54,7 +54,7 @@ void setup() {
     Serial.println("certificate doesn't match");
   }
 
-  String url = "/repos/esp8266/Arduino/commits/esp8266/status";
+  String url = "/repos/esp8266/Arduino/commits/master/status";
   Serial.print("requesting URL: ");
   Serial.println(url);
 
diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
index 6d4365221..247701acd 100644
--- a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
@@ -50,6 +50,17 @@ extern "C"
 #define SSL_DEBUG_OPTS 0
 #endif
 
+uint8_t* default_private_key = 0;
+uint32_t default_private_key_len = 0;
+static bool default_private_key_dynamic = false;
+//
+uint8_t* default_certificate = 0;
+uint32_t default_certificate_len = 0;
+static bool default_certificate_dynamic = false;
+
+static void clear_private_key();
+static void clear_certificate();
+
 
 class SSLContext {
 public:
@@ -70,6 +81,9 @@ public:
         if (_ssl_ctx_refcnt == 0) {
             ssl_ctx_free(_ssl_ctx);
         }
+
+        clear_private_key();
+        clear_certificate();
     }
 
     void ref() {
@@ -337,6 +351,66 @@ bool WiFiClientSecure::verify(const char* fp, const char* url) {
     return true;
 }
 
+void WiFiClientSecure::setCertificate(const uint8_t* cert_data, size_t size) {
+  clear_certificate();
+  default_certificate = (uint8_t*) cert_data;
+  default_certificate_len = size;
+}
+
+void WiFiClientSecure::setPrivateKey(const uint8_t* pk, size_t size) {
+  clear_private_key();
+  default_private_key = (uint8_t*) pk;
+  default_private_key_len = size;
+}
+
+bool WiFiClientSecure::loadCertificate(Stream& stream, size_t size) {
+  clear_certificate();
+  default_certificate = new uint8_t[size];
+  if (!default_certificate) {
+    return false;
+  }
+  if (stream.readBytes(default_certificate, size) != size) {
+    delete[] default_certificate;
+    return false;
+  }
+  default_certificate_dynamic = true;
+  default_certificate_len = size;
+  return true;
+}
+
+bool WiFiClientSecure::loadPrivateKey(Stream& stream, size_t size) {
+  clear_private_key();
+  default_private_key = new uint8_t[size];
+  if (!default_private_key) {
+    return false;
+  }
+  if (stream.readBytes(default_private_key, size) != size) {
+    delete[] default_private_key;
+    return false;
+  }
+  default_private_key_dynamic = true;
+  default_private_key_len = size;
+  return true;
+}
+
+static void clear_private_key() {
+  if (default_private_key && default_private_key_dynamic) {
+    delete[] default_private_key;
+    default_private_key_dynamic = false;
+  }
+  default_private_key = 0;
+  default_private_key_len = 0;
+}
+
+static void clear_certificate() {
+  if (default_certificate && default_certificate_dynamic) {
+    delete[] default_certificate;
+    default_certificate_dynamic = false;
+  }
+  default_certificate = 0;
+  default_certificate_len = 0;
+}
+
 extern "C" int ax_port_read(int fd, uint8_t* buffer, size_t count) {
     ClientContext* _client = reinterpret_cast<ClientContext*>(fd);
     if (_client->state() != ESTABLISHED && !_client->getSize()) {
diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.h b/libraries/ESP8266WiFi/src/WiFiClientSecure.h
index 8ce11f939..07b111e1a 100644
--- a/libraries/ESP8266WiFi/src/WiFiClientSecure.h
+++ b/libraries/ESP8266WiFi/src/WiFiClientSecure.h
@@ -48,6 +48,22 @@ public:
   int peek() override;
   void stop() override;
 
+  void setCertificate(const uint8_t* cert_data, size_t size);
+  void setPrivateKey(const uint8_t* pk, size_t size);
+
+  bool loadCertificate(Stream& stream, size_t size);
+  bool loadPrivateKey(Stream& stream, size_t size);
+
+  template<typename TFile>
+  bool loadCertificate(TFile& file) {
+    return loadCertificate(file, file.size());
+  }
+
+  template<typename TFile>
+  bool loadPrivateKey(TFile& file) {
+    return loadPrivateKey(file, file.size());
+  }
+
 protected:
     int _connectSSL();
 
diff --git a/tools/sdk/lib/libaxtls.a b/tools/sdk/lib/libaxtls.a
index b74d97cc434d721102ac4874ea72865d8ff219f8..9e29c802bd67ed9c543db86b405a38974432558f 100644
GIT binary patch
delta 19157
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
YZ}%JbzO9?_x&ZeElDu0P+v@TE0Q>0ftN;K2

delta 21805
zcmc(n33L?2+V`txdL|Q+K*+w4O!feQB<wq33m~f`KtPrRf)Lh#5dnb-hzNoLf)pqa
zK~%&I1q>orK><Ng@rsCuiW?#dF1TF<`TqZ&YEp8}J?H(-dCz$ZYU)={J+)U?S65f(
zx9^g__#=5`f;+cG^ES;}JfG6R@a>o{%>P5{`~S(@y>pJRZ9vu#Vc9J&h=3ccr$amO
zKd@bT6pr3G!qGIq-yY3(t_+NOQ1M+mHr4FdWNaC!{POrlGrDHl6=P?XlB`}C7**3L
z-I0}{sl?PQ>f@N$M^~vM9a%9-uy%(#x@N$0j@9F|IMFrNBAf$S>TxFC<UF#^7VOxB
zI05EZr!80+7~^c2*G$%vj!cKRNqW-*qGVW*IX7gWDMUW(1|h^Y`TP~5y*wFYMmWwG
zHNOOz^IZ8ylRv6|#PNwES%|<q@3GJ`XSxUx+<efM(ka2mn|NJ9z~3Y!IDF9NkEaB~
z>&Xjt97#S^KkPtg$d5wQ9H?(TZ}@T-8Xv;uI|9X1o|q?`0hw2GL)?Ll7WZ2Gdx&AU
zTq3tcUbEa>w{x&rC%j?ltfIb!-hnfwO&mA2(%XGn+4$MsZsTTDmfu=FwzP7bx6AF7
z6Q<25ubiEm7#)(Ao7b#at7grbH*el{cyvg!7P)P6n=5Z_c3xC&gxhB&8}g52^TKjN
znVmB{Ft1tbrn&f+m%E@^FP7mF&IR|0+yzS=3l@mCuP*KNN~@P1oOvQVx9+PiTpV9#
ze^lq212;Czd0|TDPLp$1R&AdC*(+@hz4hcn`4KDY{HG=$==0Ox1il(Fw2N<X$>sx@
zt8S^Yt|0!mEsOpb_r^O-)<$n%^+%~Wu;RO2-D=J}bS%$^IPvze*IG|0UwHEH!B>86
z@z~MFV+)(jSzLG3!g`y#7Hu~iPD2=a`Os`m6fA$&nuoS6ozWoR>z$L9B)`_C)uuVi
zd-s|U>^}c-Qh(REyf3f%&V@`m6&`)INywi0Z+RzgyX}dqUq12YWk<=Zr11P6mu~+x
z^y-QUl_#El)(jk+{qd=QfN|xSQ(qlbnm=UOht1nxn_4)3W9R+(?VfsMVE?L~1tEza
z_x&k;WQRsYPxSlq&Kb8J61fW<BOQkLudU?!pEc9}UMsOA4{o1Y|JRAjwjAzt*f+QJ
zq@=;2Gc(d&|9QmlPnurdnz--IgsRZH_nqp|Vb2Th!rdRt`KImz=eoZ3MWYYib5>6)
ztei08{#TtZKlQK8|5-3E?8L?wpY8k1o7;|7-52t~@y)M(U(&1hMOkmu#Vc(i*KQj5
z#jcS}%`=`Y;~F+;{nwb4@ppdRuGlsBfTN4JQl52m+rbgOFOQGfe)`jUDnEWJf7bmC
z!q!HWcHY_P(U3E}A4|XIki2{2%e#K;es%Kse=q;O`GSJP(6HuF4~hY|@A`T+(m4Lz
zxPZ|1A347}Gp)~x*Y9~}=E*}5$^E|>5P#nF$D+8ihfaR!*;zEyk#yptzpmv!KO~{#
z_or7~e*ds<(bYv8FJxRgiX?oGznd_5fiq#m5ZA<viXTpf*HmWx{^r2<n%tFK_SGky
z+w3{{?=CwN9=Z_n>*>$lj;?+vG4i=y3IBR{>@Ck+JhA!NCx-<(^80(<*|uW;-phA6
zjx-+=amQ=E)sD+&zKy$d;r>Mj%OBq0D^Kd*;IWnN?(y@kl;<b!`@LZ6nYMSHU)DRc
z`^NFZd#+mC){);OyZ_%Gtz0Tbtf_O;{P?&kx6%6az|xHy{!aIuI&pB*f}evE+axEh
z?0jPH<ifXpykqvmKmFNx!I{g+jwv+{zTWhm4}_4@!_BJ=Fyjc*iJ!WmCgv`&+;N}N
z3<OjeVvk%FVI~;6Yqmw0@76Ka%UMZg6F842nN5A$BZU|fBt(``=yGNwLY6VeF<*#A
z#b5^d?7;3?V4xwyK?JV00tY+hnW9k)WS1b@X2}LQSDlzI8YM&MiV|X<U+9>Nlyf1A
zgX}}dWTDp#cf>`>30^a?c}qycgRR0aI*Q_4^|VhkDpN^kSz#*anN~9LC9jzj#Vkhp
z1FbCX^M_sXnz2kgFxgCOz{GdmkoZ0%egwLGWcOq<Gio|iezNm8J4a-Gim-)pL9#hA
zX$!*2Li}aBY!r!{W)4&f!kq4a_3~=6+0Qs5`=pp{>ih+9=46Qfs<|)4oZ>LH%fHgh
z*mSmMb*PnwW1iL0XpfxU=r>lN(MUjOv}~JhW;o!Mrkf2Bb6L8X2xoh`*~K_0zfU(i
zIb2aPJHzbfI2b8^N;hNWnhZ0>Xd$1;Ff$qPWQLh;6w50aW;`OsWSU=6dNmW$Su!=t
zOfjS^$TEvPUC^b*26v=<Jj-n9`^eaan^nW5_(2)PjtC)A-vb01(I~gec?OM<d<kU?
zY?TXfT{KkYdMIBAV~vKO;j@gv&N`)zEThP;jX`BJ=YX0A{aotS1EluAPaUI)l_*do
zkHV0x<7>=R)0isDaYL#f8&;}RXR3L2sv?-Fv4GvD0ZJSqzzvTjWe%3~v>^f#C|wSf
zu7D8gIz{Tu9yGv9g^;+M<9Xu`Xa-I#MNN$Z<(8OB0ZVE{o^MAsMBC3%O5^BKNCKwf
zr^ifcuKOCTkr9f%H`W&-6LxumD9CjS5tQYF;Gk^K$c*)!hdhGCiJ(?QCE`X<Cfp_k
zJ@=rU-5ak_i$4(OLQ*gt7?hljUtU300-|R)3gX_x@oniwTxMcSMfBW)nz*a`Fv!Zn
zN~`DBq7KAGlPI1fUu|T1qZe9?AJNl=vbu{o-Vyj)BQr69!#v_sOeYavaZc&g5E*!!
z2D3OLa~orP{zWIE`|toX^6r_Cheku2APRayJ9rnl1%)iU|L1!3ML{Ae7rc`?#qx>9
zW@_>bs#*#pRG-B!xX7elpqiB5H8vBXciGuQSj29H?%tZjY;%#*oh*8X=eTNi<e0g^
zlNPeO#2`95EF4K^H>@cx8-uDDmBt6jJ(j`<I_qE^f&<uZczJMqngS#JdL)i*CH>f_
zmYwSwm~dr>4(7`NQD{zwc)2F0zY7<hx05+OvSLR0Osv^PPZ~G7=>!x?jKxB(W<e*j
ztC<rZ4Cll^2Y#ch--&_F>+BA6f#U;1@f#XgPZ)tAH4)v+y`I3YRO!BwpN|NLuDR65
zOmo)h0wD$>>L^P$I^$wLMowlH`V4L<0>~WRp*5EVdHNXgolVXN<14wMo+H(D7M=Tu
z{9&M(>gL3bB+k}zq`0ew2(iZ_^KUj&9B;ej@zzEL-TkEj8Sdk#=ng~X5B5M07gmWW
z&qB}DW;9r?80<-PoDG)QgUk%qI*887&meN0!koHK`UWARS*4hv!({FdPl{_zI_@U&
zU5Xbr6rx?QtfDx(Qi$_1snASy>}x4Y+8R-^?gOs+j-^5-Kj2DtooR_O$fTjjtIblm
zuh7hJFK>m5#Vsp_BKn?tF@4B-MM(AW4j5}5xgTQ3-`!>CYFCEC+e1Fm4oUW3?Fw}i
z_mCwNo_#=$DE4HyN_q&fNM2*y?;ij<<&I*+{i@g6HLi@1tN}uJF^Iir?>M>QLO_B!
zNQehz^<Y!B;>^M+)es)h7_Qam%Fjv9?huCehM(qRLss1yaLzZz@3nrJ#*`cUXprlM
z;R~<({CO_B!H=R}H`L#F-RIYT;-CH$vGbn-@%jz^_vIaHT}j4ex$H-GlCKU1%Rr1R
zbe{;r6dMh{ZJ1pe{Id{#KP<!ZZV1o6!Qb}={|NX!xY){(7UNg^GdxcC{wWZP;jcu5
zF7mr#vvo|_xLZqapIkXwy9Cpk=e2Aprw=zHT*THj$-{7`44pi!w2W8iXkMJRVa9oS
zxY^oBlV1%tQ$vFNby@_+2$m7Im^mGl=&U932eZOPoS$(w6-K<DV>C`6$I0Bw?&#PC
z{$N~|!btRUHaSU_Tz01#4P<CHBig4zx?3TBtzH`UC42D$GZ5BDwonw2Q~b=uossJ2
z5;D6BrVQ4|uux1OXZm?ESye>7@|Y{ew~`W$WtcUv1`7(a4%V*b267WhF_*yF@~s+g
zBdZ!cO;%~{(0G@ozsJu$IG8u+VFSYKhqV(rNLKP=WR>V~at?lAPQV(u7K$`D5xmR7
zFgOB(^Bl$vCKF3;!tJT#x5Mp+Te=nCfd^BW6@dX|<Vd+|q*>@gdL!UngS43TEbuFe
z=Yo%Ga<1H&=MrS(Aw$0kIthvwf%_<CI;9#fQoIE6^@^8+<>FE1<`zik2t2vC0GKG5
z_c!t>FmGn$Ghp7r$Y<rU(WW;Y6bdN^K#=PBc3^5mz$FL8%j2WX=sbvG;Kh6g5q@Bb
zVOb+K$apez&}J3~#mSfwb2J;s3lW~+MG(Va_*}tgU%?F{LnjS#a*(<@;*~rLa&nLw
zJ&lx{1Cbn*1c2$R<m_v*E%yyj0WA<f4)OwE22+kg?1DQ=>9m2IY!`yl4hz=-a<ZN1
zEG5r}oNO2F9wqM%IT`x?A^flk=!F2XozSyN-WPJRUAWhjd?4iHpkx5dn@V1!I4H#u
zi&IL@4j~7n`sId0{!(gY4n`eHAgPD?2BrIh62Yt+`;Hu>CWLGyp8z>INKFo%lzcMe
zWb|*v7&E#QNmM{IiXz;?X>L`jm5OcoD#~HEnL=z*IxC?=4pJBIb|qf}IXNg>o*!eT
za`df(=yi(J=sQYP*mX$mG#NS@phFI7B0G%rM|%XKC|ojjv~*rRP?>>fP05J16*^>$
z^_64IXb#$K5Ot$S4ZNXB^=Zh-c7bOo`3}g*wtOMw$mSKe%azV9=#cHAtW`QE*&s@1
z4|Lr0pe)&CW=;sovJbMu6eY+BWo98o`ymQOw4g+Jq|Cg-$ddWv%v2vQ7nn^5Vdhsb
z7G5VS`4J`G2lu!p|CEeW4<atvzEaOoj&#l=^GjrvP9rso9D_dDuC%Y63OJ4ca*&#b
zdnx$|$jL#u0GJ_^tAdUss|>g%r<|+pwdAIL{l_%s`U)GBmg(;2NtUOV7SLB?F3{`<
zMH&}tJVIk87LJ80MAj@xjsVjdA@aD((@6f^!dX8Aa!wJnl>Zw~?!(8M>6DLvj27~W
zTd)Fne7u=V`CQ0oAz%4E^e-s=t&q_|o-hGj4OO-oEktuCn5|m<1P({r+=;roDX)hg
zm|$3gWrL{?Ycu*4EPotlr24`ch(}jgJGi;VobPRU7ma&qJV4`-8kcFzez4P-p|S5y
z&9g*fUfXtrM>T#{<Cio(sPVfRpVs)C#y|VnKO6t81=PV6VrLwsagN4aHSVwRaE))(
zc!tLFHC|&Ne><~Bw1B5I-lOs78h@|xe>8SsB-m;8)_8=*V{B&q%WV&MuEt9=UZe3N
z8b7V^M;d>x@gEv<$zvBT5A3r&oCR%Or}0*eYczgM<99SZt?@aHf7bZ#TK0)LW^Kk%
z8mDO7RO5CU7ic_4<9jrISmReTK5DUl{E2H?Kx<sZc1v{Ac!0*YXgpry+cf5a&rWBV
z#!}<0y3%u6zzL1N(fG2)*EG(?yklq9N8@6RCu=-Qu~q*?TEI$;H)y;~<6Rmb(D*Zr
zFKGOm#*Tp6g4PYdYRoQmoEDIwaWjoOX?&B$Lo^<v@obIn)_B!*M*TNl_XzQ%#=A8>
zpz+%pf28r(8vms6RgD8ZwY85V`_%0rSqo^Qaa)ahXl(7Es<<OHdAY{7YrJ0L$29gm
zuX+BZ@llOG(D-wWFKYZBja`AYwY*c~#Tu{mb9>BrLTuIop4PZV<99Uv&SKf70t+nF
z2z9ZwYJ^&;i3S>{kd;ohCePF4?KSyL8V}HPhH3Iqn%p-*3s|V}J(|)gO}<u>Kc?~P
z8ox=#tWEPSIn2+eG@Wn#I&#=_Gb%)dyMtI+Id{6*-UzMPGu;d@@>H9oVclZ4PZN#1
zYTT0?CV!k^_Ka20R%^i<ES3XrGgFOFS$Uh8gS@uF7oyttN58@ei0p3h)@6zOrO(#5
zjmF(I9;oq1ji+inN8`mBKcI2{O`7LLjbGFF1C2k|_@c%ESj(ZB2P<pq)QBS0J~>vf
zzkY2sc_&TYOOyB0<U=+22u(g+lh4%TVO3hd-By5{bvw$XdjAP6c!$O>Y5bbTZ;(~o
z<C^><vKoD#XgU`)o!>O}UDG@sG>qLi^)-$ntIU!#d6vc;t9Hh%H2rRxPG5}&`<X8)
z@Vu)9jJLRE$4qm)fzFGWRoi)WvEa7L7fx1#vw<d0(d5~hyuHTxn$As{e3-_gG#&Q@
zD?sj_WsXLXytDBvtg>zd*Dg{AvXb}I<b5r<tekCT__%vCPScxC=CcOOOif-zMoZA#
zO;&wct?56n$#;YK7{eW@y_Cb!944#u--^&~*&i@KWpJ9TGWbP{&<zhec0vQlDxqPT
ze4HldlfJFLLgR<7Gj7>WUH1raNaG(gc1P7F6t8hBjr(dmL*u(NepKUskq4u8G@obz
zS2V7V@o3kerN+ZFo~`jZi{<e)&Q`MN5+g?5o9T(E*?Xs193h{5*vNHb^(2hCvSgZP
zzC3-=nJf1mg4U-i%~L+UM7LZ0eQ=oSfsYiUJ^Y(`kaHjJJ0(v7|D-q#{JY{N;H!#r
zz)r+tnk~V2EoO07F!!w>_lX|xM5=&(;CRKu!O4pGOp3!^R^&2p6U9@&%@t1rw^htF
zX=lX?z&#Y-1MZ{vUhohHG+Da);3-i7>%o&0Zvfw}xEfrg_$lzcik}BRsCXB+TJg)^
z#}&T<env5$XLl<8lqG#hdCr1gRs1LTkm6u8=Ua+n!0##Maf}ZY_W*yQnA@OVDlP_p
ztC)u|eo)La7{7vjR_)>WO9gBO8+f{+ocpK&iaAa~6dwmiDCR+nc*WfOO;OBU_$<ZT
zvf@@8)8trdp*V#7-%fer5Rk7p3tXVM8Mv=v_U|CYJiJk?xF>j&V!p#FQ#=$rQSmTv
zh2mSlGc88@m%%en1xyCtrI;_fmMUHfUZI#<o)0SKL-oUo+1HyDzX;x@cpvy##mB(A
z6!Sg8UZ3*356^zZAAsLbd=|`yV>aCvuqPCM4d#O~<=?=bRm{HrM)A+!ONxI1|DyOe
z@L!63)}uY1U764o*Z{?$PzX`XehgRK2pp@pBREMh-*TiY?hkIPcpx}WF^|c#R?Igc
z9ZmE<GiHBvQvu__y%m>(2PkIW4OYxe*;^FP0+%YD10Jt<E_jOK`QY0WSAl0MUgSjo
z`;_Ma1l+Bd?_-uJ=KjSh#ZQ5y;#a^M6(0vbs`wM|lZx3b&nf-_yjw9hUtcEsP<!^#
z0Tu8k_zlH@aNkxO2KRl%@o+y<?1lT8V(xc*t(beH-zn}7_b0{NFa1L?cguZ$E6-fG
zID%<)#{zJW;=92074t1ujN%pGM8({#PgBen0o*=jw>|~t3oP<8;8u!vfjj!yC%A9T
zO%f`x6?!W^4CaOj<?n#GtxV>|`Uu6}gU2Xl4JRn}z@4f%1TJ4AGj1r{If_}4Di`{n
z0rBuGRsl(Hmn%+%`+(wfxI9xr{Vcef6tlKl6|=V66*q^wLvc&EFDlN5yH9ZecW+)(
zo?dW|DDDsU9mRv-ayN$=7r{NPm|I9Z%0zhyT<-FaS=)<>xuMJ*AIj&!{f}bi%iW)w
z7_bn)vqR)X;2_0ZCe~NXC0(TAZD1OMivwkh$QtiMW}!1(t<Fj?knNS)WQ}>b;>G)p
zjb@xW(OrYX<)`ga=rubYGyB^f|FQG<XUxP7MwffqeQVaV`_{Gpu!{HM4)@8*+Ed}t
zHJ8%@I?vGs1F8cit@jIBSZSH9nzw3Uog9xWOF+R<mKIj|vqZ8;6ebUiXUe8+J-I1i
z2hJvAlp5J);B?%+_G8gu_+8KRumfHk2ge~6Pf63{(`PVJ{UKg&WlCQW<+v7q?85|4
zO0b9;^moCPYo5I8XUJ>Lwe`dpT>^u)uO03Rb}z<@wRZg;SyDg#j;h7pTYENrsI00Y
zZ$^QLFMqsI{KT@VS;_D;F2A*1-HBxj3q-J|{rY(x9E_;x+};yz^kyAwgVL&lq+a{{
zsP+1Q;c2kw+w1-;<@ds+$(GAH;6zUaFn_ggZ;X7agD1$?AwTTkY20odDz^n8CR&T9
zR51u}IF;vAg=hv3t~(ghuwD?H1x{dAFzsZAj-G_5E{N|m+@m3J8XlgQaXMVT$f+GY
zDaK;Cs-q_|p#U-5<^#|OxEnu?6;#S%rk+RTYaKnQX^Wv@ib6_+gAWYOF_M}kkh>c7
zAa<02ojhLOMWX>?2i<}n<02!7;5*1%E25V{8@QPtQZ9^z40fz4smrIzEg00L2&iWi
zIXvEaMxkRmc#z9!)h{#-Du<y05dx5C268r**)3~q;DNpRS8+pwl&d#mQ2h=N8OxXn
zPTYm@rLVEhZhB)w@MH?MW+S*ORW>w5is4){8(Xb%gTgym-e2%by$DzlId+UNo=FGs
z)o?@%enMsl<JoTkj#a*rD873&o}<DF*ysZMe29`qj{>lkFu`2f8K<odhu7Hf!1cUO
zGw)Ae{du2e-h8_si3U5vu$J)Dtpe->@C^goYOd8V^Ke6nz8^v7nN6KB%;d6h5IQjv
z#?1nM3UMq~V#cpbDsB@su2{8=$1C6jF8+-uV+X>%fi*V7p!FNH@=KRP!gntXS~FI(
z!B*Z*ztzss)~UvmJVg|rh_c37eg~o^RZgkEAsB;cIaeK@pHvEOyzxGwJ6Ap8^SThl
z4O@>ndW|6%*U9za=aYi)vSm`?yP2V>#^(%W3y+3Pu>(?{gwMqb#3$-DgEr^fP4L%_
zpt{|ac(*OKX3Dxll=zq}=I9ool}c<SV2RM`zaoU!pBpv7ICbLmBO2ezmpQR=J`u{g
zBtc6_aQWYjcv*;(&WEG{B7-$E@~sB4uWn;Q0*ahjK9vD%>D!=_IeDDrX9sbqn>p?F
zN?~*{I3{+(-(Uq3>S8eJNnql5ybkJSrTaU*Q1<(hQMp760KboGzr@+LZ##W+Y~Szn
zjTJ_BgJXqDl*Ae1kWLRPRjwSe`1oN=H&W7&1-2_i!`e|4z#DqJ2;~DJyTEEa>#AX+
zu^MSiwi$w~wn!3<*jh%%6iED+x}{KPEBHjx6b_d>W1OXd$RdEtmBxQFUOw-y{`L=G
zqcwh#<IlLjoc!X(7by6yR*+o;!Ayj|il|KpO)O&9pp1tgZJKiuI_|~1YMbOz-moqz
zWaRJ?=cN@dayiJ{3z)1{eT<Df1m<y^1boIoj)Nv>6VZglix<t-BB6kn8DvSCNFnn(
z2UN&gyLpo2m_q?EzK|Be>1h|#KB#xN1CvYLr3($CzL6Jhgrhz0U5GDZVperUK&TyH
zEfAe`YomlU6`f=Kg3Q?ZMwmN4Ms|(GjDk;mY&C3IL<AXw;Y4crQ5prmrWK8BL``mY
zPd&rO@-(gu?i@=&c2k47WybanZxP!emc?x1!ueseV+N|3;}2%(GF5P{UcTPp9Z<A9
zU5g?n)9ePJ4~o`2oDUZ#lIe`Ma3r0nu>U-foDE4ntRV{Nlv_B8j;&i*4Uc7PU5Ci6
z&WEHB)(|7;aN>4~xpQNyNu~Y({92|LehX!Cfv16sx}~yPfhW^f0c5wMlyvU4a3q}_
zu>UM&t!^Q8msq+Z=-9forL0m4EG0E~6Ar+shs#D`LNz_>VFN`+za-VDrvEWr32Ygr
zeHs=eq{Au25JhyPJkTv5()X?<DWv1YU^m1lIue$}uPqW2I%(+^(eWo#Y$c?0i>^0v
zBqU6Q#iz?zHbBhx7oVQluz{9fNMQnsPyYg42{~AX(}q8#RYkUpcLN@absz!TaDLqb
zi)zwoxBA+JNZ(VIppZ^GT#x^(4`XEWau-E(Y=zoN)G7?t6$W3gB^8*NLo~0Zn_#6j
zob#oXuulxXv3P6{s&d=U5XGM|wiT<m4jg|1#n%%M#s4jSB(wv>44%tRsHP_xHc$!B
zp7bX0q4&Dde@p3Ot0Y6|ury9_hp(D&&MyyTLa>GyT3f84|1B}@S{h;)ogWQc7={=E
zSNs9%M4wj^xN8YH9TN#d?x-fP0T7oCGlfcR-otA19%kqLIubYv8-iM|F+9FF&$YO@
zB84Juu%e|qRTDVJ-=JeBu?|6r$jd1LuT>M64ZDbLj_iMvC#@UDg>6~`+QN2(EwzPk
z^I-?V+LH*-GTh2?h!lB$sBu)z@8jv|oLoLe?(5@8Opdg^T9_2buNfi(`89(P=*F)D
zFP;sjJFt%Yq>tyWRC;`Y!T6mYh))}Y!=ws7cyI;=;<rU$P|fVV9()d4N8Z!V)6ekK
ze9+G`(J*I}PA!w226!HE-A1hWWPqoI5onL6V(TjiUouL`>d~d~WYs>yP|kUshI0J3
zbSZB{Aq?f5Pa|L{&xggGLZrYlt0={sg=wf?0hc<^_gQnG6@Z^5unk}tnKK!U2bRp`
z2j!fDXqXUrHY^en4cU=!snZjT|5n^y06uh3&Lc;eiaFI-6E`!U$1W+SJsM`f(cuL%
zgFRp@oUMd7sAw3M+zKu;Krdd;n4=g=0!z+e9ITj^Qh?&rSS<oa918&lQxQK$2{)0p
zS@Z8fo(YD0dy_K~U##)V6Zao!$lH)V4m4BT%l+!srzh;LT&Mrjlfw?{(-YSbq?aar
zp^j+Tbg(DbI3n8*_GG#uFfbR%&u+$7BDoFa^1=9egGY(JmpS;J#MPl8ksqJ97hxgT
z$}Ot~;WL%2#zIV%IYS`ci&xr5kOjpHL$GBkeH5?B!&7O1^cLddm$ESH>yy>*3=VZ(
zY2*L;#IYz$CJgmtxV^ZFN`%}GMb|EL&}umiU!=IJAg(lJXc5Fc(HhUoSNWmJA2I%~
zPvT;=uTKWW`oBK;rK9!riF<e~3T><%jHsd$%l}+4q87wkAD=8w7S=ljFPbY_`obOY
zu3)s{1z8>L7@JoQQq)s0)Udh@po|mUWk3E?hv8ZBsbQWU>T%@LAZ>nWA-fDUlYPD5
zLCRJ?^79K`1{h1%{kMV{u`4XY`HX9uPyp{}yhQS08O{#24Z~N#vK+Ma#n0FH=0x)k
zy7o8(yfnUnWdhH`wG9(^$@ajd|G*9YWAJn2Z-LABr{$fucoN%;n_4+zTE*<q71O3o
z7GtMPzJ1Env}UbawGv#m59;4@botcs%JS05<#Wb~DdVP$t(YyWiRXd9MoASDW{(~}
zu5vUdB4NX{DWm%j7Zj~-9hfXrM|j$ERU{1728MHl!Al5+9bkCz1LK7?*yJ#2u(m!M
z+16(R+nlR$UveORU<Sh4I?U3Du@-Xv%i6$Tq6vmII4Qxfv7lrbPIyL=pIeYq{oIDk
zQo(e9HPS7#dei3anw+D>mKQO9+k=ZyL~!PUxf?dZ;Xk0wULkV{$eyAO%fy`nGFyu8
zvB+L<oMM)VlO*MAsrHK5QhZ=$n#1`_)lUVm*(PZ`UnzOvKCa|!PU{^NB3n;VaG4M%
zJg?#$xSZRVF`Jw%N@kOjgR~a)F~CCw2B<FJy_SiV!p$c`hY`v4#|FIbQl}U$Ep^yk
zWIKaVltU*U?mRM^3Z@E{a@=P8_ajDT0hYkp9~-PuN|dcv%=;3Tf{aZ04`jsUcp%#!
z5(w2=Z6G5Du`gh_MrK^zez>BI;7d~WQ8qnDhy#cmqy|wNO9_X-;dW9w`OqQTIyWgD
z-s}b{o$k;f+dAAXV#ZvDPtbTO`=1&2LWHScI|3Kyc1a&q%p2M3in;zgte7{%w-mGA
z>1SN>r;0f~xJ0C!H_AU0Po#&N<8}nDV#&Pw^1Y=k=R0Z^v<L+y+XbzH-@c}SA{@6V
z4m6GhGP{))izS>uZxzNtPC2`b7V?!Pp13IXP(Ccf*m|@G+mA5oGXV}{h84l3HNZ3+
zZwAUkGXgdooDH{B;|Yp$;8v0mcNSb)JDs^?l};6y=~TeQOyIljS*`+ZgS%Ss?Ql1c
zk?13EY3)R}l2xMHz)W-p+-Ef2t@uT_`xGC6OUpEm@$x(d4_c$@ge&SMCc?YLM@pG|
zR`J7NPT&SFR~R}*eGC1E>=j2^a{nRwP=9cSrrKQNb{colxR=HQG#;sOna0*0y2^fr
zCifq*R{=}3fOQ%_s_}Cg^B{s<zc(~Kq48%LU(nc%wnE%!h;Rw`Jr*ZgEPIXhB>Fm&
zRS%9Jo0f{O_J5W9HZ3l%TU&n~n4Oh|C`&Y*2Q}ukZCBt)vP$zAFyi{GJI5|fX|JaA
zieJeZ??*KqP5=g$h%~1(`4^h}8*)9r&aayMPfZ@g>CrA7XB<0GP7HQQQ#IzD$JTGD
z$$7YeEx`+_yQb5htO{DF$w%69w)RAs)5aO?TS^%$&1y||yT-dU<`EOSEXT;OG{@nx
zEW8dsrd$oZb7WPP?=(4&6hMxafZ<URJAxYv20KEe#ymP;XVwMG%sAF=)^u*sbVe(k
zROn38bSgESS$vz%gs8+*9QHU|qABsszC9IJYw{hM{6$U9gBZ5{+nSt*FKjvA>|2#d
zM(z0q-wxnm3cHpK$@OK)7p^!TXQO`ftEL>O@f3}@{cX1-{!+_zeI8A)<F42E35|Kw
zz}9(P<M(*z!VdUc3phts{mc);?1KLcW~=f}`Maj$an<TXlGUQPIa#ICnT$9zrDSW7
zi*A~vDcwQN^eZjU<oA)iemP&l+llhUyTPW0c~q0Xq46n=zt#8`a;z#H-+9}KdM&<w
zhHjR;x2-d{=9LMaY$Ie4x{ED9GelM|aHPsNpK|2NM)S>>5Wa!31D};iPdnNhC#CN_
zXSDn?Bp^8NYc2SDjk*0~N8?VL&2D*Zq9-*ZNfV{6er{^C9OZQfhw#OXtvNtW>*$P*
z9jl3M)A$bQD?mX{CwO8)sx|qe@|w?VFXt>m1s-bPiIEqQ-MRA3Dl<lA+-Ky<cA+SB
zPYhx^AD-s1nTM}z=35+_$H{tAJgMnCXJd;NYP?G02UkB_kt%=d?94UZk<Xn#J2gu}
z5x>$@&dbgVQN%BtIH|Zj-x(}#`oI|+lBdQYd!eQ5c5gtc(OV{^xuXa3!#_LQVvR>@
zJXT{~R<=I>_KVF+HNH<)hXq8-hrHOF*d?DsHn9h^;6oa}E$g|Q(f&i0LDnHlpY^F3
z8l9#cdYX$znta8mtSC^7<%{U6m`f3kHtJ&?DT)=xfk!D$1D7ez0#8(&4X*IB&$`>q
zQ~}%_oU6Dkc(GzW!K_rA4}M5-Kk!z?1Ht@?nFZq0%pS#DQS#18IiFw-DlP@T$#3Eq
zz&qJ-6>uk*&tjDGG3SipDll)klyhNoUhx|6&x-kE^M_)tBL7zW7}!KS#^s&LUZ%gu
z`w$oN40sJ3rT7q-4+xYW0jDT_6U;M*lph20O+5Ksa0|unfw|{OIaf~kicf+I6rTe3
z1zV>oKY?eE3OENYR{TA9l;R)2Ws3RIZlYq|3M&)`gJ&w{Yw5X)!@-Lc^O<d>VlOwi
z`I?U<<*jgo;tcQ>#eAOIrnnjSS;c(*-ldq&b9)u@@q54GA>hM`hl9CTU|xJIKWQ=A
zpAT_oQ~;kOzfjCu-+9HG!Iu<22mVFz3*bK$?*?PH$I5_%j|&QBb{HJ2n9I5_#a!0K
z*rzHv;1X2;-)y8Q=1T=0WMo30f^!vr4sNBG4}u*OUjlbk%z@ZT@n2w0k4#6v7Af{|
zMjx&`9HAwOgTc2dt_$YLC`RUB<)KD0A1--Hip(`6Csi^B?jpr}CvdM~-k0xJ%(W#9
i{=g7t4`qxn9?g2$XpA|F<_Jn{-;_^~)y~sdjsG86CDa)J


From 8cec66b23ba3b78e9abec9cd918b1b9cced5266c Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Fri, 4 Dec 2015 18:16:05 +0100
Subject: [PATCH 02/41] add a simple TCP example

---
 .../examples/WiFiClientMin/WiFiClientMin.ino  | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino

diff --git a/libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino b/libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino
new file mode 100644
index 000000000..9386362ff
--- /dev/null
+++ b/libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino
@@ -0,0 +1,68 @@
+/*
+ *  This sketch sends a message to a TCP server
+ *
+ */
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+ESP8266WiFiMulti WiFiMulti;
+
+void setup() {
+    Serial.begin(115200);
+    delay(10);
+
+    // We start by connecting to a WiFi network
+    WiFiMulti.addAP("SSID", "passpasspass");
+
+    Serial.println();
+    Serial.println();
+    Serial.print("Wait for WiFi... ");
+
+    while(WiFiMulti.run() != WL_CONNECTED) {
+        Serial.print(".");
+        delay(500);
+    }
+
+    Serial.println("");
+    Serial.println("WiFi connected");
+    Serial.println("IP address: ");
+    Serial.println(WiFi.localIP());
+
+    delay(500);
+}
+
+
+void loop() {
+    const uint16_t port = 80;
+    const char * host = "192.168.1.1"; // ip or dns
+
+	
+	
+    Serial.print("connecting to ");
+    Serial.println(host);
+
+    // Use WiFiClient class to create TCP connections
+    WiFiClient client;
+
+    if (!client.connect(host, port)) {
+        Serial.println("connection failed");
+		Serial.println("wait 5 sec...");
+		delay(5000);
+        return;
+    }
+
+    // This will send the request to the server
+    client.print("Send this data to server");
+
+    //read back one line from server
+    String line = client.readStringUntil('\r');
+    client.println(line);
+
+    Serial.println("closing connection");
+    client.stop();
+	
+    Serial.println("wait 5 sec...");
+	delay(5000);
+}
+

From 34571a0e9d2bfa69aa855c9b283cb7bc4abf0515 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Fri, 4 Dec 2015 18:20:40 +0100
Subject: [PATCH 03/41] typo

---
 .../examples/WiFiClientMin/WiFiClientMin.ino         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino b/libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino
index 9386362ff..accb37bf8 100644
--- a/libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino
+++ b/libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino
@@ -37,8 +37,8 @@ void loop() {
     const uint16_t port = 80;
     const char * host = "192.168.1.1"; // ip or dns
 
-	
-	
+    
+    
     Serial.print("connecting to ");
     Serial.println(host);
 
@@ -47,8 +47,8 @@ void loop() {
 
     if (!client.connect(host, port)) {
         Serial.println("connection failed");
-		Serial.println("wait 5 sec...");
-		delay(5000);
+        Serial.println("wait 5 sec...");
+        delay(5000);
         return;
     }
 
@@ -61,8 +61,8 @@ void loop() {
 
     Serial.println("closing connection");
     client.stop();
-	
+    
     Serial.println("wait 5 sec...");
-	delay(5000);
+    delay(5000);
 }
 

From cedce24bf39171d2d74eab2d6aead61108a88530 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Fri, 4 Dec 2015 19:07:51 +0100
Subject: [PATCH 04/41] rename to WiFiClientBasic

---
 .../WiFiClientMin.ino => WiFiClientBasic/WiFiClientBasic.ino}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename libraries/ESP8266WiFi/examples/{WiFiClientMin/WiFiClientMin.ino => WiFiClientBasic/WiFiClientBasic.ino} (100%)

diff --git a/libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino b/libraries/ESP8266WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino
similarity index 100%
rename from libraries/ESP8266WiFi/examples/WiFiClientMin/WiFiClientMin.ino
rename to libraries/ESP8266WiFi/examples/WiFiClientBasic/WiFiClientBasic.ino

From e3137a0b559aeda228718fde4f46c0ff70786610 Mon Sep 17 00:00:00 2001
From: Rodrigo Mendez <rmendez@makerlab.mx>
Date: Fri, 4 Dec 2015 18:24:08 -0600
Subject: [PATCH 05/41] added ESPino to supported boards

---
 boards.txt                     | 85 ++++++++++++++++++++++++++++++++++
 variants/espino/pins_arduino.h | 73 +++++++++++++++++++++++++++++
 2 files changed, 158 insertions(+)
 create mode 100644 variants/espino/pins_arduino.h

diff --git a/boards.txt b/boards.txt
index 8ed16f539..5b8505dd2 100644
--- a/boards.txt
+++ b/boards.txt
@@ -691,3 +691,88 @@ 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=434160
+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=generic
+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.FlashFreq.40=40MHz
+espino.menu.FlashFreq.40.build.flash_freq=40
+espino.menu.FlashFreq.80=80MHz
+espino.menu.FlashFreq.80.build.flash_freq=80
+
+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
diff --git a/variants/espino/pins_arduino.h b/variants/espino/pins_arduino.h
new file mode 100644
index 000000000..2efad2db3
--- /dev/null
+++ b/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 */

From d076012cc8b0a8d3c0917795ff56bad9205c526d Mon Sep 17 00:00:00 2001
From: Rodrigo Mendez <rmendez@makerlab.mx>
Date: Fri, 4 Dec 2015 18:40:21 -0600
Subject: [PATCH 06/41] variant and maxium_size for ESPino board wasn't
 correct, fixed

---
 boards.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boards.txt b/boards.txt
index 5b8505dd2..b24d084de 100644
--- a/boards.txt
+++ b/boards.txt
@@ -699,7 +699,7 @@ espino.name=ESPino
 espino.upload.tool=esptool
 espino.upload.speed=115200
 espino.upload.resetmethod=ck
-espino.upload.maximum_size=434160
+espino.upload.maximum_size=1044464
 espino.upload.maximum_data_size=81920
 espino.upload.wait_for_upload_port=true
 espino.serial.disableDTR=true
@@ -709,7 +709,7 @@ espino.build.mcu=esp8266
 espino.build.f_cpu=80000000L
 espino.build.board=ESP8266_ESP12
 espino.build.core=esp8266
-espino.build.variant=generic
+espino.build.variant=espino
 espino.build.flash_mode=qio
 espino.build.flash_size=4M
 espino.build.flash_freq=40

From ac0264767ae932e57c95f6a233689863f455c641 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sat, 5 Dec 2015 13:04:24 +0100
Subject: [PATCH 07/41] #1151 SPI definition correction - SPILADDR

---
 cores/esp8266/esp8266_peri.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cores/esp8266/esp8266_peri.h b/cores/esp8266/esp8266_peri.h
index 64c1f30b5..4fd057009 100644
--- a/cores/esp8266/esp8266_peri.h
+++ b/cores/esp8266/esp8266_peri.h
@@ -494,7 +494,7 @@ extern uint8_t esp8266_gpioToFn[16];
 
 //SPI Phase Length Locations
 #define SPILCOMMAND	28 //4 bit in SPIxU2 default 7 (8bit)
-#define SPILADDR	16 //6 bit in SPIxU1 default:23 (24bit)
+#define SPILADDR	26 //6 bit in SPIxU1 default:23 (24bit)
 #define SPILDUMMY	0  //8 bit in SPIxU1 default:0 (0 cycles)
 #define SPILMISO	8  //9 bit in SPIxU1 default:0 (1bit)
 #define SPILMOSI	17 //9 bit in SPIxU1 default:0 (1bit)

From f7bbea407e484771ca6ab9813990d20ccbb17f23 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Sat, 5 Dec 2015 16:29:37 +0300
Subject: [PATCH 08/41] Fix failure when trying to open empty file (#1126)

---
 cores/esp8266/spiffs_api.cpp  | 11 +++++++++++
 tests/FSWrapper/FSWrapper.ino | 10 +++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/cores/esp8266/spiffs_api.cpp b/cores/esp8266/spiffs_api.cpp
index 978e2ea0d..f1689cbfe 100644
--- a/cores/esp8266/spiffs_api.cpp
+++ b/cores/esp8266/spiffs_api.cpp
@@ -410,6 +410,17 @@ protected:
 FileImplPtr SPIFFSImpl::open(const char* path, OpenMode openMode, AccessMode accessMode) {
     int mode = getSpiffsMode(openMode, accessMode);
     int fd = SPIFFS_open(&_fs, path, mode, 0);
+    if (fd < 0 && _fs.err_code == SPIFFS_ERR_DELETED && (openMode & OM_CREATE)) {
+        DEBUGV("SPIFFSImpl::open: fd=%d path=`%s` openMode=%d accessMode=%d err=%d, trying to remove\r\n",
+            fd, path, openMode, accessMode, _fs.err_code);
+        auto rc = SPIFFS_remove(&_fs, path);
+        if (rc != SPIFFS_OK) {
+            DEBUGV("SPIFFSImpl::open: SPIFFS_ERR_DELETED, but failed to remove path=`%s` openMode=%d accessMode=%d err=%d\r\n",
+                path, openMode, accessMode, _fs.err_code);
+            return FileImplPtr();
+        }
+        fd = SPIFFS_open(&_fs, path, mode, 0);
+    }
     if (fd < 0) {
         DEBUGV("SPIFFSImpl::open: fd=%d path=`%s` openMode=%d accessMode=%d err=%d\r\n",
             fd, path, openMode, accessMode, _fs.err_code);
diff --git a/tests/FSWrapper/FSWrapper.ino b/tests/FSWrapper/FSWrapper.ino
index b152093d5..099065f4f 100644
--- a/tests/FSWrapper/FSWrapper.ino
+++ b/tests/FSWrapper/FSWrapper.ino
@@ -139,7 +139,15 @@ void setup() {
       fail("some files left after format");
     }
   }
-
+  {
+    File tmp = SPIFFS.open("/tmp.txt", "w");
+  }
+  {
+    File tmp = SPIFFS.open("/tmp.txt", "w");
+    if (!tmp) {
+      fail("failed to re-open empty file");
+    }
+  }
   Serial.println("success");
 }
 

From 68a406274af6dbcbecf5aaeae5c97654aee35b14 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sat, 5 Dec 2015 17:16:53 +0100
Subject: [PATCH 09/41] add parameter name to h for better reading

---
 cores/esp8266/Updater.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cores/esp8266/Updater.h b/cores/esp8266/Updater.h
index b9f1b3d06..a25cb081b 100644
--- a/cores/esp8266/Updater.h
+++ b/cores/esp8266/Updater.h
@@ -26,7 +26,7 @@ class UpdaterClass {
       Call this to check the space needed for the update
       Will return false if there is not enough space
     */
-    bool begin(size_t size, int = U_FLASH);
+    bool begin(size_t size, int command = U_FLASH);
 
     /*
       Writes a buffer to the flash and increments the address

From 02366bb9352f0ac6a7ae4a394ab17f8a66a18240 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sat, 5 Dec 2015 17:17:24 +0100
Subject: [PATCH 10/41] add example makefile.init file for eclipse

---
 doc/eclipse/makefile.init | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 doc/eclipse/makefile.init

diff --git a/doc/eclipse/makefile.init b/doc/eclipse/makefile.init
new file mode 100644
index 000000000..f8e6d9daa
--- /dev/null
+++ b/doc/eclipse/makefile.init
@@ -0,0 +1,39 @@
+vecho := @echo
+Q := @
+
+PROJECT_NAME=project_name
+
+OTA_IP=192.168.254.100
+OTA_PORT=8266
+
+SERIAL_PORT=COM3
+SERIAL_BAUD=230400
+
+ARDUINO_BASE      = D:/Coding/avr/Programme/arduino-nightly
+ESP8266_BASE      = $(ARDUINO_BASE)/hardware/esp8266com/esp8266
+ESP8266_TOOLS     = $(ESP8266_BASE)/tools
+XTENSA_TOOLS_ROOT = $(ESP8266_TOOLS)/xtensa-lx106-elf/bin
+
+PYTHON_BIN        = python
+ESPTOOL_PY_BIN    = $(ESP8266_TOOLS)/esptool.py
+ESPOTA_PY_BIN     = $(ESP8266_TOOLS)/espota.py
+ESPTOOL_BIN       = $(ESP8266_TOOLS)/esptool/esptool.exe
+
+ota:
+    $(vecho) ota...
+    $(PYTHON_BIN) $(ESPOTA_PY_BIN) -i $(OTA_IP) -p $(OTA_PORT) --auth= -f ./$(PROJECT_NAME).bin
+    
+ota_spiffs:
+    $(vecho) ota spiffs...
+    $(PYTHON_BIN) $(ESPOTA_PY_BIN) -i $(OTA_IP) -p $(OTA_PORT) --auth= -s -f ./$(PROJECT_NAME)_spiffs.bin
+        
+erase_flash:
+    $(vecho) "Erase Flash"
+    $(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(ESPPORT) -b $(SERIAL_BAUD) erase_flash    
+    
+dumpmem:     
+    $(vecho) "Read Flash need some time..."                                     
+    $(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(ESPPORT) -b $(ESPBAUD) read_flash 0 4194304  dump.bin
+
+objdump:
+    "$(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-objdump" -S $(PROJECT_NAME).elf > $(PROJECT_NAME).dobj

From d06b9105d56470a6fb3749600d543406247ba046 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sat, 5 Dec 2015 17:22:28 +0100
Subject: [PATCH 11/41] fix C&P...

---
 doc/eclipse/makefile.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/eclipse/makefile.init b/doc/eclipse/makefile.init
index f8e6d9daa..76438d62c 100644
--- a/doc/eclipse/makefile.init
+++ b/doc/eclipse/makefile.init
@@ -29,11 +29,11 @@ ota_spiffs:
         
 erase_flash:
     $(vecho) "Erase Flash"
-    $(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(ESPPORT) -b $(SERIAL_BAUD) erase_flash    
+    $(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(SERIAL_PORT) -b $(SERIAL_BAUD) erase_flash    
     
 dumpmem:     
     $(vecho) "Read Flash need some time..."                                     
-    $(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(ESPPORT) -b $(ESPBAUD) read_flash 0 4194304  dump.bin
+    $(PYTHON_BIN) $(ESPTOOL_PY_BIN) -p $(SERIAL_PORT) -b $(SERIAL_BAUD) read_flash 0 4194304 dump.bin
 
 objdump:
     "$(XTENSA_TOOLS_ROOT)/xtensa-lx106-elf-objdump" -S $(PROJECT_NAME).elf > $(PROJECT_NAME).dobj

From ecce35d24058e3a6b77a86f845c732f2592b5540 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sat, 5 Dec 2015 20:33:08 +0100
Subject: [PATCH 12/41] allow SPIFFS

---
 .../src/ESP8266httpUpdate.cpp                 | 61 ++++++++++++++++---
 .../ESP8266httpUpdate/src/ESP8266httpUpdate.h |  6 +-
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
index 39ba0555c..8907df24a 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -23,9 +23,10 @@
  *
  */
 
-
 #include "ESP8266httpUpdate.h"
 
+extern "C" uint32_t _SPIFFS_start;
+extern "C" uint32_t _SPIFFS_end;
 
 ESP8266HTTPUpdate::ESP8266HTTPUpdate(void) {
 }
@@ -46,6 +47,19 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(const char * url, const char * cur
     return handleUpdate(&http, current_version);
 }
 
+/**
+ *
+ * @param url const char *
+ * @param current_version const char *
+ * @param httpsFingerprint const char *
+ * @return t_httpUpdate_return
+ */
+t_httpUpdate_return ESP8266HTTPUpdate::updateSpiffs(const char * url, const char * current_version, const char * httpsFingerprint) {
+    HTTPClient http;
+    http.begin(url, httpsFingerprint);
+    return handleUpdate(&http, current_version, false, true);
+}
+
 /**
  *
  * @param host const char *
@@ -73,7 +87,7 @@ t_httpUpdate_return ESP8266HTTPUpdate::update(String host, uint16_t port, String
  * @param current_version const char *
  * @return t_httpUpdate_return
  */
-t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const char * current_version) {
+t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const char * current_version, bool reboot, bool spiffs) {
 
     t_httpUpdate_return ret = HTTP_UPDATE_FAILED;
 
@@ -85,6 +99,12 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
     http->addHeader("x-ESP8266-chip-size", String(ESP.getFlashChipRealSize()));
     http->addHeader("x-ESP8266-sdk-version", ESP.getSdkVersion());
 
+    if(spiffs) {
+        http->addHeader("x-ESP8266-mode", "spiffs");
+    } else {
+        http->addHeader("x-ESP8266-mode", "sketch");
+    }
+
     if(current_version && current_version[0] != 0x00) {
         http->addHeader("x-ESP8266-version", current_version);
     }
@@ -119,9 +139,20 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
     switch(code) {
         case 200:  ///< OK (Start Update)
             if(len > 0) {
-                if(len > ESP.getFreeSketchSpace()) {
+                bool startUpdate = false;
+                if(spiffs) {
+                    size_t spiffsSize = ((size_t) &_SPIFFS_end - (size_t) &_SPIFFS_start);
+                    if(len > (int) spiffsSize) {
+                        DEBUG_HTTP_UPDATE("[httpUpdate] spiffsSize to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len);
+                    }
+                } else {
+                    if(len > (int) ESP.getFreeSketchSpace()) {
+                        DEBUG_HTTP_UPDATE("[httpUpdate] FreeSketchSpace to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len);
+                    }
+                }
+
+                if(!startUpdate) {
                     ret = HTTP_UPDATE_FAILED;
-                    DEBUG_HTTP_UPDATE("[httpUpdate] FreeSketchSpace to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len);
                 } else {
 
                     WiFiClient * tcp = http->getStreamPtr();
@@ -131,11 +162,25 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
 
                     delay(100);
 
-                    if(runUpdate(*tcp, len, http->header("x-MD5"))) {
+                    int command;
+
+                    if(spiffs) {
+                        command = U_SPIFFS;
+                        DEBUG_HTTP_UPDATE("[httpUpdate] runUpdate spiffs...\n");
+                    } else {
+                        command = U_FLASH;
+                        DEBUG_HTTP_UPDATE("[httpUpdate] runUpdate flash...\n");
+                    }
+
+                    if(runUpdate(*tcp, len, http->header("x-MD5"), command)) {
                         ret = HTTP_UPDATE_OK;
                         DEBUG_HTTP_UPDATE("[httpUpdate] Update ok\n");
                         http->end();
-                        ESP.restart();
+
+                        if(reboot) {
+                            ESP.restart();
+                        }
+
                     } else {
                         ret = HTTP_UPDATE_FAILED;
                         DEBUG_HTTP_UPDATE("[httpUpdate] Update failed\n");
@@ -171,9 +216,9 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
  * @param md5 String
  * @return true if Update ok
  */
-bool ESP8266HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5) {
+bool ESP8266HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command) {
 
-    if(!Update.begin(size)) {
+    if(!Update.begin(size, command)) {
         DEBUG_HTTP_UPDATE("[httpUpdate] Update.begin failed!\n");
         return false;
     }
diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
index a494695ff..f9a4d8030 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
@@ -53,9 +53,11 @@ class ESP8266HTTPUpdate {
         t_httpUpdate_return update(const char * host, uint16_t port, const char * url = "/", const char * current_version = "", bool https = false, const char * httpsFingerprint = "");
         t_httpUpdate_return update(String host, uint16_t port, String url = "/", String current_version = "", bool https = false, String httpsFingerprint = "");
 
+        t_httpUpdate_return updateSpiffs(const char * url, const char * current_version, const char * httpsFingerprint);
+
     protected:
-        t_httpUpdate_return handleUpdate(HTTPClient * http, const char * current_version);
-        bool runUpdate(Stream& in, uint32_t size, String md5);
+        t_httpUpdate_return handleUpdate(HTTPClient * http, const char * current_version, bool reboot = true, bool spiffs = false);
+        bool runUpdate(Stream& in, uint32_t size, String md5, int command = U_FLASH);
 };
 
 extern ESP8266HTTPUpdate ESPhttpUpdate;

From 95d53c37c381536cb9e87a0516082b1f5c2f26ba Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sat, 5 Dec 2015 20:47:58 +0100
Subject: [PATCH 13/41] add httpUpdateSPIFFS.ino example

---
 .../httpUpdateSPIFFS/httpUpdateSPIFFS.ino     | 65 +++++++++++++++++++
 .../src/ESP8266httpUpdate.cpp                 |  2 +-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 libraries/ESP8266httpUpdate/examples/httpUpdateSPIFFS/httpUpdateSPIFFS.ino

diff --git a/libraries/ESP8266httpUpdate/examples/httpUpdateSPIFFS/httpUpdateSPIFFS.ino b/libraries/ESP8266httpUpdate/examples/httpUpdateSPIFFS/httpUpdateSPIFFS.ino
new file mode 100644
index 000000000..3d746af6c
--- /dev/null
+++ b/libraries/ESP8266httpUpdate/examples/httpUpdateSPIFFS/httpUpdateSPIFFS.ino
@@ -0,0 +1,65 @@
+/**
+ * httpUpdateSPIFFS.ino
+ *
+ *  Created on: 05.12.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+#include <ESP8266HTTPClient.h>
+#include <ESP8266httpUpdate.h>
+
+#define USE_SERIAL Serial
+
+ESP8266WiFiMulti WiFiMulti;
+
+void setup() {
+
+    USE_SERIAL.begin(115200);
+    // USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    WiFiMulti.addAP("SSID", "PASSWORD");
+
+}
+
+void loop() {
+    // wait for WiFi connection
+    if((WiFiMulti.run() == WL_CONNECTED)) {
+
+        USE_SERIAL.println("Update SPIFFS...");
+        t_httpUpdate_return ret = ESPhttpUpdate.updateSpiffs("https://server/spiffs.bin");
+        if(ret == HTTP_UPDATE_OK) {
+            USE_SERIAL.println("Update sketch...");
+            ret = ESPhttpUpdate.update("https://server/file.bin");
+
+            switch(ret) {
+                case HTTP_UPDATE_FAILED:
+                    USE_SERIAL.println("HTTP_UPDATE_FAILD");
+                    break;
+
+                case HTTP_UPDATE_NO_UPDATES:
+                    USE_SERIAL.println("HTTP_UPDATE_NO_UPDATES");
+                    break;
+
+                case HTTP_UPDATE_OK:
+                    USE_SERIAL.println("HTTP_UPDATE_OK");
+                    break;
+            }
+        }
+    }
+}
+
diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
index 8907df24a..52a094c69 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -143,7 +143,7 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
                 if(spiffs) {
                     size_t spiffsSize = ((size_t) &_SPIFFS_end - (size_t) &_SPIFFS_start);
                     if(len > (int) spiffsSize) {
-                        DEBUG_HTTP_UPDATE("[httpUpdate] spiffsSize to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len);
+                        DEBUG_HTTP_UPDATE("[httpUpdate] spiffsSize to low (%d) needed: %d\n", spiffsSize, len);
                     }
                 } else {
                     if(len > (int) ESP.getFreeSketchSpace()) {

From d8e3c766a33041158af3f97499742ee4eb522e0c Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Sun, 6 Dec 2015 11:07:25 +0100
Subject: [PATCH 14/41] ESP8266HTTPUpdate - improve error displaying

---
 .../ESP8266httpUpdate/src/ESP8266httpUpdate.cpp   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
index 52a094c69..92b047b30 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "ESP8266httpUpdate.h"
+#include <StreamString.h>
 
 extern "C" uint32_t _SPIFFS_start;
 extern "C" uint32_t _SPIFFS_end;
@@ -218,8 +219,12 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
  */
 bool ESP8266HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int command) {
 
+    StreamString error;
+
     if(!Update.begin(size, command)) {
-        DEBUG_HTTP_UPDATE("[httpUpdate] Update.begin failed!\n");
+        Update.printError(error);
+        error.trim(); // remove line ending
+        DEBUG_HTTP_UPDATE("[httpUpdate] Update.begin failed! (%s)\n", error.c_str());
         return false;
     }
 
@@ -228,12 +233,16 @@ bool ESP8266HTTPUpdate::runUpdate(Stream& in, uint32_t size, String md5, int com
     }
 
     if(Update.writeStream(in) != size) {
-        DEBUG_HTTP_UPDATE("[httpUpdate] Update.writeStream failed!\n");
+        Update.printError(error);
+        error.trim(); // remove line ending
+        DEBUG_HTTP_UPDATE("[httpUpdate] Update.writeStream failed! (%s)\n", error.c_str());
         return false;
     }
 
     if(!Update.end()) {
-        DEBUG_HTTP_UPDATE("[httpUpdate] Update.end failed!\n");
+        Update.printError(error);
+        error.trim(); // remove line ending
+        DEBUG_HTTP_UPDATE("[httpUpdate] Update.end failed! (%s)\n", error.c_str());
         return false;
     }
 

From 6fa70bda011419520c1484ab7f861114a827e45a Mon Sep 17 00:00:00 2001
From: Martin Ayotte <martinayotte@yahoo.ca>
Date: Sun, 6 Dec 2015 09:42:51 -0500
Subject: [PATCH 15/41] replace delay with while loop in WiFiClient.ino

---
 libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino b/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino
index 7ffc78acd..8ed67168a 100644
--- a/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino
+++ b/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino
@@ -71,7 +71,13 @@ void loop() {
   client.print(String("GET ") + url + " HTTP/1.1\r\n" +
                "Host: " + host + "\r\n" + 
                "Connection: close\r\n\r\n");
-  delay(10);
+  while (client.available() == 0) {
+    if (timeout - millis() < 0) {
+      Serial.println(">>> Client Timeout !");
+      client.stop();
+      return;
+    }
+  }
   
   // Read all the lines of the reply from server and print them to Serial
   while(client.available()){

From e166e85f739758a258567b2f49834b05dd8dbd16 Mon Sep 17 00:00:00 2001
From: Martin Ayotte <martinayotte@yahoo.ca>
Date: Sun, 6 Dec 2015 09:47:00 -0500
Subject: [PATCH 16/41] oupps ! I forgot to set the timout value

---
 libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino b/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino
index 8ed67168a..eb7c02eff 100644
--- a/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino
+++ b/libraries/ESP8266WiFi/examples/WiFiClient/WiFiClient.ino
@@ -71,6 +71,7 @@ void loop() {
   client.print(String("GET ") + url + " HTTP/1.1\r\n" +
                "Host: " + host + "\r\n" + 
                "Connection: close\r\n\r\n");
+  int timeout = millis() + 5000;
   while (client.available() == 0) {
     if (timeout - millis() < 0) {
       Serial.println(">>> Client Timeout !");

From 3d1fbc60ab5c96294a6c68ea6bb9f292cb11aead Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Sun, 6 Dec 2015 20:22:54 +0300
Subject: [PATCH 17/41] Replace chain of UDP pbufs with a single pbuf before
 sending (#1009)

Packets up to 1492 bytes may be sent this way.
Also reduced pbuf_unit_size to 128 bytes.
---
 .../ESP8266WiFi/src/include/UdpContext.h      | 58 ++++++++-----------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/libraries/ESP8266WiFi/src/include/UdpContext.h b/libraries/ESP8266WiFi/src/include/UdpContext.h
index d9347fd34..708007036 100644
--- a/libraries/ESP8266WiFi/src/include/UdpContext.h
+++ b/libraries/ESP8266WiFi/src/include/UdpContext.h
@@ -1,9 +1,9 @@
-/* 
+/*
   UdpContext.h - UDP connection handling on top of lwIP
 
   Copyright (c) 2014 Ivan Grokhotkov. All rights reserved.
   This file is part of the esp8266 core 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
@@ -206,10 +206,10 @@ public:
         size_t max_size = _rx_buf->len - _rx_buf_offset;
         size = (size < max_size) ? size : max_size;
         DEBUGV(":urd %d, %d, %d\r\n", size, _rx_buf->len, _rx_buf_offset);
-        
-        os_memcpy(dst, reinterpret_cast<char*>(_rx_buf->payload) + _rx_buf_offset, size);        
+
+        memcpy(dst, reinterpret_cast<char*>(_rx_buf->payload) + _rx_buf_offset, size);
         _consume(size);
-        
+
         return size;
     }
 
@@ -236,7 +236,7 @@ public:
         {
             _reserve(_tx_buf_offset + size);
         }
-        
+
         size_t left_to_copy = size;
         while(left_to_copy)
         {
@@ -249,7 +249,7 @@ public:
                 continue;
             }
             size_t will_copy = (left_to_copy < free_cur) ? left_to_copy : free_cur;
-            os_memcpy(reinterpret_cast<char*>(_tx_buf_cur->payload) + used_cur, data, will_copy);
+            memcpy(reinterpret_cast<char*>(_tx_buf_cur->payload) + used_cur, data, will_copy);
             _tx_buf_offset += will_copy;
             left_to_copy -= will_copy;
             data += will_copy;
@@ -259,18 +259,20 @@ public:
 
     void send(ip_addr_t* addr = 0, uint16_t port = 0)
     {
-        size_t orig_size = _tx_buf_head->tot_len;
-
         size_t data_size = _tx_buf_offset;
-        size_t size_adjustment = orig_size - data_size;
-        for (pbuf* p = _tx_buf_head; p; p = p->next)
-        {
-            p->tot_len -= size_adjustment;
-            if (!p->next)
-            {
-                p->len = p->tot_len;
-            }
+        pbuf* tx_copy = pbuf_alloc(PBUF_TRANSPORT, data_size, PBUF_RAM);
+        uint8_t* dst = reinterpret_cast<uint8_t*>(tx_copy->payload);
+        for (pbuf* p = _tx_buf_head; p; p = p->next) {
+            size_t will_copy = (data_size < p->len) ? data_size : p->len;
+            memcpy(dst, p->payload, will_copy);
+            dst += will_copy;
+            data_size -= will_copy;
         }
+        pbuf_free(_tx_buf_head);
+        _tx_buf_head = 0;
+        _tx_buf_cur = 0;
+        _tx_buf_offset = 0;
+
 
         if (!addr) {
             addr = &_dest_addr;
@@ -282,30 +284,16 @@ public:
             _pcb->ttl = _multicast_ttl;
         }
 
-        udp_sendto(_pcb, _tx_buf_head, addr, port);
-
+        udp_sendto(_pcb, tx_copy, addr, port);
         _pcb->ttl = old_ttl;
-
-        for (pbuf* p = _tx_buf_head; p; p = p->next)
-        {
-            p->tot_len += size_adjustment;
-            if (!p->next)
-            {
-                p->len = p->tot_len;
-            }
-        }
-
-        pbuf_free(_tx_buf_head);
-        _tx_buf_head = 0;
-        _tx_buf_cur = 0;
-        _tx_buf_offset = 0;
+        pbuf_free(tx_copy);
     }
 
 private:
 
     void _reserve(size_t size)
     {
-        const size_t pbuf_unit_size = 512;
+        const size_t pbuf_unit_size = 128;
         if (!_tx_buf_head)
         {
             _tx_buf_head = pbuf_alloc(PBUF_TRANSPORT, pbuf_unit_size, PBUF_RAM);
@@ -357,7 +345,7 @@ private:
     }
 
 
-    static void _s_recv(void *arg, 
+    static void _s_recv(void *arg,
             udp_pcb *upcb, pbuf *p,
             ip_addr_t *addr, u16_t port)
     {

From c6c7d2475059fff19f7127b0a4aba082c7ca7200 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Sun, 6 Dec 2015 20:39:54 +0300
Subject: [PATCH 18/41] Add __throw_logic_error (#1136)

---
 cores/esp8266/abi.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cores/esp8266/abi.cpp b/cores/esp8266/abi.cpp
index b38f16453..ff865d9ca 100644
--- a/cores/esp8266/abi.cpp
+++ b/cores/esp8266/abi.cpp
@@ -68,6 +68,10 @@ void __throw_length_error(char const*) {
 void __throw_bad_alloc() {
     panic();
 }
+
+void __throw_logic_error(const char* str) {
+    panic();
+}
 }
 
 // TODO: rebuild windows toolchain to make this unnecessary:

From ee314f2cdc1890997516338491aeea4e4510ef71 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Sun, 6 Dec 2015 20:54:35 +0300
Subject: [PATCH 19/41] fix portInput(Output, Mode)Register definitions to
 return pointers (#1110)

---
 cores/esp8266/Arduino.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/cores/esp8266/Arduino.h b/cores/esp8266/Arduino.h
index 7e06e0058..10c6ebd44 100644
--- a/cores/esp8266/Arduino.h
+++ b/cores/esp8266/Arduino.h
@@ -219,14 +219,12 @@ void loop(void);
 void yield(void);
 void optimistic_yield(uint32_t interval_us);
 
-// Get the bit location within the hardware port of the given virtual pin.
-// This comes from the pins_*.c file for the active board configuration.
 #define digitalPinToPort(pin)       (0)
 #define digitalPinToBitMask(pin)    (1UL << (pin))
 #define digitalPinToTimer(pin)      (0)
-#define portOutputRegister(port)    ((volatile uint32_t*) GPO)
-#define portInputRegister(port)     ((volatile uint32_t*) GPI)
-#define portModeRegister(port)      ((volatile uint32_t*) GPE)
+#define portOutputRegister(port)    ((volatile uint32_t*) &GPO)
+#define portInputRegister(port)     ((volatile uint32_t*) &GPI)
+#define portModeRegister(port)      ((volatile uint32_t*) &GPE)
 
 #define NOT_A_PIN -1
 #define NOT_A_PORT -1

From cc0a8ead55ce756103ff47146cdbd499cd1a2d77 Mon Sep 17 00:00:00 2001
From: Christopher Pascoe <alltheblinkythings@gmail.com>
Date: Sun, 6 Dec 2015 21:03:05 -0800
Subject: [PATCH 20/41] Always arm the "TX FIFO Empty" interrupt after we write
 into _tx_buffer. This avoids a race where the interrupt handler detects an
 empty _tx_buffer just before we write data into it.

Note that commit d6f62943d4b511e7d5fe6147096c8979890416f5 works around
this race when data is continually added to _tx_buffer in the hung state.
We revert that change here as the race should no longer occur.

Testing performed:
 - set UART_CONF1.txfifo_empty_thrhd=0x70 (which exacerbates the issue)
 - generate a ~240 byte burst of data, sent in back-to-back Serial1.write(, 4)
   calls, optionally followed by a Serial1.flush()
Test results:
 - before this change, observe occasional unsent data and hang in flush()
   (if used).
 - after this change, data is sent as expected.
---
 cores/esp8266/HardwareSerial.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/cores/esp8266/HardwareSerial.cpp b/cores/esp8266/HardwareSerial.cpp
index 2e93f8aee..78108bee7 100644
--- a/cores/esp8266/HardwareSerial.cpp
+++ b/cores/esp8266/HardwareSerial.cpp
@@ -617,18 +617,15 @@ size_t HardwareSerial::write(uint8_t c) {
     size_t room = uart_get_tx_fifo_room(_uart);
     if(room > 0 && _tx_buffer->empty()) {
         uart_transmit_char(_uart, c);
-        if(room < 10) {
-            uart_arm_tx_interrupt(_uart);
-        }
         return 1;
     }
 
     while(_tx_buffer->room() == 0) {
         yield();
-        uart_arm_tx_interrupt(_uart);
     }
 
     _tx_buffer->write(c);
+    uart_arm_tx_interrupt(_uart);
     return 1;
 }
 

From 7133a6c1f99b74986586c56a9a2ab7013cdc7cb9 Mon Sep 17 00:00:00 2001
From: Christopher Pascoe <alltheblinkythings@gmail.com>
Date: Mon, 7 Dec 2015 00:23:46 -0800
Subject: [PATCH 21/41] Ensure that we never write an out of bounds value
 (_bufend) to  _begin or _end, even temporarily.

Testing:
  - Boot tested, ran basic serial I/O code

Notes:
  - Before this change, there are instruction like "s32i.n <reg>, <this>, <_begin>" in the
    disassembled output, followed by an overwrite if <reg> turns out to be _bufend.
    After this change, there is only one store instruction to <_begin> per function.
---
 cores/esp8266/cbuf.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cores/esp8266/cbuf.h b/cores/esp8266/cbuf.h
index fee98a94b..ce3ac5c64 100644
--- a/cores/esp8266/cbuf.h
+++ b/cores/esp8266/cbuf.h
@@ -62,7 +62,7 @@ class cbuf {
             if(getSize() == 0) return -1;
 
             char result = *_begin;
-            if(++_begin == _bufend) _begin = _buf;
+            _begin = wrap_if_bufend(_begin + 1);
             return static_cast<int>(result);
         }
 
@@ -78,8 +78,7 @@ class cbuf {
                 dst += top_size;
             }
             memcpy(dst, _begin, size_to_read);
-            _begin += size_to_read;
-            if(_begin == _bufend) _begin = _buf;
+            _begin = wrap_if_bufend(_begin + size_to_read);
             return size_read;
         }
 
@@ -87,7 +86,7 @@ class cbuf {
             if(room() == 0) return 0;
 
             *_end = c;
-            if(++_end == _bufend) _end = _buf;
+            _end = wrap_if_bufend(_end + 1);
             return 1;
         }
 
@@ -103,8 +102,7 @@ class cbuf {
                 src += top_size;
             }
             memcpy(_end, src, size_to_write);
-            _end += size_to_write;
-            if(_end == _bufend) _end = _buf;
+            _end = wrap_if_bufend(_end + size_to_write);
             return size_written;
         }
 
@@ -114,6 +112,10 @@ class cbuf {
         }
 
     private:
+        inline char* wrap_if_bufend(char* ptr) {
+            return (ptr == _bufend) ? _buf : ptr;
+        }
+
         size_t _size;
         char* _buf;
         char* _bufend;

From d8417c2855b685e31d1d5796c5a89e5a70d49e84 Mon Sep 17 00:00:00 2001
From: Christopher Pascoe <alltheblinkythings@gmail.com>
Date: Mon, 7 Dec 2015 00:31:46 -0800
Subject: [PATCH 22/41] Remove a check in room() for (_begin == _end).  It's
 covered by the (_end >= _begin) case.

---
 cores/esp8266/cbuf.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cores/esp8266/cbuf.h b/cores/esp8266/cbuf.h
index ce3ac5c64..087e7200b 100644
--- a/cores/esp8266/cbuf.h
+++ b/cores/esp8266/cbuf.h
@@ -42,9 +42,6 @@ class cbuf {
             if(_end >= _begin) {
                 return _size - (_end - _begin) - 1;
             }
-            if(_begin == _end) {
-                return _size;
-            }
             return _begin - _end - 1;
         }
 

From dd89de4dad042a427c7e7399d6bb2a1a1b5cc537 Mon Sep 17 00:00:00 2001
From: Jens Hauke <jens@4k2.de>
Date: Mon, 7 Dec 2015 18:01:15 +0100
Subject: [PATCH 23/41] Make pgm_read_byte() and pgm_read_word() usable from c
 files.

The two defines used reinterpret_cast<> which is only available when
compiling with c++. Now using plain old c casts instead.
---
 cores/esp8266/pgmspace.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cores/esp8266/pgmspace.h b/cores/esp8266/pgmspace.h
index 4ee599557..c9e83fa05 100644
--- a/cores/esp8266/pgmspace.h
+++ b/cores/esp8266/pgmspace.h
@@ -78,7 +78,7 @@ int	vsnprintf_P(char *str, size_t strSize, PGM_P formatP, va_list ap) __attribut
 (__extension__({                                                               \
     PGM_P __local = (PGM_P)(addr);  /* isolate varible for macro expansion */         \
     ptrdiff_t __offset = ((uint32_t)__local & 0x00000003); /* byte aligned mask */            \
-    const uint32_t* __addr32 = reinterpret_cast<const uint32_t*>(reinterpret_cast<const uint8_t*>(__local)-__offset);   \
+    const uint32_t* __addr32 = (const uint32_t*)((const uint8_t*)(__local)-__offset); \
     uint8_t __result = ((*__addr32) >> (__offset * 8));                        \
     __result;                                                                  \
 }))
@@ -87,7 +87,7 @@ int	vsnprintf_P(char *str, size_t strSize, PGM_P formatP, va_list ap) __attribut
 (__extension__({                                                               \
     PGM_P __local = (PGM_P)(addr); /* isolate varible for macro expansion */          \
     ptrdiff_t __offset = ((uint32_t)__local & 0x00000002);   /* word aligned mask */          \
-    const uint32_t* __addr32 = reinterpret_cast<const uint32_t*>(reinterpret_cast<const uint8_t*>(__local) - __offset); \
+    const uint32_t* __addr32 = (const uint32_t*)((const uint8_t*)(__local) - __offset); \
     uint16_t __result = ((*__addr32) >> (__offset * 8));                       \
     __result;                                                                  \
 }))	

From 8847d7ab1af8e4572b4a2afe5fcc0443cf22b338 Mon Sep 17 00:00:00 2001
From: Rodrigo Mendez <rmendez@makerlab.mx>
Date: Mon, 7 Dec 2015 17:35:30 -0600
Subject: [PATCH 24/41] added ESPino to dox/boards.md and
 package_esp8266com_index.template.json. removed flash speed selection

---
 boards.txt                                     | 5 -----
 doc/boards.md                                  | 9 +++++++++
 package/package_esp8266com_index.template.json | 7 +++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/boards.txt b/boards.txt
index b24d084de..248622f74 100644
--- a/boards.txt
+++ b/boards.txt
@@ -726,11 +726,6 @@ espino.menu.CpuFrequency.80.build.f_cpu=80000000L
 espino.menu.CpuFrequency.160=160 MHz
 espino.menu.CpuFrequency.160.build.f_cpu=160000000L
 
-espino.menu.FlashFreq.40=40MHz
-espino.menu.FlashFreq.40.build.flash_freq=40
-espino.menu.FlashFreq.80=80MHz
-espino.menu.FlashFreq.80.build.flash_freq=80
-
 espino.menu.FlashMode.dio=DIO
 espino.menu.FlashMode.dio.build.flash_mode=dio
 espino.menu.FlashMode.qio=QIO
diff --git a/doc/boards.md b/doc/boards.md
index e92c4c591..578ea319d 100644
--- a/doc/boards.md
+++ b/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:
diff --git a/package/package_esp8266com_index.template.json b/package/package_esp8266com_index.template.json
index ee1042450..d070d4809 100644
--- a/package/package_esp8266com_index.template.json
+++ b/package/package_esp8266com_index.template.json
@@ -43,11 +43,14 @@
             {
               "name": "SweetPea ESP-210"
             },
-			{
+            {
               "name": "WeMos D1"
             },
-			{
+            {
               "name": "WeMos D1 mini"
+            },
+            {
+              "name": "ESPino"
             }
           ],
           "toolsDependencies": [

From a3c3c934bcfae34dc4cac04f010dda7bc6bd44b2 Mon Sep 17 00:00:00 2001
From: tzapu <alex@tzapu.com>
Date: Tue, 8 Dec 2015 08:49:40 +0200
Subject: [PATCH 25/41] Update libraries.md

Added link to WiFiManager
---
 doc/libraries.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/libraries.md b/doc/libraries.md
index 314b1aa51..894143815 100644
--- a/doc/libraries.md
+++ b/doc/libraries.md
@@ -152,3 +152,4 @@ Libraries that don't rely on low-level access to AVR registers should work well.
 - [Souliss, Smart Home](https://github.com/souliss/souliss) - Framework for Smart Home based on Arduino, Android and openHAB.
 - [ST7735](https://github.com/nzmichaelh/Adafruit-ST7735-Library) - Adafruit's ST7735 library modified to be compatible with ESP8266.  Just make sure to modify the pins in the examples as they are still AVR specific.
 - [UTFT-ESP8266](https://github.com/gnulabis/UTFT-ESP8266) - UTFT display library with support for ESP8266. Only serial interface (SPI) displays are supported for now (no 8-bit parallel mode, etc). Also includes support for the hardware SPI controller of the ESP8266.
+- [WiFiManager](https://github.com/tzapu/WiFiManager) - WiFi Connection manager with web captive portal. If it can't connect, it starts AP mode and a configuration portal so you can choose and enter WiFi credentials.

From 02e22b38cb17697d43f347478d63530c72b61e7d Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Tue, 8 Dec 2015 11:33:15 +0100
Subject: [PATCH 26/41] add define RANDOM_REG32  ESP8266_DREG(0x20E44)

---
 cores/esp8266/esp8266_peri.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cores/esp8266/esp8266_peri.h b/cores/esp8266/esp8266_peri.h
index 4fd057009..e7aab1f03 100644
--- a/cores/esp8266/esp8266_peri.h
+++ b/cores/esp8266/esp8266_peri.h
@@ -834,4 +834,10 @@ extern uint8_t esp8266_gpioToFn[16];
 #define I2STXCMM (0x7)      //I2S_TX_CHAN_MOD
 #define I2STXCM  (0)        //I2S_TX_CHAN_MOD_S
 
+/**
+ Random Number Generator 32bit
+ http://esp8266-re.foogod.com/wiki/Random_Number_Generator
+**/
+#define RANDOM_REG32  ESP8266_DREG(0x20E44)
+
 #endif

From 22af40af184b28c64b31031a6b0a0edd407c80a7 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Tue, 8 Dec 2015 11:35:14 +0100
Subject: [PATCH 27/41] add note about Adafruit_ILI9341

---
 doc/libraries.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/libraries.md b/doc/libraries.md
index 314b1aa51..756293ef7 100644
--- a/doc/libraries.md
+++ b/doc/libraries.md
@@ -140,14 +140,15 @@ While many RC servo motors will accept the 3.3V IO data pin from a ESP8266, most
 
 Libraries that don't rely on low-level access to AVR registers should work well. Here are a few libraries that were verified to work:
 
+- [Adafruit_ILI9341](https://github.com/Links2004/Adafruit_ILI9341) - Port of the Adafruit ILI9341 for the ESP8266 
 - [arduinoWebSockets](https://github.com/Links2004/arduinoWebSockets) - WebSocket Server and Client compatible with ESP8266 (RFC6455)
-- [aREST](https://github.com/marcoschwartz/aREST) REST API handler library.
+- [aREST](https://github.com/marcoschwartz/aREST) - REST API handler library.
 - [Blynk](https://github.com/blynkkk/blynk-library) - easy IoT framework for Makers (check out the [Kickstarter page](http://tiny.cc/blynk-kick)).
 - [DallasTemperature](https://github.com/milesburton/Arduino-Temperature-Control-Library.git)
 - [DHT-sensor-library](https://github.com/adafruit/DHT-sensor-library) - Arduino library for the DHT11/DHT22 temperature and humidity sensors. Download latest v1.1.1 library and no changes are necessary.  Older versions should initialize DHT as follows: `DHT dht(DHTPIN, DHTTYPE, 15)`
 - [NeoPixel](https://github.com/adafruit/Adafruit_NeoPixel) - Adafruit's NeoPixel library, now with support for the ESP8266 (use version 1.0.2 or higher from Arduino's library manager).
 - [NeoPixelBus](https://github.com/Makuna/NeoPixelBus) - Arduino NeoPixel library compatible with ESP8266. Use the "NeoPixelAnimator" branch for ESP8266 to get HSL color support and more.
-- [PubSubClient](https://github.com/Imroy/pubsubclient) MQTT library by @Imroy.
+- [PubSubClient](https://github.com/Imroy/pubsubclient) - MQTT library by @Imroy.
 - [RTC](https://github.com/Makuna/Rtc) - Arduino Library for Ds1307 & Ds3231 compatible with ESP8266.
 - [Souliss, Smart Home](https://github.com/souliss/souliss) - Framework for Smart Home based on Arduino, Android and openHAB.
 - [ST7735](https://github.com/nzmichaelh/Adafruit-ST7735-Library) - Adafruit's ST7735 library modified to be compatible with ESP8266.  Just make sure to modify the pins in the examples as they are still AVR specific.

From 5cd42a0316b528fca61482ef41b6d75431e8f399 Mon Sep 17 00:00:00 2001
From: Ivan Grokhotkov <igrokhotkov@gmail.com>
Date: Wed, 9 Dec 2015 09:23:47 +0300
Subject: [PATCH 28/41] WiFiClientSecure: don't trash certificate and private
 key on stop()

---
 libraries/ESP8266WiFi/src/WiFiClientSecure.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
index 247701acd..997fe5ccb 100644
--- a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
+++ b/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)

From 8b161ecf16e4ef0250fa0e1164c4c746c2685034 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 12:47:23 +0100
Subject: [PATCH 29/41] add http codes as enum t_http_codes

---
 .../ESP8266HTTPClient/src/ESP8266HTTPClient.h | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
index 2d1312a29..46c3de415 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
@@ -42,6 +42,71 @@
 #define HTTPC_ERROR_NO_STREAM           (-6)
 #define HTTPC_ERROR_NO_HTTP_SERVER      (-7)
 
+/// HTTP codes see RFC7231
+typedef enum {
+    HTTP_CODE_CONTINUE = 100,
+    HTTP_CODE_SWITCHING_PROTOCOLS = 101,
+    HTTP_CODE_PROCESSING = 102,
+    HTTP_CODE_OK = 200,
+    HTTP_CODE_CREATED = 201,
+    HTTP_CODE_ACCEPTED = 202,
+    HTTP_CODE_NON_AUTHORITATIVE_INFORMATION = 203,
+    HTTP_CODE_NO_CONTENT = 204,
+    HTTP_CODE_RESET_CONTENT = 205,
+    HTTP_CODE_PARTIAL_CONTENT = 206,
+    HTTP_CODE_MULTI_STATUS = 207,
+    HTTP_CODE_ALREADY_REPORTED = 208,
+    HTTP_CODE_IM_USED = 226,
+    HTTP_CODE_MULTIPLE_CHOICES = 300,
+    HTTP_CODE_MOVED_PERMANENTLY = 301,
+    HTTP_CODE_FOUND = 302,
+    HTTP_CODE_SEE_OTHER = 303,
+    HTTP_CODE_NOT_MODIFIED = 304,
+    HTTP_CODE_USE_PROXY = 305,
+    HTTP_CODE_TEMPORARY_REDIRECT = 307,
+    HTTP_CODE_PERMANENT_REDIRECT = 308,
+    HTTP_CODE_BAD_REQUEST = 400,
+    HTTP_CODE_UNAUTHORIZED = 401,
+    HTTP_CODE_PAYMENT_REQUIRED = 402,
+    HTTP_CODE_FORBIDDEN = 403,
+    HTTP_CODE_NOT_FOUND = 404,
+    HTTP_CODE_METHOD_NOT_ALLOWED = 405,
+    HTTP_CODE_NOT_ACCEPTABLE = 406,
+    HTTP_CODE_PROXY_AUTHENTICATION_REQUIRED = 407,
+    HTTP_CODE_REQUEST_TIMEOUT = 408,
+    HTTP_CODE_CONFLICT = 409,
+    HTTP_CODE_GONE = 410,
+    HTTP_CODE_LENGTH_REQUIRED = 411,
+    HTTP_CODE_PRECONDITION_FAILED = 412,
+    HTTP_CODE_PAYLOAD_TOO_LARGE = 413,
+    HTTP_CODE_URI_TOO_LONG = 414,
+    HTTP_CODE_UNSUPPORTED_MEDIA_TYPE = 415,
+    HTTP_CODE_RANGE_NOT_SATISFIABLE = 416,
+    HTTP_CODE_EXPECTATION_FAILED = 417,
+    HTTP_CODE_MISDIRECTED_REQUEST = 421,
+    HTTP_CODE_UNPROCESSABLE_ENTITY = 422,
+    HTTP_CODE_LOCKED = 423,
+    HTTP_CODE_FAILED_DEPENDENCY = 424,
+    HTTP_CODE_UNASSIGNED = 425,
+    HTTP_CODE_UPGRADE_REQUIRED = 426,
+    HTTP_CODE_UNASSIGNED = 427,
+    HTTP_CODE_PRECONDITION_REQUIRED = 428,
+    HTTP_CODE_TOO_MANY_REQUESTS = 429,
+    HTTP_CODE_UNASSIGNED = 430,
+    HTTP_CODE_REQUEST_HEADER_FIELDS_TOO_LARGE = 431,
+    HTTP_CODE_INTERNAL_SERVER_ERROR = 500,
+    HTTP_CODE_NOT_IMPLEMENTED = 501,
+    HTTP_CODE_BAD_GATEWAY = 502,
+    HTTP_CODE_SERVICE_UNAVAILABLE = 503,
+    HTTP_CODE_GATEWAY_TIMEOUT = 504,
+    HTTP_CODE_HTTP_VERSION_NOT_SUPPORTED = 505,
+    HTTP_CODE_VARIANT_ALSO_NEGOTIATES = 506,
+    HTTP_CODE_INSUFFICIENT_STORAGE = 507,
+    HTTP_CODE_LOOP_DETECTED = 508,
+    HTTP_CODE_UNASSIGNED = 509,
+    HTTP_CODE_NOT_EXTENDED = 510,
+    HTTP_CODE_NETWORK_AUTHENTICATION_REQUIRED = 511
+} t_http_codes;
 
 class HTTPClient {
     public:

From e15c745e6f27ccf8cf8d2bcd3e42cb03857c8447 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 12:50:55 +0100
Subject: [PATCH 30/41] remove some HTTP_CODE_UNASSIGNED

---
 libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
index 46c3de415..a455192ed 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
@@ -87,12 +87,9 @@ typedef enum {
     HTTP_CODE_UNPROCESSABLE_ENTITY = 422,
     HTTP_CODE_LOCKED = 423,
     HTTP_CODE_FAILED_DEPENDENCY = 424,
-    HTTP_CODE_UNASSIGNED = 425,
     HTTP_CODE_UPGRADE_REQUIRED = 426,
-    HTTP_CODE_UNASSIGNED = 427,
     HTTP_CODE_PRECONDITION_REQUIRED = 428,
     HTTP_CODE_TOO_MANY_REQUESTS = 429,
-    HTTP_CODE_UNASSIGNED = 430,
     HTTP_CODE_REQUEST_HEADER_FIELDS_TOO_LARGE = 431,
     HTTP_CODE_INTERNAL_SERVER_ERROR = 500,
     HTTP_CODE_NOT_IMPLEMENTED = 501,
@@ -103,7 +100,6 @@ typedef enum {
     HTTP_CODE_VARIANT_ALSO_NEGOTIATES = 506,
     HTTP_CODE_INSUFFICIENT_STORAGE = 507,
     HTTP_CODE_LOOP_DETECTED = 508,
-    HTTP_CODE_UNASSIGNED = 509,
     HTTP_CODE_NOT_EXTENDED = 510,
     HTTP_CODE_NETWORK_AUTHENTICATION_REQUIRED = 511
 } t_http_codes;

From 1dabac60a925b0b548b78e49489cdac6ed5fd391 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 12:56:49 +0100
Subject: [PATCH 31/41] rework HTTPclient examples

---
 .../examples/BasicHttpClient/BasicHttpClient.ino      | 10 +++++++---
 .../examples/ReuseConnection/ReuseConnection.ino      | 11 ++++++++---
 .../examples/StreamHttpClient/StreamHttpClient.ino    | 11 +++++++----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino b/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino
index 3c722556b..8e2b5d2f4 100644
--- a/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino
+++ b/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino
@@ -43,24 +43,28 @@ void loop() {
 
         USE_SERIAL.print("[HTTP] begin...\n");
         // configure traged server and url
-        //http.begin("192.168.1.12", 443, "/test.html", true, "7a 9c f4 db 40 d3 62 5a 6e 21 bc 5c cc 66 c8 3e a1 45 59 38"); //HTTPS
-        http.begin("192.168.1.12", 80, "/test.html"); //HTTP
+        //http.begin("https://192.168.1.12/test.html", "7a 9c f4 db 40 d3 62 5a 6e 21 bc 5c cc 66 c8 3e a1 45 59 38"); //HTTPS
+        http.begin("http://192.168.1.12/test.html"); //HTTP
 
         USE_SERIAL.print("[HTTP] GET...\n");
         // start connection and send HTTP header
         int httpCode = http.GET();
+
+        // httpCode will be negative on error
         if(httpCode) {
             // HTTP header has been send and Server response header has been handled
             USE_SERIAL.printf("[HTTP] GET... code: %d\n", httpCode);
 
             // file found at server
-            if(httpCode == 200) {
+            if(httpCode == HTTP_CODE_OK) {
                 String payload = http.getString();
                 USE_SERIAL.println(payload);
             }
         } else {
             USE_SERIAL.print("[HTTP] GET... failed, no connection or no HTTP server\n");
         }
+
+        http.end();
     }
 
     delay(10000);
diff --git a/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino b/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino
index e725a1f76..36c189cb3 100644
--- a/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino
+++ b/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino
@@ -36,26 +36,31 @@ void setup() {
 
     WiFiMulti.addAP("SSID", "PASSWORD");
 
-
+    // allow reuse (if server supports it)
+    http.setReuse(true);
 }
 
 void loop() {
     // wait for WiFi connection
     if((WiFiMulti.run() == WL_CONNECTED)) {
 
-        http.begin("192.168.1.12", 80, "/test.html");
+        http.begin("http://192.168.1.12/test.html");
+        //http.begin("192.168.1.12", 80, "/test.html");
 
         int httpCode = http.GET();
         if(httpCode) {
             USE_SERIAL.printf("[HTTP] GET... code: %d\n", httpCode);
 
             // file found at server
-            if(httpCode == 200) {
+            if(httpCode == HTTP_CODE_OK) {
                 http.writeToStream(&USE_SERIAL);
             }
         } else {
             USE_SERIAL.print("[HTTP] GET... failed, no connection or no HTTP server\n");
         }
+
+        http.end();
+
     }
 
     delay(1000);
diff --git a/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino b/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino
index 442fa6547..7f6c37872 100644
--- a/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino
+++ b/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino
@@ -42,19 +42,20 @@ void loop() {
         HTTPClient http;
 
         USE_SERIAL.print("[HTTP] begin...\n");
-        // configure traged server and url
-        http.begin("192.168.1.12", 80, "/test.html");
+
+        // configure server and url
+        http.begin("http://192.168.1.12/test.html");
+        //http.begin("192.168.1.12", 80, "/test.html");
 
         USE_SERIAL.print("[HTTP] GET...\n");
         // start connection and send HTTP header
         int httpCode = http.GET();
         if(httpCode) {
             // HTTP header has been send and Server response header has been handled
-
             USE_SERIAL.printf("[HTTP] GET... code: %d\n", httpCode);
 
             // file found at server
-            if(httpCode == 200) {
+            if(httpCode == HTTP_CODE_OK) {
 
                 // get lenght of document (is -1 when Server sends no Content-Length header)
                 int len = http.getSize();
@@ -91,6 +92,8 @@ void loop() {
         } else {
             USE_SERIAL.print("[HTTP] GET... failed, no connection or no HTTP server\n");
         }
+
+        http.end();
     }
 
     delay(10000);

From b1e3d2256a3f891909dacaa229551ba79151cae5 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 13:01:08 +0100
Subject: [PATCH 32/41] add errorToString function

---
 .../BasicHttpClient/BasicHttpClient.ino       |  2 +-
 .../ReuseConnection/ReuseConnection.ino       |  2 +-
 .../StreamHttpClient/StreamHttpClient.ino     |  2 +-
 .../src/ESP8266HTTPClient.cpp                 | 27 +++++++++++++++++++
 .../ESP8266HTTPClient/src/ESP8266HTTPClient.h |  2 ++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino b/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino
index 8e2b5d2f4..d3a5fbc7d 100644
--- a/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino
+++ b/libraries/ESP8266HTTPClient/examples/BasicHttpClient/BasicHttpClient.ino
@@ -61,7 +61,7 @@ void loop() {
                 USE_SERIAL.println(payload);
             }
         } else {
-            USE_SERIAL.print("[HTTP] GET... failed, no connection or no HTTP server\n");
+            USE_SERIAL.printf("[HTTP] GET... failed, error: %s\n", http.errorToString(httpCode).c_str());
         }
 
         http.end();
diff --git a/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino b/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino
index 36c189cb3..35babdc33 100644
--- a/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino
+++ b/libraries/ESP8266HTTPClient/examples/ReuseConnection/ReuseConnection.ino
@@ -56,7 +56,7 @@ void loop() {
                 http.writeToStream(&USE_SERIAL);
             }
         } else {
-            USE_SERIAL.print("[HTTP] GET... failed, no connection or no HTTP server\n");
+            USE_SERIAL.printf("[HTTP] GET... failed, error: %s\n", http.errorToString(httpCode).c_str());
         }
 
         http.end();
diff --git a/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino b/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino
index 7f6c37872..2e7f4487d 100644
--- a/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino
+++ b/libraries/ESP8266HTTPClient/examples/StreamHttpClient/StreamHttpClient.ino
@@ -90,7 +90,7 @@ void loop() {
 
             }
         } else {
-            USE_SERIAL.print("[HTTP] GET... failed, no connection or no HTTP server\n");
+            USE_SERIAL.printf("[HTTP] GET... failed, error: %s\n", http.errorToString(httpCode).c_str());
         }
 
         http.end();
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
index 37b71dbc1..5561c62ae 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
@@ -454,6 +454,33 @@ String HTTPClient::getString(void) {
     return sstring;
 }
 
+/**
+ * converts error code to String
+ * @param error int
+ * @return String
+ */
+String HTTPClient::errorToString(int error) {
+    switch(error) {
+        case HTTPC_ERROR_CONNECTION_REFUSED:
+            return String("connection refused");
+        case HTTPC_ERROR_SEND_HEADER_FAILED:
+            return String("send header failed");
+        case HTTPC_ERROR_SEND_PAYLOAD_FAILED:
+            return String("send payload failed");
+        case HTTPC_ERROR_NOT_CONNECTED:
+            return String("not connected");
+        case HTTPC_ERROR_CONNECTION_LOST:
+            return String("connection lost");
+        case HTTPC_ERROR_NO_STREAM:
+            return String("no stream");
+        case HTTPC_ERROR_NO_HTTP_SERVER:
+            return String("no HTTP server");
+        default:
+            return String();
+    }
+}
+
+
 /**
  * adds Header to the request
  * @param name
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
index a455192ed..5d3fc51bc 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
@@ -147,6 +147,8 @@ class HTTPClient {
         int writeToStream(Stream * stream);
         String getString(void);
 
+        String errorToString(int error);
+
     protected:
 
         struct RequestArgument {

From 62f38bfef3681209933c88702ed3ad26db911cb6 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 13:51:39 +0100
Subject: [PATCH 33/41] add base64 class

---
 cores/esp8266/base64.cpp | 63 ++++++++++++++++++++++++++++++++++++++++
 cores/esp8266/base64.h   | 36 +++++++++++++++++++++++
 2 files changed, 99 insertions(+)
 create mode 100644 cores/esp8266/base64.cpp
 create mode 100644 cores/esp8266/base64.h

diff --git a/cores/esp8266/base64.cpp b/cores/esp8266/base64.cpp
new file mode 100644
index 000000000..11deb0af0
--- /dev/null
+++ b/cores/esp8266/base64.cpp
@@ -0,0 +1,63 @@
+/**
+ * base64.cpp
+ *
+ * Created on: 09.12.2015
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the ESP8266 core for Arduino.
+ *
+ * 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 "Arduino.h"
+extern "C" {
+#include "libb64/cdecode.h"
+#include "libb64/cencode.h"
+}
+#include "base64.h"
+
+/**
+ * convert input data to base64
+ * @param data uint8_t *
+ * @param length size_t
+ * @return String
+ */
+String base64::encode(uint8_t * data, size_t length) {
+    // base64 needs more size then the source data
+    size_t size = ((length * 1.6f) + 1);
+    char * buffer = (char *) malloc(size);
+    if(buffer) {
+        base64_encodestate _state;
+        base64_init_encodestate(&_state);
+        int len = base64_encode_block((const char *) &data[0], length, &buffer[0], &_state);
+        len = base64_encode_blockend((buffer + len), &_state);
+
+        String base64 = String(buffer);
+        free(buffer);
+        return base64;
+    }
+    return String("-FAIL-");
+}
+
+/**
+ * convert input data to base64
+ * @param text String
+ * @return String
+ */
+String base64::encode(String text) {
+    return base64::encode((uint8_t *) text.c_str(), text.length());
+}
+
diff --git a/cores/esp8266/base64.h b/cores/esp8266/base64.h
new file mode 100644
index 000000000..39be2d397
--- /dev/null
+++ b/cores/esp8266/base64.h
@@ -0,0 +1,36 @@
+/**
+ * base64.h
+ *
+ * Created on: 09.12.2015
+ *
+ * Copyright (c) 2015 Markus Sattler. All rights reserved.
+ * This file is part of the ESP8266 core for Arduino.
+ *
+ * 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
+ *
+ */
+
+#ifndef CORE_BASE64_H_
+#define CORE_BASE64_H_
+
+class base64 {
+    public:
+        static String encode(uint8_t * data, size_t length);
+        static String encode(String text);
+    private:
+};
+
+
+#endif /* CORE_BASE64_H_ */

From a9ce1b4f2ebb774d69aab6573bd474d5d704ff4e Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 13:51:55 +0100
Subject: [PATCH 34/41] add Authorization support for HTTP client

---
 cores/esp8266/core_esp8266_features.h         |  1 +
 .../src/ESP8266HTTPClient.cpp                 | 26 +++++++++++++++++--
 .../ESP8266HTTPClient/src/ESP8266HTTPClient.h |  4 ++-
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/cores/esp8266/core_esp8266_features.h b/cores/esp8266/core_esp8266_features.h
index bafcd3aee..ae5d58539 100644
--- a/cores/esp8266/core_esp8266_features.h
+++ b/cores/esp8266/core_esp8266_features.h
@@ -26,6 +26,7 @@
 
 
 #define CORE_HAS_LIBB64
+#define CORE_HAS_BASE64_CLASS
 
 
 #endif
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
index 5561c62ae..357aebda3 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
@@ -26,9 +26,11 @@
 #include <ESP8266WiFi.h>
 #include <WiFiClientSecure.h>
 #include <StreamString.h>
+#include <base64.h>
 
 #include "ESP8266HTTPClient.h"
 
+
 /**
  * constractor
  */
@@ -219,6 +221,20 @@ void HTTPClient::setUserAgent(const char * userAgent) {
     _userAgent = userAgent;
 }
 
+/**
+ * set the Authorizatio for the http request
+ * @param user const char *
+ * @param password const char *
+ */
+void HTTPClient::setAuthorization(const char * user, const char * password) {
+    if(user && password) {
+        String auth = user;
+        auth += ":";
+        auth += password;
+        _base64Authorization = base64::encode(auth);
+    }
+}
+
 /**
  * send a GET request
  * @return http code
@@ -490,7 +506,7 @@ String HTTPClient::errorToString(int error) {
 void HTTPClient::addHeader(const String& name, const String& value, bool first) {
 
     // not allow set of Header handled by code
-    if(!name.equalsIgnoreCase("Connection") && !name.equalsIgnoreCase("User-Agent") && !name.equalsIgnoreCase("Host")) {
+    if(!name.equalsIgnoreCase("Connection") && !name.equalsIgnoreCase("User-Agent") && !name.equalsIgnoreCase("Host") && !(_base64Authorization.length() && name.equalsIgnoreCase("Authorization"))) {
         String headerLine = name;
         headerLine += ": ";
         headerLine += value;
@@ -622,7 +638,13 @@ bool HTTPClient::sendHeader(const char * type) {
     } else {
         header += "close";
     }
-    header += "\r\n" + _Headers + "\r\n";
+    header += "\r\n";
+
+    if(_base64Authorization.length()) {
+        header += "Authorization: Basic " + _base64Authorization + "\r\n";
+    }
+
+    header += _Headers + "\r\n";
 
     return (_tcp->write(header.c_str(), header.length()) == header.length());
 }
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
index 5d3fc51bc..f6c4bba6a 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
@@ -25,7 +25,7 @@
 #ifndef ESP8266HTTPClient_H_
 #define ESP8266HTTPClient_H_
 
-//#define DEBUG_HTTPCLIENT(...) Serial1.printf( __VA_ARGS__ )
+#define DEBUG_HTTPCLIENT(...) Serial1.printf( __VA_ARGS__ )
 
 #ifndef DEBUG_HTTPCLIENT
 #define DEBUG_HTTPCLIENT(...)
@@ -121,6 +121,7 @@ class HTTPClient {
 
         void setReuse(bool reuse); /// keep-alive
         void setUserAgent(const char * userAgent);
+        void setAuthorization(const char * user, const char * password);
 
         /// request handling
         int GET();
@@ -172,6 +173,7 @@ class HTTPClient {
 
         String _Headers;
         String _userAgent;
+        String _base64Authorization;
 
         /// Response handling
         RequestArgument* _currentHeaders;

From 85341ff25a0a144a3095b8a6f20fdd07f825fdf4 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 14:19:28 +0100
Subject: [PATCH 35/41] HTTPClient phasing username + password from url

---
 .../src/ESP8266HTTPClient.cpp                 | 42 +++++++++++++------
 .../ESP8266HTTPClient/src/ESP8266HTTPClient.h |  3 +-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
index 357aebda3..6a8d010e1 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
@@ -102,27 +102,34 @@ void HTTPClient::begin(String url, String httpsFingerprint) {
     String protocol;
     // check for : (http: or https:
     int index = url.indexOf(':');
-    int index2;
+    //int index2;
     bool hasPort = false;
     if(index) {
         protocol = url.substring(0, index);
         url.remove(0, (index + 3)); // remove http:// or https://
 
-        index = url.indexOf(':');
-        index2 = url.indexOf('/');
+        index = url.indexOf('/');
+        String host = url.substring(0, index);
+        url.remove(0, index); // remove host part
 
-        if(index >= 0 && ((index2 >= 0 && index < index2) || index2 == 0)) { // do we have a port?
-            _host = url.substring(0, index); // hostname
-            url.remove(0, (index + 1)); // remove hostname + :
+        // get Authorization
+        index = host.indexOf('@');
+        if(index >= 0) {
+            // auth info
+            String auth = host.substring(0, index);
+            host.remove(0, index +1); // remove auth part including @
+            _base64Authorization = base64::encode(auth);
+        }
 
-            index = url.indexOf('/');
-            _port = url.substring(0, index).toInt(); // get port
-            url.remove(0, index); // remove port
+        // get port
+        index = host.indexOf(':');
+        if(index >= 0) {
+            _host = host.substring(0, index); // hostname
+            host.remove(0, (index + 1)); // remove hostname + :
+            _port = host.toInt(); // get port
             hasPort = true;
         } else {
-            index = index2;
-            _host = url.substring(0, index);
-            url.remove(0, index); // remove hostname
+            _host = host;
         }
 
         _url = url;
@@ -141,6 +148,7 @@ void HTTPClient::begin(String url, String httpsFingerprint) {
             DEBUG_HTTPCLIENT("[HTTP-Client][begin] protocol: %s unknown?!\n", protocol.c_str());
             return;
         }
+
     }
 
     DEBUG_HTTPCLIENT("[HTTP-Client][begin] host: %s port: %d url: %s https: %d httpsFingerprint: %s\n", _host.c_str(), _port, _url.c_str(), _https, _httpsFingerprint.c_str());
@@ -235,6 +243,16 @@ void HTTPClient::setAuthorization(const char * user, const char * password) {
     }
 }
 
+/**
+ * set the Authorizatio for the http request
+ * @param auth const char * base64
+ */
+void HTTPClient::setAuthorization(const char * auth) {
+    if(auth) {
+        _base64Authorization = auth;
+    }
+}
+
 /**
  * send a GET request
  * @return http code
diff --git a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
index f6c4bba6a..2bf6d0565 100644
--- a/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
+++ b/libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
@@ -25,7 +25,7 @@
 #ifndef ESP8266HTTPClient_H_
 #define ESP8266HTTPClient_H_
 
-#define DEBUG_HTTPCLIENT(...) Serial1.printf( __VA_ARGS__ )
+//#define DEBUG_HTTPCLIENT(...) Serial1.printf( __VA_ARGS__ )
 
 #ifndef DEBUG_HTTPCLIENT
 #define DEBUG_HTTPCLIENT(...)
@@ -122,6 +122,7 @@ class HTTPClient {
         void setReuse(bool reuse); /// keep-alive
         void setUserAgent(const char * userAgent);
         void setAuthorization(const char * user, const char * password);
+        void setAuthorization(const char * auth);
 
         /// request handling
         int GET();

From 0a4da83243bdbcc30cd36639765ca966d7aeb268 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 14:19:49 +0100
Subject: [PATCH 36/41] HTTPClient add Authorization example

---
 .../examples/Authorization/Authorization.ino  | 84 +++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 libraries/ESP8266HTTPClient/examples/Authorization/Authorization.ino

diff --git a/libraries/ESP8266HTTPClient/examples/Authorization/Authorization.ino b/libraries/ESP8266HTTPClient/examples/Authorization/Authorization.ino
new file mode 100644
index 000000000..79a4c3fdf
--- /dev/null
+++ b/libraries/ESP8266HTTPClient/examples/Authorization/Authorization.ino
@@ -0,0 +1,84 @@
+/**
+ * Authorization.ino
+ *
+ *  Created on: 09.12.2015
+ *
+ */
+
+#include <Arduino.h>
+
+#include <ESP8266WiFi.h>
+#include <ESP8266WiFiMulti.h>
+
+#include <ESP8266HTTPClient.h>
+
+#define USE_SERIAL Serial
+
+ESP8266WiFiMulti WiFiMulti;
+
+void setup() {
+
+    USE_SERIAL.begin(115200);
+   // USE_SERIAL.setDebugOutput(true);
+
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+    USE_SERIAL.println();
+
+    for(uint8_t t = 4; t > 0; t--) {
+        USE_SERIAL.printf("[SETUP] WAIT %d...\n", t);
+        USE_SERIAL.flush();
+        delay(1000);
+    }
+
+    WiFiMulti.addAP("SSID", "PASSWORD");
+
+}
+
+void loop() {
+    // wait for WiFi connection
+    if((WiFiMulti.run() == WL_CONNECTED)) {
+
+        HTTPClient http;
+
+        USE_SERIAL.print("[HTTP] begin...\n");
+        // configure traged server and url
+
+
+        http.begin("http://user:password@192.168.1.12/test.html");
+
+        /*
+          // or
+          http.begin("http://192.168.1.12/test.html");
+          http.setAuthorization("user", "password");
+
+          // or
+          http.begin("http://192.168.1.12/test.html");
+          http.setAuthorization("dXNlcjpwYXN3b3Jk");
+         */
+
+
+        USE_SERIAL.print("[HTTP] GET...\n");
+        // start connection and send HTTP header
+        int httpCode = http.GET();
+
+        // httpCode will be negative on error
+        if(httpCode) {
+            // HTTP header has been send and Server response header has been handled
+            USE_SERIAL.printf("[HTTP] GET... code: %d\n", httpCode);
+
+            // file found at server
+            if(httpCode == HTTP_CODE_OK) {
+                String payload = http.getString();
+                USE_SERIAL.println(payload);
+            }
+        } else {
+            USE_SERIAL.printf("[HTTP] GET... failed, error: %s\n", http.errorToString(httpCode).c_str());
+        }
+
+        http.end();
+    }
+
+    delay(10000);
+}
+

From b1ea7b602e3b731f7b9e5f666aabfe7d5e743d41 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 16:27:04 +0100
Subject: [PATCH 37/41] httpUpdate Improve error handling

---
 .../ESP8266httpUpdate/src/ESP8266httpUpdate.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
index 92b047b30..763efea4b 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -120,6 +120,12 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
     int code = http->GET();
     int len = http->getSize();
 
+    if(code <= 0) {
+        DEBUG_HTTP_UPDATE("[httpUpdate] HTTP error: %s\n", http->errorToString(code).c_str());
+        http->end();
+        return HTTP_UPDATE_FAILED;
+    }
+
     DEBUG_HTTP_UPDATE("[httpUpdate] Header read fin.\n");
     DEBUG_HTTP_UPDATE("[httpUpdate] Server header:\n");
     DEBUG_HTTP_UPDATE("[httpUpdate]  - code: %d\n", code);
@@ -138,7 +144,7 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
     }
 
     switch(code) {
-        case 200:  ///< OK (Start Update)
+        case HTTP_CODE_OK:  ///< OK (Start Update)
             if(len > 0) {
                 bool startUpdate = false;
                 if(spiffs) {
@@ -192,19 +198,18 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
                 DEBUG_HTTP_UPDATE("[httpUpdate] Content-Length is 0 or not set by Server?!\n");
             }
             break;
-        case 304:
+        case HTTP_CODE_NOT_MODIFIED:
             ///< Not Modified (No updates)
             ret = HTTP_UPDATE_NO_UPDATES;
             break;
-        case 403:
-            ///< Forbidden
-            // todo handle login
         default:
             ret = HTTP_UPDATE_FAILED;
-            DEBUG_HTTP_UPDATE("[httpUpdate] Code is (%d)\n", code);
+            DEBUG_HTTP_UPDATE("[httpUpdate] HTTP Code is (%d)\n", code);
+            //http->writeToStream(&Serial1);
             break;
     }
 
+
     http->end();
 
     return ret;

From 95089b75b909da9828f81047d90162a272b548dd Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Wed, 9 Dec 2015 19:56:14 +0100
Subject: [PATCH 38/41] fix startUpdate always false

---
 libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
index 763efea4b..785258de9 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.cpp
@@ -146,15 +146,17 @@ t_httpUpdate_return ESP8266HTTPUpdate::handleUpdate(HTTPClient * http, const cha
     switch(code) {
         case HTTP_CODE_OK:  ///< OK (Start Update)
             if(len > 0) {
-                bool startUpdate = false;
+                bool startUpdate = true;
                 if(spiffs) {
                     size_t spiffsSize = ((size_t) &_SPIFFS_end - (size_t) &_SPIFFS_start);
                     if(len > (int) spiffsSize) {
                         DEBUG_HTTP_UPDATE("[httpUpdate] spiffsSize to low (%d) needed: %d\n", spiffsSize, len);
+                        startUpdate = false;
                     }
                 } else {
                     if(len > (int) ESP.getFreeSketchSpace()) {
                         DEBUG_HTTP_UPDATE("[httpUpdate] FreeSketchSpace to low (%d) needed: %d\n", ESP.getFreeSketchSpace(), len);
+                        startUpdate = false;
                     }
                 }
 

From a7609bce35ee36cd02b5026df4fff1a7dca5079b Mon Sep 17 00:00:00 2001
From: Christopher Pascoe <alltheblinkythings@gmail.com>
Date: Wed, 9 Dec 2015 22:17:50 -0800
Subject: [PATCH 39/41] Remove double include of cbuf.h.

---
 libraries/ESP8266WiFi/src/WiFiClientSecure.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
index 997fe5ccb..f141a0909 100644
--- a/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiClientSecure.cpp
@@ -29,7 +29,6 @@ extern "C"
 }
 #include <errno.h>
 #include "debug.h"
-#include "cbuf.h"
 #include "ESP8266WiFi.h"
 #include "WiFiClientSecure.h"
 #include "WiFiClient.h"

From 55afeba174ae00b4ca1ea0bcc104642bea92e683 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Thu, 10 Dec 2015 12:00:28 +0100
Subject: [PATCH 40/41] see #1167 add close and stop as alias

---
 libraries/ESP8266WebServer/src/ESP8266WebServer.cpp |  9 +++++++++
 libraries/ESP8266WebServer/src/ESP8266WebServer.h   |  3 +++
 libraries/ESP8266WiFi/src/WiFiServer.cpp            | 10 ++++++++++
 libraries/ESP8266WiFi/src/WiFiServer.h              |  2 ++
 4 files changed, 24 insertions(+)

diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
index cecc8eabc..a2c8a9866 100644
--- a/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
+++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.cpp
@@ -71,6 +71,7 @@ ESP8266WebServer::~ESP8266WebServer() {
     delete handler;
     handler = next;
   }
+  close();
 }
 
 void ESP8266WebServer::begin() {
@@ -173,6 +174,14 @@ void ESP8266WebServer::handleClient() {
   _handleRequest();
 }
 
+void ESP8266WebServer::close() {
+  _server.close();
+}
+
+void ESP8266WebServer::stop() {
+  close();
+}
+
 void ESP8266WebServer::sendHeader(const String& name, const String& value, bool first) {
   String headerLine = name;
   headerLine += ": ";
diff --git a/libraries/ESP8266WebServer/src/ESP8266WebServer.h b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
index 40172e92a..e9ea8f1a1 100644
--- a/libraries/ESP8266WebServer/src/ESP8266WebServer.h
+++ b/libraries/ESP8266WebServer/src/ESP8266WebServer.h
@@ -66,6 +66,9 @@ public:
   void begin();
   void handleClient();
   
+  void close();
+  void stop();
+
   bool authenticate(const char * username, const char * password);
   void requestAuthentication();
   
diff --git a/libraries/ESP8266WiFi/src/WiFiServer.cpp b/libraries/ESP8266WiFi/src/WiFiServer.cpp
index 5de2d4ac7..462e7d7de 100644
--- a/libraries/ESP8266WiFi/src/WiFiServer.cpp
+++ b/libraries/ESP8266WiFi/src/WiFiServer.cpp
@@ -121,6 +121,16 @@ uint8_t WiFiServer::status()  {
     return _pcb->state;
 }
 
+void WiFiServer::close() {
+    if (!_pcb) {
+      return;
+    }
+    tcp_close(_pcb);
+}
+
+void WiFiServer::stop() {
+    close();
+}
 
 size_t WiFiServer::write(uint8_t b) {
     return write(&b, 1);
diff --git a/libraries/ESP8266WiFi/src/WiFiServer.h b/libraries/ESP8266WiFi/src/WiFiServer.h
index 263bcbcdf..424a2331d 100644
--- a/libraries/ESP8266WiFi/src/WiFiServer.h
+++ b/libraries/ESP8266WiFi/src/WiFiServer.h
@@ -54,6 +54,8 @@ public:
   virtual size_t write(uint8_t);
   virtual size_t write(const uint8_t *buf, size_t size);
   uint8_t status();
+  void close();
+  void stop();
 
   using Print::write;
 

From fdadadc7875386b749ee23728bc6abc31accc259 Mon Sep 17 00:00:00 2001
From: Markus Sattler <help.markus+git@gmail.com>
Date: Thu, 10 Dec 2015 12:03:53 +0100
Subject: [PATCH 41/41] add default values for updateSpiffs

---
 libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
index f9a4d8030..d3fe4ca19 100644
--- a/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
+++ b/libraries/ESP8266httpUpdate/src/ESP8266httpUpdate.h
@@ -53,7 +53,7 @@ class ESP8266HTTPUpdate {
         t_httpUpdate_return update(const char * host, uint16_t port, const char * url = "/", const char * current_version = "", bool https = false, const char * httpsFingerprint = "");
         t_httpUpdate_return update(String host, uint16_t port, String url = "/", String current_version = "", bool https = false, String httpsFingerprint = "");
 
-        t_httpUpdate_return updateSpiffs(const char * url, const char * current_version, const char * httpsFingerprint);
+        t_httpUpdate_return updateSpiffs(const char * url, const char * current_version = "", const char * httpsFingerprint = "");
 
     protected:
         t_httpUpdate_return handleUpdate(HTTPClient * http, const char * current_version, bool reboot = true, bool spiffs = false);