diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index 19cfc3c..cd73bc6 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -17,7 +17,7 @@ substitutions: name: ${device_name} wifi_timeout: '15' ##### DON'T CHANGE THIS ###### - version: "4.2.3" + version: "4.2.4" ############################## ##### External components ##### diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index afd12bc..d9440c6 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.HMI and b/advanced/hmi/nspanel_CJK_eu.HMI differ diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft index 0015fd3..4859e00 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.tft and b/advanced/hmi/nspanel_CJK_eu.tft differ diff --git a/advanced/hmi/nspanel_CJK_eu_code/boot.txt b/advanced/hmi/nspanel_CJK_eu_code/boot.txt index fe3720b..67902b2 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/boot.txt @@ -102,7 +102,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.4dev + Text : 4.2.4 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI index 9482987..21a9b57 100644 Binary files a/advanced/hmi/nspanel_CJK_us.HMI and b/advanced/hmi/nspanel_CJK_us.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft index 0f398c5..03fddf4 100644 Binary files a/advanced/hmi/nspanel_CJK_us.tft and b/advanced/hmi/nspanel_CJK_us.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_code/boot.txt b/advanced/hmi/nspanel_CJK_us_code/boot.txt index abfb730..34e18cf 100644 --- a/advanced/hmi/nspanel_CJK_us_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_us_code/boot.txt @@ -102,7 +102,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.4dev + Text : 4.2.4 Max. Text Size : 9 Events diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index f6323e9..d8a0891 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.HMI and b/advanced/hmi/nspanel_CJK_us_land.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us_land.tft b/advanced/hmi/nspanel_CJK_us_land.tft index b7bc147..1d17078 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.tft and b/advanced/hmi/nspanel_CJK_us_land.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt index fe3720b..67902b2 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/boot.txt @@ -102,7 +102,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.4dev + Text : 4.2.4 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_blank.HMI b/advanced/hmi/nspanel_blank.HMI index a675718..d53e119 100644 Binary files a/advanced/hmi/nspanel_blank.HMI and b/advanced/hmi/nspanel_blank.HMI differ diff --git a/advanced/hmi/nspanel_blank_code/Program.s.txt b/advanced/hmi/nspanel_blank_code/Program.s.txt index df4824f..dc5458e 100644 --- a/advanced/hmi/nspanel_blank_code/Program.s.txt +++ b/advanced/hmi/nspanel_blank_code/Program.s.txt @@ -4,5 +4,6 @@ Program.s int display_mode=4 // 1 = EU, 2 = US, 3 = US landscape, 4 = blank dim=100//Configure backlight recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode + bauds=115200 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/advanced/hmi/nspanel_blank_code/blank.txt b/advanced/hmi/nspanel_blank_code/blank.txt index af268eb..30eae3e 100644 --- a/advanced/hmi/nspanel_blank_code/blank.txt +++ b/advanced/hmi/nspanel_blank_code/blank.txt @@ -83,7 +83,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : TFT: v2024.1.1 + Text : TFT: v2024.1.2 Max. Text Size : 20 Events @@ -203,11 +203,6 @@ Timer tm_esphome printh FF FF FF covx counter.val,aux1.txt,0,0 esp_version.txt="ESP: Retry #"+aux1.txt - sys0=counter.val%10 - if(sys0==0) - { - baud=115200 - } covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index 73fdba1..50a925d 100644 Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ diff --git a/advanced/hmi/nspanel_eu_code/boot.txt b/advanced/hmi/nspanel_eu_code/boot.txt index fe3720b..67902b2 100644 --- a/advanced/hmi/nspanel_eu_code/boot.txt +++ b/advanced/hmi/nspanel_eu_code/boot.txt @@ -102,7 +102,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.4dev + Text : 4.2.4 Max. Text Size : 9 Text esph_version diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index 2cebb19..2735cca 100644 Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ diff --git a/advanced/hmi/nspanel_us_code/boot.txt b/advanced/hmi/nspanel_us_code/boot.txt index abfb730..34e18cf 100644 --- a/advanced/hmi/nspanel_us_code/boot.txt +++ b/advanced/hmi/nspanel_us_code/boot.txt @@ -102,7 +102,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.4dev + Text : 4.2.4 Max. Text Size : 9 Events diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index d81bf46..72aad06 100644 Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ diff --git a/advanced/hmi/nspanel_us_land_code/boot.txt b/advanced/hmi/nspanel_us_land_code/boot.txt index fe3720b..67902b2 100644 --- a/advanced/hmi/nspanel_us_land_code/boot.txt +++ b/advanced/hmi/nspanel_us_land_code/boot.txt @@ -102,7 +102,7 @@ Text tft_version Dragging : 0 Send Component ID : on press and release Associated Keyboard: none - Text : 4.2.4dev + Text : 4.2.4 Max. Text Size : 9 Text esph_version diff --git a/nspanel_blank.tft b/nspanel_blank.tft index c127cbe..286468e 100644 Binary files a/nspanel_blank.tft and b/nspanel_blank.tft differ diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index cd354b7..cfc3f7f 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -37,7 +37,7 @@ blueprint: 🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) - ℹ️ Version: v4.2.4dev + ℹ️ Version: v4.2.4 source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -3962,7 +3962,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.2.4dev' + blueprint_version: '4.2.4' date_format_temp: !input 'date_format' # Avoid breaking change for existing users with legacy type format date_format: > diff --git a/nspanel_eu.tft b/nspanel_eu.tft index ebd089b..36f6273 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 528737d..1f20d8b 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index e621943..8a0ed2a 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