diff --git a/custom_configuration/nspanel_blank_code/Program.s.txt b/custom_configuration/nspanel_blank_code/Program.s.txt new file mode 100644 index 0000000..c007e76 --- /dev/null +++ b/custom_configuration/nspanel_blank_code/Program.s.txt @@ -0,0 +1,8 @@ +Program.s + //The following code is only run once when power on, and is generally used for global variable definition and power on initialization data + int sys0=0,sys1=0,sys2=0 //At present, the definition of global variable only supports 4-byte signed integer (int), and other types of global quantity declaration are not supported. If you want to use string type, you can use variable control in the page to implement + bauds=115200//Configure baudrate + dim=100//Configure backlight + recmod=0//Serial data parsing mode:0-Passive mode;1-Active mode + printh 00 00 00 ff ff ff 88 ff ff ff//Output power on information to serial port + page 0 //Power on start page 0 diff --git a/custom_configuration/nspanel_blank_code/page0.txt b/custom_configuration/nspanel_blank_code/page0.txt new file mode 100644 index 0000000..e6969bb --- /dev/null +++ b/custom_configuration/nspanel_blank_code/page0.txt @@ -0,0 +1,21 @@ +Page page0 + Attributes + ID : 0 + Scope : local + Dragging : 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID: disabled + +QR Code qr0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Send Component ID: disabled + Text : https://github.com/Blackymas/NSPanel_HA_Blueprint + Max. Text Size : 50 + diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index c44619e..6ec11ac 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -33,7 +33,7 @@ blueprint: 🎉 Roadmap can be found here: [Roadmap](https://github.com/Blackymas/NSPanel_HA_Blueprint/labels/roadmap) - ℹ️ Version: v.3.5_dev + ℹ️ Version: v4.0 dev source_url: https://github.com/Blackymas/NSPanel_HA_Blueprint/blob/main/nspanel_blueprint.yaml domain: automation @@ -3525,7 +3525,7 @@ trigger_variables: variables: ##### GENERAL ##### - blueprint_version: '3.5_dev' + blueprint_version: '4.0 dev' date_format_temp: !input 'date_format' #Avoid breaking change for existing users with legacy type format date_format: > diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index 8fee703..0798916 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -6,44 +6,17 @@ ##################################################################################################### -##### ADVANCED CONFIGURATION - activate only when you know what you do ############################## substitutions: +##### ADVANCED CONFIGURATION - Please change this on your ESPHome yaml when needed ##### verbose_log: "false" - # ## usage of secrets-file ## -> comment in ###### Change ME ###### - # device_name: "nspanel-name" # Wird im Blueprint benötigt! - # wifi_ssid: !secret nspanel_wifi_ssid # add in your esphome secrets file. - # wifi_password: !secret nspanel_wifi_password # add in your esphome secrets file. -> per default this is also used for ota_password and web_password wifi_hidden: "false" - # ota_password: !secret nspanel_ota_password # add in your esphome secrets file. - manual change in code required to activate - # web_password: !secret nspanel_web_password # add in your esphome secrets file. - manual change in code required to activate - # api_password: !secret nspanel_api_password # add in your esphome secrets file. - manual change in code required to activate - # nextion_update_url: !secret nspanel_update_url # add in your esphome secrets file. Example: "http://"HOME ASSISTANT IP":8123/local/nspanel/nspanel.tft" - - # ## static ip config ## - # ip: "10.0.0.7" - # gw: "10.0.0.138" - # subnet: "255.255.255.0" - # dns: "10.0.0.138" - # domain: ".local" - time_source: "homeassistant" # Either "homeassistant" or "sntp" are supported +##### END OF ADVANCED CONFIGURATION #################################################### -###### USE THIS ONLY FOR YOUR FIRST TFT UPLOAD -###### AND IF EXIT-REPARSE BUTTON FAILS -###### ONCE IT WORKED, REMOVE THESE LINES -###### https://github.com/esphome/esphome/pull/2956 -# external_components: -# - source: github://pr#2956 -# components: [nextion] -# refresh: 1h -################################################## - -##### if you rename this file to .nspanel_esphome.yaml then you can activate nested config -##### use the ADVANCED CONFIG-Section as device configuration -##### https://esphome.io/guides/configuration-types.html#yaml-insertion-operator -# <<: !include .nspanel_esphome.yaml - -##### END OF ADVANCED CONFIGURATION ############################################################## + ##### DON'T CHANGE THIS ##### + version: "4.0 dev" + addon_climate: "false" + ############################# ##### WIFI SETUP ##### wifi: @@ -53,14 +26,6 @@ wifi: password: ${wifi_password} hidden: ${wifi_hidden} power_save_mode: none - ##### advanced config - uncomment to use static IP-Config ##### - # manual_ip: - # static_ip: ${ip} - # gateway: ${gw} - # subnet: ${subnet} - # dns1: ${dns} - # domain: ${domain} - ##### Enable fallback hotspot (captive portal) in case wifi connection fails ap: ssid: "${device_name}" password: ${wifi_password} @@ -81,14 +46,10 @@ web_server: auth: username: admin password: ${wifi_password} - ##### advanced config - change to use web_password ##### - # password: ${web_password} ##### OTA PASSWORD ##### ota: password: ${wifi_password} - ##### advanced config - change to use ota_password ##### - # password: ${ota_password} safe_mode: true reboot_timeout: 3min num_attempts: 3 @@ -96,36 +57,28 @@ ota: ##### LOGGER ##### logger: baud_rate: 0 - #level: INFO - -##### CONFIGURE INTERNAL BUZZER ##### -output: - ##### BUZZER FOR PLAYING RINGTONES ##### - - platform: ledc - id: buzzer_out - pin: - number: 21 ##### ENABLE RINGTONE MUSIC SUPPORT ##### rtttl: id: buzzer output: buzzer_out +##### CONFIGURE INTERNAL BUZZER ##### +output: + ##### BUZZER FOR PLAYING RINGTONES ##### + - platform: ledc + id: buzzer_out + pin: + number: 21 + ##### UART FOR NEXTION DISPLAY ##### uart: + id: tf_uart tx_pin: 16 rx_pin: 17 baud_rate: 115200 - id: tf_uart - # debug: - # direction: BOTH - # dummy_receiver: false - # after: - # delimiter: "\n" - # sequence: - # - lambda: UARTDebug::log_string(direction, bytes); -### Keeps time display updated +##### Keeps time display updated ##### time: - platform: ${time_source} id: time_provider @@ -1203,7 +1156,7 @@ display: on_setup: then: - lambda: id(disp1).send_command_printf("page 8"); - - lambda: id(disp1).set_component_text_printf("boot.esph_version", "%s", "3.5_dev"); ### esphome-version ### + - lambda: id(disp1).set_component_text_printf("boot.esph_version", "%s", "${version}"); ### esphome-version ### - wait_until: api.connected - lambda: id(disp1).set_component_text_printf("boot.ip_addr", "%s", id(ip_address).state.c_str()); diff --git a/nspanel_esphome_addon_climate.yaml b/nspanel_esphome_addon_climate.yaml index 51c154b..facc0b3 100644 --- a/nspanel_esphome_addon_climate.yaml +++ b/nspanel_esphome_addon_climate.yaml @@ -16,6 +16,10 @@ substitutions: addon_climate_visual_max_temperature: "25" addon_climate_visual_temperature_step: "0.5" + ##### DON'T CHANGE THIS ##### + addon_climate: "true" + ############################# + climate: - platform: thermostat name: ${device_name} Thermostat @@ -277,7 +281,7 @@ script: id(disp1).set_component_font_color("climate.button07_icon", (id(thermostat_embedded).mode==climate::CLIMATE_MODE_OFF) ? 35921 : 48631); switch: - ##### PHYSICAL SWITCH 0 (Dummy) - Usend when embedded climate is disabled ##### + ##### PHYSICAL SWITCH 0 (Dummy) - Used when relay is not set ##### - name: ${device_name} Relay 0 (dummy) platform: template id: relay_0 diff --git a/nspanel_eu.HMI b/nspanel_eu.HMI index b971e15..25ff329 100644 Binary files a/nspanel_eu.HMI and b/nspanel_eu.HMI differ diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 989c0af..62df725 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_eu_code/boot.txt b/nspanel_eu_code/boot.txt index a9d3274..d693b92 100644 --- a/nspanel_eu_code/boot.txt +++ b/nspanel_eu_code/boot.txt @@ -107,7 +107,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 3.5_dev + Text : 4.0 dev Max. Text Size : 8 Text esph_version diff --git a/nspanel_us.HMI b/nspanel_us.HMI index 7540398..90e3dba 100644 Binary files a/nspanel_us.HMI and b/nspanel_us.HMI differ diff --git a/nspanel_us.tft b/nspanel_us.tft index 37a5a3d..90f6d1a 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_code/boot.txt b/nspanel_us_code/boot.txt index a9d3274..d693b92 100644 --- a/nspanel_us_code/boot.txt +++ b/nspanel_us_code/boot.txt @@ -107,7 +107,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 3.5_dev + Text : 4.0 dev Max. Text Size : 8 Text esph_version diff --git a/nspanel_us_land.HMI b/nspanel_us_land.HMI index 812c18f..c5607da 100644 Binary files a/nspanel_us_land.HMI and b/nspanel_us_land.HMI differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 35e42c8..7d7160c 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ diff --git a/nspanel_us_land_code/boot.txt b/nspanel_us_land_code/boot.txt index a9d3274..d693b92 100644 --- a/nspanel_us_land_code/boot.txt +++ b/nspanel_us_land_code/boot.txt @@ -107,7 +107,7 @@ Text tft_version Dragging : 0 Send Component ID : disabled Associated Keyboard: none - Text : 3.5_dev + Text : 4.0 dev Max. Text Size : 8 Text esph_version