Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@akbooer
akbooer committed Jul 6, 2016
2 parents 8510b1a + 575ccfc commit e72c6e9
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 123 deletions.
154 changes: 33 additions & 121 deletions D_EventWatcher.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,14 +452,44 @@
"lang_tag": "geochart",
"text": "<a href='/port_3480/data_request?id=lr_EventWatcher&report=geochart' target='_blank'>Where am I?</a>"
},
"top": "3",
"top": "4",
"Display": {
"Top": 80,
"Left": 390,
"Width": 220,
"Height": 20
}
}
},
{
"ControlGroup":"5",
"ControlType": "variable",
"top": "4",
"left": "0",
"Display": {
"Service": "urn:akbooer-com:serviceId:EventWatcher1",
"Variable": "Version",
"Top": 120,
"Left": 390,
"Width": 75,
"Height": 20
}
},
{
"ControlGroup":"5",
"ControlType": "label",
"top": "5",
"left": "0",
"Label": {
"lang_tag": "donate",
"text": "<a href='https:\/\/www.justgiving.com\/DataYours\/' target='_blank'>DONATE to Cancer Research UK</a>"
},
"Display": {
"Top": 160,
"Left": 390,
"Width": 75,
"Height": 20
}
}
]
},
{
Expand All @@ -483,124 +513,6 @@
"Function": "device_notifications"
}
],
"eventList2": [
{
"id": 1,
"label": {
"lang_tag": "error_led_on_or_off",
"text": "Error LED is on or off"
},
"serviceId": "urn:akbooer-com:serviceId:EventWatcher1",
"norepeat": "1",
"argumentList": [
{
"id": 1,
"dataType": "boolean",
"defaultValue": "1",
"allowedValueList": [
{
"Off": "0",
"HumanFriendlyText": {
"lang_tag": "hft_error_led_off",
"text": "Error LED is off"
}
},
{
"On": "255",
"HumanFriendlyText": {
"lang_tag": "hft_error_led_on",
"text": "Error LED is on"
}
}
],
"name": "ErrorLED",
"comparisson": "=",
"prefix": {
"lang_tag": "on_or_off",
"text": "On or Off"
},
"suffix": {}
}
]
},
{
"id": 2,
"label": {
"lang_tag": "network_led_on_or_off",
"text": "Network LED is on or off"
},
"serviceId": "urn:akbooer-com:serviceId:EventWatcher1",
"norepeat": "1",
"argumentList": [
{
"id": 1,
"dataType": "boolean",
"defaultValue": "1",
"allowedValueList": [
{
"Off": "0",
"HumanFriendlyText": {
"lang_tag": "hft_network_led_off",
"text": "Network LED is off"
}
},
{
"On": "255",
"HumanFriendlyText": {
"lang_tag": "hft_network_led_on",
"text": "Network LED is on"
}
}
],
"name": "NetworkLED",
"comparisson": "=",
"prefix": {
"lang_tag": "on_or_off",
"text": "On or Off"
},
"suffix": {}
}
]
},
{
"id": 3,
"label": {
"lang_tag": "zwave_led_on_or_off",
"text": "Zwave LED is on or off"
},
"serviceId": "urn:akbooer-com:serviceId:EventWatcher1",
"norepeat": "1",
"argumentList": [
{
"id": 1,
"dataType": "boolean",
"defaultValue": "1",
"allowedValueList": [
{
"Off": "0",
"HumanFriendlyText": {
"lang_tag": "hft_zwave_led_off",
"text": "Zwave LED is off"
}
},
{
"On": "255",
"HumanFriendlyText": {
"lang_tag": "hft_zwave_led_on",
"text": "Zwave LED is on"
}
}
],
"name": "ZwaveLED",
"comparisson": "=",
"prefix": {
"lang_tag": "on_or_off",
"text": "On or Off"
},
"suffix": {}
}
]
}
],
"eventList2": [],
"DeviceType": "urn:akbooer-com:device:EventWatcher:1"
}
11 changes: 9 additions & 2 deletions L_EventWatcher.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
local ABOUT = {
NAME = "EventWatcher",
VERSION = "2016.07.01",
VERSION = "2016.07.06",
DESCRIPTION = "EventWatcher - variable and event reporting",
AUTHOR = "@akbooer",
COPYRIGHT = "(c) 2013-2016 AKBooer",
Expand All @@ -25,6 +25,7 @@ local ABOUT = {
-- see: http://forum.micasaverde.com/index.php/topic,37627.0.html
-- ALSO, extra door and HVAC watches (suggested by @johnes)
-- see: http://forum.micasaverde.com/index.php/topic,37514.0.html
-- 2016.07.06 modified version numbering (for AltAppStore)

--[[
UI5:
Expand Down Expand Up @@ -1296,7 +1297,13 @@ end

function init (lul_device)
log 'starting...'
set ('Version', ABOUT.VERSION: sub(3,-1)) -- save code version number in UI variable

do -- version number
local y,m,d = ABOUT.VERSION:match "(%d+)%D+(%d+)%D+(%d+)"
local version = ("%d.%d.%d"): format (y%2000,m,d)
set ('Version', version)
end

set ('LuupRestart', os.date("%d-%b-%Y %X", LuupRestart))

local uptime = ((getSystemFile "/proc/uptime"): match "%d+") or LuupRestart
Expand Down
Binary file removed icons/EventWatcher50.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_0.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_100.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_125.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_150.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_175.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_25.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_50.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_74.png
View file
Binary file not shown.
Binary file removed icons/EventWatcher_75.png
View file
Binary file not shown.

0 comments on commit e72c6e9

Please sign in to comment.