From b07dd46f5522d77da2b9356fff78b29699a284a2 Mon Sep 17 00:00:00 2001
From: Yurii <laxilef@gmail.com>
Date: Sun, 10 Mar 2024 04:10:18 +0300
Subject: [PATCH] refactor: optimization * names changed: pin => gpio * ability
 to change OpenTherm GPIO without rebooting

---
 data/settings.html                    |  24 ++-
 data/static/app.js.gz                 | Bin 3887 -> 3924 bytes
 lib/CustomOpenTherm/CustomOpenTherm.h |   1 +
 platformio.ini                        | 124 ++++++-------
 src/MainTask.h                        |  42 ++---
 src/OpenThermTask.h                   | 243 +++++++++++++++-----------
 src/SensorsTask.h                     |  33 ++--
 src/Settings.h                        |  34 ++--
 src/defines.h                         |  83 +++++----
 src/main.cpp                          |   2 +-
 src/utils.h                           | 102 +++++++----
 src_data/static/app.js                |  10 +-
 12 files changed, 388 insertions(+), 310 deletions(-)

diff --git a/data/settings.html b/data/settings.html
index d29695c..ddcdf82 100644
--- a/data/settings.html
+++ b/data/settings.html
@@ -63,13 +63,13 @@
         <div id="opentherm-settings-busy" aria-busy="true"></div>
         <form action="/api/settings" id="opentherm-settings" class="hidden">
           <div class="grid">
-            <label for="opentherm-in-pin">
+            <label for="opentherm-in-gpio">
               In GPIO
-              <input type="number" inputmode="numeric" class="opentherm-in-pin" name="opentherm[inPin]" min="0" max="99" step="1" required>
+              <input type="number" inputmode="numeric" class="opentherm-in-gpio" name="opentherm[inGpio]" min="0" max="254" step="1">
             </label>
-            <label for="opentherm-in-pin">
+            <label for="opentherm-in-gpio">
               Out GPIO
-              <input type="number" inputmode="numeric" class="opentherm-out-pin" name="opentherm[outPin]" min="0" max="99" step="1" required>
+              <input type="number" inputmode="numeric" class="opentherm-out-gpio" name="opentherm[outGpio]" min="0" max="254" step="1">
             </label>
             <label for="opentherm-member-id-code">
               Master MemberID code
@@ -77,10 +77,6 @@
             </label>
           </div>
 
-          <fieldset>
-            <mark>After changing GPIO, the ESP must be restarted for the changes to take effect.</mark>
-          </fieldset>
-
           <fieldset>
             <legend>Options</legend>
             <label for="opentherm-dhw-present">
@@ -190,9 +186,9 @@
             </label>
           </fieldset>
 
-          <label for="outdoor-sensor-pin">
+          <label for="outdoor-sensor-gpio">
             GPIO
-            <input type="number" inputmode="numeric" class="outdoor-sensor-pin" name="sensors[outdoor][pin]" min="0" max="99" step="1" required>
+            <input type="number" inputmode="numeric" class="outdoor-sensor-gpio" name="sensors[outdoor][gpio]" min="0" max="254" step="1">
           </label>
           <label for="outdoor-sensor-offset">
             Temp offset (calibration)
@@ -229,9 +225,9 @@
             </label>
           </fieldset>
 
-          <label for="indoor-sensor-pin">
+          <label for="indoor-sensor-gpio">
             GPIO
-            <input type="number" inputmode="numeric" class="indoor-sensor-pin" name="sensors[indoor][pin]" min="0" max="99" step="1" required>
+            <input type="number" inputmode="numeric" class="indoor-sensor-gpio" name="sensors[indoor][gpio]" min="0" max="254" step="1">
           </label>
 
           <div class="grid">
@@ -267,9 +263,9 @@
           <br>
 
           <div class="grid">
-            <label for="extpump-pin">
+            <label for="extpump-gpio">
               Relay GPIO
-              <input type="number" inputmode="numeric" class="extpump-pin" name="externalPump[pin]" min="0" max="99" step="1" required>
+              <input type="number" inputmode="numeric" class="extpump-gpio" name="externalPump[gpio]" min="0" max="254" step="1">
             </label>
             <label for="extpump-pc-time">
               Post circulation time <small>(min)</small>
