diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 13ef122..d509f40 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -3570,8 +3570,8 @@ variables: unknown: '{{ all_icons.unknown }}' #"\uE2D5" pic: button: - "off": "101" - "on": "102" + "off": "35" + "on": "36" weather: sunny: '{{ "2" if sun_is_up else "15"}}' #some weather providers returns "sunny" for "clear-night" cloudy: "3" diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index 48c0ab3..2cfabf7 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -554,7 +554,7 @@ api: // Alarm page - Buttons if (supported_features & 1) // Alarm - Button - Home { - id(disp1).send_command_printf("bt_home_pic.pic=%i", (state=="armed_home") ? 133 : 132); + id(disp1).send_command_printf("bt_home_pic.pic=%i", (state=="armed_home") ? 43 : 42); id(disp1).set_component_background_color("bt_home_text", (state=="armed_home") ? 19818 : 52857); id(disp1).set_component_background_color("bt_home_icon", (state=="armed_home") ? 19818 : 52857); id(disp1).set_component_font_color("bt_home_text", (state=="armed_home") ? 65535 : 0); @@ -563,7 +563,7 @@ api: } if (supported_features & 2) // Alarm - Button - Away { - id(disp1).send_command_printf("bt_away_pic.pic=%i", (state=="armed_away") ? 133 : 132); + id(disp1).send_command_printf("bt_away_pic.pic=%i", (state=="armed_away") ? 43 : 42); id(disp1).set_component_background_color("bt_away_text", (state=="armed_away") ? 19818 : 52857); id(disp1).set_component_background_color("bt_away_icon", (state=="armed_away") ? 19818 : 52857); id(disp1).set_component_font_color("bt_away_text", (state=="armed_away") ? 65535 : 0); @@ -572,7 +572,7 @@ api: } if (supported_features & 4) // Alarm - Button - Night { - id(disp1).send_command_printf("bt_night_pic.pic=%i", (state=="armed_night") ? 133 : 132); + id(disp1).send_command_printf("bt_night_pic.pic=%i", (state=="armed_night") ? 43 : 42); id(disp1).set_component_background_color("bt_night_text", (state=="armed_night") ? 19818 : 52857); id(disp1).set_component_background_color("bt_night_icon", (state=="armed_night") ? 19818 : 52857); id(disp1).set_component_font_color("bt_night_text", (state=="armed_night") ? 65535 : 0); @@ -581,7 +581,7 @@ api: } if (supported_features & 32) // Alarm - Button - Vacation { - id(disp1).send_command_printf("bt_vacat_pic.pic=%i", (state=="armed_vacation") ? 133 : 132); + id(disp1).send_command_printf("bt_vacat_pic.pic=%i", (state=="armed_vacation") ? 43 : 42); id(disp1).set_component_background_color("bt_vacat_text", (state=="armed_vacation") ? 19818 : 52857); id(disp1).set_component_background_color("bt_vacat_icon", (state=="armed_vacation") ? 19818 : 52857); id(disp1).set_component_font_color("bt_vacat_text", (state=="armed_vacation") ? 65535 : 0); @@ -590,7 +590,7 @@ api: } if (supported_features & 16) // Alarm - Button - Custom bypass { - id(disp1).send_command_printf("bt_bypass_pic.pic=%i", (state=="armed_bypass") ? 133 : 132); + id(disp1).send_command_printf("bt_bypass_pic.pic=%i", (state=="armed_bypass") ? 43 : 42); id(disp1).set_component_background_color("bt_bypass_text", (state=="armed_bypass") ? 19818 : 52857); id(disp1).set_component_background_color("bt_bypass_icon", (state=="armed_bypass") ? 19818 : 52857); id(disp1).set_component_font_color("bt_bypass_text", (state=="armed_bypass") ? 65535 : 0); @@ -599,7 +599,7 @@ api: } if ( true ) // Alarm - Button - Disarm { - id(disp1).send_command_printf("bt_disarm_pic.pic=%i", (state=="disarmed") ? 133 : 132); + id(disp1).send_command_printf("bt_disarm_pic.pic=%i", (state=="disarmed") ? 43 : 42); id(disp1).set_component_background_color("bt_disarm_text", (state=="disarmed") ? 19818 : 52857); id(disp1).set_component_background_color("bt_disarm_icon", (state=="disarmed") ? 19818 : 52857); id(disp1).set_component_font_color("bt_disarm_text", (state=="disarmed") ? 65535 : 0); @@ -1023,6 +1023,14 @@ text_sensor: id(disp1).set_component_text_printf("climate.button07_icon", "%s", "\uE424"); //mdi:power id(addon_climate_update_page_climate)->execute(); } + else if (page=="cover") + { + ESP_LOGV("text_sensor.nspanelevent", "Construct cover page"); + id(disp1).set_component_text_printf("cover.cover_stop", "%s", "\uE666"); //mdi:stop-circle-outline + // In the future this will be dynamically contructed based on the device_class + id(disp1).set_component_text_printf("cover.cover_open", "%s", "\uF11D"); //mdi:window-shutter-open + id(disp1).set_component_text_printf("cover.cover_close", "%s", "\uF11B"); //mdi:window-shutter + } else if (page=="fan") { ESP_LOGV("text_sensor.nspanelevent", "Construct fan page"); diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index 79dcf14..f3b40eb 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 7fe0003..31414fd 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/alarm.txt b/nspanel_eu_code/alarm.txt index 8617a97..e01d943 100644 --- a/nspanel_eu_code/alarm.txt +++ b/nspanel_eu_code/alarm.txt @@ -308,7 +308,7 @@ Hotspot bt_home Events Touch Press Event - bt_home_pic.pic=134 + bt_home_pic.pic=44 bt_home_text.bco=65024 bt_home_text.pco=0 bt_home_icon.bco=65024 @@ -332,7 +332,7 @@ Hotspot bt_away Events Touch Press Event - bt_away_pic.pic=134 + bt_away_pic.pic=44 bt_away_text.bco=65024 bt_away_text.pco=0 bt_away_icon.bco=65024 @@ -356,7 +356,7 @@ Hotspot bt_night Events Touch Press Event - bt_night_pic.pic=134 + bt_night_pic.pic=44 bt_night_text.bco=65024 bt_night_text.pco=0 bt_night_icon.bco=65024 @@ -380,7 +380,7 @@ Hotspot bt_vacat Events Touch Press Event - bt_vacat_pic.pic=134 + bt_vacat_pic.pic=44 bt_vacat_text.bco=65024 bt_vacat_text.pco=0 bt_vacat_icon.bco=65024 @@ -404,7 +404,7 @@ Hotspot bt_bypass Events Touch Press Event - bt_bypass_pic.pic=134 + bt_bypass_pic.pic=44 bt_bypass_text.bco=65024 bt_bypass_text.pco=0 bt_bypass_icon.bco=65024 @@ -428,7 +428,7 @@ Hotspot bt_disarm Events Touch Press Event - bt_disarm_pic.pic=134 + bt_disarm_pic.pic=44 bt_disarm_text.bco=65024 bt_disarm_text.pco=0 bt_disarm_icon.bco=65024 diff --git a/nspanel_eu_code/cover.txt b/nspanel_eu_code/cover.txt index bfb2b25..1a8db51 100644 --- a/nspanel_eu_code/cover.txt +++ b/nspanel_eu_code/cover.txt @@ -51,21 +51,21 @@ Page cover Variable (string) va1 Attributes - ID : 9 + ID : 7 Scope : local Text : newtxt Max. Text Size: 10 Variable (string) coversetting Attributes - ID : 13 + ID : 11 Scope : local Text : Max. Text Size: 255 Variable (string) back_page Attributes - ID : 14 + ID : 12 Scope : local Text : home Max. Text Size: 15 @@ -102,7 +102,7 @@ Text page_label Text icon_state Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -112,7 +112,7 @@ Text icon_state Text battery_icon Attributes - ID : 12 + ID : 10 Scope : local Dragging : 0 Send Component ID : disabled @@ -150,7 +150,7 @@ Button cover_open Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -170,7 +170,7 @@ Button cover_close Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -184,13 +184,13 @@ Button cover_close Button cover_stop Attributes - ID : 10 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -204,7 +204,7 @@ Button cover_stop Button button_back Attributes - ID : 15 + ID : 13 Scope : local Dragging : 0 Send Component ID: disabled @@ -231,60 +231,3 @@ Button button_back page home } -Timer swipestore - Attributes - ID : 8 - Scope : local - Period (ms): 50 - Enabled : no - - Events - Timer Event - swipex=tch0 - swipey=tch1 - -TouchCap swipe - Attributes - ID : 7 - Scope: local - Value: 0 - - Events - Touch Press Event - swipestore.en=1 // Start swipestore timer - - Touch Release Event - swipestore.en=0 - // Touch has ended, x - if(tch0==0) - { - swipec=swipex-tch2 - // From Left to Right - if(swipec>swipedx) - { - //page - } - // Right to Left - swipec2=0-swipedx - if(swipec100) - { - //page - } - // Down to Up - swipec2=0-swipedy - if(swipec<-100) - { - //page - } - } - diff --git a/nspanel_eu_code/pics/0.png b/nspanel_eu_code/pics/0.png deleted file mode 100644 index 4ca2946..0000000 Binary files a/nspanel_eu_code/pics/0.png and /dev/null differ diff --git a/nspanel_eu_code/pics/100.png b/nspanel_eu_code/pics/100.png deleted file mode 100644 index e6b1091..0000000 Binary files a/nspanel_eu_code/pics/100.png and /dev/null differ diff --git a/nspanel_eu_code/pics/124.png b/nspanel_eu_code/pics/124.png deleted file mode 100644 index ea7832f..0000000 Binary files a/nspanel_eu_code/pics/124.png and /dev/null differ diff --git a/nspanel_eu_code/pics/99.png b/nspanel_eu_code/pics/99.png deleted file mode 100644 index 27c95be..0000000 Binary files a/nspanel_eu_code/pics/99.png and /dev/null differ diff --git a/nspanel_eu_code/pics/button_amber.png b/nspanel_eu_code/pics/button_amber.png deleted file mode 100644 index e6d24ae..0000000 Binary files a/nspanel_eu_code/pics/button_amber.png and /dev/null differ diff --git a/nspanel_eu_code/pics/button_green.png b/nspanel_eu_code/pics/button_green.png deleted file mode 100644 index 3ab4886..0000000 Binary files a/nspanel_eu_code/pics/button_green.png and /dev/null differ diff --git a/nspanel_eu_code/pics/button_grey_dark.png b/nspanel_eu_code/pics/button_grey_dark.png deleted file mode 100644 index fee4c31..0000000 Binary files a/nspanel_eu_code/pics/button_grey_dark.png and /dev/null differ diff --git a/nspanel_eu_code/pics/button_grey_super_light.png b/nspanel_eu_code/pics/button_grey_super_light.png deleted file mode 100644 index 5f813b2..0000000 Binary files a/nspanel_eu_code/pics/button_grey_super_light.png and /dev/null differ diff --git a/nspanel_eu_code/pics/button_white.png b/nspanel_eu_code/pics/button_white.png deleted file mode 100644 index 3f56d7a..0000000 Binary files a/nspanel_eu_code/pics/button_white.png and /dev/null differ diff --git a/nspanel_eu_code/settings.txt b/nspanel_eu_code/settings.txt index aff078f..9ad0e7d 100644 --- a/nspanel_eu_code/settings.txt +++ b/nspanel_eu_code/settings.txt @@ -40,7 +40,7 @@ Page settings Text bright_text Attributes - ID : 5 + ID : 3 Scope : local Dragging : 0 Send Component ID : disabled @@ -50,7 +50,7 @@ Text bright_text Text dim_text Attributes - ID : 6 + ID : 4 Scope : local Dragging : 0 Send Component ID : disabled @@ -60,7 +60,7 @@ Text dim_text Text lbl_reboot Attributes - ID : 7 + ID : 5 Scope : local Dragging : 0 Send Component ID : disabled @@ -70,7 +70,7 @@ Text lbl_reboot Text lbl_sleep Attributes - ID : 8 + ID : 6 Scope : local Dragging : 0 Send Component ID : disabled @@ -80,7 +80,7 @@ Text lbl_sleep Text lbl_brightness Attributes - ID : 9 + ID : 7 Scope : local Dragging : 0 Send Component ID : disabled @@ -90,7 +90,7 @@ Text lbl_brightness Text lbl_dimming Attributes - ID : 10 + ID : 8 Scope : local Dragging : 0 Send Component ID : disabled @@ -100,7 +100,7 @@ Text lbl_dimming Slider brightslider Attributes - ID : 3 + ID : 1 Scope : global Dragging : 0 Send Component ID: on press and release @@ -119,7 +119,7 @@ Slider brightslider Slider dimslider Attributes - ID : 4 + ID : 2 Scope : global Dragging : 0 Send Component ID: on press and release @@ -138,7 +138,7 @@ Slider dimslider Button button_back Attributes - ID : 13 + ID : 11 Scope : local Dragging : 0 Send Component ID: disabled @@ -152,7 +152,7 @@ Button button_back Dual-state Button bt_reboot Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Send Component ID: on press and release @@ -162,7 +162,7 @@ Dual-state Button bt_reboot Dual-state Button bt_sleep Attributes - ID : 12 + ID : 10 Scope : global Dragging : 0 Send Component ID: on press and release @@ -172,7 +172,7 @@ Dual-state Button bt_sleep Hotspot bt_bright_down Attributes - ID : 14 + ID : 12 Scope : local Dragging : 0 Send Component ID: disabled @@ -192,7 +192,7 @@ Hotspot bt_bright_down Hotspot bt_bright_up Attributes - ID : 15 + ID : 13 Scope : local Dragging : 0 Send Component ID: disabled @@ -212,7 +212,7 @@ Hotspot bt_bright_up Hotspot bt_dim_down Attributes - ID : 16 + ID : 14 Scope : local Dragging : 0 Send Component ID: disabled @@ -232,7 +232,7 @@ Hotspot bt_dim_down Hotspot bt_dim_up Attributes - ID : 17 + ID : 15 Scope : local Dragging : 0 Send Component ID: disabled @@ -250,60 +250,3 @@ Hotspot bt_dim_up printh FF FF FF } -Timer swipestore - Attributes - ID : 2 - Scope : local - Period (ms): 50 - Enabled : no - - Events - Timer Event - swipex=tch0 - swipey=tch1 - -TouchCap swipe - Attributes - ID : 1 - Scope: local - Value: 0 - - Events - Touch Press Event - swipestore.en=1 // Start swipestore timer - - Touch Release Event - swipestore.en=0 - // Touch has ended, x - if(tch0==0) - { - swipec=swipex-tch2 - // From Left to Right - if(swipec>swipedx) - { - //page - } - // Right to Left - swipec2=0-swipedx - if(swipec100) - { - //page - } - // Down to Up - swipec2=0-swipedy - if(swipec<-100) - { - //page - } - } - diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 6129053..e451d82 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index fa3944e..0fe81f8 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/alarm.txt b/nspanel_us_code/alarm.txt index 8617a97..e01d943 100644 --- a/nspanel_us_code/alarm.txt +++ b/nspanel_us_code/alarm.txt @@ -308,7 +308,7 @@ Hotspot bt_home Events Touch Press Event - bt_home_pic.pic=134 + bt_home_pic.pic=44 bt_home_text.bco=65024 bt_home_text.pco=0 bt_home_icon.bco=65024 @@ -332,7 +332,7 @@ Hotspot bt_away Events Touch Press Event - bt_away_pic.pic=134 + bt_away_pic.pic=44 bt_away_text.bco=65024 bt_away_text.pco=0 bt_away_icon.bco=65024 @@ -356,7 +356,7 @@ Hotspot bt_night Events Touch Press Event - bt_night_pic.pic=134 + bt_night_pic.pic=44 bt_night_text.bco=65024 bt_night_text.pco=0 bt_night_icon.bco=65024 @@ -380,7 +380,7 @@ Hotspot bt_vacat Events Touch Press Event - bt_vacat_pic.pic=134 + bt_vacat_pic.pic=44 bt_vacat_text.bco=65024 bt_vacat_text.pco=0 bt_vacat_icon.bco=65024 @@ -404,7 +404,7 @@ Hotspot bt_bypass Events Touch Press Event - bt_bypass_pic.pic=134 + bt_bypass_pic.pic=44 bt_bypass_text.bco=65024 bt_bypass_text.pco=0 bt_bypass_icon.bco=65024 @@ -428,7 +428,7 @@ Hotspot bt_disarm Events Touch Press Event - bt_disarm_pic.pic=134 + bt_disarm_pic.pic=44 bt_disarm_text.bco=65024 bt_disarm_text.pco=0 bt_disarm_icon.bco=65024 diff --git a/nspanel_us_code/cover.txt b/nspanel_us_code/cover.txt index bfb2b25..1a8db51 100644 --- a/nspanel_us_code/cover.txt +++ b/nspanel_us_code/cover.txt @@ -51,21 +51,21 @@ Page cover Variable (string) va1 Attributes - ID : 9 + ID : 7 Scope : local Text : newtxt Max. Text Size: 10 Variable (string) coversetting Attributes - ID : 13 + ID : 11 Scope : local Text : Max. Text Size: 255 Variable (string) back_page Attributes - ID : 14 + ID : 12 Scope : local Text : home Max. Text Size: 15 @@ -102,7 +102,7 @@ Text page_label Text icon_state Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -112,7 +112,7 @@ Text icon_state Text battery_icon Attributes - ID : 12 + ID : 10 Scope : local Dragging : 0 Send Component ID : disabled @@ -150,7 +150,7 @@ Button cover_open Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -170,7 +170,7 @@ Button cover_close Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -184,13 +184,13 @@ Button cover_close Button cover_stop Attributes - ID : 10 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -204,7 +204,7 @@ Button cover_stop Button button_back Attributes - ID : 15 + ID : 13 Scope : local Dragging : 0 Send Component ID: disabled @@ -231,60 +231,3 @@ Button button_back page home } -Timer swipestore - Attributes - ID : 8 - Scope : local - Period (ms): 50 - Enabled : no - - Events - Timer Event - swipex=tch0 - swipey=tch1 - -TouchCap swipe - Attributes - ID : 7 - Scope: local - Value: 0 - - Events - Touch Press Event - swipestore.en=1 // Start swipestore timer - - Touch Release Event - swipestore.en=0 - // Touch has ended, x - if(tch0==0) - { - swipec=swipex-tch2 - // From Left to Right - if(swipec>swipedx) - { - //page - } - // Right to Left - swipec2=0-swipedx - if(swipec100) - { - //page - } - // Down to Up - swipec2=0-swipedy - if(swipec<-100) - { - //page - } - } - diff --git a/nspanel_us_code/pics/0.png b/nspanel_us_code/pics/0.png deleted file mode 100644 index beecd3c..0000000 Binary files a/nspanel_us_code/pics/0.png and /dev/null differ diff --git a/nspanel_us_code/pics/103.png b/nspanel_us_code/pics/103.png deleted file mode 100644 index d7bcb3a..0000000 Binary files a/nspanel_us_code/pics/103.png and /dev/null differ diff --git a/nspanel_us_code/pics/124.png b/nspanel_us_code/pics/124.png deleted file mode 100644 index faa8a07..0000000 Binary files a/nspanel_us_code/pics/124.png and /dev/null differ diff --git a/nspanel_us_code/pics/125.png b/nspanel_us_code/pics/125.png deleted file mode 100644 index 3212fb3..0000000 Binary files a/nspanel_us_code/pics/125.png and /dev/null differ diff --git a/nspanel_us_code/pics/127.png b/nspanel_us_code/pics/127.png deleted file mode 100644 index 57184a6..0000000 Binary files a/nspanel_us_code/pics/127.png and /dev/null differ diff --git a/nspanel_us_code/settings.txt b/nspanel_us_code/settings.txt index 4fe5885..a81dad9 100644 --- a/nspanel_us_code/settings.txt +++ b/nspanel_us_code/settings.txt @@ -138,7 +138,7 @@ Slider dimslider Button button_back Attributes - ID : 13 + ID : 11 Scope : local Dragging : 0 Send Component ID: disabled @@ -152,7 +152,7 @@ Button button_back Dual-state Button bt_reboot Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Send Component ID: on press and release @@ -162,7 +162,7 @@ Dual-state Button bt_reboot Dual-state Button bt_sleep Attributes - ID : 12 + ID : 10 Scope : global Dragging : 0 Send Component ID: on press and release @@ -172,7 +172,7 @@ Dual-state Button bt_sleep Hotspot bt_bright_down Attributes - ID : 14 + ID : 12 Scope : local Dragging : 0 Send Component ID: disabled @@ -192,7 +192,7 @@ Hotspot bt_bright_down Hotspot bt_bright_up Attributes - ID : 15 + ID : 13 Scope : local Dragging : 0 Send Component ID: disabled @@ -212,7 +212,7 @@ Hotspot bt_bright_up Hotspot bt_dim_down Attributes - ID : 16 + ID : 14 Scope : local Dragging : 0 Send Component ID: disabled @@ -232,7 +232,7 @@ Hotspot bt_dim_down Hotspot bt_dim_up Attributes - ID : 17 + ID : 15 Scope : local Dragging : 0 Send Component ID: disabled @@ -250,60 +250,3 @@ Hotspot bt_dim_up printh FF FF FF } -Timer swipestore - Attributes - ID : 9 - Scope : local - Period (ms): 50 - Enabled : no - - Events - Timer Event - swipex=tch0 - swipey=tch1 - -TouchCap swipe - Attributes - ID : 10 - Scope: local - Value: 0 - - Events - Touch Press Event - swipestore.en=1 // Start swipestore timer - - Touch Release Event - swipestore.en=0 - // Touch has ended, x - if(tch0==0) - { - swipec=swipex-tch2 - // From Left to Right - if(swipec>swipedx) - { - //page - } - // Right to Left - swipec2=0-swipedx - if(swipec100) - { - //page - } - // Down to Up - swipec2=0-swipedy - if(swipec<-100) - { - //page - } - } - diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 98c984c..616d895 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 84865c2..ec63ac6 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/alarm.txt b/nspanel_us_land_code/alarm.txt index 8617a97..e01d943 100644 --- a/nspanel_us_land_code/alarm.txt +++ b/nspanel_us_land_code/alarm.txt @@ -308,7 +308,7 @@ Hotspot bt_home Events Touch Press Event - bt_home_pic.pic=134 + bt_home_pic.pic=44 bt_home_text.bco=65024 bt_home_text.pco=0 bt_home_icon.bco=65024 @@ -332,7 +332,7 @@ Hotspot bt_away Events Touch Press Event - bt_away_pic.pic=134 + bt_away_pic.pic=44 bt_away_text.bco=65024 bt_away_text.pco=0 bt_away_icon.bco=65024 @@ -356,7 +356,7 @@ Hotspot bt_night Events Touch Press Event - bt_night_pic.pic=134 + bt_night_pic.pic=44 bt_night_text.bco=65024 bt_night_text.pco=0 bt_night_icon.bco=65024 @@ -380,7 +380,7 @@ Hotspot bt_vacat Events Touch Press Event - bt_vacat_pic.pic=134 + bt_vacat_pic.pic=44 bt_vacat_text.bco=65024 bt_vacat_text.pco=0 bt_vacat_icon.bco=65024 @@ -404,7 +404,7 @@ Hotspot bt_bypass Events Touch Press Event - bt_bypass_pic.pic=134 + bt_bypass_pic.pic=44 bt_bypass_text.bco=65024 bt_bypass_text.pco=0 bt_bypass_icon.bco=65024 @@ -428,7 +428,7 @@ Hotspot bt_disarm Events Touch Press Event - bt_disarm_pic.pic=134 + bt_disarm_pic.pic=44 bt_disarm_text.bco=65024 bt_disarm_text.pco=0 bt_disarm_icon.bco=65024 diff --git a/nspanel_us_land_code/cover.txt b/nspanel_us_land_code/cover.txt index bfb2b25..1a8db51 100644 --- a/nspanel_us_land_code/cover.txt +++ b/nspanel_us_land_code/cover.txt @@ -51,21 +51,21 @@ Page cover Variable (string) va1 Attributes - ID : 9 + ID : 7 Scope : local Text : newtxt Max. Text Size: 10 Variable (string) coversetting Attributes - ID : 13 + ID : 11 Scope : local Text : Max. Text Size: 255 Variable (string) back_page Attributes - ID : 14 + ID : 12 Scope : local Text : home Max. Text Size: 15 @@ -102,7 +102,7 @@ Text page_label Text icon_state Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Send Component ID : disabled @@ -112,7 +112,7 @@ Text icon_state Text battery_icon Attributes - ID : 12 + ID : 10 Scope : local Dragging : 0 Send Component ID : disabled @@ -150,7 +150,7 @@ Button cover_open Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -170,7 +170,7 @@ Button cover_close Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -184,13 +184,13 @@ Button cover_close Button cover_stop Attributes - ID : 10 + ID : 8 Scope : local Dragging : 0 Send Component ID: disabled State : unpressed Text : - Max. Text Size : 10 + Max. Text Size : 3 Events Touch Press Event @@ -204,7 +204,7 @@ Button cover_stop Button button_back Attributes - ID : 15 + ID : 13 Scope : local Dragging : 0 Send Component ID: disabled @@ -231,60 +231,3 @@ Button button_back page home } -Timer swipestore - Attributes - ID : 8 - Scope : local - Period (ms): 50 - Enabled : no - - Events - Timer Event - swipex=tch0 - swipey=tch1 - -TouchCap swipe - Attributes - ID : 7 - Scope: local - Value: 0 - - Events - Touch Press Event - swipestore.en=1 // Start swipestore timer - - Touch Release Event - swipestore.en=0 - // Touch has ended, x - if(tch0==0) - { - swipec=swipex-tch2 - // From Left to Right - if(swipec>swipedx) - { - //page - } - // Right to Left - swipec2=0-swipedx - if(swipec100) - { - //page - } - // Down to Up - swipec2=0-swipedy - if(swipec<-100) - { - //page - } - } - diff --git a/nspanel_us_land_code/instructions.md b/nspanel_us_land_code/instructions.md index 32378ff..774fb93 100644 --- a/nspanel_us_land_code/instructions.md +++ b/nspanel_us_land_code/instructions.md @@ -6,7 +6,7 @@ Comment out `lcd_dev fffb 0002 0000 0020` ## Page `home`: 1. Change left_bt_pic (x,y,w,h) from ( 47,307,120,3) to (467,173,3,120) 2. Change right_bt_pic(x,y,w,h) from (288,307,120,3) to (467, 27,3,120) -3. Rotate pictures 77 & 78 by 90degrees +3. Rotate pictures 30 & 31 by 90degrees - You will find the pics under pics folder where this instruction file is 4. Add the following to "Preinitialize Event" on page `home` (at the end) to hide those elements: ``` vis left_bt_text,0 diff --git a/nspanel_us_land_code/pics/77_vertical.png b/nspanel_us_land_code/pics/30_vertical.png similarity index 100% rename from nspanel_us_land_code/pics/77_vertical.png rename to nspanel_us_land_code/pics/30_vertical.png diff --git a/nspanel_us_land_code/pics/78_vertical.png b/nspanel_us_land_code/pics/31_vertical.png similarity index 100% rename from nspanel_us_land_code/pics/78_vertical.png rename to nspanel_us_land_code/pics/31_vertical.png diff --git a/nspanel_us_land_code/settings.txt b/nspanel_us_land_code/settings.txt index a08610d..2f98cbf 100644 --- a/nspanel_us_land_code/settings.txt +++ b/nspanel_us_land_code/settings.txt @@ -40,7 +40,7 @@ Page settings Text bright_text Attributes - ID : 5 + ID : 3 Scope : local Dragging : 0 Send Component ID : disabled @@ -50,7 +50,7 @@ Text bright_text Text dim_text Attributes - ID : 6 + ID : 4 Scope : local Dragging : 0 Send Component ID : disabled @@ -60,7 +60,7 @@ Text dim_text Text lbl_reboot Attributes - ID : 7 + ID : 5 Scope : local Dragging : 0 Send Component ID : disabled @@ -70,7 +70,7 @@ Text lbl_reboot Text lbl_sleep Attributes - ID : 8 + ID : 6 Scope : local Dragging : 0 Send Component ID : disabled @@ -80,7 +80,7 @@ Text lbl_sleep Text lbl_brightness Attributes - ID : 9 + ID : 7 Scope : local Dragging : 0 Send Component ID : disabled @@ -90,7 +90,7 @@ Text lbl_brightness Text lbl_dimming Attributes - ID : 10 + ID : 8 Scope : local Dragging : 0 Send Component ID : disabled @@ -100,7 +100,7 @@ Text lbl_dimming Slider brightslider Attributes - ID : 3 + ID : 1 Scope : global Dragging : 0 Send Component ID: on press and release @@ -119,7 +119,7 @@ Slider brightslider Slider dimslider Attributes - ID : 4 + ID : 2 Scope : global Dragging : 0 Send Component ID: on press and release @@ -138,7 +138,7 @@ Slider dimslider Button button_back Attributes - ID : 13 + ID : 11 Scope : local Dragging : 0 Send Component ID: disabled @@ -152,7 +152,7 @@ Button button_back Dual-state Button bt_reboot Attributes - ID : 11 + ID : 9 Scope : local Dragging : 0 Send Component ID: on press and release @@ -162,7 +162,7 @@ Dual-state Button bt_reboot Dual-state Button bt_sleep Attributes - ID : 12 + ID : 10 Scope : global Dragging : 0 Send Component ID: on press and release @@ -172,7 +172,7 @@ Dual-state Button bt_sleep Hotspot bt_bright_down Attributes - ID : 14 + ID : 12 Scope : local Dragging : 0 Send Component ID: disabled @@ -192,7 +192,7 @@ Hotspot bt_bright_down Hotspot bt_bright_up Attributes - ID : 15 + ID : 13 Scope : local Dragging : 0 Send Component ID: disabled @@ -212,7 +212,7 @@ Hotspot bt_bright_up Hotspot bt_dim_down Attributes - ID : 16 + ID : 14 Scope : local Dragging : 0 Send Component ID: disabled @@ -232,7 +232,7 @@ Hotspot bt_dim_down Hotspot bt_dim_up Attributes - ID : 17 + ID : 15 Scope : local Dragging : 0 Send Component ID: disabled @@ -250,60 +250,3 @@ Hotspot bt_dim_up printh FF FF FF } -Timer swipestore - Attributes - ID : 2 - Scope : local - Period (ms): 50 - Enabled : no - - Events - Timer Event - swipex=tch0 - swipey=tch1 - -TouchCap swipe - Attributes - ID : 1 - Scope: local - Value: 0 - - Events - Touch Press Event - swipestore.en=1 // Start swipestore timer - - Touch Release Event - swipestore.en=0 - // Touch has ended, x - if(tch0==0) - { - swipec=swipex-tch2 - // From Left to Right - if(swipec>swipedx) - { - //page - } - // Right to Left - swipec2=0-swipedx - if(swipec100) - { - //page - } - // Down to Up - swipec2=0-swipedy - if(swipec<-100) - { - //page - } - } -