Update

Signed-off-by: ´Abraham <xe1gyq@gmail.com>

Author: xe1gyq

Hochob/Main.sh

@@ -14,7 +14,7 @@ test -d $HOCHOB_SERVER_CONFIGURATION_PID || mkdir -p $HOCHOB_SERVER_CONFIGURATIO
 
 export HOCHOB_SERVER_CONFIGURATION_DEMO=$HOCHOB_SERVER_CONFIGURATION/demo
 export HOCHOB_SERVER_CONFIGURATION_LANGUAGE=$HOCHOB_SERVER_CONFIGURATION/language
-export HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE=$HOCHOB_SERVER_CONFIGURATION/robotavailable
+export HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE=$HOCHOB_SERVER_CONFIGURATION/amikooavailable
 
 # Hochob Server Root
 
@@ -37,9 +37,9 @@ export HOCHOB_SERVER_SERVICES_KEYPAD=$HOCHOB_SERVER_SERVICES/Keypad/
 export HOCHOB_SERVER_SERVICES_KILL=$HOCHOB_SERVER_SERVICES/Kill/
 export HOCHOB_SERVER_SERVICES_LANGUAGE=$HOCHOB_SERVER_SERVICES/Language/
 export HOCHOB_SERVER_SERVICES_MEMORIES=$HOCHOB_SERVER_SERVICES/Memories/
-export HOCHOB_SERVER_SERVICES_ROBOT=$HOCHOB_SERVER_SERVICES/Robot/
-export HOCHOB_SERVER_SERVICES_ROBOT_REMOTE=$HOCHOB_SERVER_SERVICES_ROBOT/Remote/
-export HOCHOB_SERVER_SERVICES_ROBOT_VIRTUAL=$HOCHOB_SERVER_SERVICES_ROBOT/Virtual/
+export HOCHOB_SERVER_SERVICES_AMIKOO=$HOCHOB_SERVER_SERVICES/Amikoo/
+export HOCHOB_SERVER_SERVICES_AMIKOO_REMOTE=$HOCHOB_SERVER_SERVICES_AMIKOO/Amikoo/
+export HOCHOB_SERVER_SERVICES_AMIKOO_VIRTUAL=$HOCHOB_SERVER_SERVICES_AMIKOO/Amikoo/
 export HOCHOB_SERVER_SERVICES_SOUND=$HOCHOB_SERVER_SERVICES/Sound/
 export HOCHOB_SERVER_SERVICES_SOUND_PLAY=$HOCHOB_SERVER_SERVICES_SOUND/Play/
 export HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_SERVICES_SOUND/SpeechSynthetizer/
@@ -61,9 +61,9 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_KILL
 export PATH=$PATH:$HOCHOB_SERVER_SERVICES_KEYPAD
 export PATH=$PATH:$HOCHOB_SERVER_SERVICES_LANGUAGE
 export PATH=$PATH:$HOCHOB_SERVER_SERVICES_MEMORIES
-export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT
-export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT_REMOTE
-export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT_VIRTUAL
+export PATH=$PATH:$HOCHOB_SERVER_SERVICES_AMIKOO
+export PATH=$PATH:$HOCHOB_SERVER_SERVICES_AMIKOO_REMOTE
+export PATH=$PATH:$HOCHOB_SERVER_SERVICES_AMIKOO_VIRTUAL
 export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND
 export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_PLAY
 export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER
@@ -82,16 +82,14 @@ export HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_AREA
 export HOCHOB_SERVER_MEDIA_AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA/CentralMayaLowlands
 export HOCHOB_SERVER_MEDIA_AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA/NorthernMayaLowlands
 
-export HOCHOB_SERVER_MEDIA_CORPORATE=$HOCHOB_SERVER_MEDIA/Corporate/
-export HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE/Image/
-export HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE/Video/
-
 export HOCHOB_SERVER_MEDIA_MEMORIES=$HOCHOB_SERVER_MEDIA/Memories/
 export HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_MEMORIES/Camera/
 export HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES/Drawing/
-export HOCHOB_SERVER_MEDIA_MEMORIES_ROBOT=$HOCHOB_SERVER_MEDIA_MEMORIES/Robot/
+export HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO=$HOCHOB_SERVER_MEDIA_MEMORIES/Amikoo/
 export HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES/Video/
 
