diff --git a/.gitignore b/.gitignore index db0c583..2083a41 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,6 @@ Nextion2Text.* .idea # Ignore dev folder -dev +#dev nspanel_esphome_prebuilt.yaml diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 52a0caa..79ff5a9 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -47,12 +47,14 @@ wifi: ##### My customization - End ##### ``` 4. Default baud rate for advanced mode is back to 115200 bps, to avoid issues when creating buttons pages. +5. ESPHome v2023.12.0 is now the minimum required version   ## Overview of noteworthy changes 1. Standardized entity's icons 2. Additional custom buttons on Home page 3. Outdoor temperature selectable font size +4. Select icon size for button's pages   ## Details of noteworthy changes @@ -72,6 +74,13 @@ Now you can select the font size of your outdoor temperature display: > Important: Long text with bigger fonts may exceed the limit of space reserved for this with incomplete information shown. +  +### 4. Select icon size for button's pages +You can also select the size of the icons on the buttos pages: + +<> +<> +   ## Next topics we are currently working on See here: https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap diff --git a/advanced/esphome/nspanel_esphome_core.yaml b/advanced/esphome/nspanel_esphome_core.yaml index c62a0f9..e9a01c3 100644 --- a/advanced/esphome/nspanel_esphome_core.yaml +++ b/advanced/esphome/nspanel_esphome_core.yaml @@ -194,7 +194,7 @@ api: component: string foreground: int[] then: - - lambda: set_component_color->execute(component, foreground, {}); + - lambda: set_component_color->execute(component, foreground); ##### Service to play a rtttl tones ##### # Example tones : https://codebender.cc/sketch:109888#RTTTL%20Songs.ino @@ -451,7 +451,7 @@ api: { if ((page_icon != std::string()) and (page_icon != "")) disp1->set_component_text_printf("icon_state", "%s", page_icon.c_str()); - set_component_color->execute("icon_state", page_icon_color, {}); + set_component_color->execute("icon_state", page_icon_color); } # Service to show a QR code on the display (ex. for WiFi password) @@ -496,15 +496,12 @@ api: variables: page: string id: string - pic: int - bg: int[] + state: bool icon: string icon_color: int[] icon_font: int bri: string - bri_color: int[] label: string - label_color: int[] then: - lambda: |- static const char *const TAG = "service.set_button"; @@ -512,11 +509,16 @@ api: std::string btnicon = id.c_str() + std::string("icon"); std::string btntext = id.c_str() + std::string("text"); std::string btnbri = id.c_str() + std::string("bri"); - disp1->send_command_printf("%spic.pic=%" PRIu32, id.c_str(), pic); + uint8_t bg_pic = state ? 47 : 46; + uint16_t txt_color = state ? 10597 : 65535; + disp1->send_command_printf("%spic.picc=%u", id.c_str(), bg_pic); + disp1->send_command_printf("%sbri.picc=%u", id.c_str(), bg_pic); + disp1->send_command_printf("%stext.picc=%u", id.c_str(), bg_pic); + disp1->send_command_printf("%sicon.picc=%u", id.c_str(), bg_pic); disp1->send_command_printf("%sicon.font=%" PRIu32, id.c_str(), icon_font); - set_component_color->execute(btnicon.c_str(), icon_color, bg); - set_component_color->execute(btntext.c_str(), label_color, bg); - set_component_color->execute(btnbri.c_str(), bri_color, bg); + disp1->send_command_printf("%sbri.pco=%u", id.c_str(), txt_color); + disp1->send_command_printf("%stext.pco=%u", id.c_str(), txt_color); + set_component_color->execute(btnicon.c_str(), icon_color); disp1->set_component_text_printf(btnicon.c_str(), "%s", icon.c_str()); display_wrapped_text->execute(btntext.c_str(), label.c_str(), 10); if (strcmp(bri.c_str(), "0") != 0) @@ -605,7 +607,7 @@ api: ESP_LOGV(TAG, "Set Notification button"); disp1->send_command_printf("is_notification=%i", (notification_text->state.empty() and notification_label->state.empty()) ? 0 : 1); disp1->set_component_text_printf("home.bt_notific", "%s", notification_icon.c_str()); - set_component_color->execute("home.bt_notific", notification_unread->state ? notification_icon_color_unread : notification_icon_color_normal, {}); + set_component_color->execute("home.bt_notific", notification_unread->state ? notification_icon_color_unread : notification_icon_color_normal); id(home_notify_icon_color_normal) = notification_icon_color_normal; id(home_notify_icon_color_unread) = notification_icon_color_unread; @@ -613,14 +615,14 @@ api: ESP_LOGV(TAG, "Set QRCode button"); disp1->send_command_printf("is_qrcode=%i", qrcode ? 1 : 0); disp1->set_component_text_printf("home.bt_qrcode", "%s", qrcode_icon.c_str()); - set_component_color->execute("home.bt_qrcode", qrcode_icon_color, {}); + set_component_color->execute("home.bt_qrcode", qrcode_icon_color); // Entities pages button ESP_LOGV(TAG, "Set Entities button"); disp1->send_command_printf("is_entities=%i", entities_pages ? 1 : 0); disp1->set_component_text_printf("home.bt_entities", "%s", entities_pages_icon.c_str()); - //set_component_color->execute("home.bt_entities", entities_pages_icon_color, {}); - set_component_color->execute("home.bt_entities", entities_pages_icon_color, {}); + //set_component_color->execute("home.bt_entities", entities_pages_icon_color); + set_component_color->execute("home.bt_entities", entities_pages_icon_color); // Alarm button ESP_LOGV(TAG, "Set Alarm button"); @@ -668,12 +670,12 @@ api: // on/off button if (supported_features & 128 and state == "off") //TURN_ON { - set_component_color->execute("bt_on_off", { 65535 }, {} ); + disp1->set_component_color("bt_on_off", 65535); disp1->show_component("bt_on_off"); } else if (supported_features & 256 and state != "off") //TURN_OFF { - set_component_color->execute("bt_on_off", { 10597 }, {} ); + disp1->set_component_color("bt_on_off", 10597); disp1->show_component("bt_on_off"); } else disp1->hide_component("bt_on_off"); @@ -1313,9 +1315,9 @@ switch: optimistic: true restore_mode: ALWAYS_OFF on_turn_on: - - lambda: set_component_color->execute("home.bt_notific", id(home_notify_icon_color_unread), {}); + - lambda: set_component_color->execute("home.bt_notific", id(home_notify_icon_color_unread)); on_turn_off: - - lambda: set_component_color->execute("home.bt_notific", id(home_notify_icon_color_normal), {}); + - lambda: set_component_color->execute("home.bt_notific", id(home_notify_icon_color_normal)); ##### Notification sound ##### - name: ${device_name} Notification sound @@ -2094,24 +2096,15 @@ script: parameters: component: string foreground: int32_t[] - background: int32_t[] then: - lambda: |- int fg565 = -1; - int bg565 = -1; - // Foreground if (foreground.size() == 3 and foreground[0] >= 0 and foreground[1] >= 0 and foreground[2] >= 0) fg565 = ((foreground[0] & 0b11111000) << 8) | ((foreground[1] & 0b11111100) << 3) | (foreground[2] >> 3); else if (foreground.size() == 1) fg565 = foreground[0]; else fg565 = -1; if (fg565 >= 0) disp1->set_component_font_color(component.c_str(), fg565); - // Background - if (background.size() == 3 and background[0] >= 0 and background[1] >= 0 and background[2] >= 0) bg565 = ((background[0] & 0b11111000) << 8) | ((background[1] & 0b11111100) << 3) | (background[2] >> 3); - else if (background.size() == 1) bg565 = background[0]; - else bg565 = -1; - if (bg565 >= 0) disp1->set_component_background_color(component.c_str(), bg565); - - id: display_wrapped_text mode: queued parameters: @@ -2462,7 +2455,7 @@ script: refresh_relays->execute(); refresh_wifi_icon->execute(); disp1->send_command_printf("is_notification=%i", (notification_text->state.empty() and notification_label->state.empty()) ? 0 : 1); - set_component_color->execute("home.bt_notific", notification_unread->state ? id(home_notify_icon_color_unread) : id(home_notify_icon_color_normal), {}); + set_component_color->execute("home.bt_notific", notification_unread->state ? id(home_notify_icon_color_unread) : id(home_notify_icon_color_normal)); refresh_datetime->execute(); addon_climate_update_page_home->execute(); } diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index 55efcfd..b8ba968 100644 Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ diff --git a/advanced/hmi/nspanel_eu_code/buttonpage01.txt b/advanced/hmi/nspanel_eu_code/buttonpage01.txt index f33cafb..84a1ffd 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage01.txt @@ -25,92 +25,62 @@ Page buttonpage01 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage01 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage01_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 45 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 46 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,7 +706,7 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes diff --git a/advanced/hmi/nspanel_eu_code/buttonpage02.txt b/advanced/hmi/nspanel_eu_code/buttonpage02.txt index 3483799..ad43ae9 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage02.txt @@ -25,92 +25,62 @@ Page buttonpage02 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage02 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage02_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage02\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes @@ -762,7 +786,7 @@ TouchCap swipe swipec2=0-swipedy if(swipec<-100) { - page home + //page } } diff --git a/advanced/hmi/nspanel_eu_code/buttonpage03.txt b/advanced/hmi/nspanel_eu_code/buttonpage03.txt index ded389d..5cd0e57 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage03.txt @@ -25,92 +25,62 @@ Page buttonpage03 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage03 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage03_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage03\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes @@ -756,7 +780,7 @@ TouchCap swipe // From Up to Down if(swipec>100) { - page home + //page } // Down to Up swipec2=0-swipedy diff --git a/advanced/hmi/nspanel_eu_code/buttonpage04.txt b/advanced/hmi/nspanel_eu_code/buttonpage04.txt index 42265d9..9434374 100644 --- a/advanced/hmi/nspanel_eu_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_eu_code/buttonpage04.txt @@ -25,92 +25,62 @@ Page buttonpage04 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage04 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage04_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage04\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index ff348d2..2f0c9b8 100644 Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ diff --git a/advanced/hmi/nspanel_us_code/buttonpage01.txt b/advanced/hmi/nspanel_us_code/buttonpage01.txt index f33cafb..84a1ffd 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage01.txt @@ -25,92 +25,62 @@ Page buttonpage01 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage01 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage01_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 45 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 46 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,7 +706,7 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes diff --git a/advanced/hmi/nspanel_us_code/buttonpage02.txt b/advanced/hmi/nspanel_us_code/buttonpage02.txt index 3483799..ad43ae9 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage02.txt @@ -25,92 +25,62 @@ Page buttonpage02 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage02 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage02_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage02\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes @@ -762,7 +786,7 @@ TouchCap swipe swipec2=0-swipedy if(swipec<-100) { - page home + //page } } diff --git a/advanced/hmi/nspanel_us_code/buttonpage03.txt b/advanced/hmi/nspanel_us_code/buttonpage03.txt index ded389d..5cd0e57 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage03.txt @@ -25,92 +25,62 @@ Page buttonpage03 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage03 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage03_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage03\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes @@ -756,7 +780,7 @@ TouchCap swipe // From Up to Down if(swipec>100) { - page home + //page } // Down to Up swipec2=0-swipedy diff --git a/advanced/hmi/nspanel_us_code/buttonpage04.txt b/advanced/hmi/nspanel_us_code/buttonpage04.txt index 42265d9..9434374 100644 --- a/advanced/hmi/nspanel_us_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_us_code/buttonpage04.txt @@ -25,92 +25,62 @@ Page buttonpage04 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage04 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage04_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage04\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index 6f101ef..1fed1e0 100644 Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage01.txt b/advanced/hmi/nspanel_us_land_code/buttonpage01.txt index f33cafb..84a1ffd 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage01.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage01.txt @@ -25,92 +25,62 @@ Page buttonpage01 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage01 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage01_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 45 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 46 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,7 +706,7 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage02.txt b/advanced/hmi/nspanel_us_land_code/buttonpage02.txt index 3483799..ad43ae9 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage02.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage02.txt @@ -25,92 +25,62 @@ Page buttonpage02 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage02 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage02_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage02\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes @@ -762,7 +786,7 @@ TouchCap swipe swipec2=0-swipedy if(swipec<-100) { - page home + //page } } diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage03.txt b/advanced/hmi/nspanel_us_land_code/buttonpage03.txt index ded389d..5cd0e57 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage03.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage03.txt @@ -25,92 +25,62 @@ Page buttonpage03 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage03 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage03_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage03\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes @@ -756,7 +780,7 @@ TouchCap swipe // From Up to Down if(swipec>100) { - page home + //page } // Down to Up swipec2=0-swipedy diff --git a/advanced/hmi/nspanel_us_land_code/buttonpage04.txt b/advanced/hmi/nspanel_us_land_code/buttonpage04.txt index 42265d9..9434374 100644 --- a/advanced/hmi/nspanel_us_land_code/buttonpage04.txt +++ b/advanced/hmi/nspanel_us_land_code/buttonpage04.txt @@ -25,92 +25,62 @@ Page buttonpage04 Variable (string) lastclick Attributes - ID : 44 + ID : 4 Scope : local Text : Max. Text Size: 100 Variable (string) click_comp Attributes - ID : 47 + ID : 7 Scope : local Text : Max. Text Size: 8 Variable (string) page_name Attributes - ID : 49 + ID : 9 Scope : local Text : buttonpage04 Max. Text Size: 12 Variable (int32) confirm Attributes - ID : 51 + ID : 11 Scope: local Value: 0 -Text button01text +Text page_label Attributes - ID : 4 + ID : 3 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 100 -Text button01bri +Text page_index Attributes ID : 5 Scope : local Dragging : 0 - Send Component ID : disabled + Send Component ID : on press and release Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 20 -Text button02text +Text button01pic Attributes - ID : 7 + ID : 12 Scope : local Dragging : 0 Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button02bri - Attributes - ID : 8 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button03text - Attributes - ID : 10 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 22 - -Text button03bri - Attributes - ID : 11 - Scope : local - Dragging : 0 - Send Component ID : disabled - Associated Keyboard: none - Text : - Max. Text Size : 4 - -Text button04text +Text button02pic Attributes ID : 13 Scope : local @@ -118,9 +88,9 @@ Text button04text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button04bri +Text button03pic Attributes ID : 14 Scope : local @@ -128,9 +98,19 @@ Text button04bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button05text +Text button04pic + Attributes + ID : 15 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button05pic Attributes ID : 16 Scope : local @@ -138,9 +118,9 @@ Text button05text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button05bri +Text button06pic Attributes ID : 17 Scope : local @@ -148,9 +128,19 @@ Text button05bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 0 -Text button06text +Text button07pic + Attributes + ID : 18 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 0 + +Text button08pic Attributes ID : 19 Scope : local @@ -158,9 +148,9 @@ Text button06text Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 22 + Max. Text Size : 0 -Text button06bri +Text button01text Attributes ID : 20 Scope : local @@ -168,9 +158,19 @@ Text button06bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button07text +Text button02text + Attributes + ID : 21 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button03text Attributes ID : 22 Scope : local @@ -180,7 +180,7 @@ Text button07text Text : Max. Text Size : 22 -Text button07bri +Text button04text Attributes ID : 23 Scope : local @@ -188,9 +188,19 @@ Text button07bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text button08text +Text button05text + Attributes + ID : 24 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 22 + +Text button06text Attributes ID : 25 Scope : local @@ -200,7 +210,7 @@ Text button08text Text : Max. Text Size : 22 -Text button08bri +Text button07text Attributes ID : 26 Scope : local @@ -208,17 +218,17 @@ Text button08bri Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 4 + Max. Text Size : 22 -Text bpage04_label +Text button08text Attributes ID : 27 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 100 + Max. Text Size : 22 Text button01icon Attributes @@ -300,75 +310,89 @@ Text button08icon Text : Max. Text Size : 10 -Text page_index +Text button01bri Attributes - ID : 46 + ID : 36 Scope : local Dragging : 0 - Send Component ID : on press and release + Send Component ID : disabled Associated Keyboard: none Text : - Max. Text Size : 20 + Max. Text Size : 4 -Picture button01pic +Text button02bri Attributes - ID : 3 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 37 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button02pic +Text button03bri Attributes - ID : 6 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 38 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button03pic +Text button04bri Attributes - ID : 9 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 39 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button04pic +Text button05bri Attributes - ID : 12 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 40 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button05pic +Text button06bri Attributes - ID : 15 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 41 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button06pic +Text button07bri Attributes - ID : 18 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 42 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 -Picture button07pic +Text button08bri Attributes - ID : 21 - Scope : local - Dragging : 0 - Send Component ID: disabled - -Picture button08pic - Attributes - ID : 24 - Scope : local - Dragging : 0 - Send Component ID: disabled + ID : 43 + Scope : local + Dragging : 0 + Send Component ID : disabled + Associated Keyboard: none + Text : + Max. Text Size : 4 Button button_back Attributes - ID : 45 + ID : 6 Scope : local Dragging : 0 Send Component ID: on press and release @@ -382,7 +406,7 @@ Button button_back Hotspot button01 Attributes - ID : 36 + ID : 44 Scope : local Dragging : 0 Send Component ID: on press and release @@ -418,7 +442,7 @@ Hotspot button01 Hotspot button02 Attributes - ID : 37 + ID : 45 Scope : local Dragging : 0 Send Component ID: on press and release @@ -454,7 +478,7 @@ Hotspot button02 Hotspot button03 Attributes - ID : 38 + ID : 46 Scope : local Dragging : 0 Send Component ID: on press and release @@ -490,7 +514,7 @@ Hotspot button03 Hotspot button04 Attributes - ID : 39 + ID : 47 Scope : local Dragging : 0 Send Component ID: on press and release @@ -526,7 +550,7 @@ Hotspot button04 Hotspot button05 Attributes - ID : 40 + ID : 48 Scope : local Dragging : 0 Send Component ID: on press and release @@ -562,7 +586,7 @@ Hotspot button05 Hotspot button06 Attributes - ID : 41 + ID : 49 Scope : local Dragging : 0 Send Component ID: on press and release @@ -598,7 +622,7 @@ Hotspot button06 Hotspot button07 Attributes - ID : 42 + ID : 50 Scope : local Dragging : 0 Send Component ID: on press and release @@ -634,7 +658,7 @@ Hotspot button07 Hotspot button08 Attributes - ID : 43 + ID : 51 Scope : local Dragging : 0 Send Component ID: on press and release @@ -682,14 +706,14 @@ Timer swipestore Timer click_timer Attributes - ID : 48 + ID : 8 Scope : local Period (ms): 800 Enabled : no Events Timer Event - lastclick.txt="{\"page\": \"buttonpage04\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" + lastclick.txt="{\"page\": \"buttonpage01\", \"event\": \"long_click\", \"component\": \""+click_comp.txt+"\"}" printh 92 prints "localevent",0 printh 00 @@ -700,7 +724,7 @@ Timer click_timer Timer wakeup_timer Attributes - ID : 50 + ID : 10 Scope : local Period (ms): 100 Enabled : yes diff --git a/docs/manuals_screenshots.md b/dev/manuals_screenshots.md similarity index 72% rename from docs/manuals_screenshots.md rename to dev/manuals_screenshots.md index 192d9ba..914b4a5 100644 --- a/docs/manuals_screenshots.md +++ b/dev/manuals_screenshots.md @@ -102,3 +102,42 @@ page settings ![Settings EU](pics/eu_settings.png) ![Settings US](pics/us_settings.png) + + +### Buttons pages (DRAFT) +``` +api=1 +page buttonpage01 +page_label.txt="Bedroom" +vis 255,1 +button01pic.picc=47 +button01text.picc=47 +button01icon.picc=47 +button01bri.picc=47 +button01text.txt="Ceiling\rlights" +button01text.pco=10597 +button01icon.txt="" +button01icon.pco=64704 +button01icon.font=10 +button01bri.txt="100%" +button01bri.pco=10597 +button02pic.picc=46 +button02text.picc=46 +button02icon.picc=46 +button02bri.picc=46 +button05pic.picc=47 +button05text.picc=47 +button05icon.picc=47 +button05bri.picc=47 +button05text.txt="Windows\rlights" +button05text.pco=10597 +button05icon.txt="" +button05icon.pco=64704 +button05icon.font=8 +button05bri.txt="100%" +button05bri.pco=10597 +button06pic.picc=46 +button06text.picc=46 +button06icon.picc=46 +button06bri.picc=46 +``` \ No newline at end of file diff --git a/advanced/hmi/nspanel_eu_code/power.page b/dev/ui/eu/draft/power.page similarity index 100% rename from advanced/hmi/nspanel_eu_code/power.page rename to dev/ui/eu/draft/power.page diff --git a/dev/ui/eu/pics/0.png b/dev/ui/eu/pics/0.png new file mode 100644 index 0000000..4ca2946 Binary files /dev/null and b/dev/ui/eu/pics/0.png differ diff --git a/dev/ui/eu/pics/35.png b/dev/ui/eu/pics/35.png new file mode 100644 index 0000000..a120be8 Binary files /dev/null and b/dev/ui/eu/pics/35.png differ diff --git a/dev/ui/eu/pics/36.png b/dev/ui/eu/pics/36.png new file mode 100644 index 0000000..3f56d7a Binary files /dev/null and b/dev/ui/eu/pics/36.png differ diff --git a/dev/ui/eu/pics/46.png b/dev/ui/eu/pics/46.png new file mode 100644 index 0000000..afd1ab5 Binary files /dev/null and b/dev/ui/eu/pics/46.png differ diff --git a/dev/ui/eu/pics/47.png b/dev/ui/eu/pics/47.png new file mode 100644 index 0000000..305dd14 Binary files /dev/null and b/dev/ui/eu/pics/47.png differ diff --git a/dev/ui/eu/pics/NSPanel - EU.pptx b/dev/ui/eu/pics/NSPanel - EU.pptx new file mode 100644 index 0000000..8663357 Binary files /dev/null and b/dev/ui/eu/pics/NSPanel - EU.pptx differ diff --git a/advanced/hmi/nspanel_eu_code/pics/SinglePixel.png b/dev/ui/eu/pics/SinglePixel.png similarity index 100% rename from advanced/hmi/nspanel_eu_code/pics/SinglePixel.png rename to dev/ui/eu/pics/SinglePixel.png diff --git a/advanced/hmi/CJK source files/fonts/ubuntu16_language.zi b/dev/ui/fonts/CJK/fonts/ubuntu16_language.zi similarity index 100% rename from advanced/hmi/CJK source files/fonts/ubuntu16_language.zi rename to dev/ui/fonts/CJK/fonts/ubuntu16_language.zi diff --git a/advanced/hmi/CJK source files/fonts/ubuntu18_language.zi b/dev/ui/fonts/CJK/fonts/ubuntu18_language.zi similarity index 100% rename from advanced/hmi/CJK source files/fonts/ubuntu18_language.zi rename to dev/ui/fonts/CJK/fonts/ubuntu18_language.zi diff --git a/advanced/hmi/CJK source files/fonts/ubuntu22_language.zi b/dev/ui/fonts/CJK/fonts/ubuntu22_language.zi similarity index 100% rename from advanced/hmi/CJK source files/fonts/ubuntu22_language.zi rename to dev/ui/fonts/CJK/fonts/ubuntu22_language.zi diff --git a/advanced/hmi/CJK source files/fonts/ubuntu26_language.zi b/dev/ui/fonts/CJK/fonts/ubuntu26_language.zi similarity index 100% rename from advanced/hmi/CJK source files/fonts/ubuntu26_language.zi rename to dev/ui/fonts/CJK/fonts/ubuntu26_language.zi diff --git a/dev/ui/us/pics/0.png b/dev/ui/us/pics/0.png new file mode 100644 index 0000000..beecd3c Binary files /dev/null and b/dev/ui/us/pics/0.png differ diff --git a/dev/ui/us/pics/35.png b/dev/ui/us/pics/35.png new file mode 100644 index 0000000..a120be8 Binary files /dev/null and b/dev/ui/us/pics/35.png differ diff --git a/dev/ui/us/pics/36.png b/dev/ui/us/pics/36.png new file mode 100644 index 0000000..3f56d7a Binary files /dev/null and b/dev/ui/us/pics/36.png differ diff --git a/dev/ui/us/pics/46.png b/dev/ui/us/pics/46.png new file mode 100644 index 0000000..fce62b8 Binary files /dev/null and b/dev/ui/us/pics/46.png differ diff --git a/dev/ui/us/pics/47.png b/dev/ui/us/pics/47.png new file mode 100644 index 0000000..f91ed36 Binary files /dev/null and b/dev/ui/us/pics/47.png differ diff --git a/dev/ui/us/pics/NSPanel - US.pptx b/dev/ui/us/pics/NSPanel - US.pptx new file mode 100644 index 0000000..a4d1fee Binary files /dev/null and b/dev/ui/us/pics/NSPanel - US.pptx differ diff --git a/advanced/hmi/nspanel_us_land_code/instructions.md b/dev/ui/us_land/instructions.md similarity index 100% rename from advanced/hmi/nspanel_us_land_code/instructions.md rename to dev/ui/us_land/instructions.md diff --git a/advanced/hmi/nspanel_us_land_code/pics/30_vertical.png b/dev/ui/us_land/pics/30_vertical.png similarity index 100% rename from advanced/hmi/nspanel_us_land_code/pics/30_vertical.png rename to dev/ui/us_land/pics/30_vertical.png diff --git a/advanced/hmi/nspanel_us_land_code/pics/31_vertical.png b/dev/ui/us_land/pics/31_vertical.png similarity index 100% rename from advanced/hmi/nspanel_us_land_code/pics/31_vertical.png rename to dev/ui/us_land/pics/31_vertical.png diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 2592e90..2c90551 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -1132,6 +1132,32 @@ blueprint: selector: *color-selector ##### Button pages ##### + ##### Button pages - Config ##### + ##### PLACEHOLDER ###################################################################### + placeholder_button_pages_config: + name: ' ' + description: '# ✅ BUTTON PAGES SETTINGS ✅' + default: ' ' + selector: *placeholder-selector + ##### PLACEHOLDER ###################################################################### + button_pages_icon_size: + name: Button icon size + description: > + *Button pages* + + *The size of the icons shown on the button pages* + default: '8' + selector: + select: + multiple: false + options: + - label: 24px + value: '7' + - label: 32px + value: '8' + - label: 48px + value: '10' + ##### Button page 01 ##### ##### PLACEHOLDER ###################################################################### placeholder07: @@ -7538,6 +7564,7 @@ action: button_page_index: '{{ (event_page[-2:] | int(-1)) - 1 }}' first_button: '{{ button_page_index * 8 }}' last_button: '{{ first_button + 8 }}' + button_pages_icon_size: !input button_pages_icon_size ##### BUTTON Page Labels ##### button_pages_labels: - label: !input button_page01_label @@ -7793,7 +7820,7 @@ action: then: - service: '{{ nextion.command.text_printf }}' data: - component: '{{ "bpage%02d_label" | format(button_page_index+1) }}' + component: page_label message: '{{ button_pages_labels[button_page_index].label }}' continue_on_error: true @@ -7831,21 +7858,11 @@ action: item_domain: '{{ repeat.item.entity.split(".")[0] | default("unknown") }}' current_entity_state: '{{ states(repeat.item.entity) | default("unavailable") }}' current_entity_state_available: '{{ current_entity_state not in ["unavailable"] }}' - btn_pic: > # Button pic (backgroun color): GRAY/WHITE + btn_state: > # Button state (on = true or off = false) {{ - nextion.pic.button.on - if (current_entity_state in ["on", "open", "opening", "home", "playing"] and item_domain not in ["automation"]) + (current_entity_state in ["on", "open", "opening", "home", "playing"] and item_domain not in ["automation"]) or (item_domain == "climate" and current_entity_state != "off") or (item_domain in ["button","input_button","scene","automation"] and trigger.id is match "current_state_entity") - else nextion.pic.button.off - }} - btn_bg: > # Background color for button's icon and texts - {{ - nextion.color.white - if (current_entity_state in ["on", "open", "opening", "home", "playing"] and item_domain not in ["automation"]) - or (item_domain == "climate" and current_entity_state != "off") - or (item_domain in ["button","input_button","scene","automation"] and trigger.id is match "current_state_entity") - else nextion.color.grey_dark }} btn_icon_font: > # Foreground color for icon {% if not current_entity_state_available %} @@ -7873,21 +7890,6 @@ action: {{ [ repeat.item.icon_color_rgb ] if is_number(repeat.item.icon_color_rgb) else repeat.item.icon_color_rgb }} {% else %}{{ nextion.color.red }} {% endif %} - btn_txt_font: > # Foreground color for label (text) - {% if not current_entity_state_available %}{{ nextion.color.white }} - {% elif current_entity_state in ["off", "closed", "closing"] or (item_domain == "person" and current_entity_state != "home") %} - {{ nextion.color.white }} - {% elif item_domain in ["button", "input_button", "scene", "automation"] and trigger.id is match "current_state_entity" %} - {{ nextion.color.grey_dark }} - {% elif item_domain in ["button", "input_button", "scene", "automation"] %} - {{ nextion.color.white }} - {% elif current_entity_state in ["on", "open", "opening", "home", "playing"] or (item_domain == "climate" and current_entity_state != "off") %} - {{ nextion.color.grey_dark }} - {% else %} - {{ nextion.color.white }} - {% endif %} - btn_bri_font: > # Foreground color for value (text) - {{ btn_txt_font }} btn_icon: > # Button's icon {% if not current_entity_state_available %}{{ nextion.icon.domain.unknown }} {% elif repeat.item.icon | length > 0 %} @@ -7937,15 +7939,12 @@ action: data: page: '{{ repeat.item.page }}' id: '{{ repeat.item.component }}' - pic: '{{ btn_pic }}' - bg: '{{ [ btn_bg ] if is_number(btn_bg) else btn_bg }}' + state: '{{ btn_state if btn_state else false }}' icon: '{{ btn_icon }}' icon_color: '{{ [ btn_icon_font ] if is_number(btn_icon_font) else btn_icon_font }}' - icon_font: 8 + icon_font: '{{ button_pages_icon_size if is_number(button_pages_icon_size) else 8 }}' bri: '{{ btn_bri_txt }}' - bri_color: '{{ [ btn_bri_font ] if is_number(btn_bri_font) else btn_bri_font }}' label: '{{ btn_label }}' - label_color: '{{ [ btn_txt_font ] if is_number(btn_txt_font) else btn_txt_font }}' continue_on_error: true - if: > {{ @@ -7959,15 +7958,12 @@ action: data: page: '{{ repeat.item.page }}' id: '{{ repeat.item.component }}' - pic: '{{ nextion.pic.button.off }}' - bg: '{{ nextion.color.grey_dark }}' + state: false icon: '{{ btn_icon }}' icon_color: '{{ nextion.color.grey_light }}' - icon_font: 8 + icon_font: '{{ button_pages_icon_size if is_number(button_pages_icon_size) else 8 }}' bri: '{{ btn_bri_txt }}' - bri_color: '{{ [ btn_bri_font ] if is_number(btn_bri_font) else btn_bri_font }}' label: '{{ btn_label }}' - label_color: '{{ nextion.color.white }}' continue_on_error: true ###### SHOW All component when page loading done ##### - if: '{{ not show_while_loading }}' diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 6611b8c..2cb2e45 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 591298c..6c8ca71 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 87ce22a..6c85ca6 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