Skip to content

Commit e95c1bb

Browse files
edwardtfnedwardtfn
committed
Update date and time format selectors (expanded)
1 parent 2074c27 commit e95c1bb

3 files changed

Lines changed: 130 additions & 38 deletions

File tree

‎esphome/nspanel_esphome_boot.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,14 @@ script:
150150
- id: boot_nextion
151151
mode: single
152152
then:
153+
- lambda: |-
154+
// Display settings
155+
boot_log->execute("Boot", "Sending display settings");
156+
disp1->send_command_printf("brightness=%i", int(display_brightness->state));
157+
disp1->send_command_printf("brightness_dim=%i", int(display_dim_brightness->state));
158+
disp1->send_command_printf("brightness_sleep=%i", int(display_sleep_brightness->state));
159+
disp1->send_command_printf("wakeup_page_id=%" PRIu8, get_page_id(wakeup_page_name->current_option()));
160+
boot_progress->execute(5);
153161
154162
- id: boot_preparation
155163
mode: single

‎esphome/nspanel_esphome_page_settings.yaml‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,6 @@ number:
4949
disp1->set_component_text_printf("dim_text", "%i%%", int(x));
5050
5151
script:
52-
- id: !extend boot_nextion
53-
then:
54-
- lambda: |-
55-
// Display settings
56-
boot_log->execute("Boot", "Sending display settings");
57-
disp1->send_command_printf("brightness=%i", int(display_brightness->state));
58-
disp1->set_component_value("settings.brightslider", int(display_brightness->state));
59-
feed_wdt_delay(${DELAY_DEFAULT});
60-
disp1->send_command_printf("brightness_dim=%i", int(display_dim_brightness->state));
61-
disp1->set_component_value("settings.dimslider", int(display_dim_brightness->state));
62-
feed_wdt_delay(${DELAY_DEFAULT});
63-
disp1->send_command_printf("brightness_sleep=%i", int(display_sleep_brightness->state));
64-
#if ESPHOME_VERSION_CODE >= VERSION_CODE(2025, 11, 0) // Code for ESPHome newer than v2025.11.0
65-
disp1->send_command_printf("wakeup_page_id=%" PRIu8, get_page_id(wakeup_page_name->current_option()));
66-
#else
67-
disp1->send_command_printf("wakeup_page_id=%" PRIu8, get_page_id(wakeup_page_name->state.c_str()));
68-
#endif
69-
boot_progress->execute(5);
70-
feed_wdt_delay(${DELAY_DEFAULT});
71-
7252
- id: !extend event_from_display
7353
then:
7454
- lambda: |-

‎nspanel_easy_blueprint.yaml‎