+export HOCHOB_SERVER_MEDIA_TRADITION=$HOCHOB_SERVER_MEDIA/Tradition/
+
 export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/
 
 export HOCHOB_SERVER_MEDIA_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/
@@ -106,12 +104,11 @@ export AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLA
 export AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA_CENTRAL_MAYA_LOWLANDS
 export AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA_NORTHERN_MAYA_LOWLANDS
 
-export CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE
-export CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO
+export TRADITION=$HOCHOB_SERVER_MEDIA_TRADITION
 
 export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA
 export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING
-export MEMORIES_ROBOT=$HOCHOB_SERVER_MEDIA_MEMORIES_ROBOT
+export MEMORIES_AMIKOO=$HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO
 export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO
 
 export VISITORS=$HOCHOB_SERVER_MEDIA_VISITORS
@@ -201,13 +198,14 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS
 
 # MQ Telemetry Transport 
 
-MQTT_SERVER_ADDRESS=10.215.56.158
+#MQTT_SERVER_ADDRESS=10.215.56.158
 #MQTT_SERVER_ADDRESS=iot.eclipse.org
+MQTT_SERVER_ADDRESS=127.0.0.1
 MQTT_SERVER_PORT=1883
 
 # Amikoo
 
-AMIKOO="lupe"
+AMIKOO="amikoo"
 AMIKOO_SAY=$AMIKOO/say
 AMIKOO_DECIR=$AMIKOO/decir
 AMIKOO_GCVISIONAPI=$AMIKOO/vision

Hochob/Services/Robot/RobotAvailable.sh renamed to Hochob/Services/Amikoo/AmikooAvailable.sh

@@ -8,7 +8,7 @@ set -x
 
 #. ~/CodeLabs/Hochob/Main.sh
 
-export ROBOTAVAILABLE_PID=$$
+export AMIKOOAVAILABLE_PID=$$
 
 LOCAL_COMMAND="$1"
 
@@ -24,9 +24,9 @@ LOCAL_COMMAND="$1"
 
 if [ -z "$1" ]
 then
-    cat $HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE
+    cat $HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE
 else
-    echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE
+    echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE
 fi
 
 # End of File

Hochob/Services/Robot/Remote/Robot.sh renamed to Hochob/Services/Amikoo/Remote/Amikoo.sh

@@ -8,7 +8,7 @@ set -x
 
 . ~/CodeLabs/Hochob/Main.sh
 
-export ROBOTREMOTE_PID=$$
+export AMIKOOREMOTE_PID=$$
 
 LOCAL_COMMAND="$1"
 LOCAL_MESSAGE=""

Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js renamed to Hochob/Services/Amikoo/Virtual/AmikooVirtual.js

@@ -8,7 +8,7 @@ set -x
 
 . ~/CodeLabs/Hochob/Main.sh
 
-export ROBOTVIRTUAL_PID=$$
+export AMIKOOVIRTUAL_PID=$$
 
 LOCAL_MESSAGE="$1"
 

Hochob/Services/Robot/Virtual/RobotVirtual.sh renamed to Hochob/Services/Amikoo/Virtual/AmikooVirtual.sh

@@ -36,7 +36,7 @@ do
     i=`expr $i + 1`
 done
 
-$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\""
+$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 2 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\""
 
 exit 0
 

Hochob/Sandbox/LupeRobot/Virtual/Amikoo.sh renamed to Hochob/Services/Amikoo/Virtual/AmikooVirtualDaemon.sh

@@ -44,8 +44,8 @@ exit 0
 # Sandbox
 # =============================================================================
 
-LOCAL_ROBOTAVAILABLE=`RobotAvailable.sh`
-if [ "$LOCAL_ROBOTAVAILABLE" -eq "0" ]; then
+LOCAL_AMIKOO_AVAILABLE=`AmikooAvailable.sh`
+if [ "$LOCAL_AMIKOO_AVAILABLE" -eq "0" ]; then
     Espeak.sh on spanish "Nel"
 else
     Robot.sh $AMIKOO_SAY "Nel"