Skip to content

Commit 4fc05ee

Browse files
xe1gyqxe1gyq
committed
Update
Signed-off-by: ´Abraham <[email protected]>
1 parent 4f4a563 commit 4fc05ee

File tree

9 files changed

+23
-25
lines changed

9 files changed

+23
-25
lines changed

‎Hochob/Main.sh

+15-17
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ test -d $HOCHOB_SERVER_CONFIGURATION_PID || mkdir -p $HOCHOB_SERVER_CONFIGURATIO
1414

1515
export HOCHOB_SERVER_CONFIGURATION_DEMO=$HOCHOB_SERVER_CONFIGURATION/demo
1616
export HOCHOB_SERVER_CONFIGURATION_LANGUAGE=$HOCHOB_SERVER_CONFIGURATION/language
17-
export HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE=$HOCHOB_SERVER_CONFIGURATION/robotavailable
17+
export HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE=$HOCHOB_SERVER_CONFIGURATION/amikooavailable
1818

1919
# Hochob Server Root
2020

@@ -37,9 +37,9 @@ export HOCHOB_SERVER_SERVICES_KEYPAD=$HOCHOB_SERVER_SERVICES/Keypad/
3737
export HOCHOB_SERVER_SERVICES_KILL=$HOCHOB_SERVER_SERVICES/Kill/
3838
export HOCHOB_SERVER_SERVICES_LANGUAGE=$HOCHOB_SERVER_SERVICES/Language/
3939
export HOCHOB_SERVER_SERVICES_MEMORIES=$HOCHOB_SERVER_SERVICES/Memories/
40-
export HOCHOB_SERVER_SERVICES_ROBOT=$HOCHOB_SERVER_SERVICES/Robot/
41-
export HOCHOB_SERVER_SERVICES_ROBOT_REMOTE=$HOCHOB_SERVER_SERVICES_ROBOT/Remote/
42-
export HOCHOB_SERVER_SERVICES_ROBOT_VIRTUAL=$HOCHOB_SERVER_SERVICES_ROBOT/Virtual/
40+
export HOCHOB_SERVER_SERVICES_AMIKOO=$HOCHOB_SERVER_SERVICES/Amikoo/
41+
export HOCHOB_SERVER_SERVICES_AMIKOO_REMOTE=$HOCHOB_SERVER_SERVICES_AMIKOO/Amikoo/
42+
export HOCHOB_SERVER_SERVICES_AMIKOO_VIRTUAL=$HOCHOB_SERVER_SERVICES_AMIKOO/Amikoo/
4343
export HOCHOB_SERVER_SERVICES_SOUND=$HOCHOB_SERVER_SERVICES/Sound/
4444
export HOCHOB_SERVER_SERVICES_SOUND_PLAY=$HOCHOB_SERVER_SERVICES_SOUND/Play/
4545
export HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_SERVICES_SOUND/SpeechSynthetizer/
@@ -61,9 +61,9 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_KILL
6161
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_KEYPAD
6262
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_LANGUAGE
6363
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_MEMORIES
64-
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT
65-
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT_REMOTE
66-
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT_VIRTUAL
64+
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_AMIKOO
65+
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_AMIKOO_REMOTE
66+
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_AMIKOO_VIRTUAL
6767
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND
6868
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_PLAY
6969
export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER
@@ -82,16 +82,14 @@ export HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_AREA
8282
export HOCHOB_SERVER_MEDIA_AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA/CentralMayaLowlands
8383
export HOCHOB_SERVER_MEDIA_AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA/NorthernMayaLowlands
8484

85-
export HOCHOB_SERVER_MEDIA_CORPORATE=$HOCHOB_SERVER_MEDIA/Corporate/
86-
export HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE/Image/
87-
export HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE/Video/
88-
8985
export HOCHOB_SERVER_MEDIA_MEMORIES=$HOCHOB_SERVER_MEDIA/Memories/
9086
export HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_MEMORIES/Camera/
9187
export HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES/Drawing/
92-
export HOCHOB_SERVER_MEDIA_MEMORIES_ROBOT=$HOCHOB_SERVER_MEDIA_MEMORIES/Robot/
88+
export HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO=$HOCHOB_SERVER_MEDIA_MEMORIES/Amikoo/
9389
export HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES/Video/
9490

