changed PLUGIN_UACTIVITY_COMMANDHEADmaster

Renamed Run to uactivityRun
k_Setup to kNone
Extra Error check for #20-yaUSBir_watchdog
Changed activity script parameters from command line to enviromet (key and watchdog scripts also changed)
New info value "UACTIVITY_INFO_VIDEODIR"
Fixed missing Symbol Error from commit e01109af

1 files changed, 21 insertions, 13 deletions

diff --git a/script/uactivity/key/#10-syslog_demo b/script/uactivity/key/#10-syslog_demo
index ee794a7..767ee55 100755
--- a/script/uactivity/key/#10-syslog_demo
+++ b/script/uactivity/key/#10-syslog_demo
@@ -1,29 +1,37 @@
 #!/bin/sh
 
-case "${1}" in
+case "${UACTIVITY_ORGIN}" in
   startup)
     logger -t "uactivity [key/$(basename ${0})]" "key starting up"
-    logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${3}"
-    logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${4}"
-    logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
+    logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${UACTIVITY_CONFIGDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${UACTIVITY_CACHEDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "Key:               ${UACTIVITY_INFO_KEY}"
+    logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory:    ${UACTIVITY_INFO_VIDEODIR}"
   ;;
   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}"
+    logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${UACTIVITY_CONFIGDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${UACTIVITY_CACHEDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "Key:               ${UACTIVITY_INFO_KEY}"
+    logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory:    ${UACTIVITY_INFO_VIDEODIR}"
   ;;
   shutdown)
     logger -t "uactivity [key/$(basename ${0})]" "key shutting down"
-    logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${3}"
-    logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${4}"
-    logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
+    logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${UACTIVITY_CONFIGDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${UACTIVITY_CACHEDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "Key:               ${UACTIVITY_INFO_KEY}"
+    logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory:    ${UACTIVITY_INFO_VIDEODIR}"
   ;;
   running)
     logger -t "uactivity [key/$(basename ${0})]" "key \"${2}\" pressed"
-    logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${3}"
-    logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${4}"
-    logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${5}"
+    logger -t "uactivity [key/$(basename ${0})]" "ConfigDirectory:   ${UACTIVITY_CONFIGDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "CacheDirectory:    ${UACTIVITY_CACHEDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "ResourceDirectory: ${UACTIVITY_RESOURCEDIRECTORY}"
+    logger -t "uactivity [key/$(basename ${0})]" "Key:               ${UACTIVITY_INFO_KEY}"
+    logger -t "uactivity [key/$(basename ${0})]" "VideoDirectory:    ${UACTIVITY_INFO_VIDEODIR}"
   ;;
 esac