added svdrp commands ACTIVE/ALIVE; updated/enhanced examples

4 files changed, 86 insertions, 3 deletions

diff --git a/script/uactivity/activity/-20-graphlcd_dbus2vdr b/script/uactivity/activity/-20-graphlcd_dbus2vdr
new file mode 100644
index 0000000..010dfbe
--- /dev/null
+++ b/script/uactivity/activity/-20-graphlcd_dbus2vdr
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# Do not use the graphlcd plugin commandline or udev to connect the display.
+# The display will be controlled only by this Script based upton user activity
+
+# Enter here the display specific values
+#
+DISPLAY="serdisp"
+SKIN="sdc_240x128"
+SWITCH_OFF_CMD="sdcmegtron_tool -b 0"
+SWITCH_ON_CMD=""
+#
+# END OF CONFIG SECTION
+
+
+
+switch_lcd(){
+  if [ "${1}" = "on" ]; then
+    # switch display on
+    [ -n "${SWITCH_ON_CMD}" ] && ${SWITCH_ON_CMD}
+    # connect the display to graphlcd
+    /usr/bin/dbus-send --system --type=method_call --dest=de.tvdr.vdr /Plugins/graphlcd de.tvdr.vdr.plugin.SVDRPCommand string:"connect" string:"${DISPLAY} ${SKIN}"
+  else
+    # disconnect the display from graphlcd
+      # " > /dev/null" because "--print-reply"
+      # --print-reply return not before graphlcd ist done with disconn
+    /usr/bin/dbus-send --system --type=method_call --print-reply --dest=de.tvdr.vdr /Plugins/graphlcd de.tvdr.vdr.plugin.SVDRPCommand string:"disconn" string:"${DISPLAY}" > /dev/null
+    # switch display off
+    [ -n "${SWITCH_OFF_CMD}" ] && ${SWITCH_OFF_CMD}
+  fi
+}
+
+
+
+case "${1}" in
+  startup)
+    true
+  ;;
+  started)
+    [ "${2}" = "true" ] && switch_lcd on
+  ;;
+  shutdown)
+    switch_lcd off
+  ;;
+  running)
+    if [ "${2}" = "true" ]; then
+      switch_lcd on
+    else
+      switch_lcd off
+    fi
+  ;;
+esac
+
+exit 0
diff --git a/script/uactivity/activity/-20-switch_tv b/script/uactivity/activity/-20-switch_tv
index 7059e1f..c9bbf57 100644
--- a/script/uactivity/activity/-20-switch_tv
+++ b/script/uactivity/activity/-20-switch_tv
@@ -1,11 +1,21 @@
 #!/bin/sh
 
 switch_tv(){
-  [ "${1}" = "on" ] && irsend -d /var/run/lirc/ya_usbir SEND_ONCE TV_REMOTE on
-  [ "${1}" = "off" ] && irsend -d /var/run/lirc/ya_usbir SEND_ONCE TV_REMOTE off
+  if [ "${1}" = "on" ]; then
+    # yaUSBir sometimes ignore the first command, send an existing dummy ir code
+    irsend -d /var/run/lirc/ya_usbir SEND_ONCE TV_DUMMY dummy
+    sleep 0.5
+    irsend -d /var/run/lirc/ya_usbir SEND_ONCE TV_REMOTE on
+  else
+    # yaUSBir sometimes ignore the first command, send an existing dummy ir code
+    irsend -d /var/run/lirc/ya_usbir SEND_ONCE TV_DUMMY dummy
+    sleep 0.5
+    irsend -d /var/run/lirc/ya_usbir SEND_ONCE TV_REMOTE off
+  fi
 }
 
 
+
 case "${1}" in
   startup)
     true
@@ -17,7 +27,11 @@ case "${1}" in
     switch_tv off
   ;;
   running)
-    [ "${2}" = "true" ] && switch_tv on || switch_tv off
+    if [ "${2}" = "true" ]; then
+      switch_tv on
+    else
+      switch_tv off
+    fi
   ;;
 esac
 
diff --git a/script/uactivity/key/-10-syslog_demo b/script/uactivity/key/-10-syslog_demo
index 337838d..ee794a7 100644
--- a/script/uactivity/key/-10-syslog_demo
+++ b/script/uactivity/key/-10-syslog_demo
@@ -7,6 +7,12 @@ case "${1}" in
     logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${4}"
     logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
   ;;
+  started)
+    logger -t "uactivity [key/$(basename ${0})]" "key started"
+    logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${3}"
+    logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${4}"
+    logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
+  ;;
   shutdown)
     logger -t "uactivity [key/$(basename ${0})]" "key shutting down"
     logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${3}"
diff --git a/script/uactivity/watchdog/-10-syslog_demo b/script/uactivity/watchdog/-10-syslog_demo
index af7249d..8ff6ca3 100644
--- a/script/uactivity/watchdog/-10-syslog_demo
+++ b/script/uactivity/watchdog/-10-syslog_demo
@@ -10,6 +10,15 @@ case "${1}" in
     logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory:    ${4}"
     logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}"
   ;;
+  started)
+    logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog started"
+    [ "${2}" = "true" ] \
+      && logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user active\"" \
+      || logger -t "uactivity [watchdog/$(basename ${0})]" "status \"user inactive\"" 
+    logger -t "uactivity [watchdog/$(basename ${0})]" "ConfigDirectory:   ${3}"
+    logger -t "uactivity [watchdog/$(basename ${0})]" "CacheDirectory:    ${4}"
+    logger -t "uactivity [watchdog/$(basename ${0})]" "ResourceDirectory: ${5}"
+  ;;
   shutdown)
     logger -t "uactivity [watchdog/$(basename ${0})]" "watchdog shutting down"
     [ "${2}" = "true" ] \