91+
export HOCHOB_SERVER_MEDIA_TRADITION=$HOCHOB_SERVER_MEDIA/Tradition/
92+
9593
export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/
9694

9795
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
106104
export AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA_CENTRAL_MAYA_LOWLANDS
107105
export AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA_NORTHERN_MAYA_LOWLANDS
108106

109-
export CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE
110-
export CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO
107+
export TRADITION=$HOCHOB_SERVER_MEDIA_TRADITION
111108

112109
export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA
113110
export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING
114-
export MEMORIES_ROBOT=$HOCHOB_SERVER_MEDIA_MEMORIES_ROBOT
111+
export MEMORIES_AMIKOO=$HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO
115112
export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO
116113

117114
export VISITORS=$HOCHOB_SERVER_MEDIA_VISITORS
@@ -201,13 +198,14 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS
201198

202199
# MQ Telemetry Transport
203200

204-
MQTT_SERVER_ADDRESS=10.215.56.158
201+
#MQTT_SERVER_ADDRESS=10.215.56.158
205202
#MQTT_SERVER_ADDRESS=iot.eclipse.org
203+
MQTT_SERVER_ADDRESS=127.0.0.1
206204
MQTT_SERVER_PORT=1883
207205

208206
# Amikoo
209207

210-
AMIKOO="lupe"
208+
AMIKOO="amikoo"
211209
AMIKOO_SAY=$AMIKOO/say
212210
AMIKOO_DECIR=$AMIKOO/decir
213211
AMIKOO_GCVISIONAPI=$AMIKOO/vision

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -x
88

99
#. ~/CodeLabs/Hochob/Main.sh
1010

11-
export ROBOTAVAILABLE_PID=$$
11+
export AMIKOOAVAILABLE_PID=$$
1212

1313
LOCAL_COMMAND="$1"
1414

@@ -24,9 +24,9 @@ LOCAL_COMMAND="$1"
2424

2525
if [ -z "$1" ]
2626
then
27-
cat $HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE
27+
cat $HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE
2828
else
29-
echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE
29+
echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE
3030
fi
3131

3232
# End of File

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -x
88

99
. ~/CodeLabs/Hochob/Main.sh
1010

11-
export ROBOTREMOTE_PID=$$
11+
export AMIKOOREMOTE_PID=$$
1212

1313
LOCAL_COMMAND="$1"
1414
LOCAL_MESSAGE=""

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

File renamed without changes.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -x
88

99
. ~/CodeLabs/Hochob/Main.sh
1010

11-
export ROBOTVIRTUAL_PID=$$
11+
export AMIKOOVIRTUAL_PID=$$
1212

1313
LOCAL_MESSAGE="$1"
1414

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

File renamed without changes.

‎Hochob/Sandbox/LupeRobot/Virtual/testing.sh renamed to ‎Hochob/Services/Amikoo/Virtual/AmikooVirtualTesting.sh

File renamed without changes.

‎Hochob/Services/Communications/MqttClient/Mosquitto.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ do
3636
i=`expr $i + 1`
3737
done
3838

39-
$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\""
39+
$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 2 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\""
4040

4141
exit 0
4242

‎Hochob/Services/Stream/Stream.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ exit 0
4444
# Sandbox
4545
# =============================================================================
4646

47-
LOCAL_ROBOTAVAILABLE=`RobotAvailable.sh`
48-
if [ "$LOCAL_ROBOTAVAILABLE" -eq "0" ]; then
47+
LOCAL_AMIKOO_AVAILABLE=`AmikooAvailable.sh`
48+
if [ "$LOCAL_AMIKOO_AVAILABLE" -eq "0" ]; then
4949
Espeak.sh on spanish "Nel"
5050
else
5151
Robot.sh $AMIKOO_SAY "Nel"

0 commit comments

Comments
 (0)