From 42edad21c4c7ae12783c41811342f75923f4d4ec Mon Sep 17 00:00:00 2001 From: int5749 Date: Tue, 7 Jul 2020 22:46:06 +0200 Subject: [PATCH 1/7] Graphical Update Graphical Update for V 2.0 --- README.md | 504 ++++++++++-------- images/SC_BasicUI_Main.png | Bin 36942 -> 28963 bytes images/SC_BasicUI_MainStatus.png | Bin 3097 -> 0 bytes images/SC_BasicUI_Main_Battery.png | Bin 0 -> 4693 bytes images/SC_BasicUI_Main_DeviceInfo.png | Bin 0 -> 8528 bytes images/SC_BasicUI_Main_Orientation.png | Bin 0 -> 4092 bytes images/SC_BasicUI_Main_Settings.png | Bin 0 -> 9561 bytes images/SC_BasicUI_Main_Settings_MultiZone.png | Bin 0 -> 45386 bytes images/SC_BasicUI_Main_Settings_Schedule.png | Bin 0 -> 31193 bytes images/SC_BasicUI_Main_Statistic.png | Bin 0 -> 38492 bytes images/SC_BasicUI_Main_Status.png | Bin 0 -> 4877 bytes images/SC_BasicUI_MultiZone.png | Bin 35439 -> 0 bytes images/SC_BasicUI_Schedule.png | Bin 58445 -> 0 bytes openhab-conf/icons/landroid.png | Bin 5739 -> 0 bytes openhab-conf/icons/mlock.zip | Bin 0 -> 1423 bytes openhab-conf/icons/mower.png | Bin 0 -> 4597 bytes openhab-conf/icons/worx_landroid_logo.png | Bin 0 -> 48472 bytes openhab-conf/transform/minstohours.js | 54 ++ 18 files changed, 349 insertions(+), 209 deletions(-) delete mode 100644 images/SC_BasicUI_MainStatus.png create mode 100644 images/SC_BasicUI_Main_Battery.png create mode 100644 images/SC_BasicUI_Main_DeviceInfo.png create mode 100644 images/SC_BasicUI_Main_Orientation.png create mode 100644 images/SC_BasicUI_Main_Settings.png create mode 100644 images/SC_BasicUI_Main_Settings_MultiZone.png create mode 100644 images/SC_BasicUI_Main_Settings_Schedule.png create mode 100644 images/SC_BasicUI_Main_Statistic.png create mode 100644 images/SC_BasicUI_Main_Status.png delete mode 100644 images/SC_BasicUI_MultiZone.png delete mode 100644 images/SC_BasicUI_Schedule.png delete mode 100644 openhab-conf/icons/landroid.png create mode 100644 openhab-conf/icons/mlock.zip create mode 100644 openhab-conf/icons/mower.png create mode 100644 openhab-conf/icons/worx_landroid_logo.png create mode 100644 openhab-conf/transform/minstohours.js diff --git a/README.md b/README.md index c062b6b..d1ae3a8 100644 --- a/README.md +++ b/README.md @@ -244,11 +244,13 @@ As second step you are able to set time in percent and split in parts of 10 betw ## File based configuration - -

- -