Lines changed: 122 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,26 +53,110 @@ blueprint:
5353
multiple: false
5454
custom_value: true
5555
options:
56-
- label: 'Weekday, DD MMMM YYYY (ex. "Friday, 22 March 2024")'
56+
# ── Full weekday · Full month name ──────────────────────────────────────
57+
- label: 'Weekday, DD MMMM YYYY (ex. "Friday, 22 March 2024")'
5758
value: '%A, %d %B %Y'
58-
- label: 'Weekday, DD.MM (ex. "Friday, 22.03")'
59-
value: '%A, %d.%m'
60-
- label: 'Weekday, DD.MM. (ex. "Friday, 22.03.")'
59+
- label: 'Weekday, DD MMMM (ex. "Friday, 22 March")'
60+
value: '%A, %d %B'
61+
# ── Full weekday · Short month name ─────────────────────────────────────
62+
- label: 'Weekday, DD MMM YYYY (ex. "Friday, 22 Mar 2024")'
63+
value: '%A, %d %b %Y'
64+
- label: 'Weekday, DD MMM (ex. "Friday, 22 Mar")'
65+
value: '%A, %d %b'
66+
- label: 'Weekday DD MMM (ex. "Friday 22 Mar")'
67+
value: '%A %d %b'
68+
# ── Full weekday · Numeric dot ───────────────────────────────────────────
69+
- label: 'Weekday, DD.MM.YYYY (ex. "Friday, 22.03.2024")'
70+
value: '%A, %d.%m.%Y'
71+
- label: 'Weekday, DD.MM. (ex. "Friday, 22.03.")'
6172
value: '%A, %d.%m.'
62-
- label: 'Weekday, DD/MM (ex. "Friday, 22/03")'
73+
- label: 'Weekday, DD.MM (ex. "Friday, 22.03")'
74+
value: '%A, %d.%m'
75+
- label: 'Weekday D.M. (ex. "Friday 22.3.")'
76+
value: '%A %-d.%-m.'
77+
- label: 'Weekday D.M (ex. "Friday 22.3")'
78+
value: '%A %-d.%-m'
79+
# ── Full weekday · Numeric slash ─────────────────────────────────────────
80+
- label: 'Weekday, DD/MM (ex. "Friday, 22/03")'
6381
value: '%A, %d/%m'
64-
- label: 'Weekday, D/M (ex. "Friday, 22/3")'
82+
- label: 'Weekday, D/M (ex. "Friday, 22/3")'
6583
value: '%A, %-d/%-m'
66-
- label: 'Weekday, M/D (ex. "Friday, 3/22")'
84+
- label: 'Weekday, M/D (ex. "Friday, 3/22")'
6785
value: '%A, %-m/%-d'
68-
- label: 'Weekday D.M (ex. "Friday 22.3")'
69-
value: '%A %-d.%-m'
70-
- label: 'Weekday D.M. (ex. "Friday 22.3.")'
71-
value: '%A %-d.%-m.'
72-
- label: Weekday D-M (ex. "Friday 22-3")
86+
# ── Full weekday · Numeric dash ──────────────────────────────────────────
87+
- label: 'Weekday D-M (ex. "Friday 22-3")'
7388
value: '%A %-d-%-m'
74-
- label: Weekday M-D (ex. "Friday 3-22")
89+
- label: 'Weekday M-D (ex. "Friday 3-22")'
7590
value: '%A %-m-%-d'
91+
# ── Short weekday · Full month name ─────────────────────────────────────
92+
- label: 'Wkd, DD MMMM YYYY (ex. "Fri, 22 March 2024")'
93+
value: '%a, %d %B %Y'
94+
- label: 'Wkd, DD MMMM (ex. "Fri, 22 March")'
95+
value: '%a, %d %B'
96+
# ── Short weekday · Short month name ────────────────────────────────────
97+
- label: 'Wkd, DD MMM YYYY (ex. "Fri, 22 Mar 2024")'
98+
value: '%a, %d %b %Y'
99+
- label: 'Wkd, DD MMM (ex. "Fri, 22 Mar")'
100+
value: '%a, %d %b'
101+
- label: 'Wkd DD MMM (ex. "Fri 22 Mar")'
102+
value: '%a %d %b'
103+
# ── Short weekday · Numeric dot ──────────────────────────────────────────
104+
- label: 'Wkd, DD.MM.YYYY (ex. "Fri, 22.03.2024")'
105+
value: '%a, %d.%m.%Y'
106+
- label: 'Wkd, DD.MM. (ex. "Fri, 22.03.")'
107+
value: '%a, %d.%m.'
108+
- label: 'Wkd, DD.MM (ex. "Fri, 22.03")'
109+
value: '%a, %d.%m'
110+
- label: 'Wkd D.M. (ex. "Fri 22.3.")'
111+
value: '%a %-d.%-m.'
112+
- label: 'Wkd D.M (ex. "Fri 22.3")'
113+
value: '%a %-d.%-m'
114+
# ── Short weekday · Numeric slash ────────────────────────────────────────
115+
- label: 'Wkd, DD/MM (ex. "Fri, 22/03")'
116+
value: '%a, %d/%m'
117+
- label: 'Wkd, D/M (ex. "Fri, 22/3")'
118+
value: '%a, %-d/%-m'
119+
- label: 'Wkd, M/D (ex. "Fri, 3/22")'
120+
value: '%a, %-m/%-d'
121+
# ── Short weekday · Numeric dash ─────────────────────────────────────────
122+
- label: 'Wkd D-M (ex. "Fri 22-3")'
123+
value: '%a %-d-%-m'
124+
- label: 'Wkd M-D (ex. "Fri 3-22")'
125+
value: '%a %-m-%-d'
126+
# ── No weekday · Full month name ─────────────────────────────────────────
127+
- label: 'DD MMMM YYYY (ex. "22 March 2024")'
128+
value: '%d %B %Y'
129+
- label: 'DD MMMM (ex. "22 March")'
130+
value: '%d %B'
131+
- label: 'MMMM DD, YYYY (ex. "March 22, 2024")'
132+
value: '%B %d, %Y'
133+
# ── No weekday · Numeric dot ──────────────────────────────────────────────
134+
- label: 'DD.MM.YYYY (ex. "22.03.2024")'
135+
value: '%d.%m.%Y'
136+
- label: 'DD.MM. (ex. "22.03.")'
137+
value: '%d.%m.'
138+
- label: 'DD.MM (ex. "22.03")'
139+
value: '%d.%m'
140+
- label: 'D.M (ex. "22.3")'
141+
value: '%-d.%-m'
142+
# ── No weekday · Numeric slash ────────────────────────────────────────────
143+
- label: 'DD/MM/YYYY (ex. "22/03/2024")'
144+
value: '%d/%m/%Y'
145+
- label: 'DD/MM (ex. "22/03")'
146+
value: '%d/%m'
147+
- label: 'D/M (ex. "22/3")'
148+
value: '%-d/%-m'
149+
- label: 'MM/DD/YYYY (ex. "03/22/2024")'
150+
value: '%m/%d/%Y'
151+
- label: 'M/D (ex. "3/22")'
152+
value: '%-m/%-d'
153+
# ── No weekday · Numeric dash ─────────────────────────────────────────────
154+
- label: 'DD-MM-YYYY (ex. "22-03-2024")'
155+
value: '%d-%m-%Y'
156+
- label: 'DD-MM (ex. "22-03")'
157+
value: '%d-%m'
158+
- label: 'YYYY-MM-DD (ex. "2024-03-22") [ISO 8601]'
159+
value: '%Y-%m-%d'
76160
time_format:
77161
name: Time Format
78162
description: "Choose how time should be displayed."
@@ -82,14 +166,34 @@ blueprint:
82166
multiple: false
83167
custom_value: true
84168
options:
85-
- label: 'HH:MM (ex. 08:30 and 20:30)'
169+
# ── 24h · Colon · Padded ─────────────────────────────────────────────────
170+
# Common in most of the world as the standard digital clock format
171+
- label: 'HH:MM (ex. "08:30" and "20:30")'
86172
value: '%H:%M'
87-
- label: 'H:MM AM/PM (ex. 8:30AM and 8:30PM)'
88-
value: '%-I:%M %p'
89-
- label: 'H:MM 24H (ex. 8:30 and 20:30)'
173+
# ── 24h · Colon · No leading zero ────────────────────────────────────────
174+
# Common in German-speaking countries (de, at, ch) and Netherlands (nl)
175+
- label: 'H:MM (ex. "8:30" and "20:30")'
90176
value: '%-H:%M'
91-
- label: 'H.MM 24H (ex. 8.30 and 20.30)'
177+
# ── 24h · Dot · Padded ───────────────────────────────────────────────────
178+
# Conventional in Finland (fi), historically Germany (de), Poland (pl), Netherlands (nl)
179+
- label: 'HH.MM (ex. "08.30" and "20.30")'
180+
value: '%H.%M'
181+
# ── 24h · Dot · No leading zero ──────────────────────────────────────────
182+
# German informal (de): "8.30 Uhr", Dutch informal (nl): "8.30 uur"
183+
- label: 'H.MM (ex. "8.30" and "20.30")'
92184
value: '%-H.%M'
185+
# ── 12h · Colon · Padded · AM/PM suffix ──────────────────────────────────
186+
# Standard in English-speaking countries (en, af, cy, ms, sw)
187+
- label: 'HH:MM AM/PM (ex. "08:30 AM" and "08:30 PM")'
188+
value: '%I:%M %p'
189+
# ── 12h · Colon · No leading zero · AM/PM suffix ─────────────────────────
190+
# Most common 12h informal usage (en, hi, bn, ar, ur, pa)
191+
- label: 'H:MM AM/PM (ex. "8:30 AM" and "8:30 PM")'
192+
value: '%-I:%M %p'
193+
# ── 12h · AM/PM prefix · Colon ───────────────────────────────────────────
194+
# Conventional in Korean (ko) and sometimes Chinese (zh-cn, zh-tw)
195+
- label: 'AM/PM H:MM (ex. "AM 8:30" and "PM 8:30")'
196+
value: '%p %-I:%M'
93197
temperature_unit:
94198
name: Temperature Unit
95199
description: "Select the temperature unit to display."

0 commit comments

Comments
 (0)