diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index e2b86c0..8748b70 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -4246,7 +4246,6 @@ variables: #Finnish is sometimes difficult language to get short words out of... :) #Uudelleenkäynnistys could be shortened as "Uudelleenkäynn." (if there is room for that dot), 2nd best would be "Uud.käynnistys", lastly "Uud.käynn.". Then there is this non-official translation "Boottaus" (but I'd prefer not). #If in current version there is this title (Brightness, Kirkkaus in Finnish) before those two sliders, you can use "Kirkas" and "Himmeä" for them. - fr: #French weekdays: mon: Lundi @@ -5382,7 +5381,7 @@ variables: brightness: Osvetlitev bright: Svetlo dimming: Zatemnitev - dim: Temno + dim: Zatemnjeno sv: #Swedish weekdays: mon: Måndag diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index f0b8f19..e6438aa 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -1393,23 +1393,6 @@ text_sensor: ESP_LOGV("text_sensor.localevent", "Finished"); - ##### touchevent sensor, Reset the page timeout ##### - - id: disp1_touchevent - platform: nextion - nextion_id: disp1 - #name: ${device_name} touchevent - component_name: touchevent - internal: true - filters: - - lambda: |- - x = x.c_str(); - x.shrink_to_fit(); - return x; - on_value: - then: - - lambda: |- - id(page_timer)->execute(int(id(page_timeout).state)); - ##### START - SWITCH CONFIGURATION ##### switch: diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 68e7dab..7aa2763 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 9dac7cb..d5861b8 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/Program.s.txt b/nspanel_eu_code/Program.s.txt index 8662cd9..66022c1 100644 --- a/nspanel_eu_code/Program.s.txt +++ b/nspanel_eu_code/Program.s.txt @@ -11,7 +11,7 @@ Program.s int display_mode=1 // 1 = EU, 2 = US, 3 = US landscape bauds=115200//Configure baudrate recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode - //randset 0,65535//used for touchevent sensor + randset 0,65535//used for touchevent sensor printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port if(display_mode==1) { diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt index 54b27b6..e4c8112 100644 --- a/nspanel_eu_code/alarm.txt +++ b/nspanel_eu_code/alarm.txt @@ -33,21 +33,17 @@ Page alarm } Touch Press Event - lastclick.txt="{\"page\": \"alarm\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lastclick.txt="{\"page\": \"alarm\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt index 391677a..9651ca7 100644 --- a/nspanel_eu_code/boot.txt +++ b/nspanel_eu_code/boot.txt @@ -23,6 +23,20 @@ Page boot printh 00 printh FF FF FF + Touch Press Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Variable (int32) counter Attributes ID : 12 diff --git a/nspanel_eu_code/buttonpage01.txt b/nspanel_eu_code/buttonpage01.txt index 27b385e..fef0928 100644 --- a/nspanel_eu_code/buttonpage01.txt +++ b/nspanel_eu_code/buttonpage01.txt @@ -30,19 +30,17 @@ Page buttonpage01 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage01\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage01\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_eu_code/buttonpage02.txt b/nspanel_eu_code/buttonpage02.txt index 4055ac9..e68be8b 100644 --- a/nspanel_eu_code/buttonpage02.txt +++ b/nspanel_eu_code/buttonpage02.txt @@ -30,19 +30,17 @@ Page buttonpage02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_eu_code/buttonpage03.txt b/nspanel_eu_code/buttonpage03.txt index 04fa1f0..56340e3 100644 --- a/nspanel_eu_code/buttonpage03.txt +++ b/nspanel_eu_code/buttonpage03.txt @@ -30,19 +30,17 @@ Page buttonpage03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_eu_code/buttonpage04.txt b/nspanel_eu_code/buttonpage04.txt index c139bb1..1906ad0 100644 --- a/nspanel_eu_code/buttonpage04.txt +++ b/nspanel_eu_code/buttonpage04.txt @@ -30,19 +30,17 @@ Page buttonpage04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_eu_code/climate.txt b/nspanel_eu_code/climate.txt index d8a95c4..6cef254 100644 --- a/nspanel_eu_code/climate.txt +++ b/nspanel_eu_code/climate.txt @@ -40,21 +40,17 @@ Page climate } Touch Press Event - climatesetting.txt="{\"page\": \"climate\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints climatesetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - climatesetting.txt="{\"page\": \"climate\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints climatesetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Page Exit Event diff --git a/nspanel_eu_code/confirm.txt b/nspanel_eu_code/confirm.txt index 61a5bb3..71c5c80 100644 --- a/nspanel_eu_code/confirm.txt +++ b/nspanel_eu_code/confirm.txt @@ -27,19 +27,17 @@ Page confirm } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "confirm",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "confirm",0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) page_id diff --git a/nspanel_eu_code/cover.txt b/nspanel_eu_code/cover.txt index 5975617..2ff6df7 100644 --- a/nspanel_eu_code/cover.txt +++ b/nspanel_eu_code/cover.txt @@ -28,21 +28,17 @@ Page cover } Touch Press Event - coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints coversetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints coversetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) va1 diff --git a/nspanel_eu_code/entitypage01.txt b/nspanel_eu_code/entitypage01.txt index e7e9ea3..f78650d 100644 --- a/nspanel_eu_code/entitypage01.txt +++ b/nspanel_eu_code/entitypage01.txt @@ -27,19 +27,17 @@ Page entitypage01 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage01\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage01\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_eu_code/entitypage02.txt b/nspanel_eu_code/entitypage02.txt index e66ba1d..7e38687 100644 --- a/nspanel_eu_code/entitypage02.txt +++ b/nspanel_eu_code/entitypage02.txt @@ -27,19 +27,17 @@ Page entitypage02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_eu_code/entitypage03.txt b/nspanel_eu_code/entitypage03.txt index 01a4cb1..8f9fd7d 100644 --- a/nspanel_eu_code/entitypage03.txt +++ b/nspanel_eu_code/entitypage03.txt @@ -27,19 +27,17 @@ Page entitypage03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_eu_code/entitypage04.txt b/nspanel_eu_code/entitypage04.txt index 92eed65..6f2ea80 100644 --- a/nspanel_eu_code/entitypage04.txt +++ b/nspanel_eu_code/entitypage04.txt @@ -27,19 +27,17 @@ Page entitypage04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_eu_code/fan.txt b/nspanel_eu_code/fan.txt index a5b78eb..d783070 100644 --- a/nspanel_eu_code/fan.txt +++ b/nspanel_eu_code/fan.txt @@ -28,21 +28,17 @@ Page fan } Touch Press Event - fansetting.txt="{\"page\": \"fan\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints fansetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - fansetting.txt="{\"page\": \"fan\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints fansetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) fansetting @@ -135,6 +131,11 @@ Slider fanslider button_up.pco=10597 } timer0.en=1 + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button button_up Attributes diff --git a/nspanel_eu_code/home.txt b/nspanel_eu_code/home.txt index 2e241a1..2f0d655 100644 --- a/nspanel_eu_code/home.txt +++ b/nspanel_eu_code/home.txt @@ -31,6 +31,20 @@ Page home vis right_bt_text,0 } + Touch Press Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Variable (int32) disdim Attributes ID : 2 diff --git a/nspanel_eu_code/keyb_num.txt b/nspanel_eu_code/keyb_num.txt index 0b191a2..ee1755e 100644 --- a/nspanel_eu_code/keyb_num.txt +++ b/nspanel_eu_code/keyb_num.txt @@ -28,21 +28,17 @@ Page keyb_num } Touch Press Event - aux.txt="{\"page\": \"keyb_num\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints aux.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - aux.txt="{\"page\": \"keyb_num\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints aux.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) page_id @@ -129,6 +125,11 @@ Button b1 Events Touch Release Event pin.txt+=b1.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button bclose Attributes @@ -157,6 +158,11 @@ Button b2 Events Touch Release Event pin.txt+=b2.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b3 Attributes @@ -171,6 +177,11 @@ Button b3 Events Touch Release Event pin.txt+=b3.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b4 Attributes @@ -185,6 +196,11 @@ Button b4 Events Touch Release Event pin.txt+=b4.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b5 Attributes @@ -199,6 +215,11 @@ Button b5 Events Touch Release Event pin.txt+=b5.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b6 Attributes @@ -213,6 +234,11 @@ Button b6 Events Touch Release Event pin.txt+=b6.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b7 Attributes @@ -227,6 +253,11 @@ Button b7 Events Touch Release Event pin.txt+=b7.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b8 Attributes @@ -241,6 +272,11 @@ Button b8 Events Touch Release Event pin.txt+=b8.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b9 Attributes @@ -255,6 +291,11 @@ Button b9 Events Touch Release Event pin.txt+=b9.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button bclear Attributes @@ -269,6 +310,11 @@ Button bclear Events Touch Release Event pin.txt="" + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b0 Attributes @@ -283,6 +329,11 @@ Button b0 Events Touch Release Event pin.txt+=b0.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button benter Attributes diff --git a/nspanel_eu_code/light.txt b/nspanel_eu_code/light.txt index a1a16b0..fbd0852 100644 --- a/nspanel_eu_code/light.txt +++ b/nspanel_eu_code/light.txt @@ -46,21 +46,17 @@ Page light } Touch Press Event - lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lightsetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lightsetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) rgb565 diff --git a/nspanel_eu_code/media_player.txt b/nspanel_eu_code/media_player.txt index 6cd305c..bade873 100644 --- a/nspanel_eu_code/media_player.txt +++ b/nspanel_eu_code/media_player.txt @@ -28,21 +28,17 @@ Page media_player } Touch Press Event - lastclick.txt="{\"page\": \"media_player\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lastclick.txt="{\"page\": \"media_player\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) back_page @@ -314,6 +310,14 @@ Slider vol_slider Upper range limit: 100 Lower range limit: 0 + Events + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Button button_back Attributes ID : 5 diff --git a/nspanel_eu_code/notification.txt b/nspanel_eu_code/notification.txt index 5708896..da05f62 100644 --- a/nspanel_eu_code/notification.txt +++ b/nspanel_eu_code/notification.txt @@ -27,19 +27,17 @@ Page notification } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"notification\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"notification\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_eu_code/qrcode.txt b/nspanel_eu_code/qrcode.txt index 74019a6..ca7abdf 100644 --- a/nspanel_eu_code/qrcode.txt +++ b/nspanel_eu_code/qrcode.txt @@ -21,19 +21,17 @@ Page qrcode printh FF FF FF Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"qrcode\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"qrcode\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text qrcode_label diff --git a/nspanel_eu_code/settings.txt b/nspanel_eu_code/settings.txt index 10e4c6f..ef27786 100644 --- a/nspanel_eu_code/settings.txt +++ b/nspanel_eu_code/settings.txt @@ -25,19 +25,17 @@ Page settings printh FF FF FF Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"settings\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"settings\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text bright_text diff --git a/nspanel_eu_code/weather01.txt b/nspanel_eu_code/weather01.txt index 5212213..9ee902e 100644 --- a/nspanel_eu_code/weather01.txt +++ b/nspanel_eu_code/weather01.txt @@ -31,7 +31,6 @@ Page weather01 prints "touchevent",0 printh 00 prints rand,0 - printh 00 printh FF FF FF Touch Release Event @@ -39,7 +38,6 @@ Page weather01 prints "touchevent",0 printh 00 prints rand,0 - printh 00 printh FF FF FF Text day diff --git a/nspanel_eu_code/weather02.txt b/nspanel_eu_code/weather02.txt index 0987b66..454ca3f 100644 --- a/nspanel_eu_code/weather02.txt +++ b/nspanel_eu_code/weather02.txt @@ -27,19 +27,17 @@ Page weather02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_eu_code/weather03.txt b/nspanel_eu_code/weather03.txt index 078875c..2f9c0bb 100644 --- a/nspanel_eu_code/weather03.txt +++ b/nspanel_eu_code/weather03.txt @@ -27,19 +27,17 @@ Page weather03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_eu_code/weather04.txt b/nspanel_eu_code/weather04.txt index 1d4973a..003c169 100644 --- a/nspanel_eu_code/weather04.txt +++ b/nspanel_eu_code/weather04.txt @@ -27,19 +27,17 @@ Page weather04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_eu_code/weather05.txt b/nspanel_eu_code/weather05.txt index 5c4d139..5300a59 100644 --- a/nspanel_eu_code/weather05.txt +++ b/nspanel_eu_code/weather05.txt @@ -27,19 +27,17 @@ Page weather05 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather05\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather05\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 08aee60..d715f6b 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index b8369c5..79c9f3e 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/Program.s.txt b/nspanel_us_code/Program.s.txt index ae6897a..9a77f5d 100644 --- a/nspanel_us_code/Program.s.txt +++ b/nspanel_us_code/Program.s.txt @@ -11,7 +11,7 @@ Program.s int display_mode=2 // 1 = EU, 2 = US, 3 = US landscape bauds=115200//Configure baudrate recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode - //randset 0,65535//used for touchevent sensor + randset 0,65535//used for touchevent sensor printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port if(display_mode==1) { diff --git a/nspanel_us_code/alarm.txt b/nspanel_us_code/alarm.txt index f474c30..7667542 100644 --- a/nspanel_us_code/alarm.txt +++ b/nspanel_us_code/alarm.txt @@ -33,21 +33,17 @@ Page alarm } Touch Press Event - lastclick.txt="{\"page\": \"alarm\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lastclick.txt="{\"page\": \"alarm\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt index 391677a..9651ca7 100644 --- a/nspanel_us_code/boot.txt +++ b/nspanel_us_code/boot.txt @@ -23,6 +23,20 @@ Page boot printh 00 printh FF FF FF + Touch Press Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Variable (int32) counter Attributes ID : 12 diff --git a/nspanel_us_code/buttonpage01.txt b/nspanel_us_code/buttonpage01.txt index 27b385e..fef0928 100644 --- a/nspanel_us_code/buttonpage01.txt +++ b/nspanel_us_code/buttonpage01.txt @@ -30,19 +30,17 @@ Page buttonpage01 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage01\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage01\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_code/buttonpage02.txt b/nspanel_us_code/buttonpage02.txt index d846ccb..8dd658a 100644 --- a/nspanel_us_code/buttonpage02.txt +++ b/nspanel_us_code/buttonpage02.txt @@ -30,19 +30,17 @@ Page buttonpage02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_code/buttonpage03.txt b/nspanel_us_code/buttonpage03.txt index ced8485..4cb8399 100644 --- a/nspanel_us_code/buttonpage03.txt +++ b/nspanel_us_code/buttonpage03.txt @@ -30,19 +30,17 @@ Page buttonpage03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_code/buttonpage04.txt b/nspanel_us_code/buttonpage04.txt index 370206a..c6832b3 100644 --- a/nspanel_us_code/buttonpage04.txt +++ b/nspanel_us_code/buttonpage04.txt @@ -30,19 +30,17 @@ Page buttonpage04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_code/climate.txt b/nspanel_us_code/climate.txt index 2bd51ef..1be13d0 100644 --- a/nspanel_us_code/climate.txt +++ b/nspanel_us_code/climate.txt @@ -40,21 +40,17 @@ Page climate } Touch Press Event - climatesetting.txt="{\"page\": \"climate\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints climatesetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - climatesetting.txt="{\"page\": \"climate\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints climatesetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Page Exit Event @@ -382,12 +378,10 @@ Slider climateslider Events Touch Press Event - climatesetting.txt="{\"page\": \"climate\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints climatesetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event @@ -399,12 +393,10 @@ Slider climateslider covx va0.val,va1.txt,0,0 target_temp.txt+="."+va1.txt timer01.en=1 - climatesetting.txt="{\"page\": \"climate\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints climatesetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Button button_back diff --git a/nspanel_us_code/confirm.txt b/nspanel_us_code/confirm.txt index 61a5bb3..71c5c80 100644 --- a/nspanel_us_code/confirm.txt +++ b/nspanel_us_code/confirm.txt @@ -27,19 +27,17 @@ Page confirm } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "confirm",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "confirm",0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) page_id diff --git a/nspanel_us_code/cover.txt b/nspanel_us_code/cover.txt index 5975617..2ff6df7 100644 --- a/nspanel_us_code/cover.txt +++ b/nspanel_us_code/cover.txt @@ -28,21 +28,17 @@ Page cover } Touch Press Event - coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints coversetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints coversetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) va1 diff --git a/nspanel_us_code/entitypage01.txt b/nspanel_us_code/entitypage01.txt index e7e9ea3..f78650d 100644 --- a/nspanel_us_code/entitypage01.txt +++ b/nspanel_us_code/entitypage01.txt @@ -27,19 +27,17 @@ Page entitypage01 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage01\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage01\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_us_code/entitypage02.txt b/nspanel_us_code/entitypage02.txt index e66ba1d..7e38687 100644 --- a/nspanel_us_code/entitypage02.txt +++ b/nspanel_us_code/entitypage02.txt @@ -27,19 +27,17 @@ Page entitypage02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_us_code/entitypage03.txt b/nspanel_us_code/entitypage03.txt index 0260674..580a001 100644 --- a/nspanel_us_code/entitypage03.txt +++ b/nspanel_us_code/entitypage03.txt @@ -27,19 +27,17 @@ Page entitypage03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_us_code/entitypage04.txt b/nspanel_us_code/entitypage04.txt index 92eed65..6f2ea80 100644 --- a/nspanel_us_code/entitypage04.txt +++ b/nspanel_us_code/entitypage04.txt @@ -27,19 +27,17 @@ Page entitypage04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_us_code/fan.txt b/nspanel_us_code/fan.txt index a5b78eb..efccc2e 100644 --- a/nspanel_us_code/fan.txt +++ b/nspanel_us_code/fan.txt @@ -28,21 +28,17 @@ Page fan } Touch Press Event - fansetting.txt="{\"page\": \"fan\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints fansetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - fansetting.txt="{\"page\": \"fan\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints fansetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) fansetting diff --git a/nspanel_us_code/home.txt b/nspanel_us_code/home.txt index 763605f..cd2f1ad 100644 --- a/nspanel_us_code/home.txt +++ b/nspanel_us_code/home.txt @@ -31,6 +31,20 @@ Page home vis right_bt_text,0 } + Touch Press Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Variable (int32) disdim Attributes ID : 2 diff --git a/nspanel_us_code/keyb_num.txt b/nspanel_us_code/keyb_num.txt index 2c8bd0d..1750a18 100644 --- a/nspanel_us_code/keyb_num.txt +++ b/nspanel_us_code/keyb_num.txt @@ -28,21 +28,17 @@ Page keyb_num } Touch Press Event - aux.txt="{\"page\": \"keyb_num\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints aux.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - aux.txt="{\"page\": \"keyb_num\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints aux.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) page_id @@ -129,6 +125,11 @@ Button b1 Events Touch Release Event pin.txt+=b1.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button bclose Attributes @@ -157,6 +158,11 @@ Button b2 Events Touch Release Event pin.txt+=b2.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b3 Attributes @@ -171,6 +177,11 @@ Button b3 Events Touch Release Event pin.txt+=b3.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b4 Attributes @@ -185,6 +196,11 @@ Button b4 Events Touch Release Event pin.txt+=b4.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b5 Attributes @@ -199,6 +215,11 @@ Button b5 Events Touch Release Event pin.txt+=b5.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b6 Attributes @@ -213,6 +234,11 @@ Button b6 Events Touch Release Event pin.txt+=b6.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b7 Attributes @@ -227,6 +253,11 @@ Button b7 Events Touch Release Event pin.txt+=b7.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b8 Attributes @@ -241,6 +272,11 @@ Button b8 Events Touch Release Event pin.txt+=b8.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b9 Attributes @@ -255,6 +291,11 @@ Button b9 Events Touch Release Event pin.txt+=b9.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button bclear Attributes @@ -269,6 +310,11 @@ Button bclear Events Touch Release Event pin.txt="" + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b0 Attributes @@ -283,6 +329,11 @@ Button b0 Events Touch Release Event pin.txt+=b0.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button benter Attributes diff --git a/nspanel_us_code/light.txt b/nspanel_us_code/light.txt index a1a16b0..fbd0852 100644 --- a/nspanel_us_code/light.txt +++ b/nspanel_us_code/light.txt @@ -46,21 +46,17 @@ Page light } Touch Press Event - lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lightsetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lightsetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) rgb565 diff --git a/nspanel_us_code/media_player.txt b/nspanel_us_code/media_player.txt index f6615d9..cc1ba65 100644 --- a/nspanel_us_code/media_player.txt +++ b/nspanel_us_code/media_player.txt @@ -28,21 +28,17 @@ Page media_player } Touch Press Event - lastclick.txt="{\"page\": \"media_player\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lastclick.txt="{\"page\": \"media_player\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) back_page @@ -326,6 +322,14 @@ Slider vol_slider Upper range limit: 100 Lower range limit: 0 + Events + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Button button_back Attributes ID : 5 diff --git a/nspanel_us_code/notification.txt b/nspanel_us_code/notification.txt index c372ed9..ebc776b 100644 --- a/nspanel_us_code/notification.txt +++ b/nspanel_us_code/notification.txt @@ -27,19 +27,17 @@ Page notification } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"notification\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"notification\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_code/qrcode.txt b/nspanel_us_code/qrcode.txt index 74019a6..ca7abdf 100644 --- a/nspanel_us_code/qrcode.txt +++ b/nspanel_us_code/qrcode.txt @@ -21,19 +21,17 @@ Page qrcode printh FF FF FF Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"qrcode\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"qrcode\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text qrcode_label diff --git a/nspanel_us_code/settings.txt b/nspanel_us_code/settings.txt index 097c5bd..f7be7c1 100644 --- a/nspanel_us_code/settings.txt +++ b/nspanel_us_code/settings.txt @@ -25,19 +25,17 @@ Page settings printh FF FF FF Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"settings\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"settings\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text bright_text @@ -233,6 +231,11 @@ Slider brightslider printh 00 prints brightslider.val,0 printh FF FF FF + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Slider dimslider Attributes @@ -261,6 +264,11 @@ Slider dimslider printh 00 prints dimslider.val,0 printh FF FF FF + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button button_back Attributes diff --git a/nspanel_us_code/weather01.txt b/nspanel_us_code/weather01.txt index 0aa74b9..2c5d790 100644 --- a/nspanel_us_code/weather01.txt +++ b/nspanel_us_code/weather01.txt @@ -27,19 +27,17 @@ Page weather01 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather01\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather01\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us_code/weather02.txt b/nspanel_us_code/weather02.txt index 0987b66..454ca3f 100644 --- a/nspanel_us_code/weather02.txt +++ b/nspanel_us_code/weather02.txt @@ -27,19 +27,17 @@ Page weather02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us_code/weather03.txt b/nspanel_us_code/weather03.txt index 078875c..2f9c0bb 100644 --- a/nspanel_us_code/weather03.txt +++ b/nspanel_us_code/weather03.txt @@ -27,19 +27,17 @@ Page weather03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us_code/weather04.txt b/nspanel_us_code/weather04.txt index 1d4973a..003c169 100644 --- a/nspanel_us_code/weather04.txt +++ b/nspanel_us_code/weather04.txt @@ -27,19 +27,17 @@ Page weather04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us_code/weather05.txt b/nspanel_us_code/weather05.txt index 5c4d139..5300a59 100644 --- a/nspanel_us_code/weather05.txt +++ b/nspanel_us_code/weather05.txt @@ -27,19 +27,17 @@ Page weather05 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather05\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather05\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 109a152..ff4bcf0 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 84e9c22..50fcf59 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/Program.s.txt b/nspanel_us_land_code/Program.s.txt index 6bb5244..5312bf1 100644 --- a/nspanel_us_land_code/Program.s.txt +++ b/nspanel_us_land_code/Program.s.txt @@ -11,7 +11,7 @@ Program.s int display_mode=3 // 1 = EU, 2 = US, 3 = US landscape bauds=115200//Configure baudrate recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode - //randset 0,65535//used for touchevent sensor + randset 0,65535//used for touchevent sensor printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port if(display_mode==1) { diff --git a/nspanel_us_land_code/alarm.txt b/nspanel_us_land_code/alarm.txt index 54b27b6..e4c8112 100644 --- a/nspanel_us_land_code/alarm.txt +++ b/nspanel_us_land_code/alarm.txt @@ -33,21 +33,17 @@ Page alarm } Touch Press Event - lastclick.txt="{\"page\": \"alarm\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lastclick.txt="{\"page\": \"alarm\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index 391677a..9651ca7 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -23,6 +23,20 @@ Page boot printh 00 printh FF FF FF + Touch Press Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Variable (int32) counter Attributes ID : 12 diff --git a/nspanel_us_land_code/buttonpage01.txt b/nspanel_us_land_code/buttonpage01.txt index 8447658..dd056b4 100644 --- a/nspanel_us_land_code/buttonpage01.txt +++ b/nspanel_us_land_code/buttonpage01.txt @@ -30,19 +30,17 @@ Page buttonpage01 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage01\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage01\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_land_code/buttonpage02.txt b/nspanel_us_land_code/buttonpage02.txt index 5b07303..af929b3 100644 --- a/nspanel_us_land_code/buttonpage02.txt +++ b/nspanel_us_land_code/buttonpage02.txt @@ -30,19 +30,17 @@ Page buttonpage02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_land_code/buttonpage03.txt b/nspanel_us_land_code/buttonpage03.txt index e9518c7..8e674a7 100644 --- a/nspanel_us_land_code/buttonpage03.txt +++ b/nspanel_us_land_code/buttonpage03.txt @@ -30,19 +30,17 @@ Page buttonpage03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_land_code/buttonpage04.txt b/nspanel_us_land_code/buttonpage04.txt index 7d8beb2..e377efe 100644 --- a/nspanel_us_land_code/buttonpage04.txt +++ b/nspanel_us_land_code/buttonpage04.txt @@ -30,19 +30,17 @@ Page buttonpage04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"buttonpage04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_land_code/climate.txt b/nspanel_us_land_code/climate.txt index d8a95c4..6cef254 100644 --- a/nspanel_us_land_code/climate.txt +++ b/nspanel_us_land_code/climate.txt @@ -40,21 +40,17 @@ Page climate } Touch Press Event - climatesetting.txt="{\"page\": \"climate\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints climatesetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - climatesetting.txt="{\"page\": \"climate\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints climatesetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Page Exit Event diff --git a/nspanel_us_land_code/confirm.txt b/nspanel_us_land_code/confirm.txt index 61a5bb3..71c5c80 100644 --- a/nspanel_us_land_code/confirm.txt +++ b/nspanel_us_land_code/confirm.txt @@ -27,19 +27,17 @@ Page confirm } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "confirm",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "confirm",0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) page_id diff --git a/nspanel_us_land_code/cover.txt b/nspanel_us_land_code/cover.txt index 5975617..2ff6df7 100644 --- a/nspanel_us_land_code/cover.txt +++ b/nspanel_us_land_code/cover.txt @@ -28,21 +28,17 @@ Page cover } Touch Press Event - coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints coversetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - coversetting.txt="{\"page\": \"cover\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints coversetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) va1 diff --git a/nspanel_us_land_code/entitypage01.txt b/nspanel_us_land_code/entitypage01.txt index a3879a0..ac057cb 100644 --- a/nspanel_us_land_code/entitypage01.txt +++ b/nspanel_us_land_code/entitypage01.txt @@ -27,19 +27,17 @@ Page entitypage01 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage01\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage01\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_us_land_code/entitypage02.txt b/nspanel_us_land_code/entitypage02.txt index 0a9367f..e2dc7e1 100644 --- a/nspanel_us_land_code/entitypage02.txt +++ b/nspanel_us_land_code/entitypage02.txt @@ -27,19 +27,17 @@ Page entitypage02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_us_land_code/entitypage03.txt b/nspanel_us_land_code/entitypage03.txt index ec40ef7..9a55ad9 100644 --- a/nspanel_us_land_code/entitypage03.txt +++ b/nspanel_us_land_code/entitypage03.txt @@ -27,19 +27,17 @@ Page entitypage03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_us_land_code/entitypage04.txt b/nspanel_us_land_code/entitypage04.txt index 49dc4e3..4c08c8b 100644 --- a/nspanel_us_land_code/entitypage04.txt +++ b/nspanel_us_land_code/entitypage04.txt @@ -27,19 +27,17 @@ Page entitypage04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"entitypage04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text value01_label diff --git a/nspanel_us_land_code/fan.txt b/nspanel_us_land_code/fan.txt index a5b78eb..d783070 100644 --- a/nspanel_us_land_code/fan.txt +++ b/nspanel_us_land_code/fan.txt @@ -28,21 +28,17 @@ Page fan } Touch Press Event - fansetting.txt="{\"page\": \"fan\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints fansetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - fansetting.txt="{\"page\": \"fan\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints fansetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) fansetting @@ -135,6 +131,11 @@ Slider fanslider button_up.pco=10597 } timer0.en=1 + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button button_up Attributes diff --git a/nspanel_us_land_code/home.txt b/nspanel_us_land_code/home.txt index 394e38d..fa54c3e 100644 --- a/nspanel_us_land_code/home.txt +++ b/nspanel_us_land_code/home.txt @@ -31,6 +31,20 @@ Page home vis right_bt_text,0 } + Touch Press Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Variable (int32) disdim Attributes ID : 2 diff --git a/nspanel_us_land_code/keyb_num.txt b/nspanel_us_land_code/keyb_num.txt index 0b191a2..ee1755e 100644 --- a/nspanel_us_land_code/keyb_num.txt +++ b/nspanel_us_land_code/keyb_num.txt @@ -28,21 +28,17 @@ Page keyb_num } Touch Press Event - aux.txt="{\"page\": \"keyb_num\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints aux.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - aux.txt="{\"page\": \"keyb_num\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints aux.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) page_id @@ -129,6 +125,11 @@ Button b1 Events Touch Release Event pin.txt+=b1.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button bclose Attributes @@ -157,6 +158,11 @@ Button b2 Events Touch Release Event pin.txt+=b2.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b3 Attributes @@ -171,6 +177,11 @@ Button b3 Events Touch Release Event pin.txt+=b3.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b4 Attributes @@ -185,6 +196,11 @@ Button b4 Events Touch Release Event pin.txt+=b4.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b5 Attributes @@ -199,6 +215,11 @@ Button b5 Events Touch Release Event pin.txt+=b5.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b6 Attributes @@ -213,6 +234,11 @@ Button b6 Events Touch Release Event pin.txt+=b6.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b7 Attributes @@ -227,6 +253,11 @@ Button b7 Events Touch Release Event pin.txt+=b7.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b8 Attributes @@ -241,6 +272,11 @@ Button b8 Events Touch Release Event pin.txt+=b8.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b9 Attributes @@ -255,6 +291,11 @@ Button b9 Events Touch Release Event pin.txt+=b9.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button bclear Attributes @@ -269,6 +310,11 @@ Button bclear Events Touch Release Event pin.txt="" + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button b0 Attributes @@ -283,6 +329,11 @@ Button b0 Events Touch Release Event pin.txt+=b0.txt + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF Button benter Attributes diff --git a/nspanel_us_land_code/light.txt b/nspanel_us_land_code/light.txt index a1a16b0..fbd0852 100644 --- a/nspanel_us_land_code/light.txt +++ b/nspanel_us_land_code/light.txt @@ -46,21 +46,17 @@ Page light } Touch Press Event - lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lightsetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lightsetting.txt="{\"page\": \"light\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lightsetting.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (int32) rgb565 diff --git a/nspanel_us_land_code/media_player.txt b/nspanel_us_land_code/media_player.txt index 6cd305c..bade873 100644 --- a/nspanel_us_land_code/media_player.txt +++ b/nspanel_us_land_code/media_player.txt @@ -28,21 +28,17 @@ Page media_player } Touch Press Event - lastclick.txt="{\"page\": \"media_player\", \"component\": \"touchevent\", \"value\": \"press\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - lastclick.txt="{\"page\": \"media_player\", \"component\": \"touchevent\", \"value\": \"release\", \"entity\": \""+entity.txt+"\"}" - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints lastclick.txt,0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) back_page @@ -314,6 +310,14 @@ Slider vol_slider Upper range limit: 100 Lower range limit: 0 + Events + Touch Release Event + printh 91 + prints "touchevent",0 + printh 00 + prints rand,0 + printh FF FF FF + Button button_back Attributes ID : 5 diff --git a/nspanel_us_land_code/notification.txt b/nspanel_us_land_code/notification.txt index 5708896..da05f62 100644 --- a/nspanel_us_land_code/notification.txt +++ b/nspanel_us_land_code/notification.txt @@ -27,19 +27,17 @@ Page notification } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"notification\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"notification\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Variable (string) lastclick diff --git a/nspanel_us_land_code/qrcode.txt b/nspanel_us_land_code/qrcode.txt index 74019a6..ca7abdf 100644 --- a/nspanel_us_land_code/qrcode.txt +++ b/nspanel_us_land_code/qrcode.txt @@ -21,19 +21,17 @@ Page qrcode printh FF FF FF Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"qrcode\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"qrcode\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text qrcode_label diff --git a/nspanel_us_land_code/settings.txt b/nspanel_us_land_code/settings.txt index d788592..67b2251 100644 --- a/nspanel_us_land_code/settings.txt +++ b/nspanel_us_land_code/settings.txt @@ -25,19 +25,17 @@ Page settings printh FF FF FF Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"settings\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"settings\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text bright_text diff --git a/nspanel_us_land_code/weather01.txt b/nspanel_us_land_code/weather01.txt index 6220a28..57c8899 100644 --- a/nspanel_us_land_code/weather01.txt +++ b/nspanel_us_land_code/weather01.txt @@ -31,7 +31,6 @@ Page weather01 prints "touchevent",0 printh 00 prints rand,0 - printh 00 printh FF FF FF Touch Release Event @@ -39,7 +38,6 @@ Page weather01 prints "touchevent",0 printh 00 prints rand,0 - printh 00 printh FF FF FF Text day diff --git a/nspanel_us_land_code/weather02.txt b/nspanel_us_land_code/weather02.txt index af1574b..7e16258 100644 --- a/nspanel_us_land_code/weather02.txt +++ b/nspanel_us_land_code/weather02.txt @@ -27,19 +27,17 @@ Page weather02 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather02\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather02\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us_land_code/weather03.txt b/nspanel_us_land_code/weather03.txt index 393b593..240dc7b 100644 --- a/nspanel_us_land_code/weather03.txt +++ b/nspanel_us_land_code/weather03.txt @@ -27,19 +27,17 @@ Page weather03 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather03\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather03\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us_land_code/weather04.txt b/nspanel_us_land_code/weather04.txt index 0739b91..df421a7 100644 --- a/nspanel_us_land_code/weather04.txt +++ b/nspanel_us_land_code/weather04.txt @@ -27,19 +27,17 @@ Page weather04 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather04\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather04\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day diff --git a/nspanel_us_land_code/weather05.txt b/nspanel_us_land_code/weather05.txt index 9730873..f554d9c 100644 --- a/nspanel_us_land_code/weather05.txt +++ b/nspanel_us_land_code/weather05.txt @@ -27,19 +27,17 @@ Page weather05 } Touch Press Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather05\", \"component\": \"touchevent\", \"value\": \"press\"}",0 - printh 00 + prints rand,0 printh FF FF FF Touch Release Event - printh 92 + printh 91 prints "touchevent",0 printh 00 - prints "{\"page\": \"weather05\", \"component\": \"touchevent\", \"value\": \"release\"}",0 - printh 00 + prints rand,0 printh FF FF FF Text day