- +You have to have Persistence Service configured in order to use statistic graphs +It's recommended to use rr4dj + +### .persist +``` +MowerBat_Chart*, MowerBatTemp_Chart*, MowerBatStatus_Chart* : strategy = everyMinute +``` ### .things ``` @@ -260,255 +262,317 @@ Bridge worxlandroid:worxlandroidBridge:MyWorxBridge "MyWorx Bridge" [ webapiUser ### .items ``` -String Shaun "Shaun [%s]" +Group All + Group Mower (All) + Group MowerBat (Mower) + Group MowerStatus (Mower) + Group MowerSchedule (Mower) + Group MowerBat_Chart (Mower) + Group MowerBatTemp_Chart (Mower) + Group MowerBatStatus_Chart (Mower) + + +/* Chart Parameters */ +Number Mower_Chart_Period "Chart Period" + +/* Landroid */ +String Shaun "Shaun [%s]" +Switch LandroidEnable "Mowing enabled" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#enable"} + +String LandroidAction "Action []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#action", autoupdate="false"} +String LandroidLastUpdate "Last Update [%1$td.%1$tm.%1$ty / %1$tH:%1$tM:%1$tS]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgCommon#lastUpdate"} +Switch LandroidPoll "Poll []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#poll"} +Switch LandroidLock "Lock" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#lock"} + +String LandroidMacAdress "MAC [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#macAdress"} +String LandroidSerialNumber "Serial Number [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgCommon#serialNumber"} +Number LandroidFirmware "Firmware [v%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#firmware"} +Switch LandroidOnline "Onlinestatus [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#online"} +Number LandroidId "Id []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgCommon#id"} +Number LandroidProductId "Id []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgCommon#id"} + +String LandroidLastUpdateOnlineStatus "Last Update Online Status [%1$td.%1$tm.%1$ty / %1$tH:%1$tM:%1$tS]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#lastUpdateOnlineStatus"} + +// Multizone +Switch LandroidMultizoneEnable "Multizone enable []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#enable"} +Number LandroidLastZone "push Start for Zone [MAP(landroid_zones.map):%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#lastZone"} -Switch LandroidEnable "Enable []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#enable"} -String LandroidAction "Action []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#action"} -String LandroidLastUpdate "Last Update Data [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgCommon#lastUpdate"} -Switch LandroidPoll "Poll []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#poll"} -Switch LandroidLock "Lock []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#lock"} +// Zone Meters +Number LandroidMeterZone1 "Meters Zone 1 [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#zone1Meter"} +Number LandroidMeterZone2 "Meters Zone 2 [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#zone2Meter"} +Number LandroidMeterZone3 "Meters Zone 3 [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#zone3Meter"} +Number LandroidMeterZone4 "Meters Zone 4 [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#zone4Meter"} -// -String LandroidSerialNumber "Serial Number [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgCommon#serialNumber"} -Number LandroidFirmware "Firmware [v%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#firmware"} -Switch LandroidOnline "Online [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#online"} -String LandroidLastUpdateOnlineStatus "Last Update Online Status [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:common#lastUpdateOnlineStatus"} +// Allocation Zones +Number LandroidAllocation0 "Alloction 0 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation0"} +Number LandroidAllocation1 "Alloction 1 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation1"} +Number LandroidAllocation2 "Alloction 2 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation2"} +Number LandroidAllocation3 "Alloction 3 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation3"} +Number LandroidAllocation4 "Alloction 4 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation4"} +Number LandroidAllocation5 "Alloction 5 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation5"} +Number LandroidAllocation6 "Alloction 6 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation6"} +Number LandroidAllocation7 "Alloction 7 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation7"} +Number LandroidAllocation8 "Alloction 8 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation8"} +Number LandroidAllocation9 "Alloction 9 []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgMultiZones#allocation9"} // Status -Number LandroidWifiQuality "Wifi Quality [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#wifiQuality"} -Switch LandroidBatteryCharging "Battery charging [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryCharging"} -Number LandroidStatusCode "Status Code [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#statusCode"} -String LandroidStatusDescription "Status [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#statusDescription"} -Number LandroidErrorCode "Error Code [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#errorCode"} -String LandroidErrorDescription "Error: [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#errorDescription"} -Number LandroidLastZone "Current Zone []" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#lastZone"} +Number LandroidWifiQuality "Wifi Quality [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#wifiQuality"} +Switch LandroidBatteryCharging "Battery charging [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryCharging"} +Number LandroidStatusCode "Status Code [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#statusCode"} +String LandroidStatusDescription "[%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#statusDescription"} +Number LandroidErrorCode "Error Code [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#errorCode"} +String LandroidErrorDescription "Error: [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datCommon#errorDescription"} + +// Move +Number LandroidPitch "Pitch [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datDmp#pitch"} +Number LandroidRoll "Roll [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datDmp#roll"} +Number LandroidYaw "Yaw [%s]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datDmp#yaw"} // Battery -Number LandroidBatteryLevel "Battery Level [%d %%]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryLevel"} -Number LandroidBatteryVoltage "Battery Voltage [%.2f V]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryVoltage"} -Number LandroidBatteryTemperature "Battery Temperature [%.1f °C]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryTemperature"} -Number LandroidBatteryChargeCycle "Battery ChargeCycle [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryChargeCycle"} +Number LandroidBatteryLevel "Battery Level [%d %%]" (MowerBat, MowerBatStatus_Chart) {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryLevel"} +Number LandroidBatteryVoltage "Battery Voltage [%.2f V]" (MowerBat, MowerBat_Chart) {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryVoltage"} +Number LandroidBatteryTemperature "Battery Temperature [%.1f °C]" (MowerBat, MowerBatTemp_Chart) {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryTemperature"} +Number LandroidBatteryChargeCycle "Battery ChargeCycle [%d]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:datBattery#batteryChargeCycle"} // Settings -Number LandroidRainDelay "Rain Delay [%d min]" {channel="worxlandroid:mower:MyWorxBridge:MySerialNumber:cfgCommon#rainDelay"} -Number LandroidScheduleTimeExtension "Schedule Time Extension [%d %%]"