diff --git a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax.properties b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax.properties index bdd1c8527..c12887795 100644 --- a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax.properties +++ b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/i18n/powermax.properties @@ -27,21 +27,6 @@ thing-type.config.powermax.x10.deviceNumber.description = The device number. thing-type.config.powermax.zone.zoneNumber.label = Zone Number thing-type.config.powermax.zone.zoneNumber.description = The zone number. -config.allowArming.label = Allow Arming -config.allowArming.description = Enable or disable arming the alarm system from openHAB. -config.allowDisarming.label = Allow Disarming -config.allowDisarming.description = Enable or disable disarming the alarm system from openHAB. -config.autoSyncTime.label = Sync Time -config.autoSyncTime.description = Automatic sync time at openHAB startup. -config.forceStandardMode.label = Force Standard Mode -config.forceStandardMode.description = Force the standard mode rather than trying using the Powerlink mode. -config.motionOffDelay.label = Motion Reset Delay -config.motionOffDelay.description = The delay in minutes to reset a motion detection. -config.panelType.label = Panel Type -config.panelType.description = Define the panel type. Only required when forcing the standard mode. -config.pinCode.label = PIN Code -config.pinCode.description = The PIN code to use for arming/disarming the alarm system from openHAB. Not required except when Powerlink mode cannot be used. - # channel types channel-type.powermax.active_alerts.label = Active Alarms and Alerts @@ -77,8 +62,10 @@ channel-type.powermax.inactive.label = Zone Inactive channel-type.powermax.inactive.description = Whether or not the zone's sensor is inactive (loss of supervision) channel-type.powermax.last_message_time.label = Last Message Time channel-type.powermax.last_message_time.description = Timestamp when the most recent message of any kind was received from the panel +channel-type.powermax.last_message_time.state.pattern = %1$tH:%1$tM channel-type.powermax.last_trip.label = Zone Last Trip channel-type.powermax.last_trip.description = Timestamp when the zone was last tripped +channel-type.powermax.last_trip.state.pattern = %1$tH:%1$tM channel-type.powermax.locked.label = Zone Armed (Contact) channel-type.powermax.locked.description = Whether or not the zone is armed (CLOSED when armed) channel-type.powermax.mode.label = System Mode @@ -116,8 +103,35 @@ channel-type.powermax.zone_last_message.label = Zone Last Status Message channel-type.powermax.zone_last_message.description = The most recent status message reported by the zone channel-type.powermax.zone_last_message_time.label = Zone Last Status Time channel-type.powermax.zone_last_message_time.description = Timestamp when Zone Last Status Message was received +channel-type.powermax.zone_last_message_time.state.pattern = %1$tH:%1$tM -# Thing status descriptions +# thing types config + +config.allowArming.label = Allow Arming +config.allowArming.description = Enable or disable arming the alarm system from openHAB. +config.allowDisarming.label = Allow Disarming +config.allowDisarming.description = Enable or disable disarming the alarm system from openHAB. +config.autoSyncTime.label = Sync Time +config.autoSyncTime.description = Automatic sync time at openHAB startup. +config.forceStandardMode.label = Force Standard Mode +config.forceStandardMode.description = Force the standard mode rather than trying using the Powerlink mode. +config.motionOffDelay.label = Motion Reset Delay +config.motionOffDelay.description = The delay in minutes to reset a motion detection. +config.panelType.label = Panel Type +config.panelType.description = Define the panel type. Only required when forcing the standard mode. +config.panelType.option.PowerMax = PowerMax +config.panelType.option.PowerMaxPlus = PowerMax+ +config.panelType.option.PowerMaxPro = PowerMax Pro +config.panelType.option.PowerMaxComplete = PowerMax Complete +config.panelType.option.PowerMaxProPart = PowerMax Pro Part +config.panelType.option.PowerMaxCompletePart = PowerMax Complete Part +config.panelType.option.PowerMaxExpress = PowerMax Express +config.panelType.option.PowerMaster10 = PowerMaster 10 +config.panelType.option.PowerMaster30 = PowerMaster 30 +config.pinCode.label = PIN Code +config.pinCode.description = The PIN code to use for arming/disarming the alarm system from openHAB. Not required except when Powerlink mode cannot be used. + +# thing status descriptions offline.config-error-mandatory-ip-port = ip and port settings must be defined in the thing configuration. offline.config-error-mandatory-serial-port = serialPort setting must be defined in the thing configuration. diff --git a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/thing/ip.xml b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/thing/ip.xml index 632dae71e..6d1dc4963 100644 --- a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/thing/ip.xml +++ b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/thing/ip.xml @@ -82,15 +82,15 @@ @text/config.panelType.description true - - - - - - - - - + + + + + + + + + PowerMaxPro true diff --git a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/thing/serial.xml b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/thing/serial.xml index e9b918992..1dc94b6c4 100644 --- a/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/thing/serial.xml +++ b/bundles/org.openhab.binding.powermax/src/main/resources/OH-INF/thing/serial.xml @@ -80,15 +80,15 @@ @text/config.panelType.description true - - - - - - - - - + + + + + + + + + PowerMaxPro true