h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-19 14:14:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

Browse Source
This commit is contained in:
joBr99
2023-09-18 18:03:15 +02:00
parent 252339d36c 0803dd5214
commit 957cde8384
14 changed files with 69 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMI/US/landscape/n2t-out-visual/pageStartup.txt
View File

@@ -396,7 +396,7 @@ Text tVersion
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 52
Text : 53
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

2
HMI/US/landscape/n2t-out/pageStartup.txt
View File

@@ -145,7 +145,7 @@ Text tVersion
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 52
Text : 53
Max. Text Size : 10
Picture p0

1
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,4 +1,3 @@
+++ /dev/fd/62 2023-08-24 14:50:12.470366313 +0000
+I/n2t-out/Program.s.txt
++ HMI/US/portrait/n2t-out/Program.s.txt
+1 +12,11 @@

8
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -14,6 +14,10 @@ popupNotify
19 Component(s)
267 Line(s) of event code
172 Unique line(s) of event code
pageStartup
19 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
popupTimer
42 Component(s)
516 Line(s) of event code
@@ -42,10 +46,6 @@ cardLChart
33 Component(s)
402 Line(s) of event code
266 Unique line(s) of event code
pageStartup
19 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
popupShutter
25 Component(s)
402 Line(s) of event code

2
HMI/US/portrait/n2t-out-visual/pageStartup.txt
View File

@@ -389,7 +389,7 @@ Text tVersion
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 52
Text : 53
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

2
HMI/US/portrait/n2t-out/pageStartup.txt
View File

@@ -139,7 +139,7 @@ Text tVersion
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 52
Text : 53
Max. Text Size : 10
Picture p0

8
HMI/n2t-out-visual/nspanel_Stats.txt
View File

@@ -18,6 +18,10 @@ popupFan
27 Component(s)
355 Line(s) of event code
206 Unique line(s) of event code
pageStartup
20 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
popupShutter
25 Component(s)
402 Line(s) of event code
@@ -34,10 +38,6 @@ cardGrid
44 Component(s)
579 Line(s) of event code
330 Unique line(s) of event code
pageStartup
20 Component(s)
198 Line(s) of event code
137 Unique line(s) of event code
cardQR
34 Component(s)
410 Line(s) of event code

2
HMI/n2t-out-visual/pageStartup.txt
View File

@@ -396,7 +396,7 @@ Text tVersion
Horizontal Alignment: center
Vertical Alignment : center
Input Type : character
Text : 52
Text : 53
Max. Text Size : 10
Word wrap : disabled
Horizontal Spacing : 0

2
HMI/n2t-out/pageStartup.txt
View File

@@ -145,7 +145,7 @@ Text tVersion
Dragging : 0
Send Component ID : disabled
Associated Keyboard: none
Text : 52
Text : 53
Max. Text Size : 10
Picture p0

4
apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
View File

@@ -27,8 +27,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
controller = LuiController(cfg, mqttsend.send_mqtt_msg)
desired_tasmota_driver_version = 8
desired_display_firmware_version = 52
version = "v4.2.0"
desired_display_firmware_version = 53
version = "v4.3.1"
model = cfg.get("model")
if model == "us-l":

1
docs/entities.md
View File

@@ -18,6 +18,7 @@ key | optional | type | default | description
`status` | True | string | `None` | Only valid for navigate and service items, adds a entity to track state for the icon
`assumed_state` | True | string | `None` | Only for cover items, up, down and stop buttons are always shown
`action_name` | True | string | `None` | Only valid for script; Button label
`font` | True | string | `None` | Used to change the font for cardGrid Icons; valid values are (`small`, `medium-icon` and `medium`). Currently only supported for homeassistant entities and not for internal ones.
`effectList` | True | string | `None` | Only valid for light; for example `[Android, Aurora` (fav list for effects)

36
ioBroker/NsPanelTs.ts
View File

