From ebe1e7243e7302c651f9fb24c45411e7c7397c6b Mon Sep 17 00:00:00 2001 From: Edward Firmo Date: Thu, 10 Aug 2023 09:33:22 +0200 Subject: [PATCH] Bump version to `4.0 dev` --- .../nspanel_blank_code/Program.s.txt | 8 ++ .../nspanel_blank_code/page0.txt | 21 +++++ nspanel_blueprint.yaml | 4 +- nspanel_esphome.yaml | 81 ++++-------------- nspanel_esphome_addon_climate.yaml | 6 +- nspanel_eu.HMI | Bin 21307134 -> 21307134 bytes nspanel_eu.tft | Bin 6324472 -> 6324472 bytes nspanel_eu_code/boot.txt | 2 +- nspanel_us.HMI | Bin 21307134 -> 21307134 bytes nspanel_us.tft | Bin 7666364 -> 7666364 bytes nspanel_us_code/boot.txt | 2 +- nspanel_us_land.HMI | Bin 21307134 -> 21307134 bytes nspanel_us_land.tft | Bin 6324492 -> 6324492 bytes nspanel_us_land_code/boot.txt | 2 +- 14 files changed, 56 insertions(+), 70 deletions(-) create mode 100644 custom_configuration/nspanel_blank_code/Program.s.txt create mode 100644 custom_configuration/nspanel_blank_code/page0.txt diff --git a/custom_configuration/nspanel_blank_code/Program.s.txt b/custom_configuration/nspanel_blank_code/Program.s.txt new file mode 100644 index 0000000..c007e76 --- /dev/null +++ b/custom_configuration/nspanel_blank_code/Program.s.txt @@ -0,0 +1,8 @@ +Program.s + //The following code is only run once when power on, and is generally used for global variable definition and power on initialization data + int sys0=0,sys1=0,sys2=0 //At present, the definition of global variable only supports 4-byte signed integer (int), and other types of global quantity declaration are not supported. If you want to use string type, you can use variable control in the page to implement + bauds=115200//Configure baudrate + dim=100//Configure backlight + recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port + page 0 //Power on start page 0 diff --git a/custom_configuration/nspanel_blank_code/page0.txt b/custom_configuration/nspanel_blank_code/page0.txt new file mode 100644 index 0000000..e6969bb --- /dev/null +++ b/custom_configuration/nspanel_blank_code/page0.txt @@ -0,0 +1,21 @@ +Page page0 + Attributes + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + +QR Code qr0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Text : https://github.com/Blackymas/NSPanel_HA_Blueprint + Max. Text Size : 50 + diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index c44619e..6ec11ac 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -33,7 +33,7 @@ blueprint: 🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) - ℹ️ Version: v.3.5_dev + ℹ️ Version: v4.0 dev source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -3525,7 +3525,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '3.5_dev' + blueprint_version: '4.0 dev' date_format_temp: !input 'date_format' #Avoid breaking change for existing users with legacy type format date_format: > diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index 8fee703..0798916 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -6,44 +6,17 @@ ##################################################################################################### -##### ADVANCED CONFIGURATION - activate only when you know what you do ############################## substitutions: +##### ADVANCED CONFIGURATION - Please change this on your ESPHome yaml when needed ##### verbose_log: "false" - # ## usage of secrets-file ## -> comment in ###### Change ME ###### - # device_name: "nspanel-name" # Wird im Blueprint benötigt! - # wifi_ssid: !secret nspanel_wifi_ssid # add in your esphome secrets file. - # wifi_password: !secret nspanel_wifi_password # add in your esphome secrets file. -> per default this is also used for ota_password and web_password wifi_hidden: "false" - # ota_password: !secret nspanel_ota_password # add in your esphome secrets file. - manual change in code required to activate - # web_password: !secret nspanel_web_password # add in your esphome secrets file. - manual change in code required to activate - # api_password: !secret nspanel_api_password # add in your esphome secrets file. - manual change in code required to activate - # nextion_update_url: !secret nspanel_update_url # add in your esphome secrets file. Example: "http://"HOME ASSISTANT IP":8123/local/nspanel/nspanel.tft" - - # ## static ip config ## - # ip: "10.0.0.7" - # gw: "10.0.0.138" - # subnet: "255.255.255.0" - # dns: "10.0.0.138" - # domain: ".local" - time_source: "homeassistant" # Either "homeassistant" or "sntp" are supported +##### END OF ADVANCED CONFIGURATION #################################################### -###### USE THIS ONLY FOR YOUR FIRST TFT UPLOAD -###### AND IF EXIT-REPARSE BUTTON FAILS -###### ONCE IT WORKED, REMOVE THESE LINES -###### https://github.com/esphome/esphome/pull/2956 -# external_components: -# - source: github://pr#2956 -# components: [nextion] -# refresh: 1h -################################################## - -##### if you rename this file to .nspanel_esphome.yaml then you can activate nested config -##### use the ADVANCED CONFIG-Section as device configuration -##### https://esphome.io/guides/configuration-types.html#yaml-insertion-operator -# <<: !include .nspanel_esphome.yaml - -##### END OF ADVANCED CONFIGURATION ############################################################## + ##### DON'T CHANGE THIS ##### + version: "4.0 dev" + addon_climate: "false" + ############################# ##### WIFI SETUP ##### wifi: @@ -53,14 +26,6 @@ wifi: password: ${wifi_password} hidden: ${wifi_hidden} power_save_mode: none - ##### advanced config - uncomment to use static IP-Config ##### - # manual_ip: - # static_ip: ${ip} - # gateway: ${gw} - # subnet: ${subnet} - # dns1: ${dns} - # domain: ${domain} - ##### Enable fallback hotspot (captive portal) in case wifi connection fails ap: ssid: "${device_name}" password: ${wifi_password} @@ -81,14 +46,10 @@ web_server: auth: username: admin password: ${wifi_password} - ##### advanced config - change to use web_password ##### - # password: ${web_password} ##### OTA PASSWORD ##### ota: password: ${wifi_password} - ##### advanced config - change to use ota_password ##### - # password: ${ota_password} safe_mode: true reboot_timeout: 3min num_attempts: 3 @@ -96,36 +57,28 @@ ota: ##### LOGGER ##### logger: baud_rate: 0 - #level: INFO - -##### CONFIGURE INTERNAL BUZZER ##### -output: - ##### BUZZER FOR PLAYING RINGTONES ##### - - platform: ledc - id: buzzer_out - pin: - number: 21 ##### ENABLE RINGTONE MUSIC SUPPORT ##### rtttl: id: buzzer output: buzzer_out +##### CONFIGURE INTERNAL BUZZER ##### +output: + ##### BUZZER FOR PLAYING RINGTONES ##### + - platform: ledc + id: buzzer_out + pin: + number: 21 + ##### UART FOR NEXTION DISPLAY ##### uart: + id: tf_uart tx_pin: 16 rx_pin: 17 baud_rate: 115200 - id: tf_uart - # debug: - # direction: BOTH - # dummy_receiver: false - # after: - # delimiter: "\n" - # sequence: - # - lambda: UARTDebug::log_string(direction, bytes); -### Keeps time display updated +##### Keeps time display updated ##### time: - platform: ${time_source} id: time_provider @@ -1203,7 +1156,7 @@ display: on_setup: then: - lambda: id(disp1).send_command_printf("page 8"); - - lambda: id(disp1).set_component_text_printf("boot.esph_version", "%s", "3.5_dev"); ### esphome-version ### + - lambda: id(disp1).set_component_text_printf("boot.esph_version", "%s", "${version}"); ### esphome-version ### - wait_until: api.connected - lambda: id(disp1).set_component_text_printf("boot.ip_addr", "%s", id(ip_address).state.c_str()); diff --git a/nspanel_esphome_addon_climate.yaml b/nspanel_esphome_addon_climate.yaml index 51c154b..facc0b3 100644 --- a/nspanel_esphome_addon_climate.yaml +++ b/nspanel_esphome_addon_climate.yaml @@ -16,6 +16,10 @@ substitutions: addon_climate_visual_max_temperature: "25" addon_climate_visual_temperature_step: "0.5" + ##### DON'T CHANGE THIS ##### + addon_climate: "true" + ############################# + climate: - platform: thermostat name: ${device_name} Thermostat @@ -277,7 +281,7 @@ script: id(disp1).set_component_font_color("climate.button07_icon", (id(thermostat_embedded).mode==climate::CLIMATE_MODE_OFF) ? 35921 : 48631); switch: - ##### PHYSICAL SWITCH 0 (Dummy) - Usend when embedded climate is disabled ##### + ##### PHYSICAL SWITCH 0 (Dummy) - Used when relay is not set ##### - name: ${device_name} Relay 0 (dummy) platform: template id: relay_0 diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index b971e15880d907ac75495c7458b5e73e7308a99d..25ff329f8e2bce7d1c5888e171bbc293f1e053c4 100644 GIT binary patch delta 1727 zcmdtg`EwIx7{Kw}G-(40Rw)f4N~-nX=w+*ED6pjzK}C&d@gO2qP*l`Pl7bgh`p~G{ zrn=&NixsO7Y(&IX(1HiHiZ>z=P*G5;SWhf|AAWKC4;*&p^L^iUX5X28X0~f>efKVy z=_|}4x1+rx?sM0<9h+nE=JcEtUqMlBRi*Lolbs(jdX4AYF~(&qo#{BR=cuc%E@U*h z48vSs5ucEe>F^c&_wKB`u#p_BcN<*B%8iZ#dycwJ42F%u0o>gXGvf0z1Ey)jwt76K z8SnJ$&T?+)>sc5Jl=P`h`lCs|2?tW(gbS&Oq(9BudXS7!o3x@yi#aXkw3yRkPK!A$ z=CsnhE&r1j_!x7NCB@>GAyOhkWta>XOG;&gl*vdbmr-(>jFvHSx||_r%2+u|&X#i| zAm_?BIZw`)3K=gK$c1u|Tr3kLD3{1Yxl|@erCcVL%Ve1%SICtzRj!h&Su4-6&aLh$_uYfF{dZ03d33B?8?;YQoC(xXn&$Q z8geglc4n7vPwZS18RbnY%FXvqo>FaRwN+)^7KjVsY@LCx}1d-2|g z+s@fHV_>3vN2J3UOIkhcz_f5#v@sY)1l5>QG?qs2elB)MIEBJ z9e3bP%)@*vz(Op-Vl2U3h@l>L;~vu!+P19X- zh~`jD4^2}PgAV%Yldh_G($DRG{ZHP Urc^URQ>GbdHa7;#&A_^U03GDmNdN!< delta 2125 zcmd_oi&qq77{~FMfd!%qh_GO&U=eBtyIc$xTm}Toij*WpyNZcP0Rl@fSP3l;pkmUB zI*CSUWke9_iesfBrC46d%1XP~+Fgkx?H*yj2R0-Ag3fWz`Fv;2yzlP5`<(6FwaT*> z#35V6XbguNoxh3+!91$7&waK6WDI@Uy7#rB04)(pJiw+Oh}qkP?@ z!07)TVzHr67&;Ssy3gtCdHPgQjHqq*_ZJ2GasSRyR>{R>ld!WJ!&%7sslpR*S3VSE*Els)tNgUzansX0?5VWrkX|tk6sI zX;uPsyx^zKK3SXI|8V10WlG;e-rY1{_uL)IFz4>&m6p?5@opv4RkfL|L0YS^WR|G* z*h>Ah`b|pDg|`p-vICNu(x~Xg5;bwOb)1?InXgwzE-BQjWtEH8sot#xdNpOIa!gHX zQql(fxC03!5ry>+kcm_X6BF3 zhTD}jlGrln7@|YXKb*H&!x;?XKl2(ifrFB^zEznj^&L;c9L_elb`~Y-wJ}CZmy1^K zZVd?3!lqd~W2$Twh42s*K`|&$0*l~bcmy7W#ZU@m@EBO390)3)5~^ScEQMuI4a?zi zSOGQg1lV9D)WRxQ4QoJ!Ct)qr!8%wEPeDCA4bQ*^*a*+UbMQQDf)}6xUW7(?37Vi8 zUWOLf3|n9;*kK#A!gkPL2fPBW!fUV-cEN6FgFVm=ufrR#7xqC1?1wkuEjR!N;Sd~# zx8WT)0`J0m@ID-c58y-i2#&#V_!vHcPvJ8-0iS~dPQn-PC42>6!#D6Pduh8R&)|;VhhkpWtWs1%8F!;CJ`~{)8U*3wq&vwXH&|0gl9R;ka^i95;?T$AfbT z$CGm@=Q7UaoGUn99B;Fj;hYhik(?k-FlQ9!D$doM z5Y9E6P|j%17|vMEwVZLB>o{SYaE^gvQw&UnuCoEXjoj)@b?iQ`P(Hr7w;sLv^cyf}$gmNk#*B-bkT7Y= zw8)HEbLK5rv}D+WrCO;a39y delta 247 zcmWN=MNR`i002Nri)(Rrmtw`;T3m{2c?yt8cmV(4M8dHb9>tNJWd7dXqkrM6hl( m@y|%!M=En2-h{W|U3ecpgpc7<_#9?`Qkj>pMC>=+`0x+n1y>XR diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt index a9d3274..d693b92 100644 --- a/nspanel_eu_code/boot.txt +++ b/nspanel_eu_code/boot.txt @@ -107,7 +107,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 3.5_dev + Text : 4.0 dev Max. Text Size : 8 Text esph_version diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 7540398b9a1aa5b3c1a1c618c8581deddab32c4c..90e3dba268ccdc037bfe4a6733b462eb82ec384e 100644 GIT binary patch delta 1635 zcmdVU`+tsg9LMqN+U|Q}jQciaqZleF8*9?-Y-~1nDW${Gfu)i}quZ&cCan{X}O;0x!F&D|ffZ@}@W$>4gRVP1(bN zkW<^maoozZT^r$b6vzB79MyJ7p>2Y_pJCo-@U{aEcFFl#2^+Pco7%%1>@_MogfFej5}thYGEf<$WV>sFi8*eS{~tr^4sieg delta 1641 zcmd7Q`BzkB9LMo{hnXQ!Vn)q{C^OqMQ5F{j1yKl{Hp><(TWqmaLjl8fn{QE3Nse}{ zY%eU^B(SlJ%=T3++@eLwHYe$|UnzJ~`aoi-QzNvFzpl4?0fYM3Me@`r@+-d30dwqJ3 zg>IUY@&D!Q<_aezpYyGyf%;CVYtsGOwr{M6wTu}QZ7Zp2D{~g!prr1=w(n@WbO}8>DZ>Y#_4rUEqwJs&!o4h_c#7o^;R+AMA?D=ap z_jQ~Vd*?+19cSL&xnQv4j1TVFGbhh+ihbU!>atvKbz+4-zF9-BGry zPrTpmXmNs96PnR2zB8>n$LB?oXLR+p)Ws%vE9X~s@LHN?2I957%Etz(Six1O#7ta` zYj7>D!}YiUH)0lULKKFZaSN(&D{jN>sKy<*6L(=YYH&B^Acnb^hkM{*KJLYRxE~Af z03O6cco>i1Q9Opn@dRqI5KrPMEW*=x2G8O-Jdeew!waZK1D4=L#IY1F;bkntD`>>4 zSdQ1Q0S2`E7&QQ1%Fpd=|Bl}^gPAJ|`0iV{-7N@t~u(p5P?>85m7dMG`WROLV= zO*u$8Sm~u4qV!e{Rr)B0DTgaZC`T$sDSefG%F#-HC0!Yy3{*0dOeIUnRt719l_APd jB}W;ix^38Y4R{XGP z&AOj9Y}&GI$1lI_+VjW0zy3M6J3LB8I%4tYZ6bLX9)-u@Nq8D2!n5!^ya+GDtNTRq Mdb&T7d$Zs840Tg(*#H0l delta 281 zcmWN==`s{>008h|S4cT?->fn0g=JyhV4#|jlGR-#myC(2c*ROP8^HEPv)re1?a&oyb* zqSXs++I8sErCX0)FZJm+U{K7EVXurB6_@bZ8)L>zm^9_Bcix-!!AD6mX3d%R$!A|I zSoGDBWh=f}wPxLhOeFqL5IletfWugN;vF)35<|Isor{RzAXP6Gp!t?MV S{1smQPG_!?iRi!hpU6FjVsHTf diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt index a9d3274..d693b92 100644 --- a/nspanel_us_code/boot.txt +++ b/nspanel_us_code/boot.txt @@ -107,7 +107,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 3.5_dev + Text : 4.0 dev Max. Text Size : 8 Text esph_version diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 812c18fbbdcc7be674fcd47ca3f77fefb7cb5bba..c5607da8d9424cd4dd48a128a1bd1d2657b68328 100644 GIT binary patch delta 1655 zcmdVU`B#)x9LMqJVP;^UmBKAsplCB?DJvY6LB-UHu+_FHDXFZm$!WB*g5;}IVq#EF zn?-vWl{(f`WMXEvYij$#q_%IA*=pGP=X=k&-Ah`sy5aU*=q?ZT zt*M$gsbF-)80Vj_tu*RHvpB4+Omqfog09nCk=@I66V=&;zLMhNf@syhqpbNwF(=iZ zP1o3fvuI}8wmnC!{z%Lz%yt}iWu=o?kh9L$$NA6gRC|2eq??%6JCWyas#?=p9}P7` zLoU+bgC7B;C!?W^rWM=iv+GmghE&)^8hr30fb?W4oRQn{KN;XL?)b2k*dPnpU>jmX zt<=I+X2Wc_jj(bXX-C;88*O9kXgkJ^wF*1VDs8MCZztG^c9NZJr`R|<)lRe1?F>89 zB6gOYZR4%V&arcCf>qmjcD`L;6YWB~$S$@Tn`D<*)GoEji(~mk{>}O2>ysPX<0Er3 z1{M_MPN<&Z<*kb5cpaVb7O!l6a}Td}dR-uyIlHbc-D}zu4|)T(OzoFky&>M^Z%&0X zz1C^*fLA*%c4b3jB!9Zm2oK{C%*Uf>!((_H zPhbHSVi6Kpj3@CFl6V@=;90ceIV{2RSc(oT!wXoB7qJ2_VI^M1D|i*J;dQ)$H?az< z@fOx#E!N>}yn}b~9^S_X_z)lAV|;>6r0^-$V*@tgGklIO@Fl*&*Z2nC;yZkgAJBy# z@e?-TXKcnV_!Yn5cl?1ru?2sj8(U{JM%+12(iETKR{~19lA#2ZOeIU%LD^B+N!eN1 zMcGx!R(4Z%S8|jdN>8Pi(p%}H?4k5k_Eh##_Ez>$a+N$~Uu8cfU)f(dKsiu3NI6*P zryQd6R|Y5rN}*Du6f1`+hbaS~<{Dq*Nj+D+)Dk-DGr7?ZZfm+_+OH zozrS@3|YCtzPek^*^{CkLT<9KCZ|6hwl$p-RjxNb#T*{xa*Ue zIK?AIW%nxV?bJV&1tBMt>^Sa@=CM6VB}r~cq%gIy>%@ko=6IVr*`eb9mwIRAhMklG z)`zP6v8`#_y>4D)QHJI#Gh!`#nL9_ekMzsW@Xf8vYE>2rl!pQ?Jn+H?KN8}hK;p~| zC*O_AYJ=sqK^Go);e#Iu@!DWw=DL$)z-8PaLF-^0EnxZ9$vRts1+9y9wQknkdRR}p z+^(=**4wVMK6aHAT3@@``q?#ht@XF-?0UPw2H1@@&<5E}HrR^nX1m3PSh3w|x7kn| zX1CiNHrz(oNW0VSvJx9*qb+1(?CxdZtX%)36%9A0M0Z>1rnV9Pi63NtYsaasKQGR4 zoH_O9U^~a@pKxL`E8lT?dZKx;@quXWnu)%6`jpbiEu%HV!)fuFap62~d{pF&5)+55}Vu6EG3?;y&Du2QUc_;vqbYG8iUf3d%7R)9?tU<55)LG0ebBJdRn2 zU^eDpE~0n>^YA2|!h9^iLOhLUun5oMIXsUS@FHHq%XkHg@hU3u8eT^g-oO$pMGVWZ z94ipVn^=iecnfc1HP&D))}b2jU_IW&25iJ8yodL(8C$Rw+wcKu@F70J$M^)>u>+st zGklIOuoGWm7rw%7>_IK|VjsT7H~1Fc;d}gm{WyRh@e_W=FF1%pIE-KM8;;<29K|sl z#~=6;f8lTZgF5^>y`spS0mY+u6`$f)5|l(GNjXJHR!&tKD5oi>D=A7tB~@vpoS~#C z>B^Z(VSDb1C0luV_Ca;|colBJxlv{WuoS}CoS3zdtMHp<0Hwvwad wDtSs<85md*H#quaK}{t2YNb;mjD0& diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 35e42c81d26764cb92385f99bdb6ee882de6fa4f..7d7160cf875e73a46d93c62add9e3b0e5fd3ac8e 100644 GIT binary patch delta 239 zcmWN=*DeE4007XS_THP?yNcSgsJ*rJc=i|49P!f6k$7yxH~1g-Bqx{67UjZs1qv03 zC|06WnQ|2>RjF2^R-Jkc8Z~LwqE(xA9XfUC)}vQcpMC=d4H-6K)R=J-CQXT%7B^$o zoP>D`7A;w}V%3^;8#Zl8+O}g?%AS1(4jnmm;?$XQ7cO17{z@nFkwh#W{Y>T4VJ5r@ cZ^OIrK70rt!>8~$eECl0Uw?lhnUA->fBPO;RR910 delta 239 zcmWN=*DeE4007XS_TGDsnl-9+QPkc_?f!~1C*h%=Bk|aXA9GJ~3i*6lA^cFHRGEl! z6)IJ!R-;y(dJP&iY1X1un|2*Kb?MflSD$_Z1`QcDV$_&%6QU+fnKonAoS1nF7A=We zmat;gnspmCZAsd;V^_+aeFxGG9XWR5)R}V^E?v2HbNCXzhHv5fPr8`<`;BD3lF@$%;#k7~ diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index a9d3274..d693b92 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -107,7 +107,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 3.5_dev + Text : 4.0 dev Max. Text Size : 8 Text esph_version