diff --git a/custom_configuration/nspanel_blank.HMI b/custom_configuration/nspanel_blank.HMI index 24ea099..aff0789 100644 Binary files a/custom_configuration/nspanel_blank.HMI and b/custom_configuration/nspanel_blank.HMI differ diff --git a/custom_configuration/nspanel_blank.tft b/custom_configuration/nspanel_blank.tft index e3c7fa3..f545fcc 100644 Binary files a/custom_configuration/nspanel_blank.tft and b/custom_configuration/nspanel_blank.tft differ diff --git a/custom_configuration/nspanel_blank_code/Program.s.txt b/custom_configuration/nspanel_blank_code/Program.s.txt index fb377bf..47bc91e 100644 --- a/custom_configuration/nspanel_blank_code/Program.s.txt +++ b/custom_configuration/nspanel_blank_code/Program.s.txt @@ -1,6 +1,5 @@ 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 - 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 diff --git a/custom_configuration/nspanel_blank_code/blank.txt b/custom_configuration/nspanel_blank_code/blank.txt index f4c073d..1526e0d 100644 --- a/custom_configuration/nspanel_blank_code/blank.txt +++ b/custom_configuration/nspanel_blank_code/blank.txt @@ -36,6 +36,13 @@ Page blank dim=100 tm0.en=1 +Variable (string) nspanelevent + Attributes + ID : 10 + Scope : local + Text : + Max. Text Size: 150 + Text file_name Attributes ID : 4 @@ -158,8 +165,20 @@ Timer tm0 Events Timer Event - dim=15 - tm0.en=0 + if(dim>50) + { + dim=50 + }else if(dim>25) + { + dim=25 + }else if(dim>10) + { + dim=10 + }else + { + dim=0 + tm0.en=0 + } Timer tm_esphome Attributes @@ -180,3 +199,20 @@ Timer tm_esphome covx baud,baud_rate.txt,0,0 baud_rate.txt+=" bps" +Timer tm_pageid + Attributes + ID : 9 + Scope : local + Period (ms): 2500 + Enabled : yes + + Events + Timer Event + nspanelevent.txt="{\"page\": \"blank\", \"event\": \"pagechanged\", \"version\": \""+tft_version.txt+"\"}" + printh 92 + prints "localevent",0 + printh 00 + prints nspanelevent.txt,0 + printh 00 + printh FF FF FF + diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 5697849..7875bd9 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: v4.1dev5 + ℹ️ Version: v4.1dev6 source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -3604,7 +3604,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '4.1dev5' + blueprint_version: '4.1dev6' date_format_temp: !input 'date_format' #Avoid breaking change for existing users with legacy type format date_format: > diff --git a/nspanel_esphome_core.yaml b/nspanel_esphome_core.yaml index 81e22a6..4d76946 100644 --- a/nspanel_esphome_core.yaml +++ b/nspanel_esphome_core.yaml @@ -12,7 +12,7 @@ substitutions: ############################################## ##### DON'T CHANGE THIS ##### - version: "4.1dev5" + version: "4.1dev6" ############################# ##### ESPHOME CONFIGURATION ##### diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index d058cbb..bb85dd9 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 597e09b..753c64c 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt index 22c5d00..13acd22 100644 --- a/nspanel_eu_code/boot.txt +++ b/nspanel_eu_code/boot.txt @@ -142,7 +142,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.1dev5 + Text : 4.1dev6 Max. Text Size : 9 Text esph_version diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 9bac26a..b3d8f7b 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 8a2a242..2c86612 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt index 22c5d00..13acd22 100644 --- a/nspanel_us_code/boot.txt +++ b/nspanel_us_code/boot.txt @@ -142,7 +142,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.1dev5 + Text : 4.1dev6 Max. Text Size : 9 Text esph_version diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index eaaed66..f7d45eb 100644 Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index fabdd11..7f32531 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index 22c5d00..13acd22 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -142,7 +142,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 4.1dev5 + Text : 4.1dev6 Max. Text Size : 9 Text esph_version