diff --git a/data/static/app.js.gz b/data/static/app.js.gz
index 4bc122e6b2c4e83c49d465da5aee3f4adbe56517..306d6ea7181fb10af500b10eaa7a7407317b6155 100644
GIT binary patch
literal 3924
zcmV-a53BGWiwFP!000001MM7ZbK5rZduRF|7<F1v6HB(!CU+CZ=_F3l=B7z=vD<#g
z`2$Qs5^9QMNiede^?$!zJV?Aq$!VJQddY{##6GYuEOtRi^CnL?EAptOyeXd*)heFD
zf2TB~2`{Qi^y{aeL{U=YHIEPw9Y<-AG%K3(*)I*PHX73=J3=ZpkK$W6thhu`1(Q^{
z0A7Fk34S2hX7nh_;xWt1hL0yR06!(kGG?5@)DJZue4LRqefk#U_>R?_=Cq2($&%y?
zI^K(7Ix(=Lh|V~v7L?CG%SW77?4sc`9+QfZDa+rIjHN(zt3^weG`ai{hZ*0*6R8f!
zJQ0%PV`r77%D^Z>4<bw{kTc37n1q96j{{1^V+nl2HzhqD)y>6<@zMEs(h{e1PMVCL
z(JQW|Lvu>1)}96uOe29a4o@dV4mRPQrG1;psX=>EZ}J2zhhWosVqjKQ;`51|FxDmr
zN)-hp0rAGKGD>P1tqJ3^*=&5|VB5Y)Sxqi7ihki$Lnp)7!jl(Gy>Za5wV2XZMSj{O
z39V}oC$4B+!l)A}L4Eo(IwfyG!XpnY$w*zJjnUv}V=?J?;$v2HRlKD^O*$LnKhXD#
zt!UBkIJPAo;?`QxoH`(;B<v*Ji^g-pdI@ba*rBRXulJ(62L}fo{k3w*k?WIZVy5@x
zlBZQwRNGw=(C(v0VCif+Eiens(JeV$N4PUQA)JUb-*G@3kt{EYD_RFrU6;>QveWo&
zy2F1!7sV#GsF)j^EyvH(87WJer?EzuEv#&ilNB9L_F8(G&uMCDZmOW;4iq4mo}xMB
zu<Jl--!ms(QNAqF`;f`LKRp}ob$|r+C<^0wF%^HBuq7oat?K)Bc#M^^re|Q2F_3~r
z8A}LmAp1YpMLstDW&~-GZte>!-$AT+o=#ew%<#lDqqUk9mzMq7EZD6#gYr6}8Cb%?
zmn+mlckFl#HUN{s{!vxNWG(5OWVM-<mAHa_Zq*<!DPI@W<!M54uN;Boj*I6Hs!otk
zk<l5&6cUdF!@NMwO`eXl@O};R7p((W4jcTpXD`0<WyJ`<nVz9keH%Z{qXxS|s;?NZ
zf?=p8Xr=nID*`mGh^GFav4icXQ|^|47|J=JBl-HVV@1zkb)uXS-VjyF0^7F<t6l3N
zD|GW|!Lnijc~LGc$VFfj$-rFs!XlVpfUD5Jja30OlD0Gj4qExe=8;sCaC-I_#^PWC
zUN0d-M6sZnRmHlVWi(&#W%MvQ@c9aiHwWi>gAB54cM}F;92~*N1EsIx4MVqYTg-(`
zi#3WZreR>rioY(_@$}H#aRJAvB}U4uBNxpHU)VjTbuBs#Da#vnK3lRhrFryqG#*Fy
zjd4VD`4xErTf`+M5}h&QiM_4JKoYxce^|@icvfq9?1DnFKmgie$!ceF?ewteL@>yi
zfBP-EB^0oQbE4n#n&2WtgO04hb%{)leDECfs$+Bd>m!p58cX``ghKT(ajK)yXQSwL
z6f^kGbFD>Y=Bkj(9<YbsiiZdL?4j>JOD1Jjw#Z3_?2)B2-%%L*X+~G7tkeFKYf1s)
z(d9*I1)oLdC~t@;u>RdZo69#~i_zyJgNG_0g18T(dk2nh?J1pNdx7Gf3Jfb~RH-pM
z)mJx~Du*qWWc_pP&gp`rAvUg+(RHdEJ%L1)#un3Hb{g(y%%BU`@i%HMcI#>^<pw&m
z!EH(9d#{C&3&!f6{&!4(`vT#du1b#k^1UN(*es%KgJ`<x)KJ~(v36)b{N}>0^qpEC
zvN~@-(&OmPfxB`f^WpN}T9vKh500ZgW`W*d%c|@8=GKC4XKJmNp57wbDq<@f627Bc
zhX=l3UZ@z(ex|E09YWjA-MU&_(sj>qPlxoH*07D!$0WJ@GmdQkqV3MdW6uwE?5P6q
z<H_g8lh41GN9Hh1_!Ki9e^$w;pCS^znnGOTOh7#A*45dJ!pC5Jrvb7gz*9qg_zJYI
z#X#F6Ncapt9@VI=oF5uv2cyWdf^?-@uyed=Nn(1T_e^y7RJ8A0^kyfc_SvXD9c^uc
zErk&T167lALb~mYG+aOooRjWW&-8_fQ)#rG6{k&o#{uTakD?Ix?H(a_$(|bHhjLK?
z&By9uxVlh%x~RF&3PlpjXEQU_YbHFdA)S}7G&s25#elR(G<pf{?fP+nb{IqxNz1{!
z6TnpQ>|lNwz<gB|OLoCHO&#Q~0?3apips~l8^9F%Q-lG=NyQz4dqV{43WRY8{xL)_
zXF02v9ffjffaHh#GB4J-M!hyGcfCu$ZjV~~yI&F79ia8^(0T9HBV2PksGo}~5W%pY
zHFCAW)>N(51okM&y4^5Ut`jW2_(C6rYHZyzK8y}6$pyZ%znY;QhxwS>n`E)`kwA}N
z*vwjqvY&CFQt**`N>e|l_s<h5Y<ng$MDlhYOIw-FZyiUYk+U0xd~qA_?nii%8RRq6
zv1&nfjw+}uHqbe(c8x2I|NA4$;q*RY%N6eL9$l@zzdOEcPQwxAr_n7vsLr#2f@}9?
zJ5>JPth*WNZQkY7@uq#v&T2V5P0-}S{pAhLFr40U$IkNq(DHx&anlbaHhe5!eDK4j
zce*|FM_#>Amu1q{alJQW^gbm{&DB<BK^~yX|I)W;oc<nzKwqU1D(K#D!06+BQnG#Z
zI(uJgJ|1`lvExkyM1)ZK5nt*;S)uq(mqpFRO)dRCe5OYv?*Pe)Bpo(9w1}vpi3kZW
zhcbqCFWYCVKGB1{{H@pX#yj{Bs(d%tA)Bu)d#PAy2vqhnZ!X|ZgSmL_MPGpOYqII^
z)j%&nn%5mNJQ!Yj3=14ESA^wyv8yNXdJi7kAlw#qlygW!?+|#3@co6}bG$b24)J%Q
zE)cq;O--liGBKP9BTrzUr3}u9D~csn5Xd2j%sE?_5ivyXx!Ypm`hJL$7iT6TC+LRw
zSn*^rQNd+|)@LoPa&sGI9>ff`kQB9hqXtLpW$WRWP!zx<4vik|r^D|S<TSI%)S#=O
zkjvA~9NnfFDILW~IiMF{`)UEjuvS3jDFsA5I-x|KO2*(WiQ&c>;r(X<cSWndHl-KM
z!tkwZbHr$GGEk(L3u+3rQRdMD=u|*<;lXKUuf>+fnSgjfCP@QvW&;AD=1Nf(6(^aH
zf;4>D$shqJ!y_0Ehmj)AiUrF(N-;V}=LfDL^@3OFt>}Ec9l*9FR+LaMFKM-!!rrzh
zS<y+*f@UoL1|U%V-MM==`nnemQ8^B4+06odP46@S8=gla>@v}ct}bXbWhqoaDGg00
zF`lO<0PhXWj$yi7PoXoZ;W@+&z^^292VV7hy6TatZdNN={luV?sb1_R*^(0UHRQ27
zQ=02u#^bEePL_9`N~9aHKAiFbXBgyscvb-W9gW$~51=<;bdeRwCCuN$>ahav;ulEP
z=$R%HFWRPS#+TX#!4PUuPl56$!2VVuyUW#>!dtOEY}=w;{lYnB+qbkb8UYxb$-(g2
z5LB2R92y)Npn$aJ&VoZjb9l*2&NH|VOUjDQ*_BHt1_!9bT6t^kJc3RSyS`A?bKPJK
z2R!haq^xK|rr~K(RDhq?@PV(|j6F*X)*5Ms(4KT<v#}GS%Lbv5n;e5k1NqUOu$a$l
zYqxc{Nw^oxHj_X^hY_|JmF3%QDscu(YBLF2R54iuHk%Mizd7y6`mCvVImR4d1j%_y
z(iGU#buT+WdZch%2ie?w|AgT?lt}c7m(8lgoY2VygS3LK{}n(mHH0<Pq_#&a+K@kd
zgnn=6DavHZ*{V;%6587nRwXKN<6-MCJ5mQSjKz}VoSpI}xqR-XoIZvF^0mw?$&_a`
z3*V<MWS36lM^f$Hg}eo1;}XHHt%g36DtPEP3cF+q`G%hwFScwd3gys(=E=sRY9S#q
zZ`W2tOJ{>NNT62m&|xfuI?t>l6NM~BgXnmW?V}U*)gw<3Mix1QDNB5LT2RndDv+ia
z3ckIJFbkYW0)1D{_-Utuc?W8R*tzSvsR9{WLqb$oz0I>?J*_}MpA^8)0Qwq$A!=bi
zr@Yss0)~}6q>^~_)OdmCVN4*UjHaW2MO2=|8_nGe_(VZoP)X-vUpTb^4p1r-k5pIO
z1Eg*UyQDBw7Lc+W9wn(DJRt;H4yOvy<0Q)SegV{?u+K`tA?-;i{Oz5SI#WQITHA3Z
zJAF0oiFDDhES;uyoJbM@dJ+nfrnD2SK1~qAJ=ieE2D9f2!k4h3!AEh3I@*u^dGD)(
zgGnEoWzkf-@cCTw0e)ZJ8(_B*=L*}IArs(rub)#*lbtw)SnvW57a)8}&!_?f?T>$+
zKd&ea(;y^B0@_ad$pHGSmy%pbO3@Ye(32~q7mZ=>^gA(P`HOA5@KAtHD@y7>v<u*C
z0rT>?Xh=ePrkWeT*1H^gIjZxoc1fz|@aqfn)}x?DvhM5ViF~ix4Tx_h8ifO*_g{fD
znRNw3(!E^{lR2|WN^!$XOov~uR44-%DFwbMZX|?tU)meDWyI@L$#?s;8v6yO!#O|`
zX6}n{9dL|{i@Mhd^4Ed-tXcbJM1mpHiQ7SgKNTcJ2t|>M{tqmy`HeX-VMsE&r}@AV
zs-NH(lFw*~hlQ(qrNbW^=@C%h%^&_TD)qH-v_LVJleGkn9^z4bQ@PVB9Kl96^nvZJ
zze;Uc-4L$(DG~f)w;_$ZabevqFD`xt5%!{zu<m*S;$G4X`UJ=2SM$q^BsAXt&-wmh
z54+Y`U1p5O<2P+CP-H-b#6V??YncVVLk&TdwYiU@F<wC#V=gqtL~b7&HzzFZ4LZfr
z_^KnGs}y>MiA1eo`9mXx_d&$)44zleHr_&@7{0~om*k})3d{?YXHB7!Cp>O5hIQiu
zr$z&Gzj<KZloV017hUZ^3@ujr?zx6Q7Uhu{c^ZJaV1NqQgn19oC(sW3dJP5toAV=A
zO2r)hk{*5oH0NkqWOU^GtOEX|!lC?01w(NE2NkZgYgsp;)R*CUF_oTLN^7)7RYf*4
zR*TPA$vANkBQ5-_Z0co<CYc<W2%#@(v_x;N&Ou5fvT3>pBSK7?<EY6~I%hd`f8@a8
zY<NKY+Cb0?_Ls_AS9FY8O!xk-=`A}B)b)0WVCDo24><}H(!%qqSjoi?3pZ_G-O8oE
i2a-x#DsKNe{r=@lt_e2ZsB9qi!2beb_ToiGPyhg!dxgOO

literal 3887
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

diff --git a/lib/CustomOpenTherm/CustomOpenTherm.h b/lib/CustomOpenTherm/CustomOpenTherm.h
index 6dc7f40..e8aa77d 100644
--- a/lib/CustomOpenTherm/CustomOpenTherm.h
+++ b/lib/CustomOpenTherm/CustomOpenTherm.h
@@ -8,6 +8,7 @@ public:
   typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, byte)> AfterSendRequestCallback;
 
   CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {}
+  ~CustomOpenTherm() {}
 
   CustomOpenTherm* setYieldCallback(YieldCallback callback = nullptr) {
     this->yieldCallback = callback;
diff --git a/platformio.ini b/platformio.ini
index 4fa665a..136261b 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -17,7 +17,7 @@ framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.0.3
 	;ihormelnyk/OpenTherm Library@^1.1.5
-	https://github.com/ihormelnyk/opentherm_library.git?080324
+	https://github.com/ihormelnyk/opentherm_library.git
 	arduino-libraries/ArduinoMqttClient@^0.1.8
 	lennarthennigs/ESP Telnet@^2.2
 	gyverlibs/FileData@^1.0.2
@@ -34,18 +34,18 @@ build_flags =
 	-D USE_SERIAL=${secrets.use_serial}
 	-D USE_TELNET=${secrets.use_telnet}
 	-D DEBUG_BY_DEFAULT=${secrets.debug}
-	-D HOSTNAME_DEFAULT='"${secrets.hostname}"'
-	-D AP_SSID_DEFAULT='"${secrets.ap_ssid}"'
-	-D AP_PASSWORD_DEFAULT='"${secrets.ap_password}"'
-	-D STA_SSID_DEFAULT='"${secrets.sta_ssid}"'
-	-D STA_PASSWORD_DEFAULT='"${secrets.sta_password}"'
-	-D PORTAL_LOGIN_DEFAULT='"${secrets.portal_login}"'
-	-D PORTAL_PASSWORD_DEFAULT='"${secrets.portal_password}"'
-	-D MQTT_SERVER_DEFAULT='"${secrets.mqtt_server}"'
-	-D MQTT_PORT_DEFAULT=${secrets.mqtt_port}
-	-D MQTT_USER_DEFAULT='"${secrets.mqtt_user}"'
-	-D MQTT_PASSWORD_DEFAULT='"${secrets.mqtt_password}"'
-	-D MQTT_PREFIX_DEFAULT='"${secrets.mqtt_prefix}"'
+	-D DEFAULT_HOSTNAME='"${secrets.hostname}"'
+	-D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
+	-D DEFAULT_AP_PASSWORD='"${secrets.ap_password}"'
+	-D DEFAULT_STA_SSID='"${secrets.sta_ssid}"'
+	-D DEFAULT_STA_PASSWORD='"${secrets.sta_password}"'
+	-D DEFAULT_PORTAL_LOGIN='"${secrets.portal_login}"'
+	-D DEFAULT_PORTAL_PASSWORD='"${secrets.portal_password}"'
+	-D DEFAULT_MQTT_SERVER='"${secrets.mqtt_server}"'
+	-D DEFAULT_MQTT_PORT=${secrets.mqtt_port}
+	-D DEFAULT_MQTT_USER='"${secrets.mqtt_user}"'
+	-D DEFAULT_MQTT_PASSWORD='"${secrets.mqtt_password}"'
+	-D DEFAULT_MQTT_PREFIX='"${secrets.mqtt_prefix}"'
 upload_speed = 921600
 monitor_speed = 115200
 monitor_filters = direct
@@ -67,7 +67,7 @@ board_build.ldscript = eagle.flash.1m256.ld
 ;board_build.ldscript = eagle.flash.4m1m.ld
 
 [esp32_defaults]
-platform = espressif32
+platform = espressif32@^6.5
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
@@ -91,12 +91,12 @@ extra_scripts = ${esp8266_defaults.extra_scripts}
 board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
 build_flags = 
 	${esp8266_defaults.build_flags}
-	-D OT_IN_PIN_DEFAULT=4
-	-D OT_OUT_PIN_DEFAULT=5
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=14
-	-D LED_STATUS_PIN=13
-	-D LED_OT_RX_PIN=15
+	-D DEFAULT_OT_IN_GPIO=4
+	-D DEFAULT_OT_OUT_GPIO=5
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=14
+	-D LED_STATUS_GPIO=13
+	-D LED_OT_RX_GPIO=15
 
 [env:d1_mini_lite]
 platform = ${esp8266_defaults.platform}
@@ -107,12 +107,12 @@ extra_scripts = ${esp8266_defaults.extra_scripts}
 board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
 build_flags = 
 	${esp8266_defaults.build_flags}
-	-D OT_IN_PIN_DEFAULT=4
-	-D OT_OUT_PIN_DEFAULT=5
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=14
-	-D LED_STATUS_PIN=13
-	-D LED_OT_RX_PIN=15
+	-D DEFAULT_OT_IN_GPIO=4
+	-D DEFAULT_OT_OUT_GPIO=5
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=14
+	-D LED_STATUS_GPIO=13
+	-D LED_OT_RX_GPIO=15
 
 [env:d1_mini_pro]
 platform = ${esp8266_defaults.platform}
@@ -123,12 +123,12 @@ extra_scripts = ${esp8266_defaults.extra_scripts}
 board_build.ldscript = ${esp8266_defaults.board_build.ldscript}
 build_flags = 
 	${esp8266_defaults.build_flags}
-	-D OT_IN_PIN_DEFAULT=4
-	-D OT_OUT_PIN_DEFAULT=5
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=14
-	-D LED_STATUS_PIN=13
-	-D LED_OT_RX_PIN=15
+	-D DEFAULT_OT_IN_GPIO=4
+	-D DEFAULT_OT_OUT_GPIO=5
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=14
+	-D LED_STATUS_GPIO=13
+	-D LED_OT_RX_GPIO=15
 
 [env:s2_mini]
 platform = ${esp32_defaults.platform}
@@ -139,12 +139,12 @@ lib_ignore = ${esp32_defaults.lib_ignore}
 extra_scripts = ${esp32_defaults.extra_scripts}
 build_flags = 
 	${esp32_defaults.build_flags}
-	-D OT_IN_PIN_DEFAULT=33
-	-D OT_OUT_PIN_DEFAULT=35
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=9
-	-D SENSOR_INDOOR_PIN_DEFAULT=7
-	-D LED_STATUS_PIN=11
-	-D LED_OT_RX_PIN=12
+	-D DEFAULT_OT_IN_GPIO=33
+	-D DEFAULT_OT_OUT_GPIO=35
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
+	-D DEFAULT_SENSOR_INDOOR_GPIO=7
+	-D LED_STATUS_GPIO=11
+	-D LED_OT_RX_GPIO=12
 
 [env:s3_mini] 
 platform = ${esp32_defaults.platform}
@@ -158,12 +158,12 @@ extra_scripts = ${esp32_defaults.extra_scripts}
 build_flags = 
 	${esp32_defaults.build_flags}
 	-D USE_BLE=1
-	-D OT_IN_PIN_DEFAULT=35
-	-D OT_OUT_PIN_DEFAULT=36
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=13
-	-D SENSOR_INDOOR_PIN_DEFAULT=12
-	-D LED_STATUS_PIN=11
-	-D LED_OT_RX_PIN=10
+	-D DEFAULT_OT_IN_GPIO=35
+	-D DEFAULT_OT_OUT_GPIO=36
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=13
+	-D DEFAULT_SENSOR_INDOOR_GPIO=12
+	-D LED_STATUS_GPIO=11
+	-D LED_OT_RX_GPIO=10
 
 [env:c3_mini] 
 platform = ${esp32_defaults.platform}
@@ -179,12 +179,12 @@ build_unflags =
 build_flags = 
 	${esp32_defaults.build_flags}
 	-D USE_BLE=1
-	-D OT_IN_PIN_DEFAULT=8
-	-D OT_OUT_PIN_DEFAULT=10
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=0
-	-D SENSOR_INDOOR_PIN_DEFAULT=1
-	-D LED_STATUS_PIN=4
-	-D LED_OT_RX_PIN=5
+	-D DEFAULT_OT_IN_GPIO=8
+	-D DEFAULT_OT_OUT_GPIO=10
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
+	-D DEFAULT_SENSOR_INDOOR_GPIO=1
+	-D LED_STATUS_GPIO=4
+	-D LED_OT_RX_GPIO=5
 
 [env:nodemcu_32s]
 platform = ${esp32_defaults.platform}
@@ -198,12 +198,12 @@ extra_scripts = ${esp32_defaults.extra_scripts}
 build_flags = 
 	${esp32_defaults.build_flags}
 	-D USE_BLE=1
-	-D OT_IN_PIN_DEFAULT=21
-	-D OT_OUT_PIN_DEFAULT=22
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=13
-	-D LED_STATUS_PIN=2 ; 18
-	-D LED_OT_RX_PIN=19
+	-D DEFAULT_OT_IN_GPIO=21
+	-D DEFAULT_OT_OUT_GPIO=22
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=13
+	-D LED_STATUS_GPIO=2 ; 18
+	-D LED_OT_RX_GPIO=19
 	;-D WOKWI=1
 
 [env:d1_mini32]
@@ -218,9 +218,9 @@ extra_scripts = ${esp32_defaults.extra_scripts}
 build_flags = 
 	${esp32_defaults.build_flags}
 	-D USE_BLE=1
-	-D OT_IN_PIN_DEFAULT=21
-	-D OT_OUT_PIN_DEFAULT=22
-	-D SENSOR_OUTDOOR_PIN_DEFAULT=12
-	-D SENSOR_INDOOR_PIN_DEFAULT=18
-	-D LED_STATUS_PIN=2
-	-D LED_OT_RX_PIN=19
+	-D DEFAULT_OT_IN_GPIO=21
+	-D DEFAULT_OT_OUT_GPIO=22
+	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
+	-D DEFAULT_SENSOR_INDOOR_GPIO=18
+	-D LED_STATUS_GPIO=2
+	-D LED_OT_RX_GPIO=19
diff --git a/src/MainTask.h b/src/MainTask.h
index b0866f1..62519a0 100644
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -52,14 +52,14 @@ protected:
   }
 
   void setup() {
-    #ifdef LED_STATUS_PIN
-      pinMode(LED_STATUS_PIN, OUTPUT);
-      digitalWrite(LED_STATUS_PIN, LOW);
+    #ifdef LED_STATUS_GPIO
+      pinMode(LED_STATUS_GPIO, OUTPUT);
+      digitalWrite(LED_STATUS_GPIO, LOW);
     #endif
 
-    if (settings.externalPump.pin != 0) {
-      pinMode(settings.externalPump.pin, OUTPUT);
-      digitalWrite(settings.externalPump.pin, LOW);
+    if (GPIO_IS_VALID(settings.externalPump.gpio)) {
+      pinMode(settings.externalPump.gpio, OUTPUT);
+      digitalWrite(settings.externalPump.gpio, LOW);
     }
   }
 
@@ -89,10 +89,6 @@ protected:
       Log.sinfoln(FPSTR(L_MAIN), F("Restart signal received. Restart after 10 sec."));
     }
 
-    if (!tOt->isEnabled() && settings.opentherm.inPin > 0 && settings.opentherm.outPin > 0 && settings.opentherm.inPin != settings.opentherm.outPin) {
-      tOt->enable();
-    }
-
     if (network->isConnected()) {
       vars.sensors.rssi = WiFi.RSSI();
 
@@ -140,8 +136,8 @@ protected:
     this->yield();
 
 
-    #ifdef LED_STATUS_PIN
-      this->ledStatus(LED_STATUS_PIN);
+    #ifdef LED_STATUS_GPIO
+      this->ledStatus(LED_STATUS_GPIO);
     #endif
     this->externalPump();
     this->yield();
@@ -211,7 +207,7 @@ protected:
     }
   }
 
-  void ledStatus(uint8_t ledPin) {
+  void ledStatus(uint8_t gpio) {
     uint8_t errors[4];
     uint8_t errCount = 0;
     static uint8_t errPos = 0;
@@ -219,7 +215,7 @@ protected:
     static bool ledOn = false;
 
     if (!this->blinkerInitialized) {
-      this->blinker->init(ledPin);
+      this->blinker->init(gpio);
       this->blinkerInitialized = true;
     }
 
@@ -247,14 +243,14 @@ protected:
     if (!this->blinker->running() && millis() - endBlinkTime >= 5000) {
       if (errCount == 0) {
         if (!ledOn) {
-          digitalWrite(ledPin, HIGH);
+          digitalWrite(gpio, HIGH);
           ledOn = true;
         }
 
         return;
 
       } else if (ledOn) {
-        digitalWrite(ledPin, LOW);
+        digitalWrite(gpio, LOW);
         ledOn = false;
         endBlinkTime = millis();
         return;
@@ -283,10 +279,10 @@ protected:
       this->heatingEnabled = true;
     }
     
-    if (!settings.externalPump.use || settings.externalPump.pin == 0) {
+    if (!settings.externalPump.use || !GPIO_IS_VALID(settings.externalPump.gpio)) {
       if (vars.states.externalPump) {
-        if (settings.externalPump.pin != 0) {
-          digitalWrite(settings.externalPump.pin, LOW);
+        if (GPIO_IS_VALID(settings.externalPump.gpio)) {
+          digitalWrite(settings.externalPump.gpio, LOW);
         }
 
         vars.states.externalPump = false;
@@ -300,7 +296,7 @@ protected:
 
     if (vars.states.externalPump && !this->heatingEnabled) {
       if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
-        digitalWrite(settings.externalPump.pin, LOW);
+        digitalWrite(settings.externalPump.gpio, LOW);
 
         vars.states.externalPump = false;
         vars.parameters.extPumpLastEnableTime = millis();
@@ -308,7 +304,7 @@ protected:
         Log.sinfoln("EXTPUMP", F("Disabled: expired post circulation time"));
 
       } else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
-        digitalWrite(settings.externalPump.pin, LOW);
+        digitalWrite(settings.externalPump.gpio, LOW);
 
         vars.states.externalPump = false;
         vars.parameters.extPumpLastEnableTime = millis();
@@ -324,7 +320,7 @@ protected:
       this->externalPumpStartTime = millis();
       this->extPumpStartReason = MainTask::PumpStartReason::HEATING;
 
-      digitalWrite(settings.externalPump.pin, HIGH);
+      digitalWrite(settings.externalPump.gpio, HIGH);
 
       Log.sinfoln("EXTPUMP", F("Enabled: heating on"));
 
@@ -333,7 +329,7 @@ protected:
       this->externalPumpStartTime = millis();
       this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;
 
-      digitalWrite(settings.externalPump.pin, HIGH);
+      digitalWrite(settings.externalPump.gpio, HIGH);
 
       Log.sinfoln("EXTPUMP", F("Enabled: anti stuck"));
     }
diff --git a/src/OpenThermTask.h b/src/OpenThermTask.h
index ff53ed6..ac55146 100644
--- a/src/OpenThermTask.h
+++ b/src/OpenThermTask.h
@@ -1,27 +1,35 @@
 #include <CustomOpenTherm.h>
-
-CustomOpenTherm* ot;
 extern FileData fsSettings;
 
 class OpenThermTask : public Task {
 public:
-  OpenThermTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {
-    ot = new CustomOpenTherm(settings.opentherm.inPin, settings.opentherm.outPin);
+  OpenThermTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {}
+
+  ~OpenThermTask() {
+    delete this->instance;
   }
 
 protected:
-  unsigned short readyTime = 60000;
-  unsigned short dhwSetTempInterval = 60000;
-  unsigned short heatingSetTempInterval = 60000;
+  const unsigned short readyTime = 60000;
+  const unsigned short dhwSetTempInterval = 60000;
+  const unsigned short heatingSetTempInterval = 60000;
+  const unsigned int initializingInterval = 3600000;
 
+  CustomOpenTherm* instance = nullptr;
+  unsigned long instanceCreatedTime = 0;
+  byte instanceInGpio = 0;
+  byte instanceOutGpio = 0;
+  bool isInitialized = false;
+  unsigned long initializedTime = 0;
+  unsigned int initializedMemberIdCode = 0;
+  byte dhwFlowRateMultiplier = 1;
+  byte pressureMultiplier = 1;
   bool pump = true;
   unsigned long lastSuccessResponse = 0;
   unsigned long prevUpdateNonEssentialVars = 0;
-  unsigned long startupTime = millis();
   unsigned long dhwSetTempTime = 0;
   unsigned long heatingSetTempTime = 0;
-  byte dhwFlowRateMultiplier = 1;
-  byte pressureMultiplier = 1;
+
 
   const char* getTaskName() {
     return "OpenTherm";
@@ -36,9 +44,35 @@ protected:
   }
 
   void setup() {
-    Log.sinfoln(FPSTR(L_OT), F("Started. GPIO IN: %hhu, GPIO OUT: %hhu"), settings.opentherm.inPin, settings.opentherm.outPin);
+    #ifdef LED_OT_RX_GPIO
+      pinMode(LED_OT_RX_GPIO, OUTPUT);
+      digitalWrite(LED_OT_RX_GPIO, LOW);
+    #endif
 
-    ot->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, byte attempt) {
+    // delete instance
+    if (this->instance != nullptr) {
+      delete this->instance;
+      this->instance = nullptr;
+      Log.sinfoln(FPSTR(L_OT), F("Stopped"));
+    }
+
+    if (!GPIO_IS_VALID(settings.opentherm.inGpio) || !GPIO_IS_VALID(settings.opentherm.outGpio)) {
+      Log.swarningln(FPSTR(L_OT), F("Not started. GPIO IN: %hhu or GPIO OUT: %hhu is not valid"), settings.opentherm.inGpio, settings.opentherm.outGpio);
+      return;
+    }
+
+    // create instance
+    this->instance = new CustomOpenTherm(settings.opentherm.inGpio, settings.opentherm.outGpio);
+
+    // flags
+    this->instanceCreatedTime = millis();
+    this->instanceInGpio = settings.opentherm.inGpio;
+    this->instanceOutGpio = settings.opentherm.outGpio;
+    this->isInitialized = false;
+
+    Log.sinfoln(FPSTR(L_OT), F("Started. GPIO IN: %hhu, GPIO OUT: %hhu"), settings.opentherm.inGpio, settings.opentherm.outGpio);
+
+    this->instance->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, byte attempt) {
       Log.straceln(
         FPSTR(L_OT),
         F("ID: %4d   Request: %8lx   Response: %8lx   Attempt: %2d   Status: %s"),
@@ -48,68 +82,39 @@ protected:
       if (status == OpenThermResponseStatus::SUCCESS) {
         this->lastSuccessResponse = millis();
 
-        #ifdef LED_OT_RX_PIN
+        #ifdef LED_OT_RX_GPIO
         {
-          digitalWrite(LED_OT_RX_PIN, HIGH);
+          digitalWrite(LED_OT_RX_GPIO, HIGH);
           delayMicroseconds(2000);
-          digitalWrite(LED_OT_RX_PIN, LOW);
+          digitalWrite(LED_OT_RX_GPIO, LOW);
         }
         #endif
       }
     });
 
-    ot->setYieldCallback([this]() {
+    this->instance->setYieldCallback([this]() {
       this->delay(25);
     });
 
-    ot->begin();
-
-    #ifdef LED_OT_RX_PIN
-      pinMode(LED_OT_RX_PIN, OUTPUT);
-      digitalWrite(LED_OT_RX_PIN, LOW);
-    #endif
-  }
-
-  void initBoiler() {
-    this->dhwFlowRateMultiplier = 1;
-    this->pressureMultiplier = 1;
-
-    // Not all boilers support these, only try once when the boiler becomes connected
-    if (updateSlaveVersion()) {
-      Log.straceln(FPSTR(L_OT), F("Slave version: %u, type: %u"), vars.parameters.slaveVersion, vars.parameters.slaveType);
-
-    } else {
-      Log.swarningln(FPSTR(L_OT), F("Get slave version failed"));
-    }
-
-    // 0x013F
-    if (setMasterVersion(0x3F, 0x01)) {
-      Log.straceln(FPSTR(L_OT), F("Master version: %u, type: %u"), vars.parameters.masterVersion, vars.parameters.masterType);
-      
-    } else {
-      Log.swarningln(FPSTR(L_OT), F("Set master version failed"));
-    }
-
-    if (updateSlaveConfig()) {
-      Log.straceln(FPSTR(L_OT), F("Slave member id: %u, flags: %u"), vars.parameters.slaveMemberId, vars.parameters.slaveFlags);
-
-    } else {
-      Log.swarningln(FPSTR(L_OT), F("Get slave config failed"));
-    }
-
-    if (setMasterConfig(settings.opentherm.memberIdCode & 0xFF, (settings.opentherm.memberIdCode & 0xFFFF) >> 8)) {
-      Log.straceln(FPSTR(L_OT), F("Master member id: %u, flags: %u"), vars.parameters.masterMemberId, vars.parameters.masterFlags);
-      
-    } else {
-      Log.swarningln(FPSTR(L_OT), F("Set master config failed"));
-    }
+    this->instance->begin();
   }
 
   void loop() {
     static byte currentHeatingTemp, currentDhwTemp = 0;
-    unsigned long localResponse;
 
-    bool heatingEnabled = (vars.states.emergency || settings.heating.enable) && this->pump && isReady();
+    if (this->instanceInGpio != settings.opentherm.inGpio || this->instanceOutGpio != settings.opentherm.outGpio) {
+      this->setup();
+
+    } else if (this->initializedMemberIdCode != settings.opentherm.memberIdCode || millis() - this->initializedTime > this->initializingInterval) {
+      this->isInitialized = false; 
+    }
+
+    if (this->instance == nullptr) {
+      this->delay(5000);
+      return;
+    }
+
+    bool heatingEnabled = (vars.states.emergency || settings.heating.enable) && this->pump && this->isReady();
     bool heatingCh2Enabled = settings.opentherm.heatingCh2Enabled;
     if (settings.opentherm.heatingCh1ToCh2) {
       heatingCh2Enabled = heatingEnabled;
@@ -118,7 +123,7 @@ protected:
       heatingCh2Enabled = settings.opentherm.dhwPresent && settings.dhw.enable;
     }
 
-    localResponse = ot->setBoilerStatus(
+    unsigned long response = this->instance->setBoilerStatus(
       heatingEnabled,
       settings.opentherm.dhwPresent && settings.dhw.enable,
       false,
@@ -128,20 +133,20 @@ protected:
       settings.opentherm.dhwBlocking
     );
 
-    if (!CustomOpenTherm::isValidResponse(localResponse)) {
-      Log.swarningln(FPSTR(L_OT), F("Invalid response after setBoilerStatus: %s"), CustomOpenTherm::statusToString(ot->getLastResponseStatus()));
+    if (!CustomOpenTherm::isValidResponse(response)) {
+      Log.swarningln(FPSTR(L_OT), F("Invalid response after setBoilerStatus: %s"), CustomOpenTherm::statusToString(this->instance->getLastResponseStatus()));
     }
 
     if (!vars.states.otStatus && millis() - this->lastSuccessResponse < 1150) {
-      Log.sinfoln(FPSTR(L_OT), F("Connected. Initializing"));
+      Log.sinfoln(FPSTR(L_OT), F("Connected"));
       
       vars.states.otStatus = true;
-      this->initBoiler();
       
     } else if (vars.states.otStatus && millis() - this->lastSuccessResponse > 1150) {
       Log.swarningln(FPSTR(L_OT), F("Disconnected"));
 
       vars.states.otStatus = false;
+      this->isInitialized = false;
     }
 
     // If boiler is disconnected, no need try setting other OT stuff
@@ -155,17 +160,27 @@ protected:
       return;
     }
 
+    if (!this->isInitialized) {
+      Log.sinfoln(FPSTR(L_OT), F("Initializing..."));
+      this->isInitialized = true;
+      this->initializedTime = millis();
+      this->initializedMemberIdCode = settings.opentherm.memberIdCode;
+      this->dhwFlowRateMultiplier = 1;
+      this->pressureMultiplier = 1;
+      this->initialize();
+    }
+
     if (vars.parameters.heatingEnabled != heatingEnabled) {
       this->prevUpdateNonEssentialVars = 0;
       vars.parameters.heatingEnabled = heatingEnabled;
       Log.sinfoln(FPSTR(L_OT_HEATING), "%s", heatingEnabled ? F("Enabled") : F("Disabled"));
     }
 
-    vars.states.heating = CustomOpenTherm::isCentralHeatingActive(localResponse);
-    vars.states.dhw = settings.opentherm.dhwPresent ? CustomOpenTherm::isHotWaterActive(localResponse) : false;
-    vars.states.flame = CustomOpenTherm::isFlameOn(localResponse);
-    vars.states.fault = CustomOpenTherm::isFault(localResponse);
-    vars.states.diagnostic = CustomOpenTherm::isDiagnostic(localResponse);
+    vars.states.heating = CustomOpenTherm::isCentralHeatingActive(response);
+    vars.states.dhw = settings.opentherm.dhwPresent ? CustomOpenTherm::isHotWaterActive(response) : false;
+    vars.states.flame = CustomOpenTherm::isFlameOn(response);
+    vars.states.fault = CustomOpenTherm::isFault(response);
+    vars.states.diagnostic = CustomOpenTherm::isDiagnostic(response);
 
     // These parameters will be updated every minute
     if (millis() - this->prevUpdateNonEssentialVars > 60000) {
@@ -282,7 +297,7 @@ protected:
     // Fault reset action
     if (vars.actions.resetFault) {
       if (vars.states.fault) {
-        if (ot->sendBoilerReset()) {
+        if (this->instance->sendBoilerReset()) {
           Log.sinfoln(FPSTR(L_OT), F("Boiler fault reset successfully"));
 
         } else {
@@ -296,7 +311,7 @@ protected:
     // Diag reset action
     if (vars.actions.resetDiagnostic) {
       if (vars.states.diagnostic) {
-        if (ot->sendServiceReset()) {
+        if (this->instance->sendServiceReset()) {
           Log.sinfoln(FPSTR(L_OT), F("Boiler diagnostic reset successfully"));
           
         } else {
@@ -318,7 +333,7 @@ protected:
       Log.sinfoln(FPSTR(L_OT_DHW), F("Set temp = %u"), newDhwTemp);
 
       // Set DHW temp
-      if (ot->setDhwTemp(newDhwTemp)) {
+      if (this->instance->setDhwTemp(newDhwTemp)) {
         currentDhwTemp = newDhwTemp;
         this->dhwSetTempTime = millis();
 
@@ -328,7 +343,7 @@ protected:
 
       // Set DHW temp to CH2
       if (settings.opentherm.dhwToCh2) {
-        if (!ot->setHeatingCh2Temp(newDhwTemp)) {
+        if (!this->instance->setHeatingCh2Temp(newDhwTemp)) {
           Log.swarningln(FPSTR(L_OT_DHW), F("Failed set ch2 temp"));
         }
       }
@@ -340,7 +355,7 @@ protected:
       Log.sinfoln(FPSTR(L_OT_HEATING), F("Set temp = %u"), vars.parameters.heatingSetpoint);
 
       // Set heating temp
-      if (ot->setHeatingCh1Temp(vars.parameters.heatingSetpoint)) {
+      if (this->instance->setHeatingCh1Temp(vars.parameters.heatingSetpoint)) {
         currentHeatingTemp = vars.parameters.heatingSetpoint;
         this->heatingSetTempTime = millis();
 
@@ -350,7 +365,7 @@ protected:
 
       // Set heating temp to CH2
       if (settings.opentherm.heatingCh1ToCh2) {
-        if (!ot->setHeatingCh2Temp(vars.parameters.heatingSetpoint)) {
+        if (!this->instance->setHeatingCh2Temp(vars.parameters.heatingSetpoint)) {
           Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set ch2 temp"));
         }
       }
@@ -373,8 +388,40 @@ protected:
     }
   }
 
+  void initialize() {
+    // Not all boilers support these, only try once when the boiler becomes connected
+    if (updateSlaveVersion()) {
+      Log.straceln(FPSTR(L_OT), F("Slave version: %u, type: %u"), vars.parameters.slaveVersion, vars.parameters.slaveType);
+
+    } else {
+      Log.swarningln(FPSTR(L_OT), F("Get slave version failed"));
+    }
+
+    // 0x013F
+    if (setMasterVersion(0x3F, 0x01)) {
+      Log.straceln(FPSTR(L_OT), F("Master version: %u, type: %u"), vars.parameters.masterVersion, vars.parameters.masterType);
+      
+    } else {
+      Log.swarningln(FPSTR(L_OT), F("Set master version failed"));
+    }
+
+    if (updateSlaveConfig()) {
+      Log.straceln(FPSTR(L_OT), F("Slave member id: %u, flags: %u"), vars.parameters.slaveMemberId, vars.parameters.slaveFlags);
+
+    } else {
+      Log.swarningln(FPSTR(L_OT), F("Get slave config failed"));
+    }
+
+    if (setMasterConfig(settings.opentherm.memberIdCode & 0xFF, (settings.opentherm.memberIdCode & 0xFFFF) >> 8)) {
+      Log.straceln(FPSTR(L_OT), F("Master member id: %u, flags: %u"), vars.parameters.masterMemberId, vars.parameters.masterFlags);
+      
+    } else {
+      Log.swarningln(FPSTR(L_OT), F("Set master config failed"));
+    }
+  }
+
   bool isReady() {
-    return millis() - this->startupTime > this->readyTime;
+    return millis() - this->instanceCreatedTime > this->readyTime;
   }
 
   bool needSetDhwTemp() {
@@ -386,7 +433,7 @@ protected:
   }
 
   bool updateSlaveConfig() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::SConfigSMemberIDcode,
       0
@@ -447,7 +494,7 @@ protected:
       return true;
     }
 
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::WRITE_DATA,
       OpenThermMessageID::MConfigMMemberIDcode,
       request
@@ -457,22 +504,22 @@ protected:
   }
 
   bool setMaxModulationLevel(byte value) {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::WRITE_DATA,
       OpenThermMessageID::MaxRelModLevelSetting,
-      ot->toF88(value)
+      this->instance->toF88(value)
     ));
 
     if (!CustomOpenTherm::isValidResponse(response)) {
       return false;
     }
 
-    vars.parameters.maxModulation = ot->fromF88(response);
+    vars.parameters.maxModulation = this->instance->fromF88(response);
     return true;
   }
 
   bool updateSlaveOtVersion() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::OpenThermVersionSlave,
       0
@@ -487,23 +534,23 @@ protected:
   }
 
   bool setMasterOtVersion(float version) {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::WRITE_DATA,
       OpenThermMessageID::OpenThermVersionMaster,
-      ot->toF88(version)
+      this->instance->toF88(version)
     ));
 
     if (!CustomOpenTherm::isValidResponse(response)) {
       return false;
     }
 
-    vars.parameters.masterOtVersion = ot->fromF88(response);
+    vars.parameters.masterOtVersion = this->instance->fromF88(response);
 
     return true;
   }
 
   bool updateSlaveVersion() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::SlaveVersion,
       0
@@ -520,7 +567,7 @@ protected:
   }
 
   bool setMasterVersion(uint8_t version, uint8_t type) {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::WRITE_DATA,
       OpenThermMessageID::MasterVersion,
       (unsigned int) version | (unsigned int) type << 8
@@ -537,7 +584,7 @@ protected:
   }
 
   bool updateMinMaxDhwTemp() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::TdhwSetUBTdhwSetLB,
       0
@@ -561,7 +608,7 @@ protected:
   }
 
   bool updateMinMaxHeatingTemp() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::MaxTSetUBMaxTSetLB,
       0
@@ -584,7 +631,7 @@ protected:
   }
 
   bool setMaxHeatingTemp(byte value) {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::WRITE_DATA,
       OpenThermMessageID::MaxTSet,
       CustomOpenTherm::temperatureToData(value)
@@ -594,7 +641,7 @@ protected:
   }
 
   bool updateOutsideTemp() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::Toutside,
       0
@@ -609,7 +656,7 @@ protected:
   }
 
   bool updateHeatingTemp() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::READ_DATA,
       OpenThermMessageID::Tboiler,
       0
@@ -630,7 +677,7 @@ protected:
 
 
   bool updateDhwTemp() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::READ_DATA,
       OpenThermMessageID::Tdhw,
       0
@@ -650,7 +697,7 @@ protected:
   }
 
   bool updateDhwFlowRate() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::READ_DATA,
       OpenThermMessageID::DHWFlowRate,
       0
@@ -670,7 +717,7 @@ protected:
   }
 
   bool updateFaultCode() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::ASFflags,
       0
@@ -685,7 +732,7 @@ protected:
   }
 
   bool updateModulationLevel() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::RelModLevel,
       0
@@ -695,7 +742,7 @@ protected:
       return false;
     }
 
-    float modulation = ot->fromF88(response);
+    float modulation = this->instance->fromF88(response);
     if (!vars.states.flame) {
       vars.sensors.modulation = 0;
     } else {
@@ -706,7 +753,7 @@ protected:
   }
 
   bool updatePressure() {
-    unsigned long response = ot->sendRequest(CustomOpenTherm::buildRequest(
+    unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,
       OpenThermMessageID::CHPressure,
       0
diff --git a/src/SensorsTask.h b/src/SensorsTask.h
index 6098e2b..ad6fca2 100644
--- a/src/SensorsTask.h
+++ b/src/SensorsTask.h
@@ -60,39 +60,38 @@ protected:
   }
 
   void loop() {
-    bool needUpdateIndoorTemp = false;
-    bool needUpdateOutdoorTemp = false;
+    bool indoorTempUpdated = false;
+    bool outdoorTempUpdated = false;
 
-    if (settings.sensors.outdoor.type == 2 && settings.sensors.outdoor.pin) {
+    if (settings.sensors.outdoor.type == 2 && GPIO_IS_VALID(settings.sensors.indoor.gpio)) {
       outdoorTemperatureSensor();
-      needUpdateOutdoorTemp = true;
+      outdoorTempUpdated = true;
     }
 
-    if (settings.sensors.indoor.type == 2 && settings.sensors.indoor.pin) {
+    if (settings.sensors.indoor.type == 2 && GPIO_IS_VALID(settings.sensors.indoor.gpio)) {
       indoorTemperatureSensor();
-      needUpdateIndoorTemp = true;
+      indoorTempUpdated = true;
     }
-
 #if USE_BLE
-    if (settings.sensors.indoor.type == 3) {
-      bluetoothSensor();
-      needUpdateIndoorTemp = true;
+    else if (settings.sensors.indoor.type == 3) {
+      indoorTemperatureBluetoothSensor();
+      indoorTempUpdated = true;
     }
 #endif
 
-    if (needUpdateOutdoorTemp && fabs(vars.temperatures.outdoor - this->filteredOutdoorTemp) > 0.099) {
+    if (outdoorTempUpdated && fabs(vars.temperatures.outdoor - this->filteredOutdoorTemp) > 0.099) {
       vars.temperatures.outdoor = this->filteredOutdoorTemp + settings.sensors.outdoor.offset;
       Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("New temp: %f"), vars.temperatures.outdoor);
     }
 
-    if (needUpdateIndoorTemp && fabs(vars.temperatures.indoor - this->filteredIndoorTemp) > 0.099) {
+    if (indoorTempUpdated && fabs(vars.temperatures.indoor - this->filteredIndoorTemp) > 0.099) {
       vars.temperatures.indoor = this->filteredIndoorTemp + settings.sensors.indoor.offset;
       Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("New temp: %f"), vars.temperatures.indoor);
     }
   }
 
 #if USE_BLE
-  void bluetoothSensor() {
+  void indoorTemperatureBluetoothSensor() {
     static bool initBleNotify = false;
     if (!initBleSensor && millis() > 5000) {
       Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Init BLE"));
@@ -210,9 +209,9 @@ protected:
 
   void outdoorTemperatureSensor() {
     if (!this->initOutdoorSensor) {
-      Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("Starting on gpio %hhu..."), settings.sensors.outdoor.pin);
+      Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("Starting on gpio %hhu..."), settings.sensors.outdoor.gpio);
 
-      this->oneWireOutdoorSensor->begin(settings.sensors.outdoor.pin);
+      this->oneWireOutdoorSensor->begin(settings.sensors.outdoor.gpio);
       this->outdoorSensor->begin();
 
       Log.straceln(
@@ -276,9 +275,9 @@ protected:
 
   void indoorTemperatureSensor() {
     if (!this->initIndoorSensor) {
-      Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("Starting on gpio %hhu..."), settings.sensors.indoor.pin);
+      Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("Starting on gpio %hhu..."), settings.sensors.indoor.gpio);
 
-      this->oneWireIndoorSensor->begin(settings.sensors.indoor.pin);
+      this->oneWireIndoorSensor->begin(settings.sensors.indoor.gpio);
       this->indoorSensor->begin();
 
       Log.straceln(
diff --git a/src/Settings.h b/src/Settings.h
index 9545ccf..da988fe 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -1,5 +1,5 @@
 struct NetworkSettings {
-  char hostname[25] = HOSTNAME_DEFAULT;
+  char hostname[25] = DEFAULT_HOSTNAME;
   bool useDhcp = true;
 
   struct {
@@ -10,14 +10,14 @@ struct NetworkSettings {
   } staticConfig;
 
   struct {
-    char ssid[33] = AP_SSID_DEFAULT;
-    char password[65] = AP_PASSWORD_DEFAULT;
+    char ssid[33] = DEFAULT_AP_SSID;
+    char password[65] = DEFAULT_AP_PASSWORD;
     byte channel = 6;
   } ap;
 
   struct {
-    char ssid[33] = STA_SSID_DEFAULT;
-    char password[65] = STA_PASSWORD_DEFAULT;
+    char ssid[33] = DEFAULT_STA_SSID;
+    char password[65] = DEFAULT_STA_PASSWORD;
     byte channel = 0;
   } sta;
 } networkSettings;
@@ -31,13 +31,13 @@ struct Settings {
 
   struct {
     bool useAuth = false;
-    char login[13] = PORTAL_LOGIN_DEFAULT;
-    char password[33] = PORTAL_PASSWORD_DEFAULT;
+    char login[13] = DEFAULT_PORTAL_LOGIN;
+    char password[33] = DEFAULT_PORTAL_PASSWORD;
   } portal;
 
   struct {
-    byte inPin = OT_IN_PIN_DEFAULT;
-    byte outPin = OT_OUT_PIN_DEFAULT;
+    byte inGpio = DEFAULT_OT_IN_GPIO;
+    byte outGpio = DEFAULT_OT_OUT_GPIO;
     unsigned int memberIdCode = 0;
     bool dhwPresent = true;
     bool summerWinterMode = false;
@@ -49,11 +49,11 @@ struct Settings {
   } opentherm;
 
   struct {
-    char server[81] = MQTT_SERVER_DEFAULT;
-    unsigned short port = MQTT_PORT_DEFAULT;
-    char user[33] = MQTT_USER_DEFAULT;
-    char password[33] = MQTT_PASSWORD_DEFAULT;
-    char prefix[33] = MQTT_PREFIX_DEFAULT;
+    char server[81] = DEFAULT_MQTT_SERVER;
+    unsigned short port = DEFAULT_MQTT_PORT;
+    char user[33] = DEFAULT_MQTT_USER;
+    char password[33] = DEFAULT_MQTT_PASSWORD;
+    char prefix[33] = DEFAULT_MQTT_PREFIX;
     unsigned short interval = 5;
   } mqtt;
 
@@ -102,14 +102,14 @@ struct Settings {
     struct {
       // 0 - boiler, 1 - manual, 2 - ds18b20
       byte type = 0;
-      byte pin = SENSOR_OUTDOOR_PIN_DEFAULT;
+      byte gpio = DEFAULT_SENSOR_OUTDOOR_GPIO;
       float offset = 0.0f;
     } outdoor;
 
     struct {
       // 1 - manual, 2 - ds18b20, 3 - ble
       byte type = 1;
-      byte pin = SENSOR_INDOOR_PIN_DEFAULT;
+      byte gpio = DEFAULT_SENSOR_INDOOR_GPIO;
       uint8_t bleAddresss[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
       float offset = 0.0f;
     } indoor;
@@ -117,7 +117,7 @@ struct Settings {
 
   struct {
     bool use = false;
-    byte pin = EXT_PUMP_PIN_DEFAULT;
+    byte gpio = DEFAULT_EXT_PUMP_GPIO;
     unsigned short postCirculationTime = 600;
     unsigned int antiStuckInterval = 2592000;
     unsigned short antiStuckTime = 300;
diff --git a/src/defines.h b/src/defines.h
index 0e4586d..dc15054 100644
--- a/src/defines.h
+++ b/src/defines.h
@@ -4,9 +4,6 @@
 
 #define EMERGENCY_TIME_TRESHOLD     120000
 #define MQTT_RECONNECT_INTERVAL     15000
-#define MQTT_KEEPALIVE              30
-
-#define OPENTHERM_OFFLINE_TRESHOLD  10
 
 #define EXT_SENSORS_INTERVAL        5000
 #define EXT_SENSORS_FILTER_K        0.15
@@ -14,16 +11,12 @@
 #define CONFIG_URL                  "http://%s/"
 #define SETTINGS_VALID_VALUE        "stvalid" // only 8 chars!
 
+#define GPIO_IS_NOT_CONFIGURED      0xff
 #define DEFAULT_HEATING_MIN_TEMP    20
 #define DEFAULT_HEATING_MAX_TEMP    90
 #define DEFAULT_DHW_MIN_TEMP        30
 #define DEFAULT_DHW_MAX_TEMP        60
 
-
-#ifndef WM_DEBUG_MODE
-  #define WM_DEBUG_MODE WM_DEBUG_NOTIFY
-#endif
-
 #ifndef USE_SERIAL
   #define USE_SERIAL true
 #endif
@@ -36,80 +29,86 @@
   #define USE_BLE false
 #endif
 
-#ifndef HOSTNAME_DEFAULT
-  #define HOSTNAME_DEFAULT "opentherm"
+#ifndef DEFAULT_HOSTNAME
+  #define DEFAULT_HOSTNAME "opentherm"
 #endif
 
-#ifndef AP_SSID_DEFAULT
-  #define AP_SSID_DEFAULT "OpenTherm Gateway"
+#ifndef DEFAULT_AP_SSID
+  #define DEFAULT_AP_SSID "OpenTherm Gateway"
 #endif
 
-#ifndef AP_PASSWORD_DEFAULT
-  #define AP_PASSWORD_DEFAULT "otgateway123456"
+#ifndef DEFAULT_AP_PASSWORD
+  #define DEFAULT_AP_PASSWORD "otgateway123456"
 #endif
 
-#ifndef STA_SSID_DEFAULT
-  #define STA_SSID_DEFAULT ""
+#ifndef DEFAULT_STA_SSID
+  #define DEFAULT_STA_SSID ""
 #endif
 
-#ifndef STA_PASSWORD_DEFAULT
-  #define STA_PASSWORD_DEFAULT ""
+#ifndef DEFAULT_STA_PASSWORD
+  #define DEFAULT_STA_PASSWORD ""
 #endif
 
 #ifndef DEBUG_BY_DEFAULT
   #define DEBUG_BY_DEFAULT false
 #endif
 
-#ifndef PORTAL_LOGIN_DEFAULT
-  #define PORTAL_LOGIN_DEFAULT ""
+#ifndef DEFAULT_PORTAL_LOGIN
+  #define DEFAULT_PORTAL_LOGIN ""
 #endif
 
-#ifndef PORTAL_PASSWORD_DEFAULT
-  #define PORTAL_PASSWORD_DEFAULT ""
+#ifndef DEFAULT_PORTAL_PASSWORD
+  #define DEFAULT_PORTAL_PASSWORD ""
 #endif
 
-#ifndef MQTT_SERVER_DEFAULT
-  #define MQTT_SERVER_DEFAULT ""
+#ifndef DEFAULT_MQTT_SERVER
+  #define DEFAULT_MQTT_SERVER ""
 #endif
 
-#ifndef MQTT_PORT_DEFAULT
-  #define MQTT_PORT_DEFAULT 1883
+#ifndef DEFAULT_MQTT_PORT
+  #define DEFAULT_MQTT_PORT 1883
 #endif
 
-#ifndef MQTT_USER_DEFAULT
-  #define MQTT_USER_DEFAULT ""
+#ifndef DEFAULT_MQTT_USER
+  #define DEFAULT_MQTT_USER ""
 #endif
 
-#ifndef MQTT_PASSWORD_DEFAULT
-  #define MQTT_PASSWORD_DEFAULT ""
+#ifndef DEFAULT_MQTT_PASSWORD
+  #define DEFAULT_MQTT_PASSWORD ""
 #endif
 
-#ifndef MQTT_PREFIX_DEFAULT
-  #define MQTT_PREFIX_DEFAULT "opentherm"
+#ifndef DEFAULT_MQTT_PREFIX
+  #define DEFAULT_MQTT_PREFIX "opentherm"
 #endif
 
-#ifndef OT_IN_PIN_DEFAULT
-  #define OT_IN_PIN_DEFAULT 0
+#ifndef DEFAULT_OT_IN_GPIO
+  #define DEFAULT_OT_IN_GPIO GPIO_IS_NOT_CONFIGURED
 #endif
 
-#ifndef OT_OUT_PIN_DEFAULT
-  #define OT_OUT_PIN_DEFAULT 0
+#ifndef DEFAULT_OT_OUT_GPIO
+  #define DEFAULT_OT_OUT_GPIO GPIO_IS_NOT_CONFIGURED
 #endif
 
-#ifndef SENSOR_OUTDOOR_PIN_DEFAULT
-  #define SENSOR_OUTDOOR_PIN_DEFAULT 0
+#ifndef DEFAULT_SENSOR_OUTDOOR_GPIO
+  #define DEFAULT_SENSOR_OUTDOOR_GPIO GPIO_IS_NOT_CONFIGURED
 #endif
 
-#ifndef SENSOR_INDOOR_PIN_DEFAULT
-  #define SENSOR_INDOOR_PIN_DEFAULT 0
+#ifndef DEFAULT_SENSOR_INDOOR_GPIO
+  #define DEFAULT_SENSOR_INDOOR_GPIO GPIO_IS_NOT_CONFIGURED
 #endif
 
-#ifndef EXT_PUMP_PIN_DEFAULT
-  #define EXT_PUMP_PIN_DEFAULT 0
+#ifndef DEFAULT_EXT_PUMP_GPIO
+  #define DEFAULT_EXT_PUMP_GPIO GPIO_IS_NOT_CONFIGURED
 #endif
 
 #ifndef PROGMEM
   #define PROGMEM 
 #endif
 
+#ifndef GPIO_IS_VALID_GPIO
+  #define GPIO_IS_VALID_GPIO(gpioNum) (gpioNum >= 0 && gpioNum <= 16)
+#endif
+
+#define GPIO_IS_VALID(gpioNum) (gpioNum != GPIO_IS_NOT_CONFIGURED && GPIO_IS_VALID_GPIO(gpioNum))
+
 char buffer[255];
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index 0aa1fef..46a10cb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -143,7 +143,7 @@ void setup() {
   tMqtt = new MqttTask(false, 500);
   Scheduler.start(tMqtt);
 
-  tOt = new OpenThermTask(false, 750);
+  tOt = new OpenThermTask(true, 750);
   Scheduler.start(tOt);
 
   tSensors = new SensorsTask(true, EXT_SENSORS_INTERVAL);
diff --git a/src/utils.h b/src/utils.h
index 1d71eb5..fac36e0 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -273,8 +273,8 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     dst["portal"]["login"] = src.portal.login;
     dst["portal"]["password"] = src.portal.password;
 
-    dst["opentherm"]["inPin"] = src.opentherm.inPin;
-    dst["opentherm"]["outPin"] = src.opentherm.outPin;
+    dst["opentherm"]["inGpio"] = src.opentherm.inGpio;
+    dst["opentherm"]["outGpio"] = src.opentherm.outGpio;
     dst["opentherm"]["memberIdCode"] = src.opentherm.memberIdCode;
     dst["opentherm"]["dhwPresent"] = src.opentherm.dhwPresent;
     dst["opentherm"]["summerWinterMode"] = src.opentherm.summerWinterMode;
@@ -324,11 +324,11 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   dst["equitherm"]["t_factor"] = roundd(src.equitherm.t_factor, 3);
 
   dst["sensors"]["outdoor"]["type"] = src.sensors.outdoor.type;
-  dst["sensors"]["outdoor"]["pin"] = src.sensors.outdoor.pin;
+  dst["sensors"]["outdoor"]["gpio"] = src.sensors.outdoor.gpio;
   dst["sensors"]["outdoor"]["offset"] = roundd(src.sensors.outdoor.offset, 2);
 
   dst["sensors"]["indoor"]["type"] = src.sensors.indoor.type;
-  dst["sensors"]["indoor"]["pin"] = src.sensors.indoor.pin;
+  dst["sensors"]["indoor"]["gpio"] = src.sensors.indoor.gpio;
 
   char bleAddress[18];
   sprintf(
@@ -346,7 +346,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
 
   if (!safe) {
     dst["externalPump"]["use"] = src.externalPump.use;
-    dst["externalPump"]["pin"] = src.externalPump.pin;
+    dst["externalPump"]["gpio"] = src.externalPump.gpio;
     dst["externalPump"]["postCirculationTime"] = roundd(src.externalPump.postCirculationTime / 60, 0);
     dst["externalPump"]["antiStuckInterval"] = roundd(src.externalPump.antiStuckInterval / 86400, 0);
     dst["externalPump"]["antiStuckTime"] = roundd(src.externalPump.antiStuckTime / 60, 0);
@@ -404,21 +404,37 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
 
 
     // opentherm
-    if (!src["opentherm"]["inPin"].isNull()) {
-      unsigned char value = src["opentherm"]["inPin"].as<unsigned char>();
+    if (!src["opentherm"]["inGpio"].isNull()) {
+      if (src["opentherm"]["inGpio"].is<JsonString>() && src["opentherm"]["inGpio"].as<JsonString>().size() == 0) {
+        if (dst.opentherm.inGpio != GPIO_IS_NOT_CONFIGURED) {
+          dst.opentherm.inGpio = GPIO_IS_NOT_CONFIGURED;
+          changed = true;
+        }
+        
+      } else {
+        unsigned char value = src["opentherm"]["inGpio"].as<unsigned char>();
 
-      if (value >= 0 && value < 50) {
-        dst.opentherm.inPin = value;
-        changed = true;
+        if (value >= 0 && value <= 254) {
+          dst.opentherm.inGpio = value;
+          changed = true;
+        }
       }
     }
     
-    if (!src["opentherm"]["outPin"].isNull()) {
-      unsigned char value = src["opentherm"]["outPin"].as<unsigned char>();
+    if (!src["opentherm"]["outGpio"].isNull()) {
+      if (src["opentherm"]["outGpio"].is<JsonString>() && src["opentherm"]["outGpio"].as<JsonString>().size() == 0) {
+        if (dst.opentherm.outGpio != GPIO_IS_NOT_CONFIGURED) {
+          dst.opentherm.outGpio = GPIO_IS_NOT_CONFIGURED;
+          changed = true;
+        }
+        
+      } else {
+        unsigned char value = src["opentherm"]["outGpio"].as<unsigned char>();
 
-      if (value >= 0 && value < 50) {
-        dst.opentherm.outPin = value;
-        changed = true;
+        if (value >= 0 && value <= 254) {
+          dst.opentherm.outGpio = value;
+          changed = true;
+        }
       }
     }
 
@@ -789,12 +805,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
-  if (!src["sensors"]["outdoor"]["pin"].isNull()) {
-    unsigned char value = src["sensors"]["outdoor"]["pin"].as<unsigned char>();
+  if (!src["sensors"]["outdoor"]["gpio"].isNull()) {
+    if (src["sensors"]["outdoor"]["gpio"].is<JsonString>() && src["sensors"]["outdoor"]["gpio"].as<JsonString>().size() == 0) {
+      if (dst.sensors.outdoor.gpio != GPIO_IS_NOT_CONFIGURED) {
+        dst.sensors.outdoor.gpio = GPIO_IS_NOT_CONFIGURED;
+        changed = true;
+      }
+      
+    } else {
+      unsigned char value = src["sensors"]["outdoor"]["gpio"].as<unsigned char>();
 
-    if (value >= 0 && value <= 50) {
-      dst.sensors.outdoor.pin = value;
-      changed = true;
+      if (value >= 0 && value <= 254) {
+        dst.sensors.outdoor.gpio = value;
+        changed = true;
+      }
     }
   }
 
@@ -821,12 +845,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
-  if (!src["sensors"]["indoor"]["pin"].isNull()) {
-    unsigned char value = src["sensors"]["indoor"]["pin"].as<unsigned char>();
-
-    if (value >= 0 && value <= 50) {
-      dst.sensors.indoor.pin = value;
-      changed = true;
+  if (!src["sensors"]["indoor"]["gpio"].isNull()) {
+    if (src["sensors"]["indoor"]["gpio"].is<JsonString>() && src["sensors"]["indoor"]["gpio"].as<JsonString>().size() == 0) {
+      if (dst.sensors.indoor.gpio != GPIO_IS_NOT_CONFIGURED) {
+        dst.sensors.indoor.gpio = GPIO_IS_NOT_CONFIGURED;
+        changed = true;
+      }
+      
+    } else {
+      unsigned char value = src["sensors"]["indoor"]["gpio"].as<unsigned char>();
+      
+      if (value >= 0 && value <= 254) {
+        dst.sensors.indoor.gpio = value;
+        changed = true;
+      }
     }
   }
 
@@ -861,12 +893,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       changed = true;
     }
 
-    if (!src["externalPump"]["pin"].isNull()) {
-      unsigned char value = src["externalPump"]["pin"].as<unsigned char>();
+    if (!src["externalPump"]["gpio"].isNull()) {
+      if (src["externalPump"]["gpio"].is<JsonString>() && src["externalPump"]["gpio"].as<JsonString>().size() == 0) {
+        if (dst.externalPump.gpio != GPIO_IS_NOT_CONFIGURED) {
+          dst.externalPump.gpio = GPIO_IS_NOT_CONFIGURED;
+          changed = true;
+        }
+        
+      } else {
+        unsigned char value = src["externalPump"]["gpio"].as<unsigned char>();
 
-      if (value >= 0 && value <= 50) {
-        dst.externalPump.pin = value;
-        changed = true;
+        if (value >= 0 && value <= 254) {
+          dst.externalPump.gpio = value;
+          changed = true;
+        }
       }
     }
 
diff --git a/src_data/static/app.js b/src_data/static/app.js
index d46ea1d..97b8807 100644
--- a/src_data/static/app.js
+++ b/src_data/static/app.js
@@ -491,8 +491,8 @@ async function loadSettings() {
   setInputValue('.portal-password', result.portal.password);
   setBusy('#portal-settings-busy', '#portal-settings', false);
 
-  setInputValue('.opentherm-in-pin', result.opentherm.inPin);
-  setInputValue('.opentherm-out-pin', result.opentherm.outPin);
+  setInputValue('.opentherm-in-gpio', result.opentherm.inGpio < 255 ? result.opentherm.inGpio : '');
+  setInputValue('.opentherm-out-gpio', result.opentherm.outGpio < 255 ? result.opentherm.outGpio : '');
   setInputValue('.opentherm-member-id-code', result.opentherm.memberIdCode);
   setCheckboxValue('.opentherm-dhw-present', result.opentherm.dhwPresent);
   setCheckboxValue('.opentherm-sw-mode', result.opentherm.summerWinterMode);
@@ -512,18 +512,18 @@ async function loadSettings() {
   setBusy('#mqtt-settings-busy', '#mqtt-settings', false);
 
   setRadioValue('.outdoor-sensor-type', result.sensors.outdoor.type);
-  setInputValue('.outdoor-sensor-pin', result.sensors.outdoor.pin);
+  setInputValue('.outdoor-sensor-gpio', result.sensors.outdoor.gpio  < 255 ? result.sensors.outdoor.gpio : '');
   setInputValue('.outdoor-sensor-offset', result.sensors.outdoor.offset);
   setBusy('#outdoor-sensor-settings-busy', '#outdoor-sensor-settings', false);
 
   setRadioValue('.indoor-sensor-type', result.sensors.indoor.type);
-  setInputValue('.indoor-sensor-pin', result.sensors.indoor.pin);
+  setInputValue('.indoor-sensor-gpio', result.sensors.indoor.gpio < 255 ? result.sensors.indoor.gpio : '');
   setInputValue('.indoor-sensor-offset', result.sensors.indoor.offset);
   setInputValue('.indoor-sensor-ble-addresss', result.sensors.indoor.bleAddresss);
   setBusy('#indoor-sensor-settings-busy', '#indoor-sensor-settings', false);
 
   setCheckboxValue('.extpump-use', result.externalPump.use);
-  setInputValue('.extpump-pin', result.externalPump.pin);
+  setInputValue('.extpump-gpio', result.externalPump.gpio < 255 ? result.externalPump.gpio : '');
   setInputValue('.extpump-pc-time', result.externalPump.postCirculationTime);
   setInputValue('.extpump-as-interval', result.externalPump.antiStuckInterval);
   setInputValue('.extpump-as-time', result.externalPump.antiStuckTime);