@@ -1,6 +1,6 @@
/*-----------------------------------------------------------------------
TypeScript v4.2.1.5 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
- abgestimmt auf TFT 52 / v4.2.1 / BerryDriver 8 / Tasmota 13.1.0
TypeScript v4.3.1.1 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
- abgestimmt auf TFT 53 / v4.3.1 / BerryDriver 8 / Tasmota 13.1.0
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen)
@@ -162,9 +162,11 @@ ReleaseNotes:
- 02.09.2023 - v4.2.1.4 Add dynamically USERICON to Alias info
- 04.09.2023 - v4.2.1.5 Fix Debug with 0_userdata.0...
- 04.09.2023 - v4.2.1.5 Add minValue/maxValue to Blinds
Next Release with TFT DEV (always implemented)
- 25.08.2023 - v4.3.0 Add Parameter fontSize (0-4) to cardGrid (with useValue)
- 15.09.2023 - v4.2.1.6 Fix ServicePage Dimmode 'next' -> 'home'
- 15.09.2023 - v4.2.1.6 Fix Log '.USERICON' to Debug.log
- 15.09.2023 - v4.2.1.6 Fix Link PowerIcon to Alias (Thermocard)
- 17.09.2023 - v4.3.1 Upgrade TFT 53 / 4.3.1
- 17.09.2023 - v4.3.1.1 Add Parameter fontSize (0-4) to cardGrid (with useValue)
***********************************************************************************************************
@@ -256,7 +258,7 @@ Erforderliche Adapter:
Upgrades in Konsole:
Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.2.1.tft
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.3.1.tft
---------------------------------------------------------------------------------------
*/
@@ -913,11 +915,11 @@ let NSPanel_Service = <PageEntities>
let NSPanel_ScreensaverDimmode = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Dimmode (1)',
'heading': 'Dimmode',
'useColor': true,
'subPage': true,
'parent': NSPanel_Screensaver,
'next': 'NSPanel_ScreensaverOther',
'home': 'NSPanel_Service',
'items': [
<PageItem>{ id: AliasPath + 'Dimmode.brightnessDay', name: 'Brightness Tag', icon: 'brightness-5', offColor: Menu, onColor: Menu, minValue: 5, maxValue: 10},
<PageItem>{ id: AliasPath + 'Dimmode.brightnessNight', name: 'Brightness Nacht', icon: 'brightness-4', offColor: Menu, onColor: Menu, minValue: 0, maxValue: 4},
@@ -1187,7 +1189,7 @@ export const config = <Config> {
// bottomScreensaverEntity 4
{
ScreensaverEntity: 'accuweather.0.Current.WindDirection',
ScreensaverEntityFactor: 0,
ScreensaverEntityFactor: 1,
ScreensaverEntityDecimalPlaces: 0,
ScreensaverEntityIconOn: 'windsock',
ScreensaverEntityIconOff: null,
@@ -1374,8 +1376,8 @@ export const config = <Config> {
const request = require('request');
//Desired Firmware
const tft_version: string = 'v4.2.1';
const desired_display_firmware_version = 52;
const tft_version: string = 'v4.3.1';
const desired_display_firmware_version = 53;
const berry_driver_version = 8;
const tasmotaOtaUrl: string = 'http://ota.tasmota.com/tasmota32/release/';
@@ -1412,7 +1414,7 @@ async function CheckDebugMode() {
console.log('Debugmodus aktiviert');
}else{
Debug = false;
console.log('Debugmodus deaktiviert')
console.log('Debugmodus deaktiviert');
}
} catch (err) {
@@ -1472,8 +1474,8 @@ async function CheckMQTTPorts() {
CheckMQTTPorts();
async function Init_Release() {
const FWVersion = [41,42,43,44,45,46,47,48,49,50,51,52,53]
const FWRelease = ['3.3.1','3.4.0','3.5.0','3.5.X','3.6.0','3.7.3','3.8.0','3.8.3','3.9.4','4.0.5','4.1.4','4.2.1','4.3.0']
const FWVersion = [41,42,43,44,45,46,47,48,49,50,51,52,53,54,55];
const FWRelease = ['3.3.1','3.4.0','3.5.0','3.5.X','3.6.0','3.7.3','3.8.0','3.8.3','3.9.4','4.0.5','4.1.4','4.2.1','4.3.1','4.4.0','4.5.0'];
try {
if (existsObject(NSPanel_Path + 'Display_Firmware.desiredVersion') == false) {
await createStateAsync(NSPanel_Path + 'Display_Firmware.desiredVersion', desired_display_firmware_version, { type: 'number' });
@@ -3817,7 +3819,7 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
if (existsState(pageItem.id + '.USERICON')) {
iconId = Icons.GetIcon(getState(pageItem.id + '.USERICON').val);
console.log(iconId);
if (Debug) console.log('iconid von ' + pageItem.id + '.USERICON: ' + getState(pageItem.id + '.USERICON').val);
RegisterEntityWatcher(pageItem.id + '.USERICON');
}
@@ -4255,9 +4257,9 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
case 'POWER':
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
if (getState(id + '.POWER').val) {
bt[i - 1] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POW' + '~';
bt[i - 1] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~';
} else {
bt[i - 1] = Icons.GetIcon('power-standby') + '~33840~1~' + 'POW' + '~';
bt[i - 1] = Icons.GetIcon('power-standby') + '~33840~1~' + 'POWER' + '~';
}
} else i--;
break;

32
ioBroker/NsPanelTs_without_Examples.ts
View File

@@ -1,6 +1,6 @@
/*-----------------------------------------------------------------------
TypeScript v4.2.1.5 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
- abgestimmt auf TFT 52 / v4.2.1 / BerryDriver 8 / Tasmota 13.1.0
TypeScript v4.3.1.1 zur Steuerung des SONOFF NSPanel mit dem ioBroker by @Armilar / @TT-Tom / @Sternmiere / @Britzelpuf / @ravenS0ne
- abgestimmt auf TFT 53 / v4.3.1 / BerryDriver 8 / Tasmota 13.1.0
@joBr99 Projekt: https://github.com/joBr99/nspanel-lovelace-ui/tree/main/ioBroker
NsPanelTs.ts (dieses TypeScript in ioBroker) Stable: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/NsPanelTs.ts
icon_mapping.ts: https://github.com/joBr99/nspanel-lovelace-ui/blob/main/ioBroker/icon_mapping.ts (TypeScript muss in global liegen)
@@ -162,9 +162,11 @@ ReleaseNotes:
- 02.09.2023 - v4.2.1.4 Add dynamically USERICON to Alias info
- 04.09.2023 - v4.2.1.5 Fix Debug with 0_userdata.0...
- 04.09.2023 - v4.2.1.5 Add minValue/maxValue to Blinds
Next Release with TFT DEV (always implemented)
- 25.08.2023 - v4.3.0 Add Parameter fontSize (0-4) to cardGrid (with useValue)
- 15.09.2023 - v4.2.1.6 Fix ServicePage Dimmode 'next' -> 'home'
- 15.09.2023 - v4.2.1.6 Fix Log '.USERICON' to Debug.log
- 15.09.2023 - v4.2.1.6 Fix Link PowerIcon to Alias (Thermocard)
- 17.09.2023 - v4.3.1 Upgrade TFT 53 / 4.3.1
- 17.09.2023 - v4.3.1.1 Add Parameter fontSize (0-4) to cardGrid (with useValue)
***********************************************************************************************************
@@ -256,7 +258,7 @@ Erforderliche Adapter:
Upgrades in Konsole:
Tasmota BerryDriver : Backlog UpdateDriverVersion https://raw.githubusercontent.com/joBr99/nspanel-lovelace-ui/main/tasmota/autoexec.be; Restart 1
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.2.1.tft
TFT EU STABLE Version : FlashNextion http://nspanel.pky.eu/lovelace-ui/github/nspanel-v4.3.1.tft
---------------------------------------------------------------------------------------
*/
@@ -517,11 +519,11 @@ let NSPanel_Service = <PageEntities>
let NSPanel_ScreensaverDimmode = <PageEntities>
{
'type': 'cardEntities',
'heading': 'Dimmode (1)',
'heading': 'Dimmode',
'useColor': true,
'subPage': true,
'parent': NSPanel_Screensaver,
'next': 'NSPanel_ScreensaverOther',
'home': 'NSPanel_Service',
'items': [
<PageItem>{ id: AliasPath + 'Dimmode.brightnessDay', name: 'Brightness Tag', icon: 'brightness-5', offColor: Menu, onColor: Menu, minValue: 5, maxValue: 10},
<PageItem>{ id: AliasPath + 'Dimmode.brightnessNight', name: 'Brightness Nacht', icon: 'brightness-4', offColor: Menu, onColor: Menu, minValue: 0, maxValue: 4},
@@ -859,8 +861,8 @@ export const config = <Config> {
const request = require('request');
//Desired Firmware
const tft_version: string = 'v4.2.1';
const desired_display_firmware_version = 52;
const tft_version: string = 'v4.3.1';
const desired_display_firmware_version = 53;
const berry_driver_version = 8;
const tasmotaOtaUrl: string = 'http://ota.tasmota.com/tasmota32/release/';
@@ -957,8 +959,8 @@ async function CheckMQTTPorts() {
CheckMQTTPorts();
async function Init_Release() {
const FWVersion = [41,42,43,44,45,46,47,48,49,50,51,52,53]
const FWRelease = ['3.3.1','3.4.0','3.5.0','3.5.X','3.6.0','3.7.3','3.8.0','3.8.3','3.9.4','4.0.5','4.1.4','4.2.1','4.3.0']
const FWVersion = [41,42,43,44,45,46,47,48,49,50,51,52,53,54,55];
const FWRelease = ['3.3.1','3.4.0','3.5.0','3.5.X','3.6.0','3.7.3','3.8.0','3.8.3','3.9.4','4.0.5','4.1.4','4.2.1','4.3.1','4.4.0','4.5.0'];
try {
if (existsObject(NSPanel_Path + 'Display_Firmware.desiredVersion') == false) {
await createStateAsync(NSPanel_Path + 'Display_Firmware.desiredVersion', desired_display_firmware_version, { type: 'number' });
@@ -3302,7 +3304,7 @@ function CreateEntity(pageItem: PageItem, placeId: number, useColors: boolean =
if (existsState(pageItem.id + '.USERICON')) {
iconId = Icons.GetIcon(getState(pageItem.id + '.USERICON').val);
console.log(iconId);
if (Debug) console.log('iconid von ' + pageItem.id + '.USERICON: ' + getState(pageItem.id + '.USERICON').val);
RegisterEntityWatcher(pageItem.id + '.USERICON');
}
@@ -3740,9 +3742,9 @@ function GenerateThermoPage(page: PageThermo): Payload[] {
case 'POWER':
if (existsState(id + '.POWER') && getState(id + '.POWER').val != null) {
if (getState(id + '.POWER').val) {
bt[i - 1] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POW' + '~';
bt[i - 1] = Icons.GetIcon('power-standby') + '~2016~1~' + 'POWER' + '~';
} else {
bt[i - 1] = Icons.GetIcon('power-standby') + '~33840~1~' + 'POW' + '~';
bt[i - 1] = Icons.GetIcon('power-standby') + '~33840~1~' + 'POWER' + '~';
}
} else i--;
break;

BIN
tasmota/nsp-lovelace-driver.tapp
View File

Binary file not shown.