Skip to content

Commit d81633f

Browse files
committed
Update
1 parent efae42f commit d81633f

9 files changed

Lines changed: 20 additions & 20 deletions

File tree

Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ LOCAL_DEVICE="Eek'"
2727
LOCAL_INSTITUTION=`Name.sh`
2828
LOCAL_LANGUAGE=`Language.sh`
2929

30-
StreamAudio.sh $LOCAL_DEVICE spanish tt \
30+
StreamAudio.sh $LOCAL_DEVICE spanish robot \
3131
"
3232
Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \
3333
Pero donde puedes ver esto y mas? En el planeta marte! Veamos si puedes responder un par de preguntas.
@@ -47,7 +47,7 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \
4747
Tres, Sojourner. \
4848
Cuatro, Mariner 4.
4949
"
50-
SurveyMultipleChoice.sh $LOCAL_DEVICE spanish tt 4
50+
SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4
5151

5252
exit 0
5353

Hochob/Services/Events/Host.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@ LOCAL_GREETING_SPANISH[7]="Que onda,"
3535

3636
LOCAL_REMINDER_ENGLISH[0]="Remember we have today our"
3737
LOCAL_REMINDER_ENGLISH[1]="Do not forget about"
38-
LOCAL_REMINDER_ENGLISH[2]="Today is the big day!,"
38+
LOCAL_REMINDER_ENGLISH[2]="Today is the big day,"
3939
LOCAL_REMINDER_ENGLISH[3]="It is finally here!,"
40-
LOCAL_REMINDER_ENGLISH[4]="Finally with us!,"
41-
LOCAL_REMINDER_ENGLISH[5]="The big day has just arrived!,"
40+
LOCAL_REMINDER_ENGLISH[4]="Finally with us,"
41+
LOCAL_REMINDER_ENGLISH[5]="The big day has just arrived,"
4242
LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, the great event,"
4343

4444
LOCAL_REMINDER_SPANISH[0]="Recuerda hoy tenemos nuestro evento,"
4545
LOCAL_REMINDER_SPANISH[1]="No olvides acerca de"
46-
LOCAL_REMINDER_SPANISH[2]="Hoy es el gran día!,"
47-
LOCAL_REMINDER_SPANISH[3]="Finalmente aquí!,"
48-
LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros!,"
49-
LOCAL_REMINDER_SPANISH[5]="El gran día ha llegado!,"
46+
LOCAL_REMINDER_SPANISH[2]="Hoy es el gran día,"
47+
LOCAL_REMINDER_SPANISH[3]="Finalmente aquí,"
48+
LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros,"
49+
LOCAL_REMINDER_SPANISH[5]="El gran día ha llegado,"
5050
LOCAL_REMINDER_SPANISH[6]="No se diga mas, el gran evento,"
5151

5252
LOCAL_CLOSURE_ENGLISH="Check your email for more information."

Hochob/Services/Keypad/HandlerMultipleChoice.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def KeypadOptionMessage(mosq, obj, msg):
1717
if __name__ == '__main__':
1818

1919
mqttclient = paho.Client()
20-
mqttclient.connect("iot.eclipse.org", 1883, 60)
20+
mqttclient.connect("10.215.56.158", 1883, 60)
2121
mqttclient.subscribe("hochob/keypad/virtual", 0)
2222
mqttclient.on_message = KeypadOptionMessage
2323
mqttclient.loop_start()

Hochob/Services/Keypad/HandlerMultipleChoice.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LOCAL_IDENTIFICATION="$1"
2222
# Main
2323
# =============================================================================
2424

25-
if [ $# -eq 0 ]
25+
if [ $# -eq 1 ]
2626
then
2727
answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerMultipleChoice.py`
2828
echo $answer

Hochob/Services/Keypad/HandlerYesNo.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
def KeypadOptionMessage(mosq, obj, msg):
1010
global loop
1111
# msg.topic = msg.topic.replace("hochob/keypad/", "")
12-
# print msg.topic + ":" + msg.payload
12+
#print msg.topic + ":" + msg.payload
1313
msg.payload = msg.payload.translate(None, '"')
1414
print msg.payload
1515
loop = 0
1616

1717
if __name__ == '__main__':
1818

1919
mqttclient = paho.Client()
20-
mqttclient.connect("iot.eclipse.org", 1883, 60)
20+
mqttclient.connect("10.215.56.158", 1883, 60)
2121
mqttclient.subscribe("hochob/keypad/virtual", 0)
2222
mqttclient.on_message = KeypadOptionMessage
2323
mqttclient.loop_start()

Hochob/Services/Keypad/HandlerYesNo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ LOCAL_IDENTIFICATION="$1"
2222
# Main
2323
# =============================================================================
2424

25-
if [ $# -eq 0 ]
25+
if [ $# -eq 1 ]
2626
then
2727
answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerYesNo.py`
2828
echo $answer

Hochob/Services/Stream/StreamAudio.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ LOCAL_TEXT="$4"
2626
# =============================================================================
2727

2828
if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then
29-
SpeechSynthetizer.sh off espeak english "\"${LOCAL_TEXT}\""
29+
SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}"
3030
elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then
31-
SpeechSynthetizer.sh off voicerss english "\"${LOCAL_TEXT}\""
31+
SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}"
3232
elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then
33-
SpeechSynthetizer.sh off espeak spanish "$\"{LOCAL_TEXT}\""
33+
SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}"
3434
elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then
35-
SpeechSynthetizer.sh off voicerss spanish "\"${LOCAL_TEXT}\""
35+
SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}"
3636
fi
3737

3838
Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3

Hochob/Services/Survey/SurveyMultipleChoice.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ chooseWrongCorrect()
7070
# Main
7171
# =============================================================================
7272

73-
LOCAL_CHOICE=`HandlerMultipleChoice.sh`
73+
LOCAL_CHOICE=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerMultipleChoice.sh virtual`
7474

7575
if [ "$LOCAL_CHOICE" = "$LOCAL_CORRECT" ]; then
7676

Hochob/Services/Survey/SurveyYesNo.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ chooseWrongCorrect()
7070
# Main
7171
# =============================================================================
7272

73-
LOCAL_OPTION=`HandlerYesNo.sh`
73+
LOCAL_OPTION=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerYesNo.sh virtual`
7474

7575
if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then
7676

0 commit comments

Comments
 (0)