From e9ba80da4b84145ba712266bdcd1829125f1faf0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 12:33:35 -0500 Subject: [PATCH 0001/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 45 +++++++++++++++++++ .../HomeAssistant/configuration.yaml | 0 .../HomeAssistant/configuration.yaml.backup | 0 .../HomeAssistant/configuration.yaml.kali | 0 4 files changed, 45 insertions(+) create mode 100755 Hochob/Main.sh rename Hochob/{ => Services}/HomeAssistant/configuration.yaml (100%) rename Hochob/{ => Services}/HomeAssistant/configuration.yaml.backup (100%) rename Hochob/{ => Services}/HomeAssistant/configuration.yaml.kali (100%) diff --git a/Hochob/Main.sh b/Hochob/Main.sh new file mode 100755 index 00000000..3b354707 --- /dev/null +++ b/Hochob/Main.sh @@ -0,0 +1,45 @@ +#!/bin/sh + + +# ============================================================================= +# Variables +# ============================================================================= + +export HOCHOB_ROOT=`pwd` + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +handlerError.sh "test" +if [ $? -eq 1 ]; then + exit 1 +fi + +if [ "$LOCAL_OPERATION" = "create" ]; then + + LOCAL_TMPFS_SIZE=$2 + LOCAL_TMPFS_MOUNTPOINT=$3 + + test -d $LOCAL_TMPFS_MOUNTPOINT || mkdir -p $LOCAL_TMPFS_MOUNTPOINT + + mount -t tmpfs tmpfs $LOCAL_TMPFS_MOUNTPOINT -o size=${LOCAL_TMPFS_SIZE}M + mount + +elif [ "$LOCAL_OPERATION" = "remove" ]; then + + LOCAL_TMPFS_MOUNTPOINT=$2 + sync && wait + umount $LOCAL_TMPFS_MOUNTPOINT + rm -rf $LOCAL_TMPFS_MOUNTPOINT + mount + +fi + +# End of file diff --git a/Hochob/HomeAssistant/configuration.yaml b/Hochob/Services/HomeAssistant/configuration.yaml similarity index 100% rename from Hochob/HomeAssistant/configuration.yaml rename to Hochob/Services/HomeAssistant/configuration.yaml diff --git a/Hochob/HomeAssistant/configuration.yaml.backup b/Hochob/Services/HomeAssistant/configuration.yaml.backup similarity index 100% rename from Hochob/HomeAssistant/configuration.yaml.backup rename to Hochob/Services/HomeAssistant/configuration.yaml.backup diff --git a/Hochob/HomeAssistant/configuration.yaml.kali b/Hochob/Services/HomeAssistant/configuration.yaml.kali similarity index 100% rename from Hochob/HomeAssistant/configuration.yaml.kali rename to Hochob/Services/HomeAssistant/configuration.yaml.kali From ea7b2c79555d96993282d762078b4552fc289029 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 12:33:52 -0500 Subject: [PATCH 0002/1653] Update Signed-off-by: Abraham Arce --- .../HomeAssistant/configuration.yaml.backup | 867 ------------------ .../HomeAssistant/configuration.yaml.kali | 690 -------------- 2 files changed, 1557 deletions(-) delete mode 100644 Hochob/Services/HomeAssistant/configuration.yaml.backup delete mode 100644 Hochob/Services/HomeAssistant/configuration.yaml.kali diff --git a/Hochob/Services/HomeAssistant/configuration.yaml.backup b/Hochob/Services/HomeAssistant/configuration.yaml.backup deleted file mode 100644 index 4909968e..00000000 --- a/Hochob/Services/HomeAssistant/configuration.yaml.backup +++ /dev/null @@ -1,867 +0,0 @@ -homeassistant: - # Name of the location where Home Assistant is running - name: Home - # Location required to calculate the time the sun rises and sets - latitude: 20.6208618 - longitude: -103.4254426 - # Impacts weather/sunrise data (altitude above sea level in meters) - elevation: 1579 - # metric for Metric, imperial for Imperial - unit_system: metric - # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones - time_zone: America/Mexico_City - customize: - - # Home : Welcome - - script.audiosectionone: - friendly_name: Bienvenida y Protocolo de Seguridad - icon: mdi:audiobook - script.audiosectiontwo: - friendly_name: Antes del Video - icon: mdi:audiobook - switch.luperobot: - friendly_name: Video - icon: mdi:video - script.luperobot: - friendly_name: Lupe Robot - icon: mdi:human-greeting - script.audiosectionthree: - friendly_name: Despues del Video - icon: mdi:audiobook - - # Home : Photography - - script.photography: - friendly_name: Photography Record - icon: mdi:camera - - # Home : Technical Center - - script.help: - friendly_name: Visitor Center Needs Technical Help - icon: mdi:block-helper - - # Lupe Robot - - switch.leftup: - friendly_name: Up - icon: mdi:human-handsup - switch.leftdown: - friendly_name: Down - icon: mdi:human-handsup - switch.leftfold: - friendly_name: Fold - icon: mdi:gesture-swipe-up - switch.leftunfold: - friendly_name: Unfold - icon: mdi:gesture-swipe-up - - switch.rightup: - friendly_name: Up - icon: mdi:human-handsup - switch.rightdown: - friendly_name: Down - icon: mdi:human-handsup - switch.rightfold: - friendly_name: Fold - icon: mdi:gesture-swipe-up - switch.rightunfold: - friendly_name: Unfold - icon: mdi:gesture-swipe-up - - switch.moveleft: - friendly_name: Move Left - icon: mdi:arrow-left-thick - switch.moveright: - friendly_name: Move Right - icon: mdi:arrow-right-thick - switch.moveforward: - friendly_name: Move Forward - icon: mdi:arrow-up-thick - switch.movebackward: - friendly_name: Move Backward - icon: mdi:arrow-down-thick - switch.movestop: - friendly_name: Move Stop - icon: mdi:stop - - switch.headleft: - friendly_name: Head Left - icon: mdi:arrow-left-thick - switch.headright: - friendly_name: Head Right - icon: mdi:arrow-right-thick - switch.resetall: - friendly_name: Reset - icon: mdi:lock-reset - - switch.bienvenida: - friendly_name: Welcome Everyone! - icon: mdi:human-greeting - switch.agradece: - friendly_name: Thanks Everyone! - icon: mdi:music - switch.dance: - friendly_name: Let's Dance - icon: mdi:heart - switch.creador: - friendly_name: My Creator Speech - icon: mdi:face - switch.norte: - friendly_name: Mexican Northern - icon: mdi:function - - # Exhibits - - script.audiosectionfour: - friendly_name: Mayas - icon: mdi:audiobook - script.audiosectionfive: - friendly_name: Intel - icon: mdi:audiobook - script.audiosectionsix: - friendly_name: Intel GDC - icon: mdi:audiobook - script.audiosectionseven: - friendly_name: Microprocesador - icon: mdi:audiobook - script.audiosectioneight: - friendly_name: Labs y Fabs - icon: mdi:audiobook - - script.audiostopjuum: - friendly_name: Stop Juum - icon: mdi:stop - script.audiopausejuum: - friendly_name: Pause Juum - icon: mdi:pause - script.audioplayjuum: - friendly_name: Play Juum - icon: mdi:play - - # Laboratories - - script.audiosectionnine: - friendly_name: Amazon Echo - icon: mdi:audiobook - script.audiosectionten: - friendly_name: Binario - icon: mdi:audiobook - script.audiosectioneleven: - friendly_name: Piano Cosmico Parte I - icon: mdi:audiobook - script.audiosectiontwelve: - friendly_name: Piano Cosmico Parte II - icon: mdi:audiobook - - script.audiostopeek: - friendly_name: Stop Eek' - icon: mdi:stop - script.audiopauseeek: - friendly_name: Pause Eek' - icon: mdi:pause - script.audioplayeek: - friendly_name: Play Eek' - icon: mdi:play - - # Support : Lupe - - script.recognize: - friendly_name: Recognize Speech - icon: mdi:microphone - - # Support : Camera - - switch.camerapreview: - friendly_name: Camera Preview - icon: mdi:video - switch.cameravideolatest: - friendly_name: Camera Play Latest - icon: mdi:video - switch.cameravideoloop: - friendly_name: Camera Play All In A Loop - icon: mdi:video - - # Hidden - - media_player.main: - hidden: yes - automation.lupe_robot_text_to_speech: - hidden: yes - automation.lupe_robot_telegram: - hidden: yes - -# Show links to resources in log and frontend -#introduction: - -# Enables the frontend -frontend: - -# Enables configuration UI -config: - -http: - # Uncomment this to add a password (recommended!) - # api_password: PASSWORD - # Uncomment this if you are using SSL or running in Docker etc - # base_url: example.duckdns.org:8123 - -# Checks for available updates -updater: - -# Discover some devices automatically -# discovery: - -# Allows you to issue voice commands from the frontend in enabled browsers -conversation: - -# Enables support for tracking state changes over time. -history: - -# View all events in a logbook -logbook: - -# Track the sun -#sun: - -#group: !include groups.yaml - -# Text to speech -tts: - - platform: google - #cache: true - #cache_dir: /tmp/tts - #time_memory: 300 - #- platform: voicerss - # api_key: 'XXXXXXXX' - #- platform: amazon_polly - # aws_access_key_id: AWS_ACCESS_KEY_ID - # aws_secret_access_key: AWS_SECRET_ACCESS_KEY - # profile_name: AWS_PROFILE - # region_name: 'us-east-1' - -#sensor: -# - platform: plex -# - platform: yr - -mqtt: - broker: iot.eclipse.org - port: 1883 - client_id: hochob - keepalive: 60 - -script: - luperobot: - alias: Lupe Robot - sequence: - - alias: Bienvenidos a Intel Guadalajara - service: tts.google_say - data: - message: "Bienvenidos a Intel Guadalajara!" - language: 'es' - photography: - alias: Photography - sequence: - - alias: Photography Record - service: shell_command.photography - help: - alias: Help Needed - sequence: - - alias: Hocho Bot Notification - service: notify.telegram - data: - message: "Visitor Center needs technical help!" - - # Audio - - audiosectionone: - alias: Audio Section One - sequence: - - alias: Audio Section One - service: shell_command.audiosectionone - audiosectiontwo: - alias: Audio Section Two - sequence: - - alias: Audio Section Two - service: shell_command.audiosectiontwo - audiosectionthree: - alias: Audio Section Three - sequence: - - alias: Audio Section Three - service: shell_command.audiosectionthree - audiosectionfour: - alias: Audio Section Four - sequence: - - alias: Audio Section Four - service: shell_command.audiosectionfour - audiosectionfive: - alias: Audio Section Five - sequence: - - alias: Audio Section Five - service: shell_command.audiosectionfive - audiosectionsix: - alias: Audio Section Six - sequence: - - alias: Audio Section Six - service: shell_command.audiosectionsix - audiosectionseven: - alias: Audio Section Seven - sequence: - - alias: Audio Section Seven - service: shell_command.audiosectionseven - audiosectioneight: - alias: Audio Section Eight - sequence: - - alias: Audio Section Eight - service: shell_command.audiosectioneight - audiosectionnine: - alias: Audio Section Nine - sequence: - - alias: Audio Section Nine - service: shell_command.audiosectionnine - audiosectionten: - alias: Audio Section Ten - sequence: - - alias: Audio Section Ten - service: shell_command.audiosectionten - audiosectioneleven: - alias: Audio Section Eleven - sequence: - - alias: Audio Section Eleven - service: shell_command.audiosectioneleven - audiosectiontwelve: - alias: Audio Section Twelve - sequence: - - alias: Audio Section Twelve - service: shell_command.audiosectiontwelve - - audiostopjuum: - alias: Audio Stop Juum - sequence: - - alias: Audio Stop Juum - service: shell_command.audiostopjuum - audiopausejuum: - alias: Audio Pause Juum - sequence: - - alias: Audio Pause Juum - service: shell_command.audiopausejuum - audioplayjuum: - alias: Audio Play Juum - sequence: - - alias: Audio Play Juum - service: shell_command.audioplayjuum - - audiostopeek: - alias: Audio Stop Eek' - sequence: - - alias: Audio Stop Eek' - service: shell_command.audiostopeek - audiopauseeek: - alias: Audio Pause Eek' - sequence: - - alias: Audio Pause Eek' - service: shell_command.audiopauseeek - audioplayeek: - alias: Audio Play Eek' - sequence: - - alias: Audio Play Eek' - service: shell_command.audioplayeek - - # Lupe Center - - lupevirtualstart: - alias: Lupe Virtual Start - sequence: - - alias: Lupe Virtual Start - service: shell_command.lupevirtualstart - lupevirtualstop: - alias: Lupe Virtual Stop - sequence: - - alias: Lupe Virtual Stop - service: shell_command.lupevirtualstop - - lupepresentation: - alias: Lupe Presentation - sequence: - - alias: Presentation - service: shell_command.lupepresentation - luperecognize: - alias: Lupe Recognize - sequence: - - alias: Recognize Speech - service: shell_command.luperecognize - - lupe_arm_left: - alias: Lupe Arm Left - sequence: - - alias: Lupe Arm Up - service: tts.google_say - data: - message: "Lupe Moviendo Brazo Izquierdo" - language: 'es' - lupe_arm_right: - alias: Lupe Arm Right - sequence: - - alias: Lupe Arm Right - service: tts.google_say - data: - message: "Lupe Moviendo Brazo Derecho" - language: 'es' - lupe_dance: - alias: Lupe Dance - sequence: - - alias: Lupe Dance - service: tts.google_say - data: - message: "Lupe Bailando" - language: 'es' - -shell_command: - restart_ha: sudo systemctl restart home-assistant.service & - photography: python /home/hochob/CodeLabs/Hochob/Photography/selfie.py & - lupepresentation: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Presentation/Presentation.sh & - luperecognition: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Recognize/Recognize.sh & - audiosectionone: bash /home/hochob/CodeLabs/Hochob/Audio/Section01.sh & - audiosectiontwo: bash /home/hochob/CodeLabs/Hochob/Audio/Section02.sh & - audiosectionthree: bash /home/hochob/CodeLabs/Hochob/Audio/Section03.sh & - audiosectionfour: bash /home/hochob/CodeLabs/Hochob/Audio/Section04.sh & - audiosectionfive: bash /home/hochob/CodeLabs/Hochob/Audio/Section05.sh & - audiosectionsix: bash /home/hochob/CodeLabs/Hochob/Audio/Section06.sh & - audiosectionseven: bash /home/hochob/CodeLabs/Hochob/Audio/Section07.sh & - audiosectioneight: bash /home/hochob/CodeLabs/Hochob/Audio/Section08.sh & - audiosectionnine: bash /home/hochob/CodeLabs/Hochob/Audio/Section09.sh & - audiosectionten: bash /home/hochob/CodeLabs/Hochob/Audio/Section10.sh & - audiosectioneleven: bash /home/hochob/CodeLabs/Hochob/Audio/Section11.sh & - audiosectiontwelve: bash /home/hochob/CodeLabs/Hochob/Audio/Section12.sh & - audiostopjuum: bash /home/hochob/CodeLabs/Hochob/Audio/Stop.sh "Juum" & - audiopausejuum: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh "Juum" & - audioplayjuum: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh "Juum" & - audiostopeek: bash /home/hochob/CodeLabs/Hochob/Audio/Stop.sh "Eek'" & - audiopauseeek: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh "Eek'" & - audioplayeek: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh "Eek'" & - lupevirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeRobot/Virtual/amikoo.sh & - lupevirtualstop: pkill node & - -switch: - - platform: command_line - switches: - luperobot: - command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot1080p.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" - lupecomplete: - command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" - camerapreview: - command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0" - command_off: "pkill vlc" - cameravideolatest: - command_on: "cvlc --no-video-title-show --fullscreen /home/hochob/VideosSelfies/latest.mp4" - command_off: "pkill vlc" - cameravideoloop: - command_on: "cvlc --no-video-title-show --fullscreen --loop /home/hochob/VideosSelfies/*.mp4" - command_off: "pkill vlc" - -# Lupe Switches - -switch 00: - - platform: mqtt - name: leftup - command_topic: "lupe/leftup" - state_topic: "lupe/leftup/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 01: - - platform: mqtt - name: leftdown - command_topic: "lupe/leftdown" - state_topic: "lupe/leftdown/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 02: - - platform: mqtt - name: leftfold - command_topic: "lupe/leftfold" - state_topic: "lupe/leftfold/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 03: - - platform: mqtt - name: leftunfold - command_topic: "lupe/leftunfold" - state_topic: "lupe/leftunfold/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 04: - - platform: mqtt - name: rightup - command_topic: "lupe/rightup" - state_topic: "lupe/rightup/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 05: - - platform: mqtt - name: rightdown - command_topic: "lupe/rightdown" - state_topic: "lupe/rightdown/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 06: - - platform: mqtt - name: rightfold - command_topic: "lupe/rightfold" - state_topic: "lupe/rightfold/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 07: - - platform: mqtt - name: rightunfold - command_topic: "lupe/rightunfold" - state_topic: "lupe/rightunfold/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 08: - - platform: mqtt - name: moveleft - command_topic: "lupe/moveleft" - state_topic: "lupe/moveleft/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 09: - - platform: mqtt - name: moveright - command_topic: "lupe/moveright" - state_topic: "lupe/moveright/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 10: - - platform: mqtt - name: moveforward - command_topic: "lupe/moveforward" - state_topic: "lupe/moveforward/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 11: - - platform: mqtt - name: movebackward - command_topic: "lupe/movebackward" - state_topic: "lupe/movebackward/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 12: - - platform: mqtt - name: movestop - command_topic: "lupe/movestop" - state_topic: "lupe/movestop/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 13: - - platform: mqtt - name: headleft - command_topic: "lupe/headleft" - state_topic: "lupe/headleft/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 14: - - platform: mqtt - name: headright - command_topic: "lupe/headright" - state_topic: "lupe/headright/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 15: - - platform: mqtt - name: resetall - command_topic: "lupe/resetall" - state_topic: "lupe/resetall/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 16: - - platform: mqtt - name: bienvenida - command_topic: "lupe/bienvenida" - state_topic: "lupe/bienvenida/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 17: - - platform: mqtt - name: agradece - command_topic: "lupe/agradece" - state_topic: "lupe/agradece/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 18: - - platform: mqtt - name: dance - command_topic: "lupe/dance" - state_topic: "lupe/dance/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 19: - - platform: mqtt - name: creador - command_topic: "lupe/creador" - state_topic: "lupe/creador/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 20: - - platform: mqtt - name: norte - command_topic: "lupe/norte" - state_topic: "lupe/norte/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -media_player: - - platform: vlc - name: main -# - platform: cast -# host: Hochob -# name: Nursery -# - platform: plex -# - platform: cast -# - platform: kodi -# host: 127.0.0.1 -# user: kodi -# password: kodi - -notify: - - platform: telegram - name: telegram - api_key: 301796470:AAHTZ7pYgjqVwOAzBDIIHfGziMvCrIFc_oc - chat_id: 166426442 - -light: - platform: hue - -automation: -# - alias: Lupe Robot Text To Speech -# hide_entity: True -# trigger: -# platform: state -# entity_id: switch.lupe -# state: 'on' -# action: -# service: tts.google_say -# data: -# message: "Bienvenido Robot Lupe" -# language: 'es' - - alias: Lupe Robot Telegram - #hide_entity: True - trigger: - platform: state - entity_id: switch.lupe - state: 'on' - action: - service: notify.telegram - data: - message: "Lupe Robot Station has been activated" - -group: - - default_view: - view: yes - entities: - - group.welcome - - group.photography - - group.technical - - # Views - - lupeview: - view: yes - name: Lupe Robot - entities: - - group.lupearmleft - - group.lupearmright - - group.lupelegs - - group.lupehead - - group.lupeactivities - - group.lupediagnostics - - exhibitsview: - view: yes - name: Exhibits - entities: - - group.audiosectionlaboratories - - group.audiocontrolslaboratories - - laboratoriesview: - view: yes - name: Laboratories - entities: - - group.audiosectionlaboratories - - group.audiocontrolslaboratories - - supportview: - view: yes - name: Support - entities: - - group.lupevirtual - - group.lupeskills - - group.selfiessupport - - # Groups : Default - - welcome: - name: Welcome - entities: - - script.audiosectionone - - script.audiosectiontwo - - switch.luperobot - - script.luperobot - - script.audiosectionthree - #- switch.lupecomplete - - photography: - name: Photography - entities: - - script.photography - - technical: - name: Technical Center - entities: - - script.help - - # Groups : Lupe Robot - - lupeactivities: - name: Activities - entities: - - switch.bienvenida - - switch.agradece - - switch.dance - - switch.creador - - switch.norte - - lupearmleft: - name: Arm Left - entities: - - switch.leftup - - switch.leftdown - - switch.leftfold - - switch.leftunfold - - lupearmright: - name: Arm Right - entities: - - switch.rightup - - switch.rightdown - - switch.rightfold - - switch.rightunfold - - lupelegs: - name: Legs - entities: - - switch.moveleft - - switch.moveright - - switch.moveforward - - switch.movebackward - - switch.movestop - - lupehead: - name: Head - entities: - - switch.headleft - - switch.headright - - lupediagnostics: - name: Diagnostics - entities: - - switch.resetall - - # Groups : Exhibits - - audiosectionexhibits: - name: Section Exhibits - entities: - - script.audiosectionfour - - script.audiosectionfive - - script.audiosectionsix - - script.audiosectionseven - - script.audiosectioneight - - audiocontrolsexhibits: - name: Controls Exhibit - entities: - - script.audiostopjuum - - script.audiopausejuum - - script.audioplayjuum - - # Groups : Laboratories - - audiosectionlaboratories: - name: Section Laboratories - entities: - - script.audiosectionnine - - script.audiosectionten - - script.audiosectioneleven - - script.audiosectiontwelve - - audiocontrolslaboratories: - name: Controls Laboratories - entities: - - script.audiostopeek - - script.audiopauseeek - - script.audioplayeek - - # Groups : Support - - lupevirtual: - name: Lupe Virtual - entities: - - script.lupevirtualstart - - script.lupevirtualstop - - lupeskills: - name: Lupe Skills - entities: - - script.luperecognize - - camera: - name: Camera - entities: - - switch.camerapreview - - switch.cameravideolatest - - switch.cameravideoloop diff --git a/Hochob/Services/HomeAssistant/configuration.yaml.kali b/Hochob/Services/HomeAssistant/configuration.yaml.kali deleted file mode 100644 index 99483ba8..00000000 --- a/Hochob/Services/HomeAssistant/configuration.yaml.kali +++ /dev/null @@ -1,690 +0,0 @@ -homeassistant: - # Name of the location where Home Assistant is running - name: Home - # Location required to calculate the time the sun rises and sets - latitude: 20.6208618 - longitude: -103.4254426 - # Impacts weather/sunrise data (altitude above sea level in meters) - elevation: 1579 - # metric for Metric, imperial for Imperial - unit_system: metric - # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones - time_zone: America/Mexico_City - customize: - - # Welcome Center - - script.welcome: - friendly_name: Welcome to Intel Visitor Center - icon: mdi:human-greeting - script.selfie: - friendly_name: Selfie Record - icon: mdi:camera - switch.lupecomplete: - friendly_name: Lupe Robot Show Complete - icon: mdi:video - switch.lupe: - friendly_name: Lupe Robot Show - icon: mdi:video - - # Lupe Center - - script.recognize: - friendly_name: Recognize Speech - icon: mdi:microphone - - # Selfie Center - - switch.preview: - friendly_name: Selfie Preview - icon: mdi:video - switch.latest: - friendly_name: Selfie Play Latest - icon: mdi:video - switch.loop: - friendly_name: Selfie Play All In A Loop - icon: mdi:video - - # Lupe - - switch.leftup: - friendly_name: Up - icon: mdi:human-handsup - switch.leftdown: - friendly_name: Down - icon: mdi:human-handsup - switch.leftfold: - friendly_name: Fold - icon: mdi:gesture-swipe-up - switch.leftunfold: - friendly_name: Unfold - icon: mdi:gesture-swipe-up - - switch.rightup: - friendly_name: Up - icon: mdi:human-handsup - switch.rightdown: - friendly_name: Down - icon: mdi:human-handsup - switch.rightfold: - friendly_name: Fold - icon: mdi:gesture-swipe-up - switch.rightunfold: - friendly_name: Unfold - icon: mdi:gesture-swipe-up - - switch.moveleft: - friendly_name: Move Left - icon: mdi:arrow-left-thick - switch.moveright: - friendly_name: Move Right - icon: mdi:arrow-right-thick - switch.moveforward: - friendly_name: Move Forward - icon: mdi:arrow-up-thick - switch.movebackward: - friendly_name: Move Backward - icon: mdi:arrow-down-thick - switch.movestop: - friendly_name: Move Stop - icon: mdi:stop - - switch.headleft: - friendly_name: Head Left - icon: mdi:arrow-left-thick - switch.headright: - friendly_name: Head Right - icon: mdi:arrow-right-thick - switch.resetall: - friendly_name: Reset - icon: mdi:lock-reset - - switch.bienvenida: - friendly_name: Welcome Everyone! - icon: mdi:human-greeting - switch.agradece: - friendly_name: Thanks Everyone! - icon: mdi:music - switch.dance: - friendly_name: Let's Dance - icon: mdi:heart - switch.creador: - friendly_name: My Creator Speech - icon: mdi:face - switch.norte: - friendly_name: Mexican Northern - icon: mdi:function - - # Technical Center - - script.help: - friendly_name: Visitor Center Needs Technical Help - icon: mdi:block-helper - - # Audio - - script.audiosectionone: - friendly_name: Audio Cast Section One - icon: audiobook - script.audiosectiontwo: - friendly_name: Audio Cast Section Two - icon: audiobook - script.audiosectionthree: - friendly_name: Audio Cast Section Three - icon: audiobook - script.audiosectionfour: - friendly_name: Audio Cast Section Four - icon: audiobook - script.audiopause: - friendly_name: Pause - icon: pause - script.audioplay: - friendly_name: Play - icon: play - - # Hidden - - media_player.main: - hidden: yes - automation.lupe_robot_text_to_speech: - hidden: yes - automation.lupe_robot_telegram: - hidden: yes - -# Show links to resources in log and frontend -#introduction: - -# Enables the frontend -frontend: - -# Enables configuration UI -config: - -http: - # Uncomment this to add a password (recommended!) - # api_password: PASSWORD - # Uncomment this if you are using SSL or running in Docker etc - # base_url: example.duckdns.org:8123 - -# Checks for available updates -updater: - -# Discover some devices automatically -discovery: - -# Allows you to issue voice commands from the frontend in enabled browsers -conversation: - -# Enables support for tracking state changes over time. -history: - -# View all events in a logbook -logbook: - -# Track the sun -#sun: - -#group: !include groups.yaml - -# Text to speech -tts: - - platform: google - #cache: true - #cache_dir: /tmp/tts - #time_memory: 300 - #- platform: voicerss - # api_key: 'XXXXXXXX' - #- platform: amazon_polly - # aws_access_key_id: AWS_ACCESS_KEY_ID - # aws_secret_access_key: AWS_SECRET_ACCESS_KEY - # profile_name: AWS_PROFILE - # region_name: 'us-east-1' - -#sensor: -# - platform: plex -# - platform: yr - -mqtt: - broker: iot.eclipse.org - port: 1883 - client_id: hochob - keepalive: 60 - -script: - welcome: - alias: Welcome - sequence: - - alias: Welcome To Intel Visitor Center - service: tts.google_say - data: - message: "Bienvenidos a Intel Guadalajara! Buscaremos que Jesus Palomino les de la Bienvenida por medio de un Video" - language: 'es' - selfie: - alias: Selfie - sequence: - - alias: Selfie Record - service: shell_command.selfie - help: - alias: Help Needed - sequence: - - alias: Hocho Bot Notification - service: notify.telegram - data: - message: "Visitor Center needs technical help!" - - # Audio - - audiosectionone: - alias: Audio Section One - sequence: - - alias: Audio Section One - service: shell_command.audiosectionone - audiosectiontwo: - alias: Audio Section Two - sequence: - - alias: Audio Section Two - service: shell_command.audiosectiontwo - audiosectionthree: - alias: Audio Section Three - sequence: - - alias: Audio Section Three - service: shell_command.audiosectionthree - audiosectionfour: - alias: Audio Section Four - sequence: - - alias: Audio Section Four - service: shell_command.audiosectionfour - audiopause: - alias: Audio Pause - sequence: - - alias: Audio Pause - service: shell_command.audiopause - audioplay: - alias: Audio Play - sequence: - - alias: Audio Play - service: shell_command.audioplay - - # Lupe Center - - presentation: - alias: Presentation - sequence: - - alias: Presentation - service: shell_command.presentation - recognize: - alias: Recognize - sequence: - - alias: Recognize Speech - service: shell_command.recognize - lupe_arm_left: - alias: Lupe Arm Left - sequence: - - alias: Lupe Arm Up - service: tts.google_say - data: - message: "Lupe Moviendo Brazo Izquierdo" - language: 'es' - lupe_arm_right: - alias: Lupe Arm Right - sequence: - - alias: Lupe Arm Right - service: tts.google_say - data: - message: "Lupe Moviendo Brazo Derecho" - language: 'es' - lupe_dance: - alias: Lupe Dance - sequence: - - alias: Lupe Dance - service: tts.google_say - data: - message: "Lupe Bailando" - language: 'es' - -shell_command: - restart_ha: sudo systemctl restart home-assistant.service & - selfie: python /home/hochob/CodeLabs/Hochob/Photography/selfie.py & - presentation: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Presentation/Presentation.sh & - recognize: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Recognize/Recognize.sh & - audiosectionone: bash /home/hochob/CodeLabs/Hochob/Audio/SectionOne.sh & - audiosectiontwo: bash /home/hochob/CodeLabs/Hochob/Audio/SectionTwo.sh & - audiosectionthree: bash /home/hochob/CodeLabs/Hochob/Audio/SectionThree.sh & - audiosectionfour: bash /home/hochob/CodeLabs/Hochob/Audio/SectionFour.sh & - audiopause: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh & - audioplay: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh & - -switch: - - platform: command_line - switches: - lupecomplete: - command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" - lupe: - command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot1080p.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" - preview: - command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0" - command_off: "pkill vlc" - latest: - command_on: "cvlc --no-video-title-show --fullscreen /home/hochob/VideosSelfies/latest.mp4" - command_off: "pkill vlc" - loop: - command_on: "cvlc --no-video-title-show --fullscreen --loop /home/hochob/VideosSelfies/*.mp4" - command_off: "pkill vlc" - -# Lupe Switches - -switch 00: - - platform: mqtt - name: leftup - command_topic: "lupe/leftup" - state_topic: "lupe/leftup/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 01: - - platform: mqtt - name: leftdown - command_topic: "lupe/leftdown" - state_topic: "lupe/leftdown/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 02: - - platform: mqtt - name: leftfold - command_topic: "lupe/leftfold" - state_topic: "lupe/leftfold/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 03: - - platform: mqtt - name: leftunfold - command_topic: "lupe/leftunfold" - state_topic: "lupe/leftunfold/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 04: - - platform: mqtt - name: rightup - command_topic: "lupe/rightup" - state_topic: "lupe/rightup/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 05: - - platform: mqtt - name: rightdown - command_topic: "lupe/rightdown" - state_topic: "lupe/rightdown/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 06: - - platform: mqtt - name: rightfold - command_topic: "lupe/rightfold" - state_topic: "lupe/rightfold/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 07: - - platform: mqtt - name: rightunfold - command_topic: "lupe/rightunfold" - state_topic: "lupe/rightunfold/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 08: - - platform: mqtt - name: moveleft - command_topic: "lupe/moveleft" - state_topic: "lupe/moveleft/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 09: - - platform: mqtt - name: moveright - command_topic: "lupe/moveright" - state_topic: "lupe/moveright/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 10: - - platform: mqtt - name: moveforward - command_topic: "lupe/moveforward" - state_topic: "lupe/moveforward/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 11: - - platform: mqtt - name: movebackward - command_topic: "lupe/movebackward" - state_topic: "lupe/movebackward/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 12: - - platform: mqtt - name: movestop - command_topic: "lupe/movestop" - state_topic: "lupe/movestop/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 13: - - platform: mqtt - name: headleft - command_topic: "lupe/headleft" - state_topic: "lupe/headleft/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 14: - - platform: mqtt - name: headright - command_topic: "lupe/headright" - state_topic: "lupe/headright/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 15: - - platform: mqtt - name: resetall - command_topic: "lupe/resetall" - state_topic: "lupe/resetall/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 16: - - platform: mqtt - name: bienvenida - command_topic: "lupe/bienvenida" - state_topic: "lupe/bienvenida/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 17: - - platform: mqtt - name: agradece - command_topic: "lupe/agradece" - state_topic: "lupe/agradece/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 18: - - platform: mqtt - name: dance - command_topic: "lupe/dance" - state_topic: "lupe/dance/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 19: - - platform: mqtt - name: creador - command_topic: "lupe/creador" - state_topic: "lupe/creador/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -switch 20: - - platform: mqtt - name: norte - command_topic: "lupe/norte" - state_topic: "lupe/norte/state" - payload_on: 1 - payload_off: 0 - qos: 1 - -media_player: - - platform: vlc - name: main -# - platform: cast -# host: Hochob -# name: Nursery -# - platform: plex -# - platform: cast -# - platform: kodi -# host: 127.0.0.1 -# user: kodi -# password: kodi - -notify: - - platform: telegram - name: telegram - api_key: 301796470:AAHTZ7pYgjqVwOAzBDIIHfGziMvCrIFc_co - chat_id: 166426424 - -light: - platform: hue - -automation: -# - alias: Lupe Robot Text To Speech -# hide_entity: True -# trigger: -# platform: state -# entity_id: switch.lupe -# state: 'on' -# action: -# service: tts.google_say -# data: -# message: "Bienvenido Robot Lupe" -# language: 'es' - - alias: Lupe Robot Telegram - #hide_entity: True - trigger: - platform: state - entity_id: switch.lupe - state: 'on' - action: - service: notify.telegram - data: - message: "Lupe Robot Station has been activated" - -group: - - #default_view: - # view: yes - # entities: - # - group.technical - # - group.entrance - # - group.selfies - - # Views - - lupeview: - view: yes - name: Lupe Robot - entities: - - group.lupediagnostics - - group.lupearmleft - - group.lupearmright - - group.lupelegs - - group.lupehead - - group.lupeactivities - - group.lupeskills - - audioview: - view: yes - name: Audio - entities: - - group.audioexhibits - - group.audiocontrols - - # Groups - - technical: - name: Technical Center - entities: - - script.help - - entrance: - name: Welcome Center - entities: - - script.welcome - - switch.lupe - - switch.lupecomplete - - selfies: - name: Selfies Center - entities: - - script.selfie - - switch.preview - - switch.latest - - switch.loop - - # Lupe - - lupediagnostics: - name: Diagnostics - entities: - - switch.resetall - - lupearmleft: - name: Arm Left - entities: - - switch.leftup - - switch.leftdown - - switch.leftfold - - switch.leftunfold - - lupearmright: - name: Arm Right - entities: - - switch.rightup - - switch.rightdown - - switch.rightfold - - switch.rightunfold - - lupelegs: - name: Legs - entities: - - switch.moveleft - - switch.moveright - - switch.moveforward - - switch.movebackward - - switch.movestop - - lupehead: - name: Head - entities: - - switch.headleft - - switch.headright - - lupeactivities: - name: Activities - entities: - #- script.lupe_dance - - switch.bienvenida - - switch.agradece - - switch.dance - - switch.creador - - switch.norte - - lupeskills: - name: Skills - entities: - - script.presentation - - script.recognize - - audioexhibits: - name: Exhibits - entities: - - script.audiosectionone - - script.audiosectiontwo - - script.audiosectionthree - - script.audiosectionfour - - audiocontrols: - name: Controls - entities: - - script.audiopause - - script.audioplay From 21340cec84fc6e8a5698bf504adb3a5883bd4ec7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 12:35:02 -0500 Subject: [PATCH 0003/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/{ => Automation}/HomeAssistant/configuration.yaml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/{ => Automation}/HomeAssistant/configuration.yaml (100%) diff --git a/Hochob/Services/HomeAssistant/configuration.yaml b/Hochob/Services/Automation/HomeAssistant/configuration.yaml similarity index 100% rename from Hochob/Services/HomeAssistant/configuration.yaml rename to Hochob/Services/Automation/HomeAssistant/configuration.yaml From dff153bd080064c6475ab018b13f37fdfabda32a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 12:56:29 -0500 Subject: [PATCH 0004/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 2 +- Hochob/Services/Calendar/hbsGcaMain.py | 0 Hochob/Services/Camera/hbsFswMain.sh | 23 +++++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100755 Hochob/Services/Calendar/hbsGcaMain.py create mode 100755 Hochob/Services/Camera/hbsFswMain.sh diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 3b354707..591c93c9 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -42,4 +42,4 @@ elif [ "$LOCAL_OPERATION" = "remove" ]; then fi -# End of file +# End of File diff --git a/Hochob/Services/Calendar/hbsGcaMain.py b/Hochob/Services/Calendar/hbsGcaMain.py new file mode 100755 index 00000000..e69de29b diff --git a/Hochob/Services/Camera/hbsFswMain.sh b/Hochob/Services/Camera/hbsFswMain.sh new file mode 100755 index 00000000..d06c6624 --- /dev/null +++ b/Hochob/Services/Camera/hbsFswMain.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +# ============================================================================= +# Variables +# ============================================================================= + +export HBS_CAMERA=`pwd` +export HBS_CAMERA_BINARY=`fswebcam` +export HBS_CAMERA_ARGUMENTS=" -r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner " +export HBS_CAMERA_DIRECTORY= + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + + +# End of File From b30b6a2a93fad36ae4da52409fa407f5274d2129 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 14:39:26 -0500 Subject: [PATCH 0005/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 61 +++++++++++-------- .../{hbsFswMain.sh => hbsCameraFswMain.sh} | 14 +++-- 2 files changed, 44 insertions(+), 31 deletions(-) rename Hochob/Services/Camera/{hbsFswMain.sh => hbsCameraFswMain.sh} (55%) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 591c93c9..2ae529fe 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -1,45 +1,52 @@ #!/bin/sh - # ============================================================================= # Variables # ============================================================================= -export HOCHOB_ROOT=`pwd` - -# ============================================================================= -# Functions -# ============================================================================= +cd ~/CodeLabs/Hochob/ -# None +export HOCHOB_ROOT=`pwd` -# ============================================================================= -# Main -# ============================================================================= +export HOCHOB_MEDIA=/tmp/HochobMedia/ -handlerError.sh "test" -if [ $? -eq 1 ]; then - exit 1 -fi +export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ -if [ "$LOCAL_OPERATION" = "create" ]; then +export HOCHOB_MEDIA_AUDIO=$HOCHOB_MEDIA/Audio/ +export HOCHOB_MEDIA_AUDIO_LUPEROBOT=$HOCHOB_MEDIA_AUDIO/LupeRobot/ +export HOCHOB_MEDIA_AUDIO_VISITORSCENTER=$HOCHOB_MEDIA_AUDIO/VisitorsCenter/ - LOCAL_TMPFS_SIZE=$2 - LOCAL_TMPFS_MOUNTPOINT=$3 +export HOCHOB_MEDIA_IMAGE=$HOCHOB_MEDIA/Image/ +export HOCHOB_MEDIA_IMAGE_CORPORATE=$HOCHOB_MEDIA_IMAGE/Corporate/ +export HOCHOB_MEDIA_IMAGE_DRAWING=$HOCHOB_MEDIA_IMAGE/Drawing/ +export HOCHOB_MEDIA_IMAGE_VISITORSCENTER=$HOCHOB_MEDIA_IMAGE/VisitorsCenter/ +export HOCHOB_MEDIA_IMAGE_VISITORS=$HOCHOB_MEDIA_IMAGE/Visitors/ - test -d $LOCAL_TMPFS_MOUNTPOINT || mkdir -p $LOCAL_TMPFS_MOUNTPOINT +export HOCHOB_MEDIA_VIDEO=$HOCHOB_MEDIA/Video/ +export HOCHOB_MEDIA_VIDEO_CORPORATE=$HOCHOB_MEDIA_VIDEO/Corporate/ +export HOCHOB_MEDIA_VIDEO_VISITORSCENTER=$HOCHOB_MEDIA_VIDEO/VisitorsCenter/ +export HOCHOB_MEDIA_VIDEO_VISITORS=$HOCHOB_MEDIA_VIDEO/Visitors/ - mount -t tmpfs tmpfs $LOCAL_TMPFS_MOUNTPOINT -o size=${LOCAL_TMPFS_SIZE}M - mount +# ============================================================================= +# Functions +# ============================================================================= -elif [ "$LOCAL_OPERATION" = "remove" ]; then +# Institution Identification through Google Calendar API +# If Google Calendar entry is registered then naming convention is +# YYYYMMDD-HHMMSS-InstitutionName +# If not, naming convention is +# YYYYMMDD-HHMMSS - LOCAL_TMPFS_MOUNTPOINT=$2 - sync && wait - umount $LOCAL_TMPFS_MOUNTPOINT - rm -rf $LOCAL_TMPFS_MOUNTPOINT - mount +institutionIdentification () { + # If Institution Identification + # + # else + # + echo "Tbd" +} -fi +# ============================================================================= +# Main +# ============================================================================= # End of File diff --git a/Hochob/Services/Camera/hbsFswMain.sh b/Hochob/Services/Camera/hbsCameraFswMain.sh similarity index 55% rename from Hochob/Services/Camera/hbsFswMain.sh rename to Hochob/Services/Camera/hbsCameraFswMain.sh index d06c6624..7731508f 100755 --- a/Hochob/Services/Camera/hbsFswMain.sh +++ b/Hochob/Services/Camera/hbsCameraFswMain.sh @@ -1,13 +1,18 @@ #!/bin/sh +set -x + # ============================================================================= # Variables # ============================================================================= -export HBS_CAMERA=`pwd` -export HBS_CAMERA_BINARY=`fswebcam` -export HBS_CAMERA_ARGUMENTS=" -r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner " -export HBS_CAMERA_DIRECTORY= +. ~/CodeLabs/Hochob/Main.sh + +export HBS_CAMERA_FSW_ROOT=`pwd` +export HBS_CAMERA_FSW_BINARY=fswebcam +export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" +export HBS_CAMERA_FSW_DIRECTORY=$HOCHOB_MEDIA_IMAGE_VISITORS/Fsw/ +export HBS_CAMERA_FSW_IMAGE=$HBS_CAMERA_FSW_DIRECTORY/hbsFswImage.jpg # ============================================================================= # Functions @@ -19,5 +24,6 @@ export HBS_CAMERA_DIRECTORY= # Main # ============================================================================= +$HBS_CAMERA_FSW_BINARY $HBS_CAMERA_FSW_ARGUMENTS $HBS_CAMERA_FSW_IMAGE # End of File From be7a108bdf4e8b47f8b9248174ab6bd7b00c30c7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 14:40:27 -0500 Subject: [PATCH 0006/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Calendar/{hbsGcaMain.py => hbsCalendarGcaMain.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Calendar/{hbsGcaMain.py => hbsCalendarGcaMain.py} (100%) diff --git a/Hochob/Services/Calendar/hbsGcaMain.py b/Hochob/Services/Calendar/hbsCalendarGcaMain.py similarity index 100% rename from Hochob/Services/Calendar/hbsGcaMain.py rename to Hochob/Services/Calendar/hbsCalendarGcaMain.py From e08bdf5df5b2982ff231db6b3bf2e1fb68235b10 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 14:42:59 -0500 Subject: [PATCH 0007/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Communications/Mqtt/vernemq.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Hochob/Services/Communications/Mqtt/vernemq.conf diff --git a/Hochob/Services/Communications/Mqtt/vernemq.conf b/Hochob/Services/Communications/Mqtt/vernemq.conf new file mode 100644 index 00000000..e69de29b From 8891c188f8a4120c0d0eed0a13f7b51adcc67e3a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 15:54:57 -0500 Subject: [PATCH 0008/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 10 ++-- Hochob/Services/Camera/hbsCameraFswMain.sh | 4 +- .../SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 47 +++++++++++++++++++ 3 files changed, 56 insertions(+), 5 deletions(-) create mode 100755 Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 2ae529fe..5a4bfac4 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -12,15 +12,19 @@ export HOCHOB_MEDIA=/tmp/HochobMedia/ export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ -export HOCHOB_MEDIA_AUDIO=$HOCHOB_MEDIA/Audio/ -export HOCHOB_MEDIA_AUDIO_LUPEROBOT=$HOCHOB_MEDIA_AUDIO/LupeRobot/ -export HOCHOB_MEDIA_AUDIO_VISITORSCENTER=$HOCHOB_MEDIA_AUDIO/VisitorsCenter/ +export HOCHOB_MEDIA_SOUND=$HOCHOB_MEDIA/Sound/ +export HOCHOB_MEDIA_SOUND_ESPEAK=$HOCHOB_MEDIA_SOUND/Espeak/ +export HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_ESPEAK/hbsSoundSsEspeakOutput.wav +export HOCHOB_MEDIA_SOUND_LUPEROBOT=$HOCHOB_MEDIA_SOUND/LupeRobot/ +export HOCHOB_MEDIA_SOUND_VISITORSCENTER=$HOCHOB_MEDIA_SOUND/VisitorsCenter/ export HOCHOB_MEDIA_IMAGE=$HOCHOB_MEDIA/Image/ export HOCHOB_MEDIA_IMAGE_CORPORATE=$HOCHOB_MEDIA_IMAGE/Corporate/ export HOCHOB_MEDIA_IMAGE_DRAWING=$HOCHOB_MEDIA_IMAGE/Drawing/ export HOCHOB_MEDIA_IMAGE_VISITORSCENTER=$HOCHOB_MEDIA_IMAGE/VisitorsCenter/ export HOCHOB_MEDIA_IMAGE_VISITORS=$HOCHOB_MEDIA_IMAGE/Visitors/ +export HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM=$HOCHOB_MEDIA_IMAGE_VISITORS/Fswebcam/ +export HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM/hbsCameraFswImage.jpg export HOCHOB_MEDIA_VIDEO=$HOCHOB_MEDIA/Video/ export HOCHOB_MEDIA_VIDEO_CORPORATE=$HOCHOB_MEDIA_VIDEO/Corporate/ diff --git a/Hochob/Services/Camera/hbsCameraFswMain.sh b/Hochob/Services/Camera/hbsCameraFswMain.sh index 7731508f..3ec05abe 100755 --- a/Hochob/Services/Camera/hbsCameraFswMain.sh +++ b/Hochob/Services/Camera/hbsCameraFswMain.sh @@ -11,8 +11,8 @@ set -x export HBS_CAMERA_FSW_ROOT=`pwd` export HBS_CAMERA_FSW_BINARY=fswebcam export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" -export HBS_CAMERA_FSW_DIRECTORY=$HOCHOB_MEDIA_IMAGE_VISITORS/Fsw/ -export HBS_CAMERA_FSW_IMAGE=$HBS_CAMERA_FSW_DIRECTORY/hbsFswImage.jpg +export HBS_CAMERA_FSW_REPOSITORY=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM +export HBS_CAMERA_FSW_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM_IMAGE # ============================================================================= # Functions diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh new file mode 100755 index 00000000..2e28c8f4 --- /dev/null +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export HBS_SOUND_SS_ESPEAK_ROOT=`pwd` +export HBS_SOUND_SS_ESPEAK_BINARY=espeak +export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" +export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" +export HBS_SOUND_SS_ESPEAK_INPUT="No input has been provided" +export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_MEDIA_SOUND_ESPEAK +export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_PLAY="$1" +LOCAL_LANGUAGE="$2" +LOCAL_TEXT="$3" + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" +elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ves-la+m5" +fi + +export HBS_SOUND_SS_ESPEAK_INPUT="$LOCAL_TEXT" + +if [ "$LOCAL_PLAY" = "on" ]; then + $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_LANGUAGE $HBS_SOUND_SS_ESPEAK_ARGUMENTS "$HBS_SOUND_SS_ESPEAK_INPUT" | tee $HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT | aplay - +elif [ "$LOCAL_PLAY" = "off" ]; then + $HBS_SOUND_SS_ESPEAK_BINARY -w $HBS_SOUND_SS_ESPEAK_OUTPUT $HBS_SOUND_SS_ESPEAK_LANGUAGE "$HBS_SOUND_SS_ESPEAK_INPUT" +fi + +# End of File From 17de6dd2c93b0689ba4ef5811873ba01e3af386f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 20:36:11 -0500 Subject: [PATCH 0009/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 7 +++- .../Stream/Stream2Chromecast}/LICENSE | 0 .../Stream/Stream2Chromecast}/README.md | 0 .../Stream2Chromecast}/cc_device_finder.py | 0 .../Stream2Chromecast}/cc_media_controller.py | 0 .../Stream/Stream2Chromecast}/cc_message.py | 0 .../Stream2Chromecast/hbsStreamS2cMain.sh | 36 +++++++++++++++++++ .../Stream2Chromecast}/stream2chromecast.py | 0 8 files changed, 42 insertions(+), 1 deletion(-) rename Hochob/{Audio/stream2chromecast => Services/Stream/Stream2Chromecast}/LICENSE (100%) rename Hochob/{Audio/stream2chromecast => Services/Stream/Stream2Chromecast}/README.md (100%) rename Hochob/{Audio/stream2chromecast => Services/Stream/Stream2Chromecast}/cc_device_finder.py (100%) rename Hochob/{Audio/stream2chromecast => Services/Stream/Stream2Chromecast}/cc_media_controller.py (100%) rename Hochob/{Audio/stream2chromecast => Services/Stream/Stream2Chromecast}/cc_message.py (100%) create mode 100755 Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh rename Hochob/{Audio/stream2chromecast => Services/Stream/Stream2Chromecast}/stream2chromecast.py (100%) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 5a4bfac4..41e3f02d 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -5,9 +5,14 @@ # ============================================================================= cd ~/CodeLabs/Hochob/ - export HOCHOB_ROOT=`pwd` +# Hochob Paths + +export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_ROOT/Services/Stream/Stream2Chromecast/ + +# Hochob Media + export HOCHOB_MEDIA=/tmp/HochobMedia/ export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ diff --git a/Hochob/Audio/stream2chromecast/LICENSE b/Hochob/Services/Stream/Stream2Chromecast/LICENSE similarity index 100% rename from Hochob/Audio/stream2chromecast/LICENSE rename to Hochob/Services/Stream/Stream2Chromecast/LICENSE diff --git a/Hochob/Audio/stream2chromecast/README.md b/Hochob/Services/Stream/Stream2Chromecast/README.md similarity index 100% rename from Hochob/Audio/stream2chromecast/README.md rename to Hochob/Services/Stream/Stream2Chromecast/README.md diff --git a/Hochob/Audio/stream2chromecast/cc_device_finder.py b/Hochob/Services/Stream/Stream2Chromecast/cc_device_finder.py similarity index 100% rename from Hochob/Audio/stream2chromecast/cc_device_finder.py rename to Hochob/Services/Stream/Stream2Chromecast/cc_device_finder.py diff --git a/Hochob/Audio/stream2chromecast/cc_media_controller.py b/Hochob/Services/Stream/Stream2Chromecast/cc_media_controller.py similarity index 100% rename from Hochob/Audio/stream2chromecast/cc_media_controller.py rename to Hochob/Services/Stream/Stream2Chromecast/cc_media_controller.py diff --git a/Hochob/Audio/stream2chromecast/cc_message.py b/Hochob/Services/Stream/Stream2Chromecast/cc_message.py similarity index 100% rename from Hochob/Audio/stream2chromecast/cc_message.py rename to Hochob/Services/Stream/Stream2Chromecast/cc_message.py diff --git a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh b/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh new file mode 100755 index 00000000..3e338205 --- /dev/null +++ b/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export HBS_STREAM_S2C_ROOT=$HOCHOB_SERVICES_STREAM_S2C +export HBS_STREAM_S2C_BINARY=stream2chromecast.py + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_DEVICE="$1" +LOCAL_VOLUME="$2" +LOCAL_FILE="$3" + +killall -9 $HBS_STREAM_S2C_BINARY + +export PATH=$PATH:$HBS_STREAM_S2C_ROOT + +$HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME +$HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE +$HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -stop + +# End of File diff --git a/Hochob/Audio/stream2chromecast/stream2chromecast.py b/Hochob/Services/Stream/Stream2Chromecast/stream2chromecast.py similarity index 100% rename from Hochob/Audio/stream2chromecast/stream2chromecast.py rename to Hochob/Services/Stream/Stream2Chromecast/stream2chromecast.py From fd1bdd8ee1309dadf4c5b0635ab1e70998e7d630 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 20:45:50 -0500 Subject: [PATCH 0010/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 9 ++++++++- Hochob/Services/Camera/hbsCameraFswMain.sh | 2 +- .../Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 4 +++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 41e3f02d..bf89f82e 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -4,12 +4,19 @@ # Variables # ============================================================================= +# Hochob Root Directory + cd ~/CodeLabs/Hochob/ export HOCHOB_ROOT=`pwd` # Hochob Paths -export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_ROOT/Services/Stream/Stream2Chromecast/ +export HOCHOB_SERVICES=$HOCHOB_ROOT/Services/ +export HOCHOB_SERVICES_CAMERA=$HOCHOB_SERVICES/Camera/ +export HOCHOB_SERVICES_SOUND=$HOCHOB_SERVICES/Sound/ +export HOCHOB_SERVICES_SOUND_SS=$HOCHOB_SERVICES_SOUND/SpeechSynthetizer/ +export HOCHOB_SERVICES_STREAM=$HOCHOB_SERVICES/Stream/ +export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_SERVICES_STREAM/Stream2Chromecast/ # Hochob Media diff --git a/Hochob/Services/Camera/hbsCameraFswMain.sh b/Hochob/Services/Camera/hbsCameraFswMain.sh index 3ec05abe..e1b0b9bb 100755 --- a/Hochob/Services/Camera/hbsCameraFswMain.sh +++ b/Hochob/Services/Camera/hbsCameraFswMain.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_CAMERA_FSW_ROOT=`pwd` +export HBS_CAMERA_FSW_ROOT=$HOCHOB_SERVICES_CAMERA export HBS_CAMERA_FSW_BINARY=fswebcam export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" export HBS_CAMERA_FSW_REPOSITORY=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh index 2e28c8f4..e4e4358b 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_SOUND_SS_ESPEAK_ROOT=`pwd` +export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVICES_SOUND_SS export HBS_SOUND_SS_ESPEAK_BINARY=espeak export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" @@ -30,6 +30,8 @@ LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" LOCAL_TEXT="$3" +export PATH=$PATH:$HBS_SOUND_SS_ESPEAK_ROOT + if [ "$LOCAL_LANGUAGE" = "english" ]; then export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then From a0e2d8286ccbbf855c50f446e43be59ab0966ae7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 27 May 2017 20:55:45 -0500 Subject: [PATCH 0011/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index bf89f82e..bc151c8d 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -9,7 +9,7 @@ cd ~/CodeLabs/Hochob/ export HOCHOB_ROOT=`pwd` -# Hochob Paths +# Hochob Services export HOCHOB_SERVICES=$HOCHOB_ROOT/Services/ export HOCHOB_SERVICES_CAMERA=$HOCHOB_SERVICES/Camera/ @@ -18,7 +18,7 @@ export HOCHOB_SERVICES_SOUND_SS=$HOCHOB_SERVICES_SOUND/SpeechSynthetizer/ export HOCHOB_SERVICES_STREAM=$HOCHOB_SERVICES/Stream/ export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_SERVICES_STREAM/Stream2Chromecast/ -# Hochob Media +# Hochob Media Mirror export HOCHOB_MEDIA=/tmp/HochobMedia/ From 4d6a8fd12d8cb956c8490c67b9d13b606de8a976 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 28 May 2017 08:42:08 -0500 Subject: [PATCH 0012/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Camera/hbsCameraFswMain.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Camera/hbsCameraFswMain.sh b/Hochob/Services/Camera/hbsCameraFswMain.sh index e1b0b9bb..db387bf6 100755 --- a/Hochob/Services/Camera/hbsCameraFswMain.sh +++ b/Hochob/Services/Camera/hbsCameraFswMain.sh @@ -24,6 +24,8 @@ export HBS_CAMERA_FSW_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM_IMAGE # Main # ============================================================================= +export PATH=$PATH:$HOCHOB_SERVICES_CAMERA + $HBS_CAMERA_FSW_BINARY $HBS_CAMERA_FSW_ARGUMENTS $HBS_CAMERA_FSW_IMAGE # End of File From c800927cdfb86a858362047f05d1e5dcabcd819d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 28 May 2017 08:45:18 -0500 Subject: [PATCH 0013/1653] Update hbsSoundSsEspeakMain.sh --- .../Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh index e4e4358b..5ccb52fd 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -16,6 +16,12 @@ export HBS_SOUND_SS_ESPEAK_INPUT="No input has been provided" export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_MEDIA_SOUND_ESPEAK export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT +LOCAL_PLAY="$1" +LOCAL_LANGUAGE="$2" +LOCAL_TEXT="$3" + +export PATH=$PATH:$HBS_SOUND_SS_ESPEAK_ROOT + # ============================================================================= # Functions # ============================================================================= @@ -26,12 +32,6 @@ export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT # Main # ============================================================================= -LOCAL_PLAY="$1" -LOCAL_LANGUAGE="$2" -LOCAL_TEXT="$3" - -export PATH=$PATH:$HBS_SOUND_SS_ESPEAK_ROOT - if [ "$LOCAL_LANGUAGE" = "english" ]; then export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then From 32cc93d4d729264fecc27f30341257288665c271 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 28 May 2017 08:45:41 -0500 Subject: [PATCH 0014/1653] Update hbsCameraFswMain.sh --- Hochob/Services/Camera/hbsCameraFswMain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Camera/hbsCameraFswMain.sh b/Hochob/Services/Camera/hbsCameraFswMain.sh index db387bf6..f691dccc 100755 --- a/Hochob/Services/Camera/hbsCameraFswMain.sh +++ b/Hochob/Services/Camera/hbsCameraFswMain.sh @@ -14,6 +14,8 @@ export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% - export HBS_CAMERA_FSW_REPOSITORY=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM export HBS_CAMERA_FSW_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM_IMAGE +export PATH=$PATH:$HOCHOB_SERVICES_CAMERA + # ============================================================================= # Functions # ============================================================================= @@ -24,8 +26,6 @@ export HBS_CAMERA_FSW_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM_IMAGE # Main # ============================================================================= -export PATH=$PATH:$HOCHOB_SERVICES_CAMERA - $HBS_CAMERA_FSW_BINARY $HBS_CAMERA_FSW_ARGUMENTS $HBS_CAMERA_FSW_IMAGE # End of File From 0e1ebdfdbeef5708dae98ae163a5016b4858f4aa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 28 May 2017 08:53:24 -0500 Subject: [PATCH 0015/1653] Update hbsStreamS2cMain.sh --- .../Stream/Stream2Chromecast/hbsStreamS2cMain.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh b/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh index 3e338205..08c50c4e 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh @@ -11,6 +11,12 @@ set -x export HBS_STREAM_S2C_ROOT=$HOCHOB_SERVICES_STREAM_S2C export HBS_STREAM_S2C_BINARY=stream2chromecast.py +LOCAL_DEVICE="$1" +LOCAL_VOLUME="$2" +LOCAL_FILE="$3" + +export PATH=$PATH:$HBS_STREAM_S2C_ROOT + # ============================================================================= # Functions # ============================================================================= @@ -21,14 +27,8 @@ export HBS_STREAM_S2C_BINARY=stream2chromecast.py # Main # ============================================================================= -LOCAL_DEVICE="$1" -LOCAL_VOLUME="$2" -LOCAL_FILE="$3" - killall -9 $HBS_STREAM_S2C_BINARY -export PATH=$PATH:$HBS_STREAM_S2C_ROOT - $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -stop From f74b9d373fa497421893ff2a4851f91bc172dc35 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 28 May 2017 09:01:22 -0500 Subject: [PATCH 0016/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Camera/hbsCameraFswMain.sh | 1 + Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 1 + Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/Hochob/Services/Camera/hbsCameraFswMain.sh b/Hochob/Services/Camera/hbsCameraFswMain.sh index f691dccc..49d1eb59 100755 --- a/Hochob/Services/Camera/hbsCameraFswMain.sh +++ b/Hochob/Services/Camera/hbsCameraFswMain.sh @@ -8,6 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh +export HBS_CAMERA_FSW_PID=$$ export HBS_CAMERA_FSW_ROOT=$HOCHOB_SERVICES_CAMERA export HBS_CAMERA_FSW_BINARY=fswebcam export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh index 5ccb52fd..616b895a 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -8,6 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh +export HBS_SOUND_SS_ESPEAK_PID=$$ export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVICES_SOUND_SS export HBS_SOUND_SS_ESPEAK_BINARY=espeak export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" diff --git a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh b/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh index 08c50c4e..0f5944ef 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh @@ -8,6 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh +export HBS_STREAM_S2C_PID=$$ export HBS_STREAM_S2C_ROOT=$HOCHOB_SERVICES_STREAM_S2C export HBS_STREAM_S2C_BINARY=stream2chromecast.py From c48962c9115cedd399c641c5e36ee95515dde59a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 28 May 2017 11:01:49 -0500 Subject: [PATCH 0017/1653] Update hbsSoundSsEspeakMain.sh --- .../Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh index 616b895a..87bdd095 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -14,8 +14,8 @@ export HBS_SOUND_SS_ESPEAK_BINARY=espeak export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" export HBS_SOUND_SS_ESPEAK_INPUT="No input has been provided" -export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_MEDIA_SOUND_ESPEAK -export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT +export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK +export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" From 889d2967f2251e57d9714037549c32761233afbd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 28 May 2017 11:01:54 -0500 Subject: [PATCH 0018/1653] Update Main.sh --- Hochob/Main.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index bc151c8d..369cf917 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -25,8 +25,9 @@ export HOCHOB_MEDIA=/tmp/HochobMedia/ export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ export HOCHOB_MEDIA_SOUND=$HOCHOB_MEDIA/Sound/ -export HOCHOB_MEDIA_SOUND_ESPEAK=$HOCHOB_MEDIA_SOUND/Espeak/ -export HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_ESPEAK/hbsSoundSsEspeakOutput.wav +export HOCHOB_MEDIA_SOUND_STREAM=$HOCHOB_MEDIA_SOUND/Stream +export HOCHOB_MEDIA_SOUND_STREAM_ESPEAK=$HOCHOB_MEDIA_SOUND_STREAM/Espeak/ +export HOCHOB_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_ESPEAK/hbsSoundSsEspeakOutput.wav export HOCHOB_MEDIA_SOUND_LUPEROBOT=$HOCHOB_MEDIA_SOUND/LupeRobot/ export HOCHOB_MEDIA_SOUND_VISITORSCENTER=$HOCHOB_MEDIA_SOUND/VisitorsCenter/ From ffa4c66c4b06294fa5661c0c7a0a0baf704051f0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 20:30:55 -0500 Subject: [PATCH 0019/1653] Update Signed-off-by: Abraham Arce --- .../Stream/Stream2Chromecast/hbsStreamS2cMain.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh b/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh index 0f5944ef..a70f5ef8 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh @@ -28,10 +28,15 @@ export PATH=$PATH:$HBS_STREAM_S2C_ROOT # Main # ============================================================================= -killall -9 $HBS_STREAM_S2C_BINARY - -$HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME -$HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE -$HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -stop +if [ $# -eq 3 ] +then + killall -9 $HBS_STREAM_S2C_BINARY + $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME + $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE + $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -stop +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi # End of File From c529e6ad0da492b540033eb887dd5ad1c8cf58f4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 20:32:59 -0500 Subject: [PATCH 0020/1653] Update Signed-off-by: Abraham Arce --- .../SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh index 87bdd095..7452104e 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -33,18 +33,25 @@ export PATH=$PATH:$HBS_SOUND_SS_ESPEAK_ROOT # Main # ============================================================================= -if [ "$LOCAL_LANGUAGE" = "english" ]; then - export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" -elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ves-la+m5" -fi - -export HBS_SOUND_SS_ESPEAK_INPUT="$LOCAL_TEXT" -if [ "$LOCAL_PLAY" = "on" ]; then - $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_LANGUAGE $HBS_SOUND_SS_ESPEAK_ARGUMENTS "$HBS_SOUND_SS_ESPEAK_INPUT" | tee $HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT | aplay - -elif [ "$LOCAL_PLAY" = "off" ]; then - $HBS_SOUND_SS_ESPEAK_BINARY -w $HBS_SOUND_SS_ESPEAK_OUTPUT $HBS_SOUND_SS_ESPEAK_LANGUAGE "$HBS_SOUND_SS_ESPEAK_INPUT" +if [ $# -eq 3 ] +then + if [ "$LOCAL_LANGUAGE" = "english" ]; then + export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" + elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ves-la+m5" + fi + + export HBS_SOUND_SS_ESPEAK_INPUT="$LOCAL_TEXT" + + if [ "$LOCAL_PLAY" = "on" ]; then + $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_LANGUAGE $HBS_SOUND_SS_ESPEAK_ARGUMENTS "$HBS_SOUND_SS_ESPEAK_INPUT" | tee $HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT | aplay - + elif [ "$LOCAL_PLAY" = "off" ]; then + $HBS_SOUND_SS_ESPEAK_BINARY -w $HBS_SOUND_SS_ESPEAK_OUTPUT $HBS_SOUND_SS_ESPEAK_LANGUAGE "$HBS_SOUND_SS_ESPEAK_INPUT" + fi +else + echo "Invalid number of arguments, see Documentation" + exit 1 fi # End of File From 71163056f08cb863abd4c90ed3c6a068aa1c4a16 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 21:09:46 -0500 Subject: [PATCH 0021/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 369cf917..d92ed53a 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -12,7 +12,9 @@ export HOCHOB_ROOT=`pwd` # Hochob Services export HOCHOB_SERVICES=$HOCHOB_ROOT/Services/ + export HOCHOB_SERVICES_CAMERA=$HOCHOB_SERVICES/Camera/ +export HOCHOB_SERVICES_IMAGE=$HOCHOB_SERVICES/Image/ export HOCHOB_SERVICES_SOUND=$HOCHOB_SERVICES/Sound/ export HOCHOB_SERVICES_SOUND_SS=$HOCHOB_SERVICES_SOUND/SpeechSynthetizer/ export HOCHOB_SERVICES_STREAM=$HOCHOB_SERVICES/Stream/ From 97c423256be80255057019e4cb2beffc7ff05479 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 21:24:43 -0500 Subject: [PATCH 0022/1653] Update Main.sh --- Hochob/Main.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index d92ed53a..853d519d 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -19,6 +19,7 @@ export HOCHOB_SERVICES_SOUND=$HOCHOB_SERVICES/Sound/ export HOCHOB_SERVICES_SOUND_SS=$HOCHOB_SERVICES_SOUND/SpeechSynthetizer/ export HOCHOB_SERVICES_STREAM=$HOCHOB_SERVICES/Stream/ export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_SERVICES_STREAM/Stream2Chromecast/ +export HOCHOB_SERVICES_VIDEO=$HOCHOB_SERVICES/Video/ # Hochob Media Mirror From 8c28b7f9f0e81d635885bac8f3d36de098cf41d2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 21:28:22 -0500 Subject: [PATCH 0023/1653] Update hbsSoundSsEspeakMain.sh --- .../Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh index 7452104e..99ad049e 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -13,6 +13,7 @@ export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVICES_SOUND_SS export HBS_SOUND_SS_ESPEAK_BINARY=espeak export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" +export HBS_SOUND_SS_ESPEAK_PLAY="-w" export HBS_SOUND_SS_ESPEAK_INPUT="No input has been provided" export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT @@ -47,7 +48,7 @@ then if [ "$LOCAL_PLAY" = "on" ]; then $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_LANGUAGE $HBS_SOUND_SS_ESPEAK_ARGUMENTS "$HBS_SOUND_SS_ESPEAK_INPUT" | tee $HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT | aplay - elif [ "$LOCAL_PLAY" = "off" ]; then - $HBS_SOUND_SS_ESPEAK_BINARY -w $HBS_SOUND_SS_ESPEAK_OUTPUT $HBS_SOUND_SS_ESPEAK_LANGUAGE "$HBS_SOUND_SS_ESPEAK_INPUT" + $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_PLAY $HBS_SOUND_SS_ESPEAK_OUTPUT $HBS_SOUND_SS_ESPEAK_LANGUAGE "$HBS_SOUND_SS_ESPEAK_INPUT" fi else echo "Invalid number of arguments, see Documentation" From e62f16cb4760b8cd3b158e3b7a4cb8a7b7b7c1aa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 21:29:52 -0500 Subject: [PATCH 0024/1653] Update hbsSoundSsEspeakMain.sh --- Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh index 99ad049e..a791e3a1 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -12,8 +12,8 @@ export HBS_SOUND_SS_ESPEAK_PID=$$ export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVICES_SOUND_SS export HBS_SOUND_SS_ESPEAK_BINARY=espeak export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" -export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" export HBS_SOUND_SS_ESPEAK_PLAY="-w" +export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" export HBS_SOUND_SS_ESPEAK_INPUT="No input has been provided" export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT From c88297d13ba77ca531216d55dc5e0c5b19c5d68f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 21:30:46 -0500 Subject: [PATCH 0025/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Image/hbsImageEogMain.sh | 39 ++++++++++++++++++++ Hochob/Services/Video/hbsVideoVlcMain.sh | 46 ++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100755 Hochob/Services/Image/hbsImageEogMain.sh create mode 100755 Hochob/Services/Video/hbsVideoVlcMain.sh diff --git a/Hochob/Services/Image/hbsImageEogMain.sh b/Hochob/Services/Image/hbsImageEogMain.sh new file mode 100755 index 00000000..28ce2c14 --- /dev/null +++ b/Hochob/Services/Image/hbsImageEogMain.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export HBS_IMAGE_EOG_PID=$$ +export HBS_IMAGE_EOG_ROOT=$HOCHOB_SERVICES_IMAGE +export HBS_IMAGE_EOG_BINARY=eog +export HBS_IMAGE_EOG_ARGUMENTS="-sf" + +LOCAL_FILES="$1" + +export PATH=$PATH:$HBS_IMAGE_EOG_ROOT + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + killall -9 $HBS_IMAGE_EOG_BINARY + $HBS_IMAGE_EOG_BINARY $HBS_IMAGE_EOG_ARGUMENTS $LOCAL_FILES & +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File diff --git a/Hochob/Services/Video/hbsVideoVlcMain.sh b/Hochob/Services/Video/hbsVideoVlcMain.sh new file mode 100755 index 00000000..31b246b9 --- /dev/null +++ b/Hochob/Services/Video/hbsVideoVlcMain.sh @@ -0,0 +1,46 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export HBS_VIDEO_VLC_PID=$$ +export HBS_VIDEO_VLC_ROOT=$HOCHOB_SERVICES_VIDEO +export HBS_VIDEO_VLC_BINARY=cvlc +export HBS_VIDEO_VLC_ARGUMENTS="--no-video-title-show --fullscreen" +export HBS_VIDEO_VLC_LOOP="--loop" + +LOCAL_LOOP="$1" +LOCAL_FILE="$2" + +export PATH=$PATH:$HBS_VIDEO_VLC_ROOT + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + killall -9 $HBS_VIDEO_VLC_BINARY + + if [ "$LOCAL_LOOP" = "on" ]; then + $HBS_VIDEO_VLC_BINARY $HBS_VIDEO_VLC_ARGUMENTS $LOCAL_FILE & + elif [ "$LOCAL_LOOP" = "off" ]; then + $HBS_VIDEO_VLC_BINARY $HBS_VIDEO_VLC_ARGUMENTS $HBS_VIDEO_VLC_LOOP $LOCAL_FILE & + fi +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 8639e8551e85f3f66680cec537c7995c4e6b8ac0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 21:38:47 -0500 Subject: [PATCH 0026/1653] Update Main.sh --- Hochob/Main.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 853d519d..987072cd 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -16,6 +16,7 @@ export HOCHOB_SERVICES=$HOCHOB_ROOT/Services/ export HOCHOB_SERVICES_CAMERA=$HOCHOB_SERVICES/Camera/ export HOCHOB_SERVICES_IMAGE=$HOCHOB_SERVICES/Image/ export HOCHOB_SERVICES_SOUND=$HOCHOB_SERVICES/Sound/ +export HOCHOB_SERVICES_SOUND_PX=$HOCHOB_SERVICES_SOUND/Play/ export HOCHOB_SERVICES_SOUND_SS=$HOCHOB_SERVICES_SOUND/SpeechSynthetizer/ export HOCHOB_SERVICES_STREAM=$HOCHOB_SERVICES/Stream/ export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_SERVICES_STREAM/Stream2Chromecast/ From c7762717583f6894bf5b47636b465f6de56d6bac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 21:42:47 -0500 Subject: [PATCH 0027/1653] Update Signed-off-by: Abraham Arce --- .../Services/Sound/Play/hbsSoundPxMpgMain.sh | 38 +++++++++++++++++++ Hochob/Services/Video/hbsVideoVlcMain.sh | 4 +- 2 files changed, 40 insertions(+), 2 deletions(-) create mode 100755 Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh diff --git a/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh b/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh new file mode 100755 index 00000000..542eea39 --- /dev/null +++ b/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export HBS_SOUND_PX_MPG123_PID=$$ +export HBS_SOUND_PX_MPG123_ROOT=$HOCHOB_SERVICES_SOUND_PX +export HBS_SOUND_PX_MPG123_BINARY=mpg123 + +LOCAL_FILE="$1" + +export PATH=$PATH:$HBS_STREAM_S2C_ROOT + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + killall -9 $HBS_SOUND_PX_MPG123_BINARY + $HBS_SOUND_PX_MPG123_BINARY $LOCAL_FILE +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File diff --git a/Hochob/Services/Video/hbsVideoVlcMain.sh b/Hochob/Services/Video/hbsVideoVlcMain.sh index 31b246b9..f856a6c5 100755 --- a/Hochob/Services/Video/hbsVideoVlcMain.sh +++ b/Hochob/Services/Video/hbsVideoVlcMain.sh @@ -34,9 +34,9 @@ then killall -9 $HBS_VIDEO_VLC_BINARY if [ "$LOCAL_LOOP" = "on" ]; then - $HBS_VIDEO_VLC_BINARY $HBS_VIDEO_VLC_ARGUMENTS $LOCAL_FILE & - elif [ "$LOCAL_LOOP" = "off" ]; then $HBS_VIDEO_VLC_BINARY $HBS_VIDEO_VLC_ARGUMENTS $HBS_VIDEO_VLC_LOOP $LOCAL_FILE & + elif [ "$LOCAL_LOOP" = "off" ]; then + $HBS_VIDEO_VLC_BINARY $HBS_VIDEO_VLC_ARGUMENTS $LOCAL_FILE & fi else echo "Invalid number of arguments, see Documentation" From 55f9a60aa87644c36bf9e5d45a57a5ae4f8a629b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 29 May 2017 21:58:04 -0500 Subject: [PATCH 0028/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Communications/{Mqtt => MqttServer}/vernemq.conf | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Communications/{Mqtt => MqttServer}/vernemq.conf (100%) diff --git a/Hochob/Services/Communications/Mqtt/vernemq.conf b/Hochob/Services/Communications/MqttServer/vernemq.conf similarity index 100% rename from Hochob/Services/Communications/Mqtt/vernemq.conf rename to Hochob/Services/Communications/MqttServer/vernemq.conf From 03e4451759b0320a497603962f0cceb2a0909253 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 30 May 2017 10:05:31 -0500 Subject: [PATCH 0029/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 2 +- Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 987072cd..b38685c6 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -31,7 +31,7 @@ export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ export HOCHOB_MEDIA_SOUND=$HOCHOB_MEDIA/Sound/ export HOCHOB_MEDIA_SOUND_STREAM=$HOCHOB_MEDIA_SOUND/Stream export HOCHOB_MEDIA_SOUND_STREAM_ESPEAK=$HOCHOB_MEDIA_SOUND_STREAM/Espeak/ -export HOCHOB_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_ESPEAK/hbsSoundSsEspeakOutput.wav +export HOCHOB_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav export HOCHOB_MEDIA_SOUND_LUPEROBOT=$HOCHOB_MEDIA_SOUND/LupeRobot/ export HOCHOB_MEDIA_SOUND_VISITORSCENTER=$HOCHOB_MEDIA_SOUND/VisitorsCenter/ diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh index a791e3a1..869336b4 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh @@ -46,7 +46,7 @@ then export HBS_SOUND_SS_ESPEAK_INPUT="$LOCAL_TEXT" if [ "$LOCAL_PLAY" = "on" ]; then - $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_LANGUAGE $HBS_SOUND_SS_ESPEAK_ARGUMENTS "$HBS_SOUND_SS_ESPEAK_INPUT" | tee $HOCHOB_MEDIA_SOUND_ESPEAK_OUTPUT | aplay - + $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_LANGUAGE $HBS_SOUND_SS_ESPEAK_ARGUMENTS "$HBS_SOUND_SS_ESPEAK_INPUT" | tee $HBS_SOUND_SS_ESPEAK_OUTPUT | aplay - elif [ "$LOCAL_PLAY" = "off" ]; then $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_PLAY $HBS_SOUND_SS_ESPEAK_OUTPUT $HBS_SOUND_SS_ESPEAK_LANGUAGE "$HBS_SOUND_SS_ESPEAK_INPUT" fi From 8ce7688fd74784b1976bbb9145860babf022029f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 30 May 2017 10:14:24 -0500 Subject: [PATCH 0030/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 6 +-- .../Services/Sound/Play/hbsSoundPxAplMain.sh | 38 +++++++++++++++++++ .../Services/Sound/Play/hbsSoundPxMpgMain.sh | 2 +- 3 files changed, 42 insertions(+), 4 deletions(-) create mode 100755 Hochob/Services/Sound/Play/hbsSoundPxAplMain.sh diff --git a/Hochob/Main.sh b/Hochob/Main.sh index b38685c6..66576c9f 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -58,11 +58,11 @@ export HOCHOB_MEDIA_VIDEO_VISITORS=$HOCHOB_MEDIA_VIDEO/Visitors/ # If not, naming convention is # YYYYMMDD-HHMMSS -institutionIdentification () { +institutionIdentification () { # If Institution Identification - # + # # else - # + # echo "Tbd" } diff --git a/Hochob/Services/Sound/Play/hbsSoundPxAplMain.sh b/Hochob/Services/Sound/Play/hbsSoundPxAplMain.sh new file mode 100755 index 00000000..9fec5184 --- /dev/null +++ b/Hochob/Services/Sound/Play/hbsSoundPxAplMain.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export HBS_SOUND_PX_APLAY_PID=$$ +export HBS_SOUND_PX_APLAY_ROOT=$HOCHOB_SERVICES_SOUND_PX +export HBS_SOUND_PX_APLAY_BINARY=aplay + +LOCAL_FILE="$1" + +export PATH=$PATH:$HBS_SOUND_PX_APLAY_ROOT + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + killall -9 $HBS_SOUND_PX_APLAY_BINARY + $HBS_SOUND_PX_APLAY_BINARY $LOCAL_FILE +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File diff --git a/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh b/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh index 542eea39..685daaac 100755 --- a/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh +++ b/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh @@ -14,7 +14,7 @@ export HBS_SOUND_PX_MPG123_BINARY=mpg123 LOCAL_FILE="$1" -export PATH=$PATH:$HBS_STREAM_S2C_ROOT +export PATH=$PATH:$HBS_SOUND_PX_MPG123_ROOT # ============================================================================= # Functions From 6d81effad1ebdb5735457761e10b250a4435aa4b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 31 May 2017 09:27:51 -0500 Subject: [PATCH 0031/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 66576c9f..932bbaa7 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -24,7 +24,7 @@ export HOCHOB_SERVICES_VIDEO=$HOCHOB_SERVICES/Video/ # Hochob Media Mirror -export HOCHOB_MEDIA=/tmp/HochobMedia/ +export HOCHOB_MEDIA=/tmp/HochobMediaSource/ export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ From 7fa134b0494ad2facf3c0ea0679a4153906dc381 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 14:59:11 -0500 Subject: [PATCH 0032/1653] Create Setup.sh --- Hochob/Setup.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 Hochob/Setup.sh diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/Hochob/Setup.sh @@ -0,0 +1 @@ + From 068938247ecb339de9e0bb4f2249741bc4ecffc7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 15:07:50 -0500 Subject: [PATCH 0033/1653] Update Setup.sh --- Hochob/Setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index 8b137891..c69f8682 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -1 +1,5 @@ +#!/bin/sh +sudo apt-get install git + +# End of File From 8fc726268e31fbcc27c9b5e34cdc192fbd40b6be Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 15:10:14 -0500 Subject: [PATCH 0034/1653] Update Setup.sh --- Hochob/Setup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index c69f8682..0a3e4298 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -1,5 +1,12 @@ #!/bin/sh +# Setup sudo apt-get install git +# Automation +sudo apt-get install python3-setuptools +sudo apt-get install python3-pip +sudo pip3 install --upgrade pip +sudo pip3 install homeassistant + # End of File From 15720eb4449715c70e5027aa22532c6c076d2d38 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 19:49:33 -0500 Subject: [PATCH 0035/1653] Update Setup.sh --- Hochob/Setup.sh | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index 0a3e4298..c827bdd5 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -1,12 +1,28 @@ #!/bin/sh -# Setup +# Server Setup sudo apt-get install git -# Automation +# Server Services Automation Home Assistant sudo apt-get install python3-setuptools sudo apt-get install python3-pip sudo pip3 install --upgrade pip sudo pip3 install homeassistant +# Server Services Calendar +# None + +# Server Services Camera +sudo apt install fswebcam + +# Server Services Institution +# None + +# Server Services Image +sudo apt install eog + +# Server Services Stream +sudo apt-get install ffmpeg +sudo apt-get install libav-tools + # End of File From a0a7dfe259759593a958842950d7f444ed47eaa6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 19:53:28 -0500 Subject: [PATCH 0036/1653] Update Setup.sh --- Hochob/Setup.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index c827bdd5..bac372f2 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -1,11 +1,11 @@ #!/bin/sh # Server Setup -sudo apt-get install git +sudo apt install git # Server Services Automation Home Assistant -sudo apt-get install python3-setuptools -sudo apt-get install python3-pip +sudo apt install python3-setuptools +sudo apt install python3-pip sudo pip3 install --upgrade pip sudo pip3 install homeassistant @@ -22,7 +22,10 @@ sudo apt install fswebcam sudo apt install eog # Server Services Stream -sudo apt-get install ffmpeg -sudo apt-get install libav-tools +sudo apt install ffmpeg +sudo apt install libav-tools + +# Server Services Sound Speech Synthetizer +sudo apt install espeak tee # End of File From 2b26eb2aa67f674b0d01ebba4fa636d7b329f7c8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 20:01:49 -0500 Subject: [PATCH 0037/1653] Update Setup.sh --- Hochob/Setup.sh | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index bac372f2..dd80bde3 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -15,17 +15,34 @@ sudo pip3 install homeassistant # Server Services Camera sudo apt install fswebcam +# Server Services Communications +# None + +# Server Services Lupe Robot +# None + # Server Services Institution # None # Server Services Image sudo apt install eog +# Server Services Motion + +# Server Services Sound Speech Synthetizer +sudo apt install espeak tee + # Server Services Stream sudo apt install ffmpeg sudo apt install libav-tools -# Server Services Sound Speech Synthetizer -sudo apt install espeak tee +# Server Services Usb +# None + +# Server Services Video +# None + +# Server Services Telegram +# None # End of File From 26e7798769724c41a62a5b99ae920b7676c1cd02 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 20:44:45 -0500 Subject: [PATCH 0038/1653] Update Main.sh --- Hochob/Main.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 932bbaa7..06967891 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -26,6 +26,9 @@ export HOCHOB_SERVICES_VIDEO=$HOCHOB_SERVICES/Video/ export HOCHOB_MEDIA=/tmp/HochobMediaSource/ +export HOCHOB_MEDIA_CAMERA_FSWEBCAM=$HOCHOB_MEDIA_IMAGE_VISITORS/Fswebcam/ +export HOCHOB_MEDIA_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM/hbsCameraFswImage.jpg + export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ export HOCHOB_MEDIA_SOUND=$HOCHOB_MEDIA/Sound/ From 7b6baa1b95d7a1a2f5807e94b888a4e4abedad86 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 20:44:48 -0500 Subject: [PATCH 0039/1653] Update hbsCameraFswMain.sh --- Hochob/Services/Camera/hbsCameraFswMain.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Camera/hbsCameraFswMain.sh b/Hochob/Services/Camera/hbsCameraFswMain.sh index 49d1eb59..0d0f828f 100755 --- a/Hochob/Services/Camera/hbsCameraFswMain.sh +++ b/Hochob/Services/Camera/hbsCameraFswMain.sh @@ -12,8 +12,8 @@ export HBS_CAMERA_FSW_PID=$$ export HBS_CAMERA_FSW_ROOT=$HOCHOB_SERVICES_CAMERA export HBS_CAMERA_FSW_BINARY=fswebcam export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" -export HBS_CAMERA_FSW_REPOSITORY=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM -export HBS_CAMERA_FSW_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM_IMAGE +export HBS_CAMERA_FSW_REPOSITORY=$HOCHOB_MEDIA_CAMERA_FSWEBCAM +export HBS_CAMERA_FSW_IMAGE=$HOCHOB_MEDIA_CAMERA_FSWEBCAM_IMAGE export PATH=$PATH:$HOCHOB_SERVICES_CAMERA From 9363c31797f5036d4ea12865ad73d576e7c038f9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 20:53:56 -0500 Subject: [PATCH 0040/1653] Update Main.sh --- Hochob/Main.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 06967891..60437d1b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -26,8 +26,8 @@ export HOCHOB_SERVICES_VIDEO=$HOCHOB_SERVICES/Video/ export HOCHOB_MEDIA=/tmp/HochobMediaSource/ -export HOCHOB_MEDIA_CAMERA_FSWEBCAM=$HOCHOB_MEDIA_IMAGE_VISITORS/Fswebcam/ -export HOCHOB_MEDIA_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM/hbsCameraFswImage.jpg +export HOCHOB_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_MEDIA_IMAGE_VISITORS/Fswebcam/ +export HOCHOB_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM/hbsCameraFswImage.jpg export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ @@ -43,8 +43,6 @@ export HOCHOB_MEDIA_IMAGE_CORPORATE=$HOCHOB_MEDIA_IMAGE/Corporate/ export HOCHOB_MEDIA_IMAGE_DRAWING=$HOCHOB_MEDIA_IMAGE/Drawing/ export HOCHOB_MEDIA_IMAGE_VISITORSCENTER=$HOCHOB_MEDIA_IMAGE/VisitorsCenter/ export HOCHOB_MEDIA_IMAGE_VISITORS=$HOCHOB_MEDIA_IMAGE/Visitors/ -export HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM=$HOCHOB_MEDIA_IMAGE_VISITORS/Fswebcam/ -export HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM/hbsCameraFswImage.jpg export HOCHOB_MEDIA_VIDEO=$HOCHOB_MEDIA/Video/ export HOCHOB_MEDIA_VIDEO_CORPORATE=$HOCHOB_MEDIA_VIDEO/Corporate/ From 9fa989034719cc73cb1d6fb7e91373cd6a6bcf05 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 23:28:25 -0500 Subject: [PATCH 0041/1653] Update Setup.sh --- Hochob/Setup.sh | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index dd80bde3..4ce6c640 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -1,48 +1,56 @@ #!/bin/sh -# Server Setup +# Hochob Setup sudo apt install git -# Server Services Automation Home Assistant +# Hochob Services Automation Home Assistant sudo apt install python3-setuptools sudo apt install python3-pip sudo pip3 install --upgrade pip sudo pip3 install homeassistant -# Server Services Calendar +# Hochob Services Calendar # None -# Server Services Camera +# Hochob Services Camera sudo apt install fswebcam -# Server Services Communications +# Hochob Services Communications # None -# Server Services Lupe Robot +# Hochob Services Lupe Robot # None -# Server Services Institution +# Hochob Services Institution # None -# Server Services Image +# Hochob Services Image sudo apt install eog -# Server Services Motion +# Hochob Services Messaging +# None + +# Hochob Services Motion +# None -# Server Services Sound Speech Synthetizer +# Hochob Services Sound Speech Synthetizer sudo apt install espeak tee -# Server Services Stream +# Hochob Services Stream sudo apt install ffmpeg sudo apt install libav-tools -# Server Services Usb +# Hochob Services Usb # None -# Server Services Video +# Hochob Services Video # None -# Server Services Telegram +# Hochob Services Telegram # None + +test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ +test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ + # End of File From 8c385e4c53aae92ce0fee2c6246312f03fb90680 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 23:28:40 -0500 Subject: [PATCH 0042/1653] Update Setup.sh --- Hochob/Setup.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index 4ce6c640..eb687d43 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -49,7 +49,6 @@ sudo apt install libav-tools # Hochob Services Telegram # None - test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ From f1ed85a77d41947144c07d8fac0b3f672ea0b7d5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 23:33:02 -0500 Subject: [PATCH 0043/1653] Update Setup.sh --- Hochob/Setup.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index eb687d43..06144bfd 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -21,12 +21,12 @@ sudo apt install fswebcam # Hochob Services Lupe Robot # None -# Hochob Services Institution -# None - # Hochob Services Image sudo apt install eog +# Hochob Services Institution +# None + # Hochob Services Messaging # None @@ -46,9 +46,6 @@ sudo apt install libav-tools # Hochob Services Video # None -# Hochob Services Telegram -# None - test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ From 9ce3aa1abb1d6b30570530f5a5c9f46964be591c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 2 Jun 2017 23:38:21 -0500 Subject: [PATCH 0044/1653] Update Setup.sh --- Hochob/Setup.sh | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index 06144bfd..17dac701 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -1,49 +1,49 @@ #!/bin/sh -# Hochob Setup +# Hochob Server Setup sudo apt install git -# Hochob Services Automation Home Assistant +# Hochob Server Services Automation Home Assistant sudo apt install python3-setuptools sudo apt install python3-pip sudo pip3 install --upgrade pip sudo pip3 install homeassistant -# Hochob Services Calendar +# Hochob Server Services Calendar # None -# Hochob Services Camera +# Hochob Server Services Camera sudo apt install fswebcam -# Hochob Services Communications +# Hochob Server Services Communications # None -# Hochob Services Lupe Robot +# Hochob Server Services Lupe Robot # None -# Hochob Services Image +# Hochob Server Services Image sudo apt install eog -# Hochob Services Institution +# Hochob Server Services Institution # None -# Hochob Services Messaging +# Hochob Server Services Messaging # None -# Hochob Services Motion +# Hochob Server Services Motion # None -# Hochob Services Sound Speech Synthetizer +# Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee -# Hochob Services Stream +# Hochob Server Services Stream sudo apt install ffmpeg sudo apt install libav-tools -# Hochob Services Usb +# Hochob Server Services Usb # None -# Hochob Services Video +# Hochob Server Services Video # None test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ From 242372b087b2e2e644afa72bfae57fbdbf7c1d0f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:05:53 -0500 Subject: [PATCH 0045/1653] Update Setup.sh --- Hochob/Setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh index 17dac701..8a7019e9 100644 --- a/Hochob/Setup.sh +++ b/Hochob/Setup.sh @@ -18,7 +18,7 @@ sudo apt install fswebcam # Hochob Server Services Communications # None -# Hochob Server Services Lupe Robot +# Hochob Server Services Robot # None # Hochob Server Services Image From 1a980ebe901e6e060ba5e05fe12e766c582e4efd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:06:14 -0500 Subject: [PATCH 0046/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 60437d1b..affe4732 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -22,7 +22,7 @@ export HOCHOB_SERVICES_STREAM=$HOCHOB_SERVICES/Stream/ export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_SERVICES_STREAM/Stream2Chromecast/ export HOCHOB_SERVICES_VIDEO=$HOCHOB_SERVICES/Video/ -# Hochob Media Mirror +# Hochob Media Source export HOCHOB_MEDIA=/tmp/HochobMediaSource/ From 1ac50a1a5365cac1b99a690db5ac0ce9f9020af9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:07:21 -0500 Subject: [PATCH 0047/1653] Update Main.sh --- Hochob/Main.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index affe4732..e7e1a761 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -4,12 +4,12 @@ # Variables # ============================================================================= -# Hochob Root Directory +# Hochob Server Root Directory cd ~/CodeLabs/Hochob/ export HOCHOB_ROOT=`pwd` -# Hochob Services +# Hochob Server Services export HOCHOB_SERVICES=$HOCHOB_ROOT/Services/ @@ -22,7 +22,7 @@ export HOCHOB_SERVICES_STREAM=$HOCHOB_SERVICES/Stream/ export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_SERVICES_STREAM/Stream2Chromecast/ export HOCHOB_SERVICES_VIDEO=$HOCHOB_SERVICES/Video/ -# Hochob Media Source +# Hochob Server Media Source export HOCHOB_MEDIA=/tmp/HochobMediaSource/ From 1c344c018df6fcae43649496f44d26397b6011b9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:17:50 -0500 Subject: [PATCH 0048/1653] Update Signed-off-by: Abraham Arce --- Hochob/Main.sh | 54 +++++++++---------- .../{hbsCameraFswMain.sh => Fswebcam.sh} | 8 +-- .../Image/{hbsImageEogMain.sh => Eog.sh} | 2 +- .../Play/{hbsSoundPxAplMain.sh => Aplay.sh} | 2 +- .../Play/{hbsSoundPxMpgMain.sh => Mpg123.sh} | 2 +- .../{hbsSoundSsEspeakMain.sh => Espeak.sh} | 6 +-- ...sStreamS2cMain.sh => Stream2Chromecast.sh} | 2 +- .../Video/{hbsVideoVlcMain.sh => Vlc.sh} | 2 +- 8 files changed, 39 insertions(+), 39 deletions(-) rename Hochob/Services/Camera/{hbsCameraFswMain.sh => Fswebcam.sh} (77%) rename Hochob/Services/Image/{hbsImageEogMain.sh => Eog.sh} (94%) rename Hochob/Services/Sound/Play/{hbsSoundPxAplMain.sh => Aplay.sh} (93%) rename Hochob/Services/Sound/Play/{hbsSoundPxMpgMain.sh => Mpg123.sh} (93%) rename Hochob/Services/Sound/SpeechSynthesizer/{hbsSoundSsEspeakMain.sh => Espeak.sh} (88%) rename Hochob/Services/Stream/Stream2Chromecast/{hbsStreamS2cMain.sh => Stream2Chromecast.sh} (94%) rename Hochob/Services/Video/{hbsVideoVlcMain.sh => Vlc.sh} (95%) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index e7e1a761..1f91cec8 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -11,43 +11,43 @@ export HOCHOB_ROOT=`pwd` # Hochob Server Services -export HOCHOB_SERVICES=$HOCHOB_ROOT/Services/ +export HOCHOB_SERVER_SERVICES=$HOCHOB_ROOT/Services/ -export HOCHOB_SERVICES_CAMERA=$HOCHOB_SERVICES/Camera/ -export HOCHOB_SERVICES_IMAGE=$HOCHOB_SERVICES/Image/ -export HOCHOB_SERVICES_SOUND=$HOCHOB_SERVICES/Sound/ -export HOCHOB_SERVICES_SOUND_PX=$HOCHOB_SERVICES_SOUND/Play/ -export HOCHOB_SERVICES_SOUND_SS=$HOCHOB_SERVICES_SOUND/SpeechSynthetizer/ -export HOCHOB_SERVICES_STREAM=$HOCHOB_SERVICES/Stream/ -export HOCHOB_SERVICES_STREAM_S2C=$HOCHOB_SERVICES_STREAM/Stream2Chromecast/ -export HOCHOB_SERVICES_VIDEO=$HOCHOB_SERVICES/Video/ +export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ +export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ +export HOCHOB_SERVER_SERVICES_SOUND=$HOCHOB_SERVER_SERVICES/Sound/ +export HOCHOB_SERVER_SERVICES_SOUND_PX=$HOCHOB_SERVER_SERVICES_SOUND/Play/ +export HOCHOB_SERVER_SERVICES_SOUND_SS=$HOCHOB_SERVER_SERVICES_SOUND/SpeechSynthetizer/ +export HOCHOB_SERVER_SERVICES_STREAM=$HOCHOB_SERVER_SERVICES/Stream/ +export HOCHOB_SERVER_SERVICES_STREAM_S2C=$HOCHOB_SERVER_SERVICES_STREAM/Stream2Chromecast/ +export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ # Hochob Server Media Source export HOCHOB_MEDIA=/tmp/HochobMediaSource/ -export HOCHOB_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_MEDIA_IMAGE_VISITORS/Fswebcam/ -export HOCHOB_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_MEDIA_IMAGE_VISITORS_FSWEBCAM/hbsCameraFswImage.jpg +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_IMAGE_VISITORS/Fswebcam/ +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_IMAGE_VISITORS_FSWEBCAM/hbsCameraFswImage.jpg -export HOCHOB_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ +export HOCHOB_SERVER_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ -export HOCHOB_MEDIA_SOUND=$HOCHOB_MEDIA/Sound/ -export HOCHOB_MEDIA_SOUND_STREAM=$HOCHOB_MEDIA_SOUND/Stream -export HOCHOB_MEDIA_SOUND_STREAM_ESPEAK=$HOCHOB_MEDIA_SOUND_STREAM/Espeak/ -export HOCHOB_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav -export HOCHOB_MEDIA_SOUND_LUPEROBOT=$HOCHOB_MEDIA_SOUND/LupeRobot/ -export HOCHOB_MEDIA_SOUND_VISITORSCENTER=$HOCHOB_MEDIA_SOUND/VisitorsCenter/ +export HOCHOB_SERVER_MEDIA_SOUND=$HOCHOB_MEDIA/Sound/ +export HOCHOB_SERVER_MEDIA_SOUND_STREAM=$HOCHOB_SERVER_MEDIA_SOUND/Stream +export HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK=$HOCHOB_SERVER_MEDIA_SOUND_STREAM/Espeak/ +export HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav +export HOCHOB_SERVER_MEDIA_SOUND_LUPEROBOT=$HOCHOB_SERVER_MEDIA_SOUND/LupeRobot/ +export HOCHOB_SERVER_MEDIA_SOUND_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_SOUND/VisitorsCenter/ -export HOCHOB_MEDIA_IMAGE=$HOCHOB_MEDIA/Image/ -export HOCHOB_MEDIA_IMAGE_CORPORATE=$HOCHOB_MEDIA_IMAGE/Corporate/ -export HOCHOB_MEDIA_IMAGE_DRAWING=$HOCHOB_MEDIA_IMAGE/Drawing/ -export HOCHOB_MEDIA_IMAGE_VISITORSCENTER=$HOCHOB_MEDIA_IMAGE/VisitorsCenter/ -export HOCHOB_MEDIA_IMAGE_VISITORS=$HOCHOB_MEDIA_IMAGE/Visitors/ +export HOCHOB_SERVER_MEDIA_IMAGE=$HOCHOB_MEDIA/Image/ +export HOCHOB_SERVER_MEDIA_IMAGE_CORPORATE=$HOCHOB_SERVER_MEDIA_IMAGE/Corporate/ +export HOCHOB_SERVER_MEDIA_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ +export HOCHOB_SERVER_MEDIA_IMAGE_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_IMAGE/VisitorsCenter/ +export HOCHOB_SERVER_MEDIA_IMAGE_VISITORS=$HOCHOB_SERVER_MEDIA_IMAGE/Visitors/ -export HOCHOB_MEDIA_VIDEO=$HOCHOB_MEDIA/Video/ -export HOCHOB_MEDIA_VIDEO_CORPORATE=$HOCHOB_MEDIA_VIDEO/Corporate/ -export HOCHOB_MEDIA_VIDEO_VISITORSCENTER=$HOCHOB_MEDIA_VIDEO/VisitorsCenter/ -export HOCHOB_MEDIA_VIDEO_VISITORS=$HOCHOB_MEDIA_VIDEO/Visitors/ +export HOCHOB_SERVER_MEDIA_VIDEO=$HOCHOB_MEDIA/Video/ +export HOCHOB_SERVER_MEDIA_VIDEO_CORPORATE=$HOCHOB_SERVER_MEDIA_VIDEO/Corporate/ +export HOCHOB_SERVER_MEDIA_VIDEO_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_VIDEO/VisitorsCenter/ +export HOCHOB_SERVER_MEDIA_VIDEO_VISITORS=$HOCHOB_SERVER_MEDIA_VIDEO/Visitors/ # ============================================================================= # Functions diff --git a/Hochob/Services/Camera/hbsCameraFswMain.sh b/Hochob/Services/Camera/Fswebcam.sh similarity index 77% rename from Hochob/Services/Camera/hbsCameraFswMain.sh rename to Hochob/Services/Camera/Fswebcam.sh index 0d0f828f..335c5662 100755 --- a/Hochob/Services/Camera/hbsCameraFswMain.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -9,13 +9,13 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_CAMERA_FSW_PID=$$ -export HBS_CAMERA_FSW_ROOT=$HOCHOB_SERVICES_CAMERA +export HBS_CAMERA_FSW_ROOT=$HOCHOB_SERVER_SERVICES_CAMERA export HBS_CAMERA_FSW_BINARY=fswebcam export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" -export HBS_CAMERA_FSW_REPOSITORY=$HOCHOB_MEDIA_CAMERA_FSWEBCAM -export HBS_CAMERA_FSW_IMAGE=$HOCHOB_MEDIA_CAMERA_FSWEBCAM_IMAGE +export HBS_CAMERA_FSW_REPOSITORY=$HOCHOB_SERVER_MEDIA_CAMERA_FSWEBCAM +export HBS_CAMERA_FSW_IMAGE=$HOCHOB_SERVER_MEDIA_CAMERA_FSWEBCAM_IMAGE -export PATH=$PATH:$HOCHOB_SERVICES_CAMERA +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA # ============================================================================= # Functions diff --git a/Hochob/Services/Image/hbsImageEogMain.sh b/Hochob/Services/Image/Eog.sh similarity index 94% rename from Hochob/Services/Image/hbsImageEogMain.sh rename to Hochob/Services/Image/Eog.sh index 28ce2c14..cb71a911 100755 --- a/Hochob/Services/Image/hbsImageEogMain.sh +++ b/Hochob/Services/Image/Eog.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_IMAGE_EOG_PID=$$ -export HBS_IMAGE_EOG_ROOT=$HOCHOB_SERVICES_IMAGE +export HBS_IMAGE_EOG_ROOT=$HOCHOB_SERVER_SERVICES_IMAGE export HBS_IMAGE_EOG_BINARY=eog export HBS_IMAGE_EOG_ARGUMENTS="-sf" diff --git a/Hochob/Services/Sound/Play/hbsSoundPxAplMain.sh b/Hochob/Services/Sound/Play/Aplay.sh similarity index 93% rename from Hochob/Services/Sound/Play/hbsSoundPxAplMain.sh rename to Hochob/Services/Sound/Play/Aplay.sh index 9fec5184..5e755ac5 100755 --- a/Hochob/Services/Sound/Play/hbsSoundPxAplMain.sh +++ b/Hochob/Services/Sound/Play/Aplay.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_SOUND_PX_APLAY_PID=$$ -export HBS_SOUND_PX_APLAY_ROOT=$HOCHOB_SERVICES_SOUND_PX +export HBS_SOUND_PX_APLAY_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PX export HBS_SOUND_PX_APLAY_BINARY=aplay LOCAL_FILE="$1" diff --git a/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh b/Hochob/Services/Sound/Play/Mpg123.sh similarity index 93% rename from Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh rename to Hochob/Services/Sound/Play/Mpg123.sh index 685daaac..0fcd8729 100755 --- a/Hochob/Services/Sound/Play/hbsSoundPxMpgMain.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_SOUND_PX_MPG123_PID=$$ -export HBS_SOUND_PX_MPG123_ROOT=$HOCHOB_SERVICES_SOUND_PX +export HBS_SOUND_PX_MPG123_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PX export HBS_SOUND_PX_MPG123_BINARY=mpg123 LOCAL_FILE="$1" diff --git a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh similarity index 88% rename from Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh rename to Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh index 869336b4..7e01d201 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/hbsSoundSsEspeakMain.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh @@ -9,14 +9,14 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_SOUND_SS_ESPEAK_PID=$$ -export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVICES_SOUND_SS +export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_SS export HBS_SOUND_SS_ESPEAK_BINARY=espeak export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" export HBS_SOUND_SS_ESPEAK_PLAY="-w" export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" export HBS_SOUND_SS_ESPEAK_INPUT="No input has been provided" -export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK -export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT +export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK +export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" diff --git a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh similarity index 94% rename from Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh rename to Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index a70f5ef8..39aa99d4 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/hbsStreamS2cMain.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_STREAM_S2C_PID=$$ -export HBS_STREAM_S2C_ROOT=$HOCHOB_SERVICES_STREAM_S2C +export HBS_STREAM_S2C_ROOT=$HOCHOB_SERVER_SERVICES_STREAM_S2C export HBS_STREAM_S2C_BINARY=stream2chromecast.py LOCAL_DEVICE="$1" diff --git a/Hochob/Services/Video/hbsVideoVlcMain.sh b/Hochob/Services/Video/Vlc.sh similarity index 95% rename from Hochob/Services/Video/hbsVideoVlcMain.sh rename to Hochob/Services/Video/Vlc.sh index f856a6c5..e0c8c4e0 100755 --- a/Hochob/Services/Video/hbsVideoVlcMain.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_VIDEO_VLC_PID=$$ -export HBS_VIDEO_VLC_ROOT=$HOCHOB_SERVICES_VIDEO +export HBS_VIDEO_VLC_ROOT=$HOCHOB_SERVER_SERVICES_VIDEO export HBS_VIDEO_VLC_BINARY=cvlc export HBS_VIDEO_VLC_ARGUMENTS="--no-video-title-show --fullscreen" export HBS_VIDEO_VLC_LOOP="--loop" From 95de4125d8da36f6cbc4e4933dcb39332b181e9b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:22:18 -0500 Subject: [PATCH 0049/1653] Update Main.sh --- Hochob/Main.sh | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 1f91cec8..b7f61f4b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -24,30 +24,31 @@ export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ # Hochob Server Media Source -export HOCHOB_MEDIA=/tmp/HochobMediaSource/ - -export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_IMAGE_VISITORS/Fswebcam/ -export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_IMAGE_VISITORS_FSWEBCAM/hbsCameraFswImage.jpg - -export HOCHOB_SERVER_MEDIA_MUSIC=$HOCHOB_MEDIA/Music/ - -export HOCHOB_SERVER_MEDIA_SOUND=$HOCHOB_MEDIA/Sound/ -export HOCHOB_SERVER_MEDIA_SOUND_STREAM=$HOCHOB_SERVER_MEDIA_SOUND/Stream -export HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK=$HOCHOB_SERVER_MEDIA_SOUND_STREAM/Espeak/ -export HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav -export HOCHOB_SERVER_MEDIA_SOUND_LUPEROBOT=$HOCHOB_SERVER_MEDIA_SOUND/LupeRobot/ -export HOCHOB_SERVER_MEDIA_SOUND_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_SOUND/VisitorsCenter/ - -export HOCHOB_SERVER_MEDIA_IMAGE=$HOCHOB_MEDIA/Image/ -export HOCHOB_SERVER_MEDIA_IMAGE_CORPORATE=$HOCHOB_SERVER_MEDIA_IMAGE/Corporate/ -export HOCHOB_SERVER_MEDIA_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ -export HOCHOB_SERVER_MEDIA_IMAGE_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_IMAGE/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_IMAGE_VISITORS=$HOCHOB_SERVER_MEDIA_IMAGE/Visitors/ - -export HOCHOB_SERVER_MEDIA_VIDEO=$HOCHOB_MEDIA/Video/ -export HOCHOB_SERVER_MEDIA_VIDEO_CORPORATE=$HOCHOB_SERVER_MEDIA_VIDEO/Corporate/ -export HOCHOB_SERVER_MEDIA_VIDEO_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_VIDEO/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_VIDEO_VISITORS=$HOCHOB_SERVER_MEDIA_VIDEO/Visitors/ +export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ + +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg + +export HOCHOB_SERVER_MEDIA_SOURCE_MUSIC=$HOCHOB_SERVER_MEDIA_SOURCE/Music/ + +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_STREAM=$HOCHOB_SERVER_MEDIA_SOUND/Stream +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_STREAM_ESPEAK=$HOCHOB_SERVER_MEDIA_SOUND_STREAM/Espeak/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_STREAM_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_LUPEROBOT=$HOCHOB_SERVER_MEDIA_SOUND/LupeRobot/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_SOUND/VisitorsCenter/ + +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_CORPORATE=$HOCHOB_SERVER_MEDIA_IMAGE/Corporate/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_IMAGE/VisitorsCenter/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORS=$HOCHOB_SERVER_MEDIA_IMAGE/Visitors/ + +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_CORPORATE=$HOCHOB_SERVER_MEDIA_VIDEO/Corporate/ +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_VIDEO/VisitorsCenter/ +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_VISITORS=$HOCHOB_SERVER_MEDIA_VIDEO/Visitors/ # ============================================================================= # Functions From 1237e4f42421dea7673aebf1cbf11fe48b8ed9ae Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:24:21 -0500 Subject: [PATCH 0050/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index 335c5662..fb2bd69c 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -12,8 +12,7 @@ export HBS_CAMERA_FSW_PID=$$ export HBS_CAMERA_FSW_ROOT=$HOCHOB_SERVER_SERVICES_CAMERA export HBS_CAMERA_FSW_BINARY=fswebcam export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" -export HBS_CAMERA_FSW_REPOSITORY=$HOCHOB_SERVER_MEDIA_CAMERA_FSWEBCAM -export HBS_CAMERA_FSW_IMAGE=$HOCHOB_SERVER_MEDIA_CAMERA_FSWEBCAM_IMAGE +export HBS_CAMERA_FSW_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA From fdb030a01368b32f2ead58f77fb4fcfe092db88a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:25:55 -0500 Subject: [PATCH 0051/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index b7f61f4b..aac873db 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -16,8 +16,8 @@ export HOCHOB_SERVER_SERVICES=$HOCHOB_ROOT/Services/ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ export HOCHOB_SERVER_SERVICES_SOUND=$HOCHOB_SERVER_SERVICES/Sound/ -export HOCHOB_SERVER_SERVICES_SOUND_PX=$HOCHOB_SERVER_SERVICES_SOUND/Play/ -export HOCHOB_SERVER_SERVICES_SOUND_SS=$HOCHOB_SERVER_SERVICES_SOUND/SpeechSynthetizer/ +export HOCHOB_SERVER_SERVICES_SOUND_PLAY=$HOCHOB_SERVER_SERVICES_SOUND/Play/ +export HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_SERVICES_SOUND/SpeechSynthetizer/ export HOCHOB_SERVER_SERVICES_STREAM=$HOCHOB_SERVER_SERVICES/Stream/ export HOCHOB_SERVER_SERVICES_STREAM_S2C=$HOCHOB_SERVER_SERVICES_STREAM/Stream2Chromecast/ export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ From 0371e74b456d32de90381ec2ac540e1106768d70 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:26:12 -0500 Subject: [PATCH 0052/1653] Update Aplay.sh --- Hochob/Services/Sound/Play/Aplay.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/Play/Aplay.sh b/Hochob/Services/Sound/Play/Aplay.sh index 5e755ac5..2ae917b0 100755 --- a/Hochob/Services/Sound/Play/Aplay.sh +++ b/Hochob/Services/Sound/Play/Aplay.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_SOUND_PX_APLAY_PID=$$ -export HBS_SOUND_PX_APLAY_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PX +export HBS_SOUND_PX_APLAY_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY export HBS_SOUND_PX_APLAY_BINARY=aplay LOCAL_FILE="$1" From 29f834dcf2ed88e955b84cd02aa9061a6af875cc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:27:30 -0500 Subject: [PATCH 0053/1653] Update Mpg123.sh --- Hochob/Services/Sound/Play/Mpg123.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 0fcd8729..74cacf94 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_SOUND_PX_MPG123_PID=$$ -export HBS_SOUND_PX_MPG123_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PX +export HBS_SOUND_PX_MPG123_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY export HBS_SOUND_PX_MPG123_BINARY=mpg123 LOCAL_FILE="$1" From 817678b18d19ad4b37bca91a974d9b3f3a1df6aa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:32:12 -0500 Subject: [PATCH 0054/1653] Update Main.sh --- Hochob/Main.sh | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index aac873db..4022a0d0 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -30,21 +30,25 @@ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg -export HOCHOB_SERVER_MEDIA_SOURCE_MUSIC=$HOCHOB_SERVER_MEDIA_SOURCE/Music/ - -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_STREAM=$HOCHOB_SERVER_MEDIA_SOUND/Stream -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_STREAM_ESPEAK=$HOCHOB_SERVER_MEDIA_SOUND_STREAM/Espeak/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_STREAM_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_LUPEROBOT=$HOCHOB_SERVER_MEDIA_SOUND/LupeRobot/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_SOUND/VisitorsCenter/ - export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_CORPORATE=$HOCHOB_SERVER_MEDIA_IMAGE/Corporate/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_IMAGE/VisitorsCenter/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORS=$HOCHOB_SERVER_MEDIA_IMAGE/Visitors/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOUND/Stream +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOUND_STREAM/Espeak/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav + +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ + +export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ + +# Hochob Server Media + +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_LUPEROBOT=$HOCHOB_SERVER_MEDIA_SOUND/LupeRobot/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_SOUND/VisitorsCenter/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_CORPORATE=$HOCHOB_SERVER_MEDIA_VIDEO/Corporate/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_VIDEO/VisitorsCenter/ From 9d14f71f085973800d267dff5c16222c9ad01833 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:33:07 -0500 Subject: [PATCH 0055/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh index 7e01d201..aa1284c6 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh @@ -9,14 +9,14 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_SOUND_SS_ESPEAK_PID=$$ -export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_SS +export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER export HBS_SOUND_SS_ESPEAK_BINARY=espeak export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" export HBS_SOUND_SS_ESPEAK_PLAY="-w" export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" export HBS_SOUND_SS_ESPEAK_INPUT="No input has been provided" -export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK -export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK_OUTPUT +export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK +export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" From 20b5c5c36f2df8dbf9b7b5a5f1a3cfd675c695f4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:33:59 -0500 Subject: [PATCH 0056/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 39aa99d4..c1bd1ab5 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HBS_STREAM_S2C_PID=$$ -export HBS_STREAM_S2C_ROOT=$HOCHOB_SERVER_SERVICES_STREAM_S2C +export HBS_STREAM_S2C_ROOT=$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST export HBS_STREAM_S2C_BINARY=stream2chromecast.py LOCAL_DEVICE="$1" From 044323ee97f05d9fb4a64f28127c9ccf34545511 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:34:02 -0500 Subject: [PATCH 0057/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 4022a0d0..a2ce655e 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -19,7 +19,7 @@ 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/ export HOCHOB_SERVER_SERVICES_STREAM=$HOCHOB_SERVER_SERVICES/Stream/ -export HOCHOB_SERVER_SERVICES_STREAM_S2C=$HOCHOB_SERVER_SERVICES_STREAM/Stream2Chromecast/ +export HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST=$HOCHOB_SERVER_SERVICES_STREAM/Stream2Chromecast/ export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ # Hochob Server Media Source From ce7793b1d0060ed8771636d5e97cb7e80477f7bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:40:14 -0500 Subject: [PATCH 0058/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index a2ce655e..cf2cad6c 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -37,7 +37,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_IMAG export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORS=$HOCHOB_SERVER_MEDIA_IMAGE/Visitors/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOUND/Stream +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOUND_STREAM/Espeak/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav From 37547e8c57f2bf78289c763556aad08df670e53c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:42:14 -0500 Subject: [PATCH 0059/1653] Update Main.sh --- Hochob/Main.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index cf2cad6c..5e4cb957 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -31,15 +31,12 @@ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CA export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_CORPORATE=$HOCHOB_SERVER_MEDIA_IMAGE/Corporate/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_IMAGE/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORS=$HOCHOB_SERVER_MEDIA_IMAGE/Visitors/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOUND/SpeechSynthesizer/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOUND_STREAM/Espeak/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOUND_STREAM_ESPEAK/hbsSoundSsEspeakOutput.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/hbsSoundSsEspeakOutput.wav export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ @@ -47,6 +44,9 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ # Hochob Server Media +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_CORPORATE=$HOCHOB_SERVER_MEDIA_IMAGE/Corporate/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_IMAGE/VisitorsCenter/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORS=$HOCHOB_SERVER_MEDIA_IMAGE/Visitors/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_LUPEROBOT=$HOCHOB_SERVER_MEDIA_SOUND/LupeRobot/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_SOUND/VisitorsCenter/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ From 66aeaab85848b48fb2274ffb838062a42a750031 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:44:23 -0500 Subject: [PATCH 0060/1653] Rename hbsCalendarGcaMain.py to Google.py --- Hochob/Services/Calendar/Google.py | 1 + Hochob/Services/Calendar/hbsCalendarGcaMain.py | 0 2 files changed, 1 insertion(+) create mode 100755 Hochob/Services/Calendar/Google.py delete mode 100755 Hochob/Services/Calendar/hbsCalendarGcaMain.py diff --git a/Hochob/Services/Calendar/Google.py b/Hochob/Services/Calendar/Google.py new file mode 100755 index 00000000..d3f5a12f --- /dev/null +++ b/Hochob/Services/Calendar/Google.py @@ -0,0 +1 @@ + diff --git a/Hochob/Services/Calendar/hbsCalendarGcaMain.py b/Hochob/Services/Calendar/hbsCalendarGcaMain.py deleted file mode 100755 index e69de29b..00000000 From 6ae7545a0fda74b4b0d20e02017ba0cf79721855 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:45:56 -0500 Subject: [PATCH 0061/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index fb2bd69c..e5362edf 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -8,13 +8,13 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_CAMERA_FSW_PID=$$ -export HBS_CAMERA_FSW_ROOT=$HOCHOB_SERVER_SERVICES_CAMERA -export HBS_CAMERA_FSW_BINARY=fswebcam -export HBS_CAMERA_FSW_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" -export HBS_CAMERA_FSW_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +export FSWEBCAM_PID=$$ +export FSWEBCAM_ROOT=$HOCHOB_SERVER_SERVICES_CAMERA +export FSWEBCAM_BINARY=fswebcam +export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" +export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE -export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA +export PATH=$PATH:$FSWEBCAM_ROOT # ============================================================================= # Functions @@ -26,6 +26,6 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA # Main # ============================================================================= -$HBS_CAMERA_FSW_BINARY $HBS_CAMERA_FSW_ARGUMENTS $HBS_CAMERA_FSW_IMAGE +$FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_IMAGE # End of File From c81eb8117df74dd769367542c4cc88b78b039cd8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:46:57 -0500 Subject: [PATCH 0062/1653] Update Eog.sh --- Hochob/Services/Image/Eog.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index cb71a911..153b8855 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -8,14 +8,14 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_IMAGE_EOG_PID=$$ -export HBS_IMAGE_EOG_ROOT=$HOCHOB_SERVER_SERVICES_IMAGE -export HBS_IMAGE_EOG_BINARY=eog -export HBS_IMAGE_EOG_ARGUMENTS="-sf" +export EOG_PID=$$ +export EOG_ROOT=$HOCHOB_SERVER_SERVICES_IMAGE +export EOG_BINARY=eog +export EOG_ARGUMENTS="-sf" LOCAL_FILES="$1" -export PATH=$PATH:$HBS_IMAGE_EOG_ROOT +export PATH=$PATH:$EOG_ROOT # ============================================================================= # Functions @@ -29,8 +29,8 @@ export PATH=$PATH:$HBS_IMAGE_EOG_ROOT if [ $# -eq 1 ] then - killall -9 $HBS_IMAGE_EOG_BINARY - $HBS_IMAGE_EOG_BINARY $HBS_IMAGE_EOG_ARGUMENTS $LOCAL_FILES & + killall -9 $EOG_BINARY + $EOG_BINARY $EOG_ARGUMENTS $LOCAL_FILES & else echo "Invalid number of arguments, see Documentation" exit 1 From f6c97f192b40f02b890a8143b6518bcf09a7c4bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:47:28 -0500 Subject: [PATCH 0063/1653] Update Aplay.sh --- Hochob/Services/Sound/Play/Aplay.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Sound/Play/Aplay.sh b/Hochob/Services/Sound/Play/Aplay.sh index 2ae917b0..ef89c2bb 100755 --- a/Hochob/Services/Sound/Play/Aplay.sh +++ b/Hochob/Services/Sound/Play/Aplay.sh @@ -8,13 +8,13 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_SOUND_PX_APLAY_PID=$$ -export HBS_SOUND_PX_APLAY_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY -export HBS_SOUND_PX_APLAY_BINARY=aplay +export APLAY_PID=$$ +export APLAY_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY +export APLAY_BINARY=aplay LOCAL_FILE="$1" -export PATH=$PATH:$HBS_SOUND_PX_APLAY_ROOT +export PATH=$PATH:$APLAY_ROOT # ============================================================================= # Functions @@ -28,8 +28,8 @@ export PATH=$PATH:$HBS_SOUND_PX_APLAY_ROOT if [ $# -eq 1 ] then - killall -9 $HBS_SOUND_PX_APLAY_BINARY - $HBS_SOUND_PX_APLAY_BINARY $LOCAL_FILE + killall -9 $APLAY_BINARY + $APLAY_BINARY $LOCAL_FILE else echo "Invalid number of arguments, see Documentation" exit 1 From f5783de03c847728378eae7055e27872fb8205a0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:47:54 -0500 Subject: [PATCH 0064/1653] Update Mpg123.sh --- Hochob/Services/Sound/Play/Mpg123.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 74cacf94..567dacd3 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -8,13 +8,13 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_SOUND_PX_MPG123_PID=$$ -export HBS_SOUND_PX_MPG123_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY -export HBS_SOUND_PX_MPG123_BINARY=mpg123 +export MPG123_PID=$$ +export MPG123_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY +export MPG123_BINARY=mpg123 LOCAL_FILE="$1" -export PATH=$PATH:$HBS_SOUND_PX_MPG123_ROOT +export PATH=$PATH:$MPG123_ROOT # ============================================================================= # Functions @@ -28,8 +28,8 @@ export PATH=$PATH:$HBS_SOUND_PX_MPG123_ROOT if [ $# -eq 1 ] then - killall -9 $HBS_SOUND_PX_MPG123_BINARY - $HBS_SOUND_PX_MPG123_BINARY $LOCAL_FILE + killall -9 $MPG123_BINARY + $MPG123_BINARY $LOCAL_FILE else echo "Invalid number of arguments, see Documentation" exit 1 From 887e6bfdb844586e14d19ade385dcd1a8ed5ee2c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:49:52 -0500 Subject: [PATCH 0065/1653] Update Espeak.sh --- .../Sound/SpeechSynthesizer/Espeak.sh | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh index aa1284c6..3d265d64 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh @@ -8,21 +8,21 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_SOUND_SS_ESPEAK_PID=$$ -export HBS_SOUND_SS_ESPEAK_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER -export HBS_SOUND_SS_ESPEAK_BINARY=espeak -export HBS_SOUND_SS_ESPEAK_ARGUMENTS="--stdout" -export HBS_SOUND_SS_ESPEAK_PLAY="-w" -export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" -export HBS_SOUND_SS_ESPEAK_INPUT="No input has been provided" -export HBS_SOUND_SS_ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK -export HBS_SOUND_SS_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT +export ESPEAK_PID=$$ +export ESPEAK_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER +export ESPEAK_BINARY=espeak +export ESPEAK_ARGUMENTS="--stdout" +export ESPEAK_PLAY="-w" +export ESPEAK_LANGUAGE="-ven+m5" +export ESPEAK_INPUT="No input has been provided" +export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK +export ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" LOCAL_TEXT="$3" -export PATH=$PATH:$HBS_SOUND_SS_ESPEAK_ROOT +export PATH=$PATH:$ESPEAK_ROOT # ============================================================================= # Functions @@ -38,17 +38,17 @@ export PATH=$PATH:$HBS_SOUND_SS_ESPEAK_ROOT if [ $# -eq 3 ] then if [ "$LOCAL_LANGUAGE" = "english" ]; then - export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ven+m5" + export ESPEAK_LANGUAGE="-ven+m5" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - export HBS_SOUND_SS_ESPEAK_LANGUAGE="-ves-la+m5" + export ESPEAK_LANGUAGE="-ves-la+m5" fi - export HBS_SOUND_SS_ESPEAK_INPUT="$LOCAL_TEXT" + export ESPEAK_INPUT="$LOCAL_TEXT" if [ "$LOCAL_PLAY" = "on" ]; then - $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_LANGUAGE $HBS_SOUND_SS_ESPEAK_ARGUMENTS "$HBS_SOUND_SS_ESPEAK_INPUT" | tee $HBS_SOUND_SS_ESPEAK_OUTPUT | aplay - + $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_OUTPUT | aplay - elif [ "$LOCAL_PLAY" = "off" ]; then - $HBS_SOUND_SS_ESPEAK_BINARY $HBS_SOUND_SS_ESPEAK_PLAY $HBS_SOUND_SS_ESPEAK_OUTPUT $HBS_SOUND_SS_ESPEAK_LANGUAGE "$HBS_SOUND_SS_ESPEAK_INPUT" + $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_OUTPUT $ESPEAK_LANGUAGE "$ESPEAK_INPUT" fi else echo "Invalid number of arguments, see Documentation" From 4a0a41650d3dca239e77c4f7944a6177c8ca2169 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:51:07 -0500 Subject: [PATCH 0066/1653] Update Stream2Chromecast.sh --- .../Stream2Chromecast/Stream2Chromecast.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index c1bd1ab5..a9f08641 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -8,15 +8,15 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_STREAM_S2C_PID=$$ -export HBS_STREAM_S2C_ROOT=$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST -export HBS_STREAM_S2C_BINARY=stream2chromecast.py +export STREAM2CHROMECAST_PID=$$ +export STREAM2CHROMECAST_ROOT=$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST +export STREAM2CHROMECAST_BINARY=stream2chromecast.py LOCAL_DEVICE="$1" LOCAL_VOLUME="$2" LOCAL_FILE="$3" -export PATH=$PATH:$HBS_STREAM_S2C_ROOT +export PATH=$PATH:$STREAM2CHROMECAST_ROOT # ============================================================================= # Functions @@ -30,10 +30,10 @@ export PATH=$PATH:$HBS_STREAM_S2C_ROOT if [ $# -eq 3 ] then - killall -9 $HBS_STREAM_S2C_BINARY - $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME - $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE - $HBS_STREAM_S2C_BINARY -devicename $LOCAL_DEVICE -stop + killall -9 $STREAM2CHROMECAST_BINARY + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else echo "Invalid number of arguments, see Documentation" exit 1 From 9ef792dd8cfcea30c9d5ead88499152f1492824c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:51:56 -0500 Subject: [PATCH 0067/1653] Update Vlc.sh --- Hochob/Services/Video/Vlc.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/Vlc.sh index e0c8c4e0..90a8e045 100755 --- a/Hochob/Services/Video/Vlc.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -8,11 +8,11 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HBS_VIDEO_VLC_PID=$$ -export HBS_VIDEO_VLC_ROOT=$HOCHOB_SERVER_SERVICES_VIDEO -export HBS_VIDEO_VLC_BINARY=cvlc -export HBS_VIDEO_VLC_ARGUMENTS="--no-video-title-show --fullscreen" -export HBS_VIDEO_VLC_LOOP="--loop" +export VLC_PID=$$ +export VLC_ROOT=$HOCHOB_SERVER_SERVICES_VIDEO +export VLC_BINARY=cvlc +export VLC_ARGUMENTS="--no-video-title-show --fullscreen" +export VLC_LOOP="--loop" LOCAL_LOOP="$1" LOCAL_FILE="$2" @@ -31,12 +31,12 @@ export PATH=$PATH:$HBS_VIDEO_VLC_ROOT if [ $# -eq 2 ] then - killall -9 $HBS_VIDEO_VLC_BINARY + killall -9 $VLC_BINARY if [ "$LOCAL_LOOP" = "on" ]; then - $HBS_VIDEO_VLC_BINARY $HBS_VIDEO_VLC_ARGUMENTS $HBS_VIDEO_VLC_LOOP $LOCAL_FILE & + $VLC_BINARY $VLC_ARGUMENTS $VLC_LOOP $LOCAL_FILE & elif [ "$LOCAL_LOOP" = "off" ]; then - $HBS_VIDEO_VLC_BINARY $HBS_VIDEO_VLC_ARGUMENTS $LOCAL_FILE & + $VLC_BINARY $VLC_ARGUMENTS $LOCAL_FILE & fi else echo "Invalid number of arguments, see Documentation" From d5cdd953ed1e4dcd8e569726b49a090ca0ddeda0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:52:11 -0500 Subject: [PATCH 0068/1653] Update Vlc.sh --- Hochob/Services/Video/Vlc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/Vlc.sh index 90a8e045..d94660f8 100755 --- a/Hochob/Services/Video/Vlc.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -17,7 +17,7 @@ export VLC_LOOP="--loop" LOCAL_LOOP="$1" LOCAL_FILE="$2" -export PATH=$PATH:$HBS_VIDEO_VLC_ROOT +export PATH=$PATH:$VLC_ROOT # ============================================================================= # Functions From 4546c9ddfab2d0fbadc21bb1d3c145c5b77ceea6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:52:45 -0500 Subject: [PATCH 0069/1653] Update Vlc.sh --- Hochob/Services/Video/Vlc.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/Vlc.sh index d94660f8..4e10e362 100755 --- a/Hochob/Services/Video/Vlc.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -32,7 +32,6 @@ export PATH=$PATH:$VLC_ROOT if [ $# -eq 2 ] then killall -9 $VLC_BINARY - if [ "$LOCAL_LOOP" = "on" ]; then $VLC_BINARY $VLC_ARGUMENTS $VLC_LOOP $LOCAL_FILE & elif [ "$LOCAL_LOOP" = "off" ]; then From 1ebf5ce6d248972931860ae67639289f374ca9d5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 01:57:22 -0500 Subject: [PATCH 0070/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Aguascalientes.sh | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh new file mode 100755 index 00000000..35b9e756 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export AGUASCALIENTES_PID=$$ + +export PATH=$PATH:$AGUASCALIENTES_ROOT + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +# End of File From d26ca2803279335b2c7486c5819cc1d46ab6f8f7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 02:07:50 -0500 Subject: [PATCH 0071/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 5e4cb957..2e946ff9 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -22,6 +22,8 @@ export HOCHOB_SERVER_SERVICES_STREAM=$HOCHOB_SERVER_SERVICES/Stream/ export HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST=$HOCHOB_SERVER_SERVICES_STREAM/Stream2Chromecast/ export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE + # Hochob Server Media Source export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ From 1b8f3246121aa855dc09a523bd92f3b2d0e969b5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 02:13:21 -0500 Subject: [PATCH 0072/1653] Update Main.sh --- Hochob/Main.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 2e946ff9..5622492e 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -46,15 +46,17 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ # Hochob Server Media -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_CORPORATE=$HOCHOB_SERVER_MEDIA_IMAGE/Corporate/ -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_IMAGE/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_VISITORS=$HOCHOB_SERVER_MEDIA_IMAGE/Visitors/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_LUPEROBOT=$HOCHOB_SERVER_MEDIA_SOUND/LupeRobot/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_SOUND/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_CORPORATE=$HOCHOB_SERVER_MEDIA_VIDEO/Corporate/ -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_VISITORSCENTER=$HOCHOB_SERVER_MEDIA_VIDEO/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_VISITORS=$HOCHOB_SERVER_MEDIA_VIDEO/Visitors/ +export HOCHOB_SERVER_MEDIA=$HOME/HochobServerMedia/ + +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_VISITORSCENTER=HOCHOB_SERVER_MEDIA_CORPORATE/VisitorsCenter/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Image/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Music/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Sound/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Video/ # ============================================================================= # Functions From b6826db320981facf094178055bf37fc95c22ab8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:07:19 -0500 Subject: [PATCH 0073/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Aguascalientes.sh | 12 ++++++++++-- Hochob/Main.sh | 3 ++- Hochob/Services/Image/Eog.sh | 2 +- Hochob/Services/Sound/Play/Mpg123.sh | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh index 35b9e756..7440a71d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -x +#set -x # ============================================================================= # Variables @@ -9,8 +9,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh export AGUASCALIENTES_PID=$$ +export AGUASCALIENTES_PATH=$(readlink -f "$0") +export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") -export PATH=$PATH:$AGUASCALIENTES_ROOT +export PATH=$PATH:$AGUASCALIENTES_DIRECTORY # ============================================================================= # Functions @@ -22,4 +24,10 @@ export PATH=$PATH:$AGUASCALIENTES_ROOT # Main # ============================================================================= +#Eog.sh "$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE/*" & +Mpg123.sh "$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND/a1.mp3" + +killall -9 eog +kill -9 $AGUASCALIENTES_PID + # End of File diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 5622492e..d68ad25c 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -23,6 +23,7 @@ export HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST=$HOCHOB_SERVER_SERVICES_S export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_PLAY # Hochob Server Media Source @@ -52,7 +53,7 @@ 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_VISITORSCENTER=HOCHOB_SERVER_MEDIA_CORPORATE/VisitorsCenter/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Image/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Music/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Sound/ diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index 153b8855..e938a28a 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -x +#set -x # ============================================================================= # Variables diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 567dacd3..10133f35 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -26,7 +26,7 @@ export PATH=$PATH:$MPG123_ROOT # Main # ============================================================================= -if [ $# -eq 1 ] +if [ $# -eq 1 ] then killall -9 $MPG123_BINARY $MPG123_BINARY $LOCAL_FILE From aef09a5415113d26da43c4e688354a0c6e5b46d4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:20:36 -0500 Subject: [PATCH 0074/1653] Update Main.sh --- Hochob/Main.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index d68ad25c..d84027f9 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -22,8 +22,14 @@ export HOCHOB_SERVER_SERVICES_STREAM=$HOCHOB_SERVER_SERVICES/Stream/ export HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST=$HOCHOB_SERVER_SERVICES_STREAM/Stream2Chromecast/ export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_PLAY +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VIDEO # Hochob Server Media Source From 5ad8e94565183243679b5fbe1007e7c84f68c6c0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:22:18 -0500 Subject: [PATCH 0075/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh | 4 +++- Hochob/Setup.sh | 0 2 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 Hochob/Setup.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh index 7440a71d..66082954 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh @@ -24,9 +24,11 @@ export PATH=$PATH:$AGUASCALIENTES_DIRECTORY # Main # ============================================================================= -#Eog.sh "$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE/*" & +Eog.sh "$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE/*" & Mpg123.sh "$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND/a1.mp3" +# How to Kill + killall -9 eog kill -9 $AGUASCALIENTES_PID diff --git a/Hochob/Setup.sh b/Hochob/Setup.sh old mode 100644 new mode 100755 From 0abe7798c27897c5a39c6a6f09050ef748e075be Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:23:40 -0500 Subject: [PATCH 0076/1653] Update Aguascalientes.sh --- Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh index 66082954..65ca9355 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh @@ -1,6 +1,6 @@ #!/bin/sh -#set -x +set -x # ============================================================================= # Variables From 9649802515e6a8ca8d615761a5a1f0449050a3a6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:24:02 -0500 Subject: [PATCH 0077/1653] Update Eog.sh --- Hochob/Services/Image/Eog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index e938a28a..153b8855 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -1,6 +1,6 @@ #!/bin/sh -#set -x +set -x # ============================================================================= # Variables From 8a2e6ffbb8dfe69d2612c2b3a08721f9eedc8311 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:24:42 -0500 Subject: [PATCH 0078/1653] Update Eog.sh --- Hochob/Services/Image/Eog.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index 153b8855..29cea7eb 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export EOG_PID=$$ export EOG_ROOT=$HOCHOB_SERVER_SERVICES_IMAGE @@ -15,7 +15,7 @@ export EOG_ARGUMENTS="-sf" LOCAL_FILES="$1" -export PATH=$PATH:$EOG_ROOT +#export PATH=$PATH:$EOG_ROOT # ============================================================================= # Functions From 35473dcc708742bc42594cc6b2a26d0db5090b94 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:25:07 -0500 Subject: [PATCH 0079/1653] Update Mpg123.sh --- Hochob/Services/Sound/Play/Mpg123.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 10133f35..a1f2dc73 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export MPG123_PID=$$ export MPG123_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY @@ -14,7 +14,7 @@ export MPG123_BINARY=mpg123 LOCAL_FILE="$1" -export PATH=$PATH:$MPG123_ROOT +#export PATH=$PATH:$MPG123_ROOT # ============================================================================= # Functions From 32f938d47330f7b7a6b382637f241a0c9c1e02e1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:26:06 -0500 Subject: [PATCH 0080/1653] Update Mpg123.sh --- Hochob/Services/Sound/Play/Mpg123.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index a1f2dc73..312a3e49 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -6,16 +6,12 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh - export MPG123_PID=$$ export MPG123_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY export MPG123_BINARY=mpg123 LOCAL_FILE="$1" -#export PATH=$PATH:$MPG123_ROOT - # ============================================================================= # Functions # ============================================================================= @@ -28,7 +24,6 @@ LOCAL_FILE="$1" if [ $# -eq 1 ] then - killall -9 $MPG123_BINARY $MPG123_BINARY $LOCAL_FILE else echo "Invalid number of arguments, see Documentation" From 215fc53993d44781647df95439ff914e645d572b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:26:30 -0500 Subject: [PATCH 0081/1653] Update Aplay.sh --- Hochob/Services/Sound/Play/Aplay.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Hochob/Services/Sound/Play/Aplay.sh b/Hochob/Services/Sound/Play/Aplay.sh index ef89c2bb..d8b0db54 100755 --- a/Hochob/Services/Sound/Play/Aplay.sh +++ b/Hochob/Services/Sound/Play/Aplay.sh @@ -6,16 +6,12 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh - export APLAY_PID=$$ export APLAY_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY export APLAY_BINARY=aplay LOCAL_FILE="$1" -export PATH=$PATH:$APLAY_ROOT - # ============================================================================= # Functions # ============================================================================= @@ -28,7 +24,6 @@ export PATH=$PATH:$APLAY_ROOT if [ $# -eq 1 ] then - killall -9 $APLAY_BINARY $APLAY_BINARY $LOCAL_FILE else echo "Invalid number of arguments, see Documentation" From 9aba470418526c03bfbbd6fd4130d92f46e3a8c8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:28:55 -0500 Subject: [PATCH 0082/1653] Update Aplay.sh --- Hochob/Services/Sound/Play/Aplay.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Sound/Play/Aplay.sh b/Hochob/Services/Sound/Play/Aplay.sh index d8b0db54..4dbe7cad 100755 --- a/Hochob/Services/Sound/Play/Aplay.sh +++ b/Hochob/Services/Sound/Play/Aplay.sh @@ -7,7 +7,6 @@ set -x # ============================================================================= export APLAY_PID=$$ -export APLAY_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY export APLAY_BINARY=aplay LOCAL_FILE="$1" From 2828a6ad2f8a7714f67b2c1533ff8f9269cadf70 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:29:07 -0500 Subject: [PATCH 0083/1653] Update Mpg123.sh --- Hochob/Services/Sound/Play/Mpg123.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 312a3e49..0b8037f6 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -7,7 +7,6 @@ set -x # ============================================================================= export MPG123_PID=$$ -export MPG123_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_PLAY export MPG123_BINARY=mpg123 LOCAL_FILE="$1" From 689c9568ac0c4db773b436951bb1c0bd21375184 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:29:30 -0500 Subject: [PATCH 0084/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh index 3d265d64..9cec9ffa 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh @@ -9,7 +9,6 @@ set -x . ~/CodeLabs/Hochob/Main.sh export ESPEAK_PID=$$ -export ESPEAK_ROOT=$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER export ESPEAK_BINARY=espeak export ESPEAK_ARGUMENTS="--stdout" export ESPEAK_PLAY="-w" @@ -22,8 +21,6 @@ LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" LOCAL_TEXT="$3" -export PATH=$PATH:$ESPEAK_ROOT - # ============================================================================= # Functions # ============================================================================= From f2ca086cb5ca9fbcffcfe89f44907b70d97b7c45 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:29:43 -0500 Subject: [PATCH 0085/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index e5362edf..eaeb5ab7 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -9,13 +9,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh export FSWEBCAM_PID=$$ -export FSWEBCAM_ROOT=$HOCHOB_SERVER_SERVICES_CAMERA export FSWEBCAM_BINARY=fswebcam export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE -export PATH=$PATH:$FSWEBCAM_ROOT - # ============================================================================= # Functions # ============================================================================= From 30d5fd7b81ca820c88daa236d8877851152a5b03 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:29:59 -0500 Subject: [PATCH 0086/1653] Update Eog.sh --- Hochob/Services/Image/Eog.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index 29cea7eb..1e261cb4 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -9,7 +9,6 @@ set -x #. ~/CodeLabs/Hochob/Main.sh export EOG_PID=$$ -export EOG_ROOT=$HOCHOB_SERVER_SERVICES_IMAGE export EOG_BINARY=eog export EOG_ARGUMENTS="-sf" From 3b6f38e81f61fed1a5a6e57aa5c36e5e28ae4aa3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:30:20 -0500 Subject: [PATCH 0087/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index a9f08641..54838c45 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -9,7 +9,6 @@ set -x . ~/CodeLabs/Hochob/Main.sh export STREAM2CHROMECAST_PID=$$ -export STREAM2CHROMECAST_ROOT=$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST export STREAM2CHROMECAST_BINARY=stream2chromecast.py LOCAL_DEVICE="$1" From 856aebf0428ed446cdff9e04ac25e319d7a8d276 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:30:40 -0500 Subject: [PATCH 0088/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 54838c45..7e0f0429 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -6,8 +6,6 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh - export STREAM2CHROMECAST_PID=$$ export STREAM2CHROMECAST_BINARY=stream2chromecast.py @@ -15,8 +13,6 @@ LOCAL_DEVICE="$1" LOCAL_VOLUME="$2" LOCAL_FILE="$3" -export PATH=$PATH:$STREAM2CHROMECAST_ROOT - # ============================================================================= # Functions # ============================================================================= From 114429fca73ffc5219376e3fae1adda4e7286ff4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:30:59 -0500 Subject: [PATCH 0089/1653] Update Vlc.sh --- Hochob/Services/Video/Vlc.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/Vlc.sh index 4e10e362..b0166ccd 100755 --- a/Hochob/Services/Video/Vlc.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -6,10 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh - export VLC_PID=$$ -export VLC_ROOT=$HOCHOB_SERVER_SERVICES_VIDEO export VLC_BINARY=cvlc export VLC_ARGUMENTS="--no-video-title-show --fullscreen" export VLC_LOOP="--loop" @@ -17,8 +14,6 @@ export VLC_LOOP="--loop" LOCAL_LOOP="$1" LOCAL_FILE="$2" -export PATH=$PATH:$VLC_ROOT - # ============================================================================= # Functions # ============================================================================= From 81ffc1fe227c4f3a04aa87f633158982c24d437f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:31:19 -0500 Subject: [PATCH 0090/1653] Update Eog.sh --- Hochob/Services/Image/Eog.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index 1e261cb4..9b23e07d 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -6,16 +6,12 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh - export EOG_PID=$$ export EOG_BINARY=eog export EOG_ARGUMENTS="-sf" LOCAL_FILES="$1" -#export PATH=$PATH:$EOG_ROOT - # ============================================================================= # Functions # ============================================================================= From 50a5bc706ef8b825a136d83908d0edd4eb68b87f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:33:55 -0500 Subject: [PATCH 0091/1653] Update Aguascalientes.sh --- .../Applications/NorthernMayaLowlands/Aguascalientes.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh index 65ca9355..d50ef5b8 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh @@ -12,8 +12,6 @@ export AGUASCALIENTES_PID=$$ export AGUASCALIENTES_PATH=$(readlink -f "$0") export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") -export PATH=$PATH:$AGUASCALIENTES_DIRECTORY - # ============================================================================= # Functions # ============================================================================= @@ -25,11 +23,8 @@ export PATH=$PATH:$AGUASCALIENTES_DIRECTORY # ============================================================================= Eog.sh "$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE/*" & -Mpg123.sh "$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND/a1.mp3" - -# How to Kill +#Mpg123.sh "$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND/a1.mp3" -killall -9 eog -kill -9 $AGUASCALIENTES_PID +kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') # End of File From 9d7b16982f7db4b95135a9565a5b0e31ee6b78dc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:34:00 -0500 Subject: [PATCH 0092/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh index d50ef5b8..c1f6b115 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh @@ -23,7 +23,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= Eog.sh "$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE/*" & -#Mpg123.sh "$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND/a1.mp3" +Mpg123.sh "$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND/a1.mp3" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From 00922ea943129d76adbb55233acc3f21bb44aba5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:50:52 -0500 Subject: [PATCH 0093/1653] Update Main.sh --- Hochob/Main.sh | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index d84027f9..53e09400 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -60,10 +60,26 @@ 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_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Image/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Music/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Sound/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Video/ + +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/VisitorsCenter/Memories/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Camera/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Drawing/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Video/ + +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS=$HOCHOB_SERVER_MEDIA/Applications/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Image/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Music/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Sound/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Video/ + +export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA +export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING +export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO + +export APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE +export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC +export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND +export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO # ============================================================================= # Functions From 506675a61fdb846cf402d3b73fe4814b4ba868bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:52:18 -0500 Subject: [PATCH 0094/1653] Update Main.sh --- Hochob/Main.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 53e09400..65afc54d 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -51,7 +51,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ -# Hochob Server Media +# Hochob Server Media Raw export HOCHOB_SERVER_MEDIA=$HOME/HochobServerMedia/ @@ -72,6 +72,8 @@ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDI export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Sound/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Video/ +# Hochob Server Media Executive + export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO From a5c5a12fca2c0e60d91dc9dc79b1ff71b2701316 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 08:56:31 -0500 Subject: [PATCH 0095/1653] Update Main.sh --- Hochob/Main.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 65afc54d..35d7bb76 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -60,12 +60,10 @@ 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_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/ - export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/VisitorsCenter/Memories/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Camera/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Drawing/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Video/ - export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS=$HOCHOB_SERVER_MEDIA/Applications/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Image/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Music/ @@ -74,6 +72,9 @@ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDI # Hochob Server Media Executive +export CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE +export CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO + export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO From 1c9442d6b958877f62a58da2eade60dedf5dff9b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:01:14 -0500 Subject: [PATCH 0096/1653] Update Signed-off-by: Abraham Arce --- Hochob/Setup/HochobServerMedia.sh | 5 +++++ Hochob/Setup/HochobServerMediaSource.sh | 5 +++++ Hochob/{Setup.sh => Setup/Packages.sh} | 3 --- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100755 Hochob/Setup/HochobServerMedia.sh create mode 100755 Hochob/Setup/HochobServerMediaSource.sh rename Hochob/{Setup.sh => Setup/Packages.sh} (82%) diff --git a/Hochob/Setup/HochobServerMedia.sh b/Hochob/Setup/HochobServerMedia.sh new file mode 100755 index 00000000..520d3127 --- /dev/null +++ b/Hochob/Setup/HochobServerMedia.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ + +# End of File diff --git a/Hochob/Setup/HochobServerMediaSource.sh b/Hochob/Setup/HochobServerMediaSource.sh new file mode 100755 index 00000000..520d3127 --- /dev/null +++ b/Hochob/Setup/HochobServerMediaSource.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ + +# End of File diff --git a/Hochob/Setup.sh b/Hochob/Setup/Packages.sh similarity index 82% rename from Hochob/Setup.sh rename to Hochob/Setup/Packages.sh index 8a7019e9..ba11c3cd 100755 --- a/Hochob/Setup.sh +++ b/Hochob/Setup/Packages.sh @@ -46,7 +46,4 @@ sudo apt install libav-tools # Hochob Server Services Video # None -test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ -test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ - # End of File From 8ec87cd5d51c6085f5ee5cb6843cffb4af4d0ae0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:08:25 -0500 Subject: [PATCH 0097/1653] Update Aguascalientes.sh --- Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh index c1f6b115..961a126f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh @@ -22,8 +22,8 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Eog.sh "$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE/*" & -Mpg123.sh "$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND/a1.mp3" +Eog.sh "$CORPORATE_IMAGE/*" & +Mpg123.sh "$APPLICATIONS_SOUND/Aguascalientes.mp3" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From 1245cfaf05e902da730ee1314aea45c388d441ec Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:12:00 -0500 Subject: [PATCH 0098/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 35d7bb76..6e561385 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -64,7 +64,7 @@ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES=$HOCHOB_SERVER_MEDIA_VISITORS export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Camera/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Drawing/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Video/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS=$HOCHOB_SERVER_MEDIA/Applications/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Applications/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Image/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Music/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Sound/ From fe087bb7c1ce92a71b55d83aa2117cf837466ee4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:13:26 -0500 Subject: [PATCH 0099/1653] Update Aguascalientes.sh --- Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh index 961a126f..a7590559 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh @@ -23,6 +23,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 Mpg123.sh "$APPLICATIONS_SOUND/Aguascalientes.mp3" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From 3aea1fd25cf18902d5186b867f8d28aabf345f98 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:19:05 -0500 Subject: [PATCH 0100/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Michoacan.sh | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/Michoacan.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh new file mode 100755 index 00000000..030c6d1d --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MICHOACAN_PID=$$ +export MICHOACAN_PATH=$(readlink -f "$0") +export MICHOACAN_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Fswebcam.sh + +kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') + +# End of File From d6eeb0f41c6ad3c6b02f7f861dde58c63218e2bb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:24:29 -0500 Subject: [PATCH 0101/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh index 9cec9ffa..1df2cfcc 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh @@ -15,7 +15,7 @@ export ESPEAK_PLAY="-w" export ESPEAK_LANGUAGE="-ven+m5" export ESPEAK_INPUT="No input has been provided" export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK -export ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT +export ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" From 27e9b17641536c47bcbc2a46854f4181813fefbe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:24:58 -0500 Subject: [PATCH 0102/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh index 1df2cfcc..398d916c 100755 --- a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh @@ -15,7 +15,7 @@ export ESPEAK_PLAY="-w" export ESPEAK_LANGUAGE="-ven+m5" export ESPEAK_INPUT="No input has been provided" export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK -export ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH +export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" @@ -43,9 +43,9 @@ then export ESPEAK_INPUT="$LOCAL_TEXT" if [ "$LOCAL_PLAY" = "on" ]; then - $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_OUTPUT | aplay - + $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_SPEECH | aplay - elif [ "$LOCAL_PLAY" = "off" ]; then - $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_OUTPUT $ESPEAK_LANGUAGE "$ESPEAK_INPUT" + $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" fi else echo "Invalid number of arguments, see Documentation" From f5da5f335697a9c7d783207ec2c974219cd5398f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:26:34 -0500 Subject: [PATCH 0103/1653] Update Main.sh --- Hochob/Main.sh | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 6e561385..ba9ed60a 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -31,7 +31,26 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VIDEO -# Hochob Server Media Source +# Hochob Server Media Source Executive + +export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH + +# Hochob Server Media Executive + +export CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE +export CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO + +export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA +export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING +export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO + +export APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE +export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC +export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND +export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO + +# Hochob Server Media Source Raw export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ @@ -45,7 +64,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawi export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_OUTPUT=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/hbsSoundSsEspeakOutput.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ @@ -70,20 +89,6 @@ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDI export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Sound/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Video/ -# Hochob Server Media Executive - -export CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE -export CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO - -export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA -export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING -export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO - -export APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE -export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC -export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND -export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO - # ============================================================================= # Functions # ============================================================================= From dad3f9866eceb80c3bf98091efba7d8768a51ea5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:27:12 -0500 Subject: [PATCH 0104/1653] Update Michoacan.sh --- Hochob/Applications/NorthernMayaLowlands/Michoacan.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh index 030c6d1d..163f8798 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh @@ -23,6 +23,7 @@ export MICHOACAN_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= Fswebcam.sh +cp $FSWEBCAM_IMAGE $MEMORIES_CAMERA kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') From 8549095293d4139a45a45b7822454c4320e5eb85 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:28:01 -0500 Subject: [PATCH 0105/1653] Update Michoacan.sh --- Hochob/Applications/NorthernMayaLowlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh index 163f8798..0ebca25f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh @@ -23,7 +23,7 @@ export MICHOACAN_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= Fswebcam.sh -cp $FSWEBCAM_IMAGE $MEMORIES_CAMERA +cp "$FSWEBCAM_IMAGE" "$MEMORIES_CAMERA" kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') From bb7accc897ccf238e2be1d2e779a06b5435059b7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:29:39 -0500 Subject: [PATCH 0106/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index ba9ed60a..589f0fff 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -79,7 +79,7 @@ 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_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/VisitorsCenter/Memories/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Memories/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Camera/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Drawing/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Video/ From ccb32144441c1d8011f0fad5b607cbefc28f3307 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:36:24 -0500 Subject: [PATCH 0107/1653] Update Main.sh --- Hochob/Main.sh | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 589f0fff..cb4b0877 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -31,25 +31,6 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VIDEO -# Hochob Server Media Source Executive - -export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE -export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH - -# Hochob Server Media Executive - -export CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE -export CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO - -export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA -export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING -export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO - -export APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE -export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC -export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND -export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO - # Hochob Server Media Source Raw export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ @@ -70,6 +51,11 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ +# Hochob Server Media Source Executive + +export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH + # Hochob Server Media Raw export HOCHOB_SERVER_MEDIA=$HOME/HochobServerMedia/ @@ -89,6 +75,20 @@ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDI export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Sound/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Video/ +# Hochob Server Media Executive + +export CORPORATE_IMAGE=$HOCHOB_SERVER_MEDIA_CORPORATE_IMAGE +export CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO + +export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA +export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING +export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO + +export APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE +export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC +export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND +export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO + # ============================================================================= # Functions # ============================================================================= From 888700e15ede70b0f77eb8eeaff553d5452aa16f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:37:14 -0500 Subject: [PATCH 0108/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/Michoacan.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh index 0ebca25f..df4068bf 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh @@ -22,8 +22,8 @@ export MICHOACAN_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Fswebcam.sh -cp "$FSWEBCAM_IMAGE" "$MEMORIES_CAMERA" +Fswebcam.sh +cp $FSWEBCAM_IMAGE $MEMORIES_CAMERA kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') From e76a75f0b942f161970fd0eaf04b06b47d080ba6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:38:01 -0500 Subject: [PATCH 0109/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh index df4068bf..163f8798 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh @@ -22,7 +22,7 @@ export MICHOACAN_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Fswebcam.sh +Fswebcam.sh cp $FSWEBCAM_IMAGE $MEMORIES_CAMERA kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') From 8311fd55862560031b5fbd2bbbfb98936853d764 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 09:39:21 -0500 Subject: [PATCH 0110/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh index 163f8798..e95ff068 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh @@ -10,7 +10,7 @@ set -x export MICHOACAN_PID=$$ export MICHOACAN_PATH=$(readlink -f "$0") -export MICHOACAN_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") +export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") # ============================================================================= # Functions From c844cb0d7e8648f24f3b8a5523df012a61df9138 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:12:37 -0500 Subject: [PATCH 0111/1653] Update Signed-off-by: Abraham Arce --- .../BajaCaliforniaNorte.sh | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh new file mode 100755 index 00000000..a7590559 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export AGUASCALIENTES_PID=$$ +export AGUASCALIENTES_PATH=$(readlink -f "$0") +export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Aguascalientes.mp3" + +kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') + +# End of File From fc0b43030e057250e1b018d27222da9af7c7c7d0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:14:52 -0500 Subject: [PATCH 0112/1653] Update BajaCaliforniaNorte.sh --- .../NorthernMayaLowlands/BajaCaliforniaNorte.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh index a7590559..aeb5cffa 100755 --- a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export AGUASCALIENTES_PID=$$ -export AGUASCALIENTES_PATH=$(readlink -f "$0") -export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") +export BAJACALIFORNIANORTE_PID=$$ +export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") +export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # ============================================================================= # Functions @@ -22,10 +22,10 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & +Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Aguascalientes.mp3" +Mpg123.sh "$APPLICATIONS_SOUND/BajaCaliforniaNorte.mp3" -kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') # End of File From 2ee2d98e1e03b49e4c35140975889178476bc672 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:15:12 -0500 Subject: [PATCH 0113/1653] Update BajaCaliforniaNorte.sh --- Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh index aeb5cffa..76874bed 100755 --- a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh @@ -22,7 +22,7 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # Main # ============================================================================= -Eog.sh "$VISITORSCENTER_IMAGE/*" & +Eog.sh "$APPLICATIONS_IMAGE/*" & sleep 1 Mpg123.sh "$APPLICATIONS_SOUND/BajaCaliforniaNorte.mp3" From acd8ac74af050285416296e6d72be82b85edf86a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:15:29 -0500 Subject: [PATCH 0114/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh index 76874bed..b22be26c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # ============================================================================= Eog.sh "$APPLICATIONS_IMAGE/*" & -sleep 1 +sleep 5 Mpg123.sh "$APPLICATIONS_SOUND/BajaCaliforniaNorte.mp3" kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') From 556b0c352efc0be32f8d10cd3dc5f6a12cd3e1ad Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:18:18 -0500 Subject: [PATCH 0115/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index ba11c3cd..e319a96d 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -33,6 +33,9 @@ sudo apt install eog # Hochob Server Services Motion # None +# Hochob Server Services Robot +# None + # Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee From ea08c4285ed611f0d2b1c853ae9592986a6b0ab7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:18:50 -0500 Subject: [PATCH 0116/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index e319a96d..0b262e13 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -18,9 +18,6 @@ sudo apt install fswebcam # Hochob Server Services Communications # None -# Hochob Server Services Robot -# None - # Hochob Server Services Image sudo apt install eog From 26698a013d2273b4fcd71b39eb5c39b3b7cfac8e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:25:35 -0500 Subject: [PATCH 0117/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 0b262e13..d490d2e3 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -33,6 +33,9 @@ sudo apt install eog # Hochob Server Services Robot # None +# Hochob Server Services Sound Play +sudo apt install mpg123 + # Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee From 61e637f01cc825e86f47187a460e0214de204d8b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:40:49 -0500 Subject: [PATCH 0118/1653] Update Signed-off-by: Abraham Arce --- .../Communications/MqttClient/Mosquitto.sh | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100755 Hochob/Services/Communications/MqttClient/Mosquitto.sh diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh new file mode 100755 index 00000000..ebdccdd8 --- /dev/null +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MOSQUITTO_PID=$$ +export FSWEBCAM_BINARY=fswebcam +export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" +export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +$FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_IMAGE + +# End of File From a6eb6a0de01acb3cb4d40eb9d63085fbfdc18be8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:45:26 -0500 Subject: [PATCH 0119/1653] Update Mosquitto.sh --- .../Services/Communications/MqttClient/Mosquitto.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index ebdccdd8..f192fc11 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -9,9 +9,12 @@ set -x . ~/CodeLabs/Hochob/Main.sh export MOSQUITTO_PID=$$ -export FSWEBCAM_BINARY=fswebcam -export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" -export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +export MOSQUITTO_BINARY=fswebcam +export MQTT_SERVER_ADDRESS=iot.eclipse.org +export MQTT_SERVER_PORT=1883 + +LOCAL_TOPIC="$1" +LOCAL_MESSAGE="$2" # ============================================================================= # Functions @@ -23,6 +26,6 @@ export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE # Main # ============================================================================= -$FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_IMAGE +$MOSQUITTO_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE # End of File From f217faf82310e31043f847db5099b8daaaeb9132 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:45:58 -0500 Subject: [PATCH 0120/1653] Update Mosquitto.sh --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index f192fc11..25a88d1a 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export MOSQUITTO_PID=$$ -export MOSQUITTO_BINARY=fswebcam +export MOSQUITTO_PUB_BINARY=mosquitto_pub export MQTT_SERVER_ADDRESS=iot.eclipse.org export MQTT_SERVER_PORT=1883 From 42234f5d3e1ba825950ac2b9075cf331ba638ccd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:48:20 -0500 Subject: [PATCH 0121/1653] Update Main.sh --- Hochob/Main.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index cb4b0877..124ea46f 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -89,6 +89,11 @@ export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO +# MQ Telemetry Transport + +MQTT_SERVER_ADDRESS=iot.eclipse.org +MQTT_SERVER_PORT=1883 + # ============================================================================= # Functions # ============================================================================= From 12e9bba77893919ac230da273249256b01872ba0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:48:41 -0500 Subject: [PATCH 0122/1653] Update Mosquitto.sh --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 25a88d1a..5e99f142 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -10,8 +10,8 @@ set -x export MOSQUITTO_PID=$$ export MOSQUITTO_PUB_BINARY=mosquitto_pub -export MQTT_SERVER_ADDRESS=iot.eclipse.org -export MQTT_SERVER_PORT=1883 +export MQTT_SERVER_ADDRESS=$MQTT_SERVER_ADDRESS +export MQTT_SERVER_PORT=$MQTT_SERVER_PORT LOCAL_TOPIC="$1" LOCAL_MESSAGE="$2" From 97ed5425032fb4bfa575f6bf93359a5538f51c6c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:50:23 -0500 Subject: [PATCH 0123/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Robot/Remote/Movement.sh | 34 ++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 Hochob/Services/Robot/Remote/Movement.sh diff --git a/Hochob/Services/Robot/Remote/Movement.sh b/Hochob/Services/Robot/Remote/Movement.sh new file mode 100755 index 00000000..9b23e07d --- /dev/null +++ b/Hochob/Services/Robot/Remote/Movement.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +export EOG_PID=$$ +export EOG_BINARY=eog +export EOG_ARGUMENTS="-sf" + +LOCAL_FILES="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + killall -9 $EOG_BINARY + $EOG_BINARY $EOG_ARGUMENTS $LOCAL_FILES & +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 89ecffdafc8bed5c049854e0c482161420384797 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:54:51 -0500 Subject: [PATCH 0124/1653] Update Main.sh --- Hochob/Main.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 124ea46f..7f2d3fd5 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -14,6 +14,8 @@ export HOCHOB_ROOT=`pwd` export HOCHOB_SERVER_SERVICES=$HOCHOB_ROOT/Services/ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ +export HOCHOB_SERVER_SERVICES_COMMUNICATIONS=$HOCHOB_SERVER_SERVICES/Communications/ +export HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT=$HOCHOB_SERVER_SERVICES_COMMUNICATIONS/MqttClient/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ export HOCHOB_SERVER_SERVICES_SOUND=$HOCHOB_SERVER_SERVICES/Sound/ export HOCHOB_SERVER_SERVICES_SOUND_PLAY=$HOCHOB_SERVER_SERVICES_SOUND/Play/ @@ -23,6 +25,8 @@ export HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST=$HOCHOB_SERVER_SERVICES_S export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_PLAY From 48e6b8c7240590f807bec3970b444693aba4689d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:56:06 -0500 Subject: [PATCH 0125/1653] Update Main.sh --- Hochob/Main.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 7f2d3fd5..52a1c102 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -17,6 +17,8 @@ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS=$HOCHOB_SERVER_SERVICES/Communications/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT=$HOCHOB_SERVER_SERVICES_COMMUNICATIONS/MqttClient/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ +export HOCHOB_SERVER_SERVICES_ROBOT=$HOCHOB_SERVER_SERVICES/Robot/ +export HOCHOB_SERVER_SERVICES_ROBOT_REMOTE=$HOCHOB_SERVER_SERVICES_ROBOT/Remote/ 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/ @@ -28,6 +30,8 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT_REMOTE export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_PLAY export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER From 2d3769deb749869a62f19db7bf60f9ed3b453b3b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:57:29 -0500 Subject: [PATCH 0126/1653] Update Movement.sh --- Hochob/Services/Robot/Remote/Movement.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Robot/Remote/Movement.sh b/Hochob/Services/Robot/Remote/Movement.sh index 9b23e07d..126ac503 100755 --- a/Hochob/Services/Robot/Remote/Movement.sh +++ b/Hochob/Services/Robot/Remote/Movement.sh @@ -6,11 +6,9 @@ set -x # Variables # ============================================================================= -export EOG_PID=$$ -export EOG_BINARY=eog -export EOG_ARGUMENTS="-sf" +export ROBOT_MOVEMENT_PID=$$ -LOCAL_FILES="$1" +LOCAL_COMMAND="$1" # ============================================================================= # Functions @@ -24,8 +22,7 @@ LOCAL_FILES="$1" if [ $# -eq 1 ] then - killall -9 $EOG_BINARY - $EOG_BINARY $EOG_ARGUMENTS $LOCAL_FILES & + Mosquitto.sh "lupe/resetal" "1" else echo "Invalid number of arguments, see Documentation" exit 1 From 29f716abf3bbb20096ad03044a78ceb8b9a727f5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:58:27 -0500 Subject: [PATCH 0127/1653] Update Mosquitto.sh --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 5e99f142..ba401d88 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -26,6 +26,12 @@ LOCAL_MESSAGE="$2" # Main # ============================================================================= -$MOSQUITTO_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE +if [ $# -eq 2 ] +then + $MOSQUITTO_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi # End of File From 79a573a7fe7aeabb0ff9f3a6d06452f362506a7d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 22:58:59 -0500 Subject: [PATCH 0128/1653] Update Mosquitto.sh --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index ba401d88..b1d4d591 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -28,7 +28,7 @@ LOCAL_MESSAGE="$2" if [ $# -eq 2 ] then - $MOSQUITTO_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 1 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE else echo "Invalid number of arguments, see Documentation" exit 1 From c7fd7363fd7d91bcdf87bf9f5bc866c3fdc940cf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:00:12 -0500 Subject: [PATCH 0129/1653] Update Movement.sh --- Hochob/Services/Robot/Remote/Movement.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Robot/Remote/Movement.sh b/Hochob/Services/Robot/Remote/Movement.sh index 126ac503..b622f970 100755 --- a/Hochob/Services/Robot/Remote/Movement.sh +++ b/Hochob/Services/Robot/Remote/Movement.sh @@ -6,6 +6,8 @@ set -x # Variables # ============================================================================= +. ~/CodeLabs/Hochob/Main.sh + export ROBOT_MOVEMENT_PID=$$ LOCAL_COMMAND="$1" From 042f74498b52cffa581d6468c23affb5632375b1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:02:17 -0500 Subject: [PATCH 0130/1653] Update Movement.sh --- Hochob/Services/Robot/Remote/Movement.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Robot/Remote/Movement.sh b/Hochob/Services/Robot/Remote/Movement.sh index b622f970..afa3881c 100755 --- a/Hochob/Services/Robot/Remote/Movement.sh +++ b/Hochob/Services/Robot/Remote/Movement.sh @@ -11,6 +11,7 @@ set -x export ROBOT_MOVEMENT_PID=$$ LOCAL_COMMAND="$1" +LOCAL_MESSAGE="$2" # ============================================================================= # Functions @@ -24,7 +25,7 @@ LOCAL_COMMAND="$1" if [ $# -eq 1 ] then - Mosquitto.sh "lupe/resetal" "1" + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE else echo "Invalid number of arguments, see Documentation" exit 1 From c8e4b7f74250bd391a23c74cf7b50def4a90f56f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:02:37 -0500 Subject: [PATCH 0131/1653] Update Movement.sh --- Hochob/Services/Robot/Remote/Movement.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Robot/Remote/Movement.sh b/Hochob/Services/Robot/Remote/Movement.sh index afa3881c..6ebf7dfc 100755 --- a/Hochob/Services/Robot/Remote/Movement.sh +++ b/Hochob/Services/Robot/Remote/Movement.sh @@ -23,7 +23,7 @@ LOCAL_MESSAGE="$2" # Main # ============================================================================= -if [ $# -eq 1 ] +if [ $# -eq 2 ] then Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE else From 920e6db94192f9e06a783a70b1b9ec03f4b6d0fc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:02:55 -0500 Subject: [PATCH 0132/1653] Update Movement.sh --- Hochob/Services/Robot/Remote/Movement.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Robot/Remote/Movement.sh b/Hochob/Services/Robot/Remote/Movement.sh index 6ebf7dfc..b2775a48 100755 --- a/Hochob/Services/Robot/Remote/Movement.sh +++ b/Hochob/Services/Robot/Remote/Movement.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ROBOT_MOVEMENT_PID=$$ +export MOVEMENT_PID=$$ LOCAL_COMMAND="$1" LOCAL_MESSAGE="$2" From 942f36ff04ad8a90f6c173079954c401c73f0d07 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:09:33 -0500 Subject: [PATCH 0133/1653] Rename Movement.sh to Robot.sh --- Hochob/Services/Robot/Remote/{Movement.sh => Robot.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Robot/Remote/{Movement.sh => Robot.sh} (100%) diff --git a/Hochob/Services/Robot/Remote/Movement.sh b/Hochob/Services/Robot/Remote/Robot.sh similarity index 100% rename from Hochob/Services/Robot/Remote/Movement.sh rename to Hochob/Services/Robot/Remote/Robot.sh From 586cb5cfa73e27de2b3d67c3cdab4554eda9fb3a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:10:40 -0500 Subject: [PATCH 0134/1653] Update BajaCaliforniaNorte.sh --- .../NorthernMayaLowlands/BajaCaliforniaNorte.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh index b22be26c..318576a0 100755 --- a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh @@ -25,6 +25,18 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") Eog.sh "$APPLICATIONS_IMAGE/*" & sleep 5 Mpg123.sh "$APPLICATIONS_SOUND/BajaCaliforniaNorte.mp3" +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/resetall 1 +sleep 10 kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') From d9fd1578aa53d0053e68c023d412c900427035d7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:14:01 -0500 Subject: [PATCH 0135/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Campeche.sh | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/Campeche.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Campeche.sh b/Hochob/Applications/NorthernMayaLowlands/Campeche.sh new file mode 100755 index 00000000..a7590559 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Campeche.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export AGUASCALIENTES_PID=$$ +export AGUASCALIENTES_PATH=$(readlink -f "$0") +export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Aguascalientes.mp3" + +kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') + +# End of File From b4e124c17dfac8385e9a4171ef7992e2ab625e61 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:17:02 -0500 Subject: [PATCH 0136/1653] Update Campeche.sh --- Hochob/Applications/NorthernMayaLowlands/Campeche.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Campeche.sh b/Hochob/Applications/NorthernMayaLowlands/Campeche.sh index a7590559..c59655dc 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Campeche.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Campeche.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export AGUASCALIENTES_PID=$$ -export AGUASCALIENTES_PATH=$(readlink -f "$0") -export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") +export CAMPECHE_PID=$$ +export CAMPECHE_PATH=$(readlink -f "$0") +export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= # Functions @@ -26,6 +26,6 @@ Eog.sh "$CORPORATE_IMAGE/*" & sleep 1 Mpg123.sh "$APPLICATIONS_SOUND/Aguascalientes.mp3" -kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') # End of File From 5f2da94c690ac535135e53eee0371a509d278c21 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:18:25 -0500 Subject: [PATCH 0137/1653] Update Campeche.sh --- Hochob/Applications/NorthernMayaLowlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Campeche.sh b/Hochob/Applications/NorthernMayaLowlands/Campeche.sh index c59655dc..5a8e7070 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Campeche.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Campeche.sh @@ -24,7 +24,7 @@ export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") Eog.sh "$CORPORATE_IMAGE/*" & sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Aguascalientes.mp3" +Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') From 9da017c69dd2fdfdaeb0e8edf9f38caa6d8d0e32 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:18:36 -0500 Subject: [PATCH 0138/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Guanajuato.sh | 31 +++++++++++++++++++ .../NorthernMayaLowlands/Guerrero.sh | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh create mode 100755 Hochob/Applications/NorthernMayaLowlands/Guerrero.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh b/Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh new file mode 100755 index 00000000..5a8e7070 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CAMPECHE_PID=$$ +export CAMPECHE_PATH=$(readlink -f "$0") +export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" + +kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/Guerrero.sh b/Hochob/Applications/NorthernMayaLowlands/Guerrero.sh new file mode 100755 index 00000000..5a8e7070 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Guerrero.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CAMPECHE_PID=$$ +export CAMPECHE_PATH=$(readlink -f "$0") +export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" + +kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') + +# End of File From a2f311110353bc63f78141b0f3626db61d2f4f61 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:21:45 -0500 Subject: [PATCH 0139/1653] Update Guanajuato.sh --- Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh b/Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh index 5a8e7070..00dd26e2 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CAMPECHE_PID=$$ -export CAMPECHE_PATH=$(readlink -f "$0") -export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") +export GUANAJUATO_PID=$$ +export GUANAJUATO_PATH=$(readlink -f "$0") +export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") # ============================================================================= # Functions @@ -23,9 +23,5 @@ export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" - -kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') # End of File From df53a9eb38dc19ceafd5e8e44d0803c7b4156b35 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:22:24 -0500 Subject: [PATCH 0140/1653] Update Campeche.sh --- Hochob/Applications/NorthernMayaLowlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Campeche.sh b/Hochob/Applications/NorthernMayaLowlands/Campeche.sh index 5a8e7070..d0199e0d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Campeche.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Campeche.sh @@ -10,7 +10,7 @@ set -x export CAMPECHE_PID=$$ export CAMPECHE_PATH=$(readlink -f "$0") -export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") +export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # ============================================================================= # Functions From 17c68faa5a600d3377f33d8d6c3de6d53df7960c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:25:21 -0500 Subject: [PATCH 0141/1653] Update Guerrero.sh --- Hochob/Applications/NorthernMayaLowlands/Guerrero.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Guerrero.sh b/Hochob/Applications/NorthernMayaLowlands/Guerrero.sh index 5a8e7070..6bb0be9b 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Guerrero.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Guerrero.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CAMPECHE_PID=$$ -export CAMPECHE_PATH=$(readlink -f "$0") -export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") +export GUERRERO_PID=$$ +export GUERRERO_PATH=$(readlink -f "$0") +export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") # ============================================================================= # Functions @@ -22,10 +22,6 @@ export CAMPECHE_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" - -kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') +Vlc.sh "on" "$CORPORATE_VIDEO/*" # End of File From 2c31beafca4c477f130835c54467d97e0848eb90 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:31:08 -0500 Subject: [PATCH 0142/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Queretaro.sh | 27 +++++++++++++++++++ .../NorthernMayaLowlands/QuintanaRoo.sh | 27 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/Queretaro.sh create mode 100755 Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Queretaro.sh b/Hochob/Applications/NorthernMayaLowlands/Queretaro.sh new file mode 100755 index 00000000..00dd26e2 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Queretaro.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export GUANAJUATO_PID=$$ +export GUANAJUATO_PATH=$(readlink -f "$0") +export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & + +# End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh b/Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh new file mode 100755 index 00000000..6bb0be9b --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export GUERRERO_PID=$$ +export GUERRERO_PATH=$(readlink -f "$0") +export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Vlc.sh "on" "$CORPORATE_VIDEO/*" + +# End of File From d9d70a79aa143cc73676c8c0994ce333e727d5c2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:34:11 -0500 Subject: [PATCH 0143/1653] Update Queretaro.sh --- Hochob/Applications/NorthernMayaLowlands/Queretaro.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Queretaro.sh b/Hochob/Applications/NorthernMayaLowlands/Queretaro.sh index 00dd26e2..4fcb0345 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Queretaro.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Queretaro.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export GUANAJUATO_PID=$$ -export GUANAJUATO_PATH=$(readlink -f "$0") -export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") +export QUERETARO_PID=$$ +export QUERETARO_PATH=$(readlink -f "$0") +export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") # ============================================================================= # Functions @@ -22,6 +22,6 @@ export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & +Eog.sh "$APPLICATIONS_IMAGE/*" & # End of File From 54dcc63e7ff67481be887e8498cf637b303425b2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:36:55 -0500 Subject: [PATCH 0144/1653] Update QuintanaRoo.sh --- Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh b/Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh index 6bb0be9b..7ed7845b 100755 --- a/Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export GUERRERO_PID=$$ -export GUERRERO_PATH=$(readlink -f "$0") -export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") +export QUINTANAROO_PID=$$ +export QUINTANAROO_PATH=$(readlink -f "$0") +export QUINTANAROO_DIRECTORY=$(dirname "$QUINTANAROO_PATH") # ============================================================================= # Functions @@ -22,6 +22,6 @@ export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") # Main # ============================================================================= -Vlc.sh "on" "$CORPORATE_VIDEO/*" +Vlc.sh "on" "$MEMORIES_VIDEO/*" # End of File From 1b3dec0ea37642b09bff65c71f597db00bdb0ecc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:38:49 -0500 Subject: [PATCH 0145/1653] Update Michoacan.sh --- Hochob/Applications/NorthernMayaLowlands/Michoacan.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh index e95ff068..4c947f61 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh @@ -22,6 +22,11 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") # Main # ============================================================================= +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 + Fswebcam.sh cp $FSWEBCAM_IMAGE $MEMORIES_CAMERA From e72c92bfe147ec4f606ee9eab1892b585e3882b4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:47:42 -0500 Subject: [PATCH 0146/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/BajaCaliforniaSur.sh | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh new file mode 100755 index 00000000..318576a0 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export BAJACALIFORNIANORTE_PID=$$ +export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") +export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$APPLICATIONS_IMAGE/*" & +sleep 5 +Mpg123.sh "$APPLICATIONS_SOUND/BajaCaliforniaNorte.mp3" +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/resetall 1 +sleep 10 + +kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') + +# End of File From 0e5fc2869c7e8e72b718c54bf6cf765625d454ef Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:56:45 -0500 Subject: [PATCH 0147/1653] Update BajaCaliforniaSur.sh --- .../NorthernMayaLowlands/BajaCaliforniaSur.sh | 61 +++++++++++++------ 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh index 318576a0..ca6dadee 100755 --- a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export BAJACALIFORNIANORTE_PID=$$ -export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") -export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") +export BAJACALIFORNIASUR_PID=$$ +export BAJACALIFORNIASUR_PATH=$(readlink -f "$0") +export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # ============================================================================= # Functions @@ -22,22 +22,43 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # Main # ============================================================================= -Eog.sh "$APPLICATIONS_IMAGE/*" & -sleep 5 -Mpg123.sh "$APPLICATIONS_SOUND/BajaCaliforniaNorte.mp3" -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/headleft 1 -sleep .6 -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/headleft 1 -sleep .6 -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/resetall 1 -sleep 10 - -kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') +Vlc.sh "off" "$APPLICATIONS_VIDEO/Silencio.mp4" & +(Robot.sh lupe/inicial 1) && sleep 1.25 + +Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte1_v3.mp4" & +sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 + +Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte2_v2.mp4" & +sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 + +Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte3_v2.mp4" & + +sleep 37.5 && Robot.sh lupe/cerebro 1 +sleep 2 +Robot.sh lupe/rightup 1 +sleep .25 +Robot.sh lupe/leftup 1 +sleep .25 +Robot.sh lupe/rightfold 1 +sleep .25 +Robot.sh lupe/leftfold 1 +sleep 2 + +Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte4_v2.mp4" & +sleep 25.5 && Robot.sh lupe/inteledison 1 +sleep 3 +Robot.sh lupe/rightdown 1 +sleep .25 +Robot.sh lupe/leftdown 1 +sleep .25 +Robot.sh lupe/rightunfold 1 +sleep .25 +Robot.sh lupe/leftunfold 1 +sleep 2 + +Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte5_v2.mp4" & +sleep 75 + +kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') # End of File From 9969f852abdb3c1c3004fe83f48eac03cb9d3d05 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 3 Jun 2017 23:58:25 -0500 Subject: [PATCH 0148/1653] Update BajaCaliforniaSur.sh --- .../Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh index ca6dadee..4ef0dfc0 100755 --- a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh @@ -23,16 +23,19 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # ============================================================================= Vlc.sh "off" "$APPLICATIONS_VIDEO/Silencio.mp4" & +#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte1_v3.mp4" & +#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte2_v2.mp4" & +#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte3_v2.mp4" & - +#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur04.mp4" & sleep 37.5 && Robot.sh lupe/cerebro 1 sleep 2 Robot.sh lupe/rightup 1 @@ -45,6 +48,7 @@ Robot.sh lupe/leftfold 1 sleep 2 Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte4_v2.mp4" & +#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/inteledison 1 sleep 3 Robot.sh lupe/rightdown 1 @@ -57,6 +61,7 @@ Robot.sh lupe/leftunfold 1 sleep 2 Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte5_v2.mp4" & +#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur06.mp4" & sleep 75 kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') From bca359bbbec6cb97c403443a90dca8ff7b2ea6e7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:09:59 -0500 Subject: [PATCH 0149/1653] Update Signed-off-by: Abraham Arce --- .../Aguascalientes.sh | 0 .../BajaCaliforniaNorte.sh | 0 .../BajaCaliforniaSur.sh | 0 .../{NorthernMayaLowlands => SouthernMayaHighlands}/Campeche.sh | 0 .../{NorthernMayaLowlands => SouthernMayaHighlands}/Guanajuato.sh | 0 .../{NorthernMayaLowlands => SouthernMayaHighlands}/Guerrero.sh | 0 .../{NorthernMayaLowlands => SouthernMayaHighlands}/Michoacan.sh | 0 .../{NorthernMayaLowlands => SouthernMayaHighlands}/Queretaro.sh | 0 .../QuintanaRoo.sh | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/Aguascalientes.sh (100%) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/BajaCaliforniaNorte.sh (100%) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/BajaCaliforniaSur.sh (100%) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/Campeche.sh (100%) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/Guanajuato.sh (100%) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/Guerrero.sh (100%) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/Michoacan.sh (100%) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/Queretaro.sh (100%) rename Hochob/Applications/{NorthernMayaLowlands => SouthernMayaHighlands}/QuintanaRoo.sh (100%) diff --git a/Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/Aguascalientes.sh rename to Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaNorte.sh rename to Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/BajaCaliforniaSur.sh rename to Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/Campeche.sh rename to Hochob/Applications/SouthernMayaHighlands/Campeche.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh b/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/Guanajuato.sh rename to Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Guerrero.sh b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/Guerrero.sh rename to Hochob/Applications/SouthernMayaHighlands/Guerrero.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/Michoacan.sh rename to Hochob/Applications/SouthernMayaHighlands/Michoacan.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Queretaro.sh b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/Queretaro.sh rename to Hochob/Applications/SouthernMayaHighlands/Queretaro.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh similarity index 100% rename from Hochob/Applications/NorthernMayaLowlands/QuintanaRoo.sh rename to Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh From d1022bbd07465e7e4f1cc90c6be14a2ab40cb99f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:34:42 -0500 Subject: [PATCH 0150/1653] Update Signed-off-by: Abraham Arce --- .../CentralMataLowlands/Acapulco.sh | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 Hochob/Applications/CentralMataLowlands/Acapulco.sh diff --git a/Hochob/Applications/CentralMataLowlands/Acapulco.sh b/Hochob/Applications/CentralMataLowlands/Acapulco.sh new file mode 100755 index 00000000..d0199e0d --- /dev/null +++ b/Hochob/Applications/CentralMataLowlands/Acapulco.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CAMPECHE_PID=$$ +export CAMPECHE_PATH=$(readlink -f "$0") +export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" + +kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') + +# End of File From 74500443fa45d307fabf20542a414c6345efe224 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:38:07 -0500 Subject: [PATCH 0151/1653] Update Acapulco.sh --- Hochob/Applications/CentralMataLowlands/Acapulco.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/CentralMataLowlands/Acapulco.sh b/Hochob/Applications/CentralMataLowlands/Acapulco.sh index d0199e0d..3b187611 100755 --- a/Hochob/Applications/CentralMataLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMataLowlands/Acapulco.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CAMPECHE_PID=$$ -export CAMPECHE_PATH=$(readlink -f "$0") -export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") +export ACAPULCO_PID=$$ +export ACAPULCO_PATH=$(readlink -f "$0") +export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # ============================================================================= # Functions @@ -22,10 +22,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" +Stream2Chromecast.sh "Triki" "1.0" "$APPLICATIONS_SOUND/Acapulco.mp3" -kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') # End of File From c81e303c994151aa862c0acc09c80c75af77e2c9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:47:53 -0500 Subject: [PATCH 0152/1653] Update Main.sh --- Hochob/Main.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 52a1c102..cd1be563 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -78,6 +78,10 @@ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_V export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Drawing/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Video/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Applications/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Area/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA/SouthernMayaHighlands +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA/CentralMayaLowlands +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA/NorthernMayaLowlands export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Image/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Music/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Sound/ From 2e9ad999d0360d7f926be6dda4d733286e0f9380 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:50:17 -0500 Subject: [PATCH 0153/1653] Update Main.sh --- Hochob/Main.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index cd1be563..6c0ecb84 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -101,6 +101,10 @@ export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO +export SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_SOUTERN_MAYA_HIGHLANDS +export CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_CENTRAL_MAYA_LOWLANDS +export NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_NORTHERN_MAYA_LOWLANDS + # MQ Telemetry Transport MQTT_SERVER_ADDRESS=iot.eclipse.org From c0958482d99258b6355806e3035320958f57b848 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:51:22 -0500 Subject: [PATCH 0154/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index a7590559..0ad49ed0 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -24,7 +24,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") Eog.sh "$CORPORATE_IMAGE/*" & sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Aguascalientes.mp3" +Mpg123.sh "$SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From 1194d621a3d779005728091adb6e068ed1ce4ef6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:51:40 -0500 Subject: [PATCH 0155/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 318576a0..11e15a5f 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -24,7 +24,7 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") Eog.sh "$APPLICATIONS_IMAGE/*" & sleep 5 -Mpg123.sh "$APPLICATIONS_SOUND/BajaCaliforniaNorte.mp3" +Mpg123.sh "$SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 From 93c124749f9d99627dbe447346730287ca5878bf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:52:00 -0500 Subject: [PATCH 0156/1653] Update BajaCaliforniaSur.sh --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 4ef0dfc0..06694519 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -22,19 +22,19 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Vlc.sh "off" "$APPLICATIONS_VIDEO/Silencio.mp4" & +Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Silencio.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 -Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte1_v3.mp4" & +Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte1_v3.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 -Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte2_v2.mp4" & +Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte2_v2.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 -Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte3_v2.mp4" & +Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte3_v2.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur04.mp4" & sleep 37.5 && Robot.sh lupe/cerebro 1 sleep 2 @@ -47,7 +47,7 @@ sleep .25 Robot.sh lupe/leftfold 1 sleep 2 -Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte4_v2.mp4" & +Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte4_v2.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/inteledison 1 sleep 3 @@ -60,7 +60,7 @@ sleep .25 Robot.sh lupe/leftunfold 1 sleep 2 -Vlc.sh "off" "$APPLICATIONS_VIDEO/Parte5_v2.mp4" & +Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte5_v2.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur06.mp4" & sleep 75 From 09cacb5e6716285510f086afbc52465c69e952a4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:52:23 -0500 Subject: [PATCH 0157/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index d0199e0d..be15c5f1 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -24,7 +24,7 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") Eog.sh "$CORPORATE_IMAGE/*" & sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" +Mpg123.sh "$SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') From d9b4b3bc0304782ef0302ccb9822cbd6887eb024 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:56:12 -0500 Subject: [PATCH 0158/1653] Update Main.sh --- Hochob/Main.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 6c0ecb84..51f5d467 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -101,9 +101,9 @@ export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO -export SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_SOUTERN_MAYA_HIGHLANDS -export CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_CENTRAL_MAYA_LOWLANDS -export NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_NORTHERN_MAYA_LOWLANDS +export AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_SOUTERN_MAYA_HIGHLANDS +export AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_CENTRAL_MAYA_LOWLANDS +export AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_NORTHERN_MAYA_LOWLANDS # MQ Telemetry Transport From 8b851f7fb169a2f56f8e18de21a4c4f8361e293d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:56:23 -0500 Subject: [PATCH 0159/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 0ad49ed0..dfbb6148 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -24,7 +24,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") Eog.sh "$CORPORATE_IMAGE/*" & sleep 1 -Mpg123.sh "$SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From 67c64222ec1ea7b504cbdd4920a255a469af2369 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:56:35 -0500 Subject: [PATCH 0160/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 11e15a5f..d3ae2dfa 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -24,7 +24,7 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") Eog.sh "$APPLICATIONS_IMAGE/*" & sleep 5 -Mpg123.sh "$SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 From 50e4f5907295b8da2f518fd4ab1ad5fb927eed28 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:56:56 -0500 Subject: [PATCH 0161/1653] Update BajaCaliforniaSur.sh --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 06694519..ad89a736 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -22,19 +22,19 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Silencio.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Silencio.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 -Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte1_v3.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte1_v3.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 -Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte2_v2.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte2_v2.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 -Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte3_v2.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte3_v2.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur04.mp4" & sleep 37.5 && Robot.sh lupe/cerebro 1 sleep 2 @@ -47,7 +47,7 @@ sleep .25 Robot.sh lupe/leftfold 1 sleep 2 -Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte4_v2.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte4_v2.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/inteledison 1 sleep 3 @@ -60,7 +60,7 @@ sleep .25 Robot.sh lupe/leftunfold 1 sleep 2 -Vlc.sh "off" "$SOUTERN_MAYA_HIGHLANDS/Parte5_v2.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte5_v2.mp4" & #Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur06.mp4" & sleep 75 From a614d924157ebd47d6192afd716a0a20410da42c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:57:09 -0500 Subject: [PATCH 0162/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index be15c5f1..883dc989 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -24,7 +24,7 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") Eog.sh "$CORPORATE_IMAGE/*" & sleep 1 -Mpg123.sh "$SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') From ce59f2ee6752132dc180f43a603bd724a6482628 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 08:57:46 -0500 Subject: [PATCH 0163/1653] Update Acapulco.sh --- Hochob/Applications/CentralMataLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMataLowlands/Acapulco.sh b/Hochob/Applications/CentralMataLowlands/Acapulco.sh index 3b187611..75b1007a 100755 --- a/Hochob/Applications/CentralMataLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMataLowlands/Acapulco.sh @@ -22,7 +22,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$APPLICATIONS_SOUND/Acapulco.mp3" +Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') From 6b02842ea7cea5b119937b697271962d22f67a34 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 09:09:05 -0500 Subject: [PATCH 0164/1653] Update Signed-off-by: Abraham Arce --- .../CentralMataLowlands/Cancun.sh | 31 +++++++++++++++++++ .../CentralMataLowlands/Huatulco.sh | 31 +++++++++++++++++++ .../CentralMataLowlands/Mazatlan.sh | 31 +++++++++++++++++++ .../CentralMataLowlands/PuertoVallarta.sh | 31 +++++++++++++++++++ 4 files changed, 124 insertions(+) create mode 100755 Hochob/Applications/CentralMataLowlands/Cancun.sh create mode 100755 Hochob/Applications/CentralMataLowlands/Huatulco.sh create mode 100755 Hochob/Applications/CentralMataLowlands/Mazatlan.sh create mode 100755 Hochob/Applications/CentralMataLowlands/PuertoVallarta.sh diff --git a/Hochob/Applications/CentralMataLowlands/Cancun.sh b/Hochob/Applications/CentralMataLowlands/Cancun.sh new file mode 100755 index 00000000..d0199e0d --- /dev/null +++ b/Hochob/Applications/CentralMataLowlands/Cancun.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CAMPECHE_PID=$$ +export CAMPECHE_PATH=$(readlink -f "$0") +export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" + +kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Applications/CentralMataLowlands/Huatulco.sh b/Hochob/Applications/CentralMataLowlands/Huatulco.sh new file mode 100755 index 00000000..d0199e0d --- /dev/null +++ b/Hochob/Applications/CentralMataLowlands/Huatulco.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CAMPECHE_PID=$$ +export CAMPECHE_PATH=$(readlink -f "$0") +export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" + +kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Applications/CentralMataLowlands/Mazatlan.sh b/Hochob/Applications/CentralMataLowlands/Mazatlan.sh new file mode 100755 index 00000000..d0199e0d --- /dev/null +++ b/Hochob/Applications/CentralMataLowlands/Mazatlan.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CAMPECHE_PID=$$ +export CAMPECHE_PATH=$(readlink -f "$0") +export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" + +kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Applications/CentralMataLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMataLowlands/PuertoVallarta.sh new file mode 100755 index 00000000..d0199e0d --- /dev/null +++ b/Hochob/Applications/CentralMataLowlands/PuertoVallarta.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CAMPECHE_PID=$$ +export CAMPECHE_PATH=$(readlink -f "$0") +export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 1 +Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" + +kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') + +# End of File From ef2552d1764a2382ae93791aa598579eddda12b9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 09:09:46 -0500 Subject: [PATCH 0165/1653] Update Signed-off-by: Abraham Arce --- .../{CentralMataLowlands => CentralMayaLowlands}/Acapulco.sh | 0 .../{CentralMataLowlands => CentralMayaLowlands}/Cancun.sh | 0 .../{CentralMataLowlands => CentralMayaLowlands}/Huatulco.sh | 0 .../{CentralMataLowlands => CentralMayaLowlands}/Mazatlan.sh | 0 .../PuertoVallarta.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/{CentralMataLowlands => CentralMayaLowlands}/Acapulco.sh (100%) rename Hochob/Applications/{CentralMataLowlands => CentralMayaLowlands}/Cancun.sh (100%) rename Hochob/Applications/{CentralMataLowlands => CentralMayaLowlands}/Huatulco.sh (100%) rename Hochob/Applications/{CentralMataLowlands => CentralMayaLowlands}/Mazatlan.sh (100%) rename Hochob/Applications/{CentralMataLowlands => CentralMayaLowlands}/PuertoVallarta.sh (100%) diff --git a/Hochob/Applications/CentralMataLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh similarity index 100% rename from Hochob/Applications/CentralMataLowlands/Acapulco.sh rename to Hochob/Applications/CentralMayaLowlands/Acapulco.sh diff --git a/Hochob/Applications/CentralMataLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh similarity index 100% rename from Hochob/Applications/CentralMataLowlands/Cancun.sh rename to Hochob/Applications/CentralMayaLowlands/Cancun.sh diff --git a/Hochob/Applications/CentralMataLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh similarity index 100% rename from Hochob/Applications/CentralMataLowlands/Huatulco.sh rename to Hochob/Applications/CentralMayaLowlands/Huatulco.sh diff --git a/Hochob/Applications/CentralMataLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh similarity index 100% rename from Hochob/Applications/CentralMataLowlands/Mazatlan.sh rename to Hochob/Applications/CentralMayaLowlands/Mazatlan.sh diff --git a/Hochob/Applications/CentralMataLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh similarity index 100% rename from Hochob/Applications/CentralMataLowlands/PuertoVallarta.sh rename to Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh From 38ce2de55d15f5af3c70d56d6392a35afa5d6c25 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 09:11:47 -0500 Subject: [PATCH 0166/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index d0199e0d..cd860058 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CAMPECHE_PID=$$ -export CAMPECHE_PATH=$(readlink -f "$0") -export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") +export CANCUN_PID=$$ +export CANCUN_PATH=$(readlink -f "$0") +export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") # ============================================================================= # Functions @@ -22,10 +22,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" +Mpg123.sh "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" -kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$CANCUN_PID | grep -o '[0-9]*') # End of File From 7bebbe861d3cba4987129c5a7af1499c3298175a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 09:12:14 -0500 Subject: [PATCH 0167/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index cd860058..79b8ab25 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -22,7 +22,7 @@ export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") # Main # ============================================================================= -Mpg123.sh "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" +Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" kill -- -$(ps -o pgid=$CANCUN_PID | grep -o '[0-9]*') From 454dbcde34e7678b85b9b9ad3d922a9638d75d0a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 09:12:53 -0500 Subject: [PATCH 0168/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index d0199e0d..2d4e9faf 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CAMPECHE_PID=$$ -export CAMPECHE_PATH=$(readlink -f "$0") -export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") +export HUATULCO_PID=$$ +export HUATULCO_PATH=$(readlink -f "$0") +export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") # ============================================================================= # Functions @@ -22,10 +22,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" +Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" -kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$HUATULCO_PID | grep -o '[0-9]*') # End of File From 1c65e80b712900697235fc2be7e9b210246a1ef3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 09:13:46 -0500 Subject: [PATCH 0169/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index d0199e0d..e7527d15 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CAMPECHE_PID=$$ -export CAMPECHE_PATH=$(readlink -f "$0") -export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") +export MAZATLAN_PID=$$ +export MAZATLAN_PATH=$(readlink -f "$0") +export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") # ============================================================================= # Functions @@ -22,10 +22,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" +Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" -kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$MAZATLAN_PID | grep -o '[0-9]*') # End of File From a455d0998e37f5ed6d607aae221b2bd9957ba2e8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 09:14:34 -0500 Subject: [PATCH 0170/1653] Update PuertoVallarta.sh --- .../CentralMayaLowlands/PuertoVallarta.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index d0199e0d..ae0a54a6 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CAMPECHE_PID=$$ -export CAMPECHE_PATH=$(readlink -f "$0") -export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") +export PUERTOVALLARTA_PID=$$ +export PUERTOVALLARTA_PATH=$(readlink -f "$0") +export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") # ============================================================================= # Functions @@ -22,10 +22,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 -Mpg123.sh "$APPLICATIONS_SOUND/Campeche.mp3" +Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" -kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$PUERTOVALLARTA_PID | grep -o '[0-9]*') # End of File From ee5bd4e90f5a557bddce1bee0fb06bac3fc5d8e9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:10:52 -0500 Subject: [PATCH 0171/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/ElCielo.sh | 29 +++++++++++++++++++ .../NorthernMayaLowlands/LaMichilia.sh | 29 +++++++++++++++++++ .../NorthernMayaLowlands/MontesAzules.sh | 29 +++++++++++++++++++ .../NorthernMayaLowlands/OjoDeLiebre.sh | 29 +++++++++++++++++++ 4 files changed, 116 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/ElCielo.sh create mode 100755 Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh create mode 100755 Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh create mode 100755 Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh new file mode 100755 index 00000000..75b1007a --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ACAPULCO_PID=$$ +export ACAPULCO_PATH=$(readlink -f "$0") +export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + +kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh new file mode 100755 index 00000000..75b1007a --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ACAPULCO_PID=$$ +export ACAPULCO_PATH=$(readlink -f "$0") +export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + +kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh new file mode 100755 index 00000000..75b1007a --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ACAPULCO_PID=$$ +export ACAPULCO_PATH=$(readlink -f "$0") +export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + +kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh new file mode 100755 index 00000000..75b1007a --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ACAPULCO_PID=$$ +export ACAPULCO_PATH=$(readlink -f "$0") +export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + +kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') + +# End of File From 8227bf01101a22c5e44c8b86f22c88f4507893ae Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:12:39 -0500 Subject: [PATCH 0172/1653] Update ElCielo.sh --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index 75b1007a..be4a8107 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ACAPULCO_PID=$$ -export ACAPULCO_PATH=$(readlink -f "$0") -export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") +export ELCIELO_PID=$$ +export ELCIELO_PATH=$(readlink -f "$0") +export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") # ============================================================================= # Functions @@ -22,8 +22,8 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" +Stream2Chromecast.sh "Triki" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" -kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') # End of File From 6cfa3bc8234ba8f6673d4a7b10a51c58759bafa1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:13:22 -0500 Subject: [PATCH 0173/1653] Update LaMichilia.sh --- Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 75b1007a..4ca2392e 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ACAPULCO_PID=$$ -export ACAPULCO_PATH=$(readlink -f "$0") -export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") +export LAMICHILIA_PID=$$ +export LAMICHILIA_PATH=$(readlink -f "$0") +export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") # ============================================================================= # Functions @@ -22,8 +22,8 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" +Stream2Chromecast.sh "Eek'" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/LaMichilia.mp3" -kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$LAMICHILIA_PID | grep -o '[0-9]*') # End of File From ba392378318f08c32635ae47bdb56a9982adb8ec Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:13:36 -0500 Subject: [PATCH 0174/1653] Update ElCielo.sh --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index be4a8107..43b6cf67 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -22,7 +22,7 @@ export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" +Stream2Chromecast.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') From e7b715e677ad5a577c20b5653c485f752ca71d3b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:14:19 -0500 Subject: [PATCH 0175/1653] Update MontesAzules.sh --- .../Applications/NorthernMayaLowlands/MontesAzules.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 75b1007a..f4e420e8 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ACAPULCO_PID=$$ -export ACAPULCO_PATH=$(readlink -f "$0") -export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") +export MONTESAZULES_PID=$$ +export MONTESAZULES_PATH=$(readlink -f "$0") +export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") # ============================================================================= # Functions @@ -22,8 +22,8 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" +Stream2Chromecast.sh "Triki" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" -kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$MONTESAZULES_PID | grep -o '[0-9]*') # End of File From b580045a4b049dbe13f1412cd8f8d368f961a413 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:14:34 -0500 Subject: [PATCH 0176/1653] Update LaMichilia.sh --- Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 4ca2392e..1ea54e8d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -22,7 +22,7 @@ export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Eek'" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/LaMichilia.mp3" +Stream2Chromecast.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/LaMichilia.mp3" kill -- -$(ps -o pgid=$LAMICHILIA_PID | grep -o '[0-9]*') From 04e95830a69b7e677c15015c31936ae9240ed6a8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:15:18 -0500 Subject: [PATCH 0177/1653] Update OjoDeLiebre.sh --- .../Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 75b1007a..148f496e 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ACAPULCO_PID=$$ -export ACAPULCO_PATH=$(readlink -f "$0") -export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") +export OJODELIEBRE_PID=$$ +export OJODELIEBRE_PATH=$(readlink -f "$0") +export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") # ============================================================================= # Functions @@ -22,8 +22,8 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" +Stream2Chromecast.sh "Triki" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" -kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$OJODELIEBRE_PID | grep -o '[0-9]*') # End of File From 3b84e423c0552b607adc2c4f19a6abde5a5ff9fd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:22:45 -0500 Subject: [PATCH 0178/1653] Update Main.sh --- Hochob/Main.sh | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 51f5d467..c652408d 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -68,42 +68,43 @@ export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ export HOCHOB_SERVER_MEDIA=$HOME/HochobServerMedia/ +export HOCHOB_SERVER_MEDIA_AREA=$HOCHOB_SERVER_MEDIA/Area/ +export HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_AREA/SouthernMayaHighlands +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_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES/Video/ + export HOCHOB_SERVER_MEDIA_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Memories/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Camera/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Drawing/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES/Video/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Applications/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Area/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA/SouthernMayaHighlands -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA/CentralMayaLowlands -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA/NorthernMayaLowlands -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Image/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Music/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Sound/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APLICATIONS/Video/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Image/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Music/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Sound/ +export HOCHOB_SERVER_MEDIA_VISITORSCENTER_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Video/ # Hochob Server Media Executive +export AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS +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 MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_CAMERA -export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_DRAWING -export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MEMORIES_VIDEO - -export APPLICATIONS_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_IMAGE -export APPLICATIONS_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_MUSIC -export APPLICATIONS_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_SOUND -export APPLICATIONS_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_VIDEO +export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA +export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING +export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO -export AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_SOUTERN_MAYA_HIGHLANDS -export AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_CENTRAL_MAYA_LOWLANDS -export AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_APPLICATIONS_AREA_NORTHERN_MAYA_LOWLANDS +export VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE +export VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC +export VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND +export VISITORSCENTER_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_VIDEO # MQ Telemetry Transport From bf744cd31c4da88d8a76e5117f883e43b76482a8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:23:52 -0500 Subject: [PATCH 0179/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index d3ae2dfa..707ad447 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -22,7 +22,7 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # Main # ============================================================================= -Eog.sh "$APPLICATIONS_IMAGE/*" & +Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" Robot.sh lupe/headright 1 From 75c37a3be56d60c9a8e4e4ee9eb3ef775393fd1d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:24:11 -0500 Subject: [PATCH 0180/1653] Update Queretaro.sh --- Hochob/Applications/SouthernMayaHighlands/Queretaro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh index 4fcb0345..c691aece 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh @@ -22,6 +22,6 @@ export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") # Main # ============================================================================= -Eog.sh "$APPLICATIONS_IMAGE/*" & +Eog.sh "$VISITORSCENTER_IMAGE/*" & # End of File From f88f3c24912656a0f39e631e4b7f421a872e2b76 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:25:12 -0500 Subject: [PATCH 0181/1653] Update BajaCaliforniaSur.sh --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index ad89a736..282e16a4 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,19 +23,19 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # ============================================================================= Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Silencio.mp4" & -#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur01.mp4" & +#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte1_v3.mp4" & -#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur02.mp4" & +#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte2_v2.mp4" & -#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur03.mp4" & +#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte3_v2.mp4" & -#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur04.mp4" & +#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & sleep 37.5 && Robot.sh lupe/cerebro 1 sleep 2 Robot.sh lupe/rightup 1 @@ -48,7 +48,7 @@ Robot.sh lupe/leftfold 1 sleep 2 Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte4_v2.mp4" & -#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur05.mp4" & +#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/inteledison 1 sleep 3 Robot.sh lupe/rightdown 1 @@ -61,7 +61,7 @@ Robot.sh lupe/leftunfold 1 sleep 2 Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte5_v2.mp4" & -#Vlc.sh "off" "$APPLICATIONS_VIDEO/BajaCaliforniaSur06.mp4" & +#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & sleep 75 kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') From dc34f329717a26a63506b8aa414032d88e488a28 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:34:59 -0500 Subject: [PATCH 0182/1653] Update Main.sh --- Hochob/Main.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index c652408d..0eac5b32 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -44,7 +44,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VIDEO export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ -export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ @@ -61,7 +61,9 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ # Hochob Server Media Source Executive +export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH # Hochob Server Media Raw From cc2b85d93cd58cc7cbb9b080a2977af0d2e17424 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:39:51 -0500 Subject: [PATCH 0183/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 4c947f61..655b500a 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -27,7 +27,7 @@ sleep .6 Robot.sh lupe/headleft 1 sleep .6 -Fswebcam.sh +Fswebcam.sh 5 cp $FSWEBCAM_IMAGE $MEMORIES_CAMERA kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') From b7e66a4e685bef459d2c4f39e9e78955181816cb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:40:29 -0500 Subject: [PATCH 0184/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 655b500a..deb5cd10 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -28,7 +28,7 @@ Robot.sh lupe/headleft 1 sleep .6 Fswebcam.sh 5 -cp $FSWEBCAM_IMAGE $MEMORIES_CAMERA +cp $FSWEBCAM_DIRECTORY/* $MEMORIES_CAMERA kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') From eb5324359bdfff94e8d23bebf618b40ae5a8afb2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:43:49 -0500 Subject: [PATCH 0185/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Camera/Fswebcam.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index eaeb5ab7..677497d1 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -13,6 +13,8 @@ export FSWEBCAM_BINARY=fswebcam export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +LOCAL_IMAGES="$1" + # ============================================================================= # Functions # ============================================================================= @@ -23,6 +25,22 @@ export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE # Main # ============================================================================= -$FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_IMAGE +IMAGE=1 + +if [ $# -eq 1 ] +then + + while [ $IMAGE -le "$LOCAL_IMAGES" ] + do + DATE=`date +"%Y%m%d%H%M%S"` + IMAGE=$(($IMAGE+1)) + $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$DATE.jpg + done + +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + # End of File From bcb8a2082bedbe3cccbf7d5a795ca8651c7ad4ff Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:45:24 -0500 Subject: [PATCH 0186/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index 677497d1..4c499b9a 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -35,6 +35,7 @@ then DATE=`date +"%Y%m%d%H%M%S"` IMAGE=$(($IMAGE+1)) $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$DATE.jpg + sleep 1 done else From ca3b3cf511978f580648db2ae44f4454d63dde55 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 10:47:09 -0500 Subject: [PATCH 0187/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Video/Ffmpeg.sh | 40 +++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100755 Hochob/Services/Video/Ffmpeg.sh diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh new file mode 100755 index 00000000..b0166ccd --- /dev/null +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -0,0 +1,40 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +export VLC_PID=$$ +export VLC_BINARY=cvlc +export VLC_ARGUMENTS="--no-video-title-show --fullscreen" +export VLC_LOOP="--loop" + +LOCAL_LOOP="$1" +LOCAL_FILE="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + killall -9 $VLC_BINARY + if [ "$LOCAL_LOOP" = "on" ]; then + $VLC_BINARY $VLC_ARGUMENTS $VLC_LOOP $LOCAL_FILE & + elif [ "$LOCAL_LOOP" = "off" ]; then + $VLC_BINARY $VLC_ARGUMENTS $LOCAL_FILE & + fi +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From f189bd1096aed8878e1de0af853ba79f4e059c4c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:13:40 -0500 Subject: [PATCH 0188/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index 4c499b9a..ebb7eb91 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -34,7 +34,9 @@ then do DATE=`date +"%Y%m%d%H%M%S"` IMAGE=$(($IMAGE+1)) - $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$DATE.jpg + NAME=%04d$IMAGE + echo $NAME + #$FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$NAME.jpg sleep 1 done From 6d3d94c0d6a407d308955bc2e4f296b50eb48e87 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:15:26 -0500 Subject: [PATCH 0189/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Camera/Fswebcam.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index ebb7eb91..8072d42f 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -33,11 +33,9 @@ then while [ $IMAGE -le "$LOCAL_IMAGES" ] do DATE=`date +"%Y%m%d%H%M%S"` + NAME=`printf %04d $IMAGE` + $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$NAME.jpg IMAGE=$(($IMAGE+1)) - NAME=%04d$IMAGE - echo $NAME - #$FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$NAME.jpg - sleep 1 done else From 113ad592dd1d305993a1480f29bf0caa26993935 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:24:05 -0500 Subject: [PATCH 0190/1653] Update Main.sh --- Hochob/Main.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 0eac5b32..50c798a9 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -56,6 +56,8 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideo.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ @@ -65,6 +67,8 @@ export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH +export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG +export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO # Hochob Server Media Raw From bdb855901a41a20ca90b3f36ae82258f930b738f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:24:21 -0500 Subject: [PATCH 0191/1653] Update Ffmpeg.sh --- Hochob/Services/Video/Ffmpeg.sh | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index b0166ccd..d10d4dd8 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -6,13 +6,11 @@ set -x # Variables # ============================================================================= -export VLC_PID=$$ -export VLC_BINARY=cvlc -export VLC_ARGUMENTS="--no-video-title-show --fullscreen" -export VLC_LOOP="--loop" +export FFMPEG_PID=$$ +export FFMPEG_BINARY=ffmpeg +export FFMPEG_ARGUMENTS="-y -framerate 10 -vf fps=10 -pix_fmt yuv420p" -LOCAL_LOOP="$1" -LOCAL_FILE="$2" +LOCAL_DIRECTORY="$1" # ============================================================================= # Functions @@ -26,12 +24,7 @@ LOCAL_FILE="$2" if [ $# -eq 2 ] then - killall -9 $VLC_BINARY - if [ "$LOCAL_LOOP" = "on" ]; then - $VLC_BINARY $VLC_ARGUMENTS $VLC_LOOP $LOCAL_FILE & - elif [ "$LOCAL_LOOP" = "off" ]; then - $VLC_BINARY $VLC_ARGUMENTS $LOCAL_FILE & - fi + $FFMPEG_BINARY -i $LOCAL_DIRECTORY/%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" exit 1 From 8bb926059664e5315ff8c61df0ba2e8fab69a429 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:25:42 -0500 Subject: [PATCH 0192/1653] Update Ffmpeg.sh --- Hochob/Services/Video/Ffmpeg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index d10d4dd8..c09b23bd 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -22,7 +22,7 @@ LOCAL_DIRECTORY="$1" # Main # ============================================================================= -if [ $# -eq 2 ] +if [ $# -eq 1 ] then $FFMPEG_BINARY -i $LOCAL_DIRECTORY/%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_VIDEO else From a03b75813f8275e790cc6dac38c93e784ff330d6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:30:12 -0500 Subject: [PATCH 0193/1653] Update Signed-off-by: Abraham Arce --- .../SouthernMayaHighlands/Zacatecas.sh | 35 +++++++++++++++++++ Hochob/Services/Video/Ffmpeg.sh | 4 ++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100755 Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh new file mode 100755 index 00000000..deb5cd10 --- /dev/null +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MICHOACAN_PID=$$ +export MICHOACAN_PATH=$(readlink -f "$0") +export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 + +Fswebcam.sh 5 +cp $FSWEBCAM_DIRECTORY/* $MEMORIES_CAMERA + +kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index c09b23bd..e9a22558 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -6,6 +6,8 @@ set -x # Variables # ============================================================================= +. ~/CodeLabs/Hochob/Main.sh + export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg export FFMPEG_ARGUMENTS="-y -framerate 10 -vf fps=10 -pix_fmt yuv420p" @@ -24,7 +26,7 @@ LOCAL_DIRECTORY="$1" if [ $# -eq 1 ] then - $FFMPEG_BINARY -i $LOCAL_DIRECTORY/%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_VIDEO + $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" exit 1 From cdaf3f4a525a1fc9dd5f4892e39c59844f04f72e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:32:53 -0500 Subject: [PATCH 0194/1653] Update Zacatecas.sh --- .../SouthernMayaHighlands/Zacatecas.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index deb5cd10..54321eb2 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export MICHOACAN_PID=$$ -export MICHOACAN_PATH=$(readlink -f "$0") -export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") +export ZACATECAS_PID=$$ +export ZACATECAS_PATH=$(readlink -f "$0") +export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # ============================================================================= # Functions @@ -22,14 +22,9 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") # Main # ============================================================================= -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/headleft 1 -sleep .6 +Fswebcam.sh 100 +Ffmpeg.sh $FSWEBCAM_DIRECTORY -Fswebcam.sh 5 -cp $FSWEBCAM_DIRECTORY/* $MEMORIES_CAMERA - -kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') # End of File From 34e92762748634855df74f4049e36fb9db0f7e23 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:35:38 -0500 Subject: [PATCH 0195/1653] Update Ffmpeg.sh --- Hochob/Services/Video/Ffmpeg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index e9a22558..6e0e151a 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -10,7 +10,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -framerate 10 -vf fps=10 -pix_fmt yuv420p" +export FFMPEG_ARGUMENTS="-y -s 1920x1080 -framerate 10 -vf fps=10 -pix_fmt yuv420p" LOCAL_DIRECTORY="$1" From dd7e4ca191ae35ea1f6253514a2259a068777a33 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:39:23 -0500 Subject: [PATCH 0196/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 54321eb2..f96777e2 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -22,7 +22,8 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -Fswebcam.sh 100 +Espeak.sh off spanish "hola mundo" +Fswebcam.sh 10 Ffmpeg.sh $FSWEBCAM_DIRECTORY kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') From e7e68c68cc63dbca8bb91a23743d21202f838845 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:44:09 -0500 Subject: [PATCH 0197/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 6 ++++-- .../{SpeechSynthesizer => SpeechSynthetizer}/Espeak.sh | 0 2 files changed, 4 insertions(+), 2 deletions(-) rename Hochob/Services/Sound/{SpeechSynthesizer => SpeechSynthetizer}/Espeak.sh (100%) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index f96777e2..a70c0211 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -22,10 +22,12 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -Espeak.sh off spanish "hola mundo" +rm -f $FSWEBCAM_DIRECTORY/* + +Espeak.sh off spanish "Bienvenidos Futuros Ingenieros" Fswebcam.sh 10 Ffmpeg.sh $FSWEBCAM_DIRECTORY -kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') # End of File diff --git a/Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh similarity index 100% rename from Hochob/Services/Sound/SpeechSynthesizer/Espeak.sh rename to Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh From a594051674f9b95be3f3a844fbc6f212077f9d7d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:46:15 -0500 Subject: [PATCH 0198/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Video/FfmpegAudio.sh | 35 ++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 Hochob/Services/Video/FfmpegAudio.sh diff --git a/Hochob/Services/Video/FfmpegAudio.sh b/Hochob/Services/Video/FfmpegAudio.sh new file mode 100755 index 00000000..6e0e151a --- /dev/null +++ b/Hochob/Services/Video/FfmpegAudio.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export FFMPEG_PID=$$ +export FFMPEG_BINARY=ffmpeg +export FFMPEG_ARGUMENTS="-y -s 1920x1080 -framerate 10 -vf fps=10 -pix_fmt yuv420p" + +LOCAL_DIRECTORY="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_VIDEO +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From c187b07e9d00b28acbf54fc63b835b86ee0e082c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:51:29 -0500 Subject: [PATCH 0199/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 50c798a9..2241feee 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -54,6 +54,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.mp3 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg @@ -67,6 +68,7 @@ export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH +export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO From 13178a8d0b79744bcb02c7f3c61b6568806ed110 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:51:41 -0500 Subject: [PATCH 0200/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index 398d916c..712a7364 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -46,6 +46,7 @@ then $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_SPEECH | aplay - elif [ "$LOCAL_PLAY" = "off" ]; then $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" + ffmpeg -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 fi else echo "Invalid number of arguments, see Documentation" From 6b43f3ba1282f32f7a909cd68f44de9e2d96c0ce Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:54:20 -0500 Subject: [PATCH 0201/1653] Update FfmpegAudio.sh --- Hochob/Services/Video/FfmpegAudio.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Video/FfmpegAudio.sh b/Hochob/Services/Video/FfmpegAudio.sh index 6e0e151a..7ff8c8e2 100755 --- a/Hochob/Services/Video/FfmpegAudio.sh +++ b/Hochob/Services/Video/FfmpegAudio.sh @@ -10,9 +10,10 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -s 1920x1080 -framerate 10 -vf fps=10 -pix_fmt yuv420p" +export FFMPEG_ARGUMENTS="-y -s 1920x1080 -framerate 10 -vf fps=10 -pix_fmt yuv420p -acodec copy" -LOCAL_DIRECTORY="$1" +LOCAL_AUDIO=$1 +LOCAL_DIRECTORY="$2" # ============================================================================= # Functions @@ -26,7 +27,7 @@ LOCAL_DIRECTORY="$1" if [ $# -eq 1 ] then - $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_VIDEO + $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" exit 1 From ab4f0a1c88636d5b868a18d8e3eae5edb2c13dfb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:54:51 -0500 Subject: [PATCH 0202/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index a70c0211..ba1dfbbe 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -26,7 +26,7 @@ rm -f $FSWEBCAM_DIRECTORY/* Espeak.sh off spanish "Bienvenidos Futuros Ingenieros" Fswebcam.sh 10 -Ffmpeg.sh $FSWEBCAM_DIRECTORY +FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY #kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') From 16326ca90adf9809f356536336f493bf8371b055 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:56:06 -0500 Subject: [PATCH 0203/1653] Update FfmpegAudio.sh --- Hochob/Services/Video/FfmpegAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegAudio.sh b/Hochob/Services/Video/FfmpegAudio.sh index 7ff8c8e2..3c7a9ccc 100755 --- a/Hochob/Services/Video/FfmpegAudio.sh +++ b/Hochob/Services/Video/FfmpegAudio.sh @@ -25,7 +25,7 @@ LOCAL_DIRECTORY="$2" # Main # ============================================================================= -if [ $# -eq 1 ] +if [ $# -eq 2 ] then $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_VIDEO else From a869fa1b770eef05ce252f1732b2a47f0165d875 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:57:30 -0500 Subject: [PATCH 0204/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 2241feee..b5c59089 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -59,6 +59,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOC export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideo.mp4 +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideoAudio.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ @@ -71,6 +72,7 @@ export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO +export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_AUDIO # Hochob Server Media Raw From 30fd9fdbe53f63e1198fd09c5819d8d3ffdc21c6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:57:58 -0500 Subject: [PATCH 0205/1653] Update FfmpegAudio.sh --- Hochob/Services/Video/FfmpegAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegAudio.sh b/Hochob/Services/Video/FfmpegAudio.sh index 3c7a9ccc..c6c0466b 100755 --- a/Hochob/Services/Video/FfmpegAudio.sh +++ b/Hochob/Services/Video/FfmpegAudio.sh @@ -27,7 +27,7 @@ LOCAL_DIRECTORY="$2" if [ $# -eq 2 ] then - $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_VIDEO + $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO else echo "Invalid number of arguments, see Documentation" exit 1 From 637e3daa0689f17ec95473faaab8806c75944e13 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:58:38 -0500 Subject: [PATCH 0206/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index 712a7364..eaff744c 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -46,7 +46,7 @@ then $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_SPEECH | aplay - elif [ "$LOCAL_PLAY" = "off" ]; then $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" - ffmpeg -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 + ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 fi else echo "Invalid number of arguments, see Documentation" From bf0413c44160b9b7609fbbda2fc5afd5da2fbf49 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 11:59:49 -0500 Subject: [PATCH 0207/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index b5c59089..54be1981 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -72,7 +72,7 @@ export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO -export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_AUDIO +export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO # Hochob Server Media Raw From c11d3d205367cca17dbf740bc9a6c6a5e2546da7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:01:41 -0500 Subject: [PATCH 0208/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index ba1dfbbe..7ace7b29 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -25,7 +25,7 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") rm -f $FSWEBCAM_DIRECTORY/* Espeak.sh off spanish "Bienvenidos Futuros Ingenieros" -Fswebcam.sh 10 +Fswebcam.sh 100 FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY #kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') From 16a034de94b0d1e722c026271362c3654a8ad51e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:04:11 -0500 Subject: [PATCH 0209/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 7ace7b29..e7b2c57d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -24,7 +24,11 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") rm -f $FSWEBCAM_DIRECTORY/* -Espeak.sh off spanish "Bienvenidos Futuros Ingenieros" +Espeak.sh off spanish \ +"Muchas gracias Futuros Ingenieros!. +A nombre del Equipo de Intel, deseamos que hayan tenido un gan visita! +Los esperamos muy pronto!" + Fswebcam.sh 100 FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY From 64ebb1504dd383711ee988f61c63882ff807c2f0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:16:36 -0500 Subject: [PATCH 0210/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index f4e420e8..02623c6c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -22,7 +22,7 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" +Stream2Chromecast.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" kill -- -$(ps -o pgid=$MONTESAZULES_PID | grep -o '[0-9]*') From 6a75e8cd4ef860f9076d56da77806745f193f0d3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:16:50 -0500 Subject: [PATCH 0211/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 148f496e..09bfec65 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -22,7 +22,7 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" +Stream2Chromecast.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" kill -- -$(ps -o pgid=$OJODELIEBRE_PID | grep -o '[0-9]*') From 5672b45b07645ed7c64add0f235a2edd1e4fb962 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:17:01 -0500 Subject: [PATCH 0212/1653] Update Signed-off-by: Abraham Arce --- .../SouthernMayaHighlands/Mexico.sh | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100755 Hochob/Applications/SouthernMayaHighlands/Mexico.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh new file mode 100755 index 00000000..deb5cd10 --- /dev/null +++ b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MICHOACAN_PID=$$ +export MICHOACAN_PATH=$(readlink -f "$0") +export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 + +Fswebcam.sh 5 +cp $FSWEBCAM_DIRECTORY/* $MEMORIES_CAMERA + +kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') + +# End of File From f12028b213846416b70a54015c8094a5f50a852f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:19:09 -0500 Subject: [PATCH 0213/1653] Update Mexico.sh --- .../Applications/SouthernMayaHighlands/Mexico.sh | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh index deb5cd10..87fb76ea 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export MICHOACAN_PID=$$ -export MICHOACAN_PATH=$(readlink -f "$0") -export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") +export MEXICO_PID=$$ +export MEXICO_PATH=$(readlink -f "$0") +export MEXICO_DIRECTORY=$(dirname "$MEXICO_PATH") # ============================================================================= # Functions @@ -22,14 +22,8 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") # Main # ============================================================================= -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/headleft 1 -sleep .6 +Fswebcam.sh 360 -Fswebcam.sh 5 -cp $FSWEBCAM_DIRECTORY/* $MEMORIES_CAMERA - -kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$MEXICO_PID | grep -o '[0-9]*') # End of File From e5ecd0b3fae30e29dec01557dd3e0fff4c4e6289 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:25:04 -0500 Subject: [PATCH 0214/1653] Update Mexico.sh --- Hochob/Applications/SouthernMayaHighlands/Mexico.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh index 87fb76ea..59655c81 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh @@ -23,6 +23,7 @@ export MEXICO_DIRECTORY=$(dirname "$MEXICO_PATH") # ============================================================================= Fswebcam.sh 360 +# find dirname -type f | shuf -n 5 kill -- -$(ps -o pgid=$MEXICO_PID | grep -o '[0-9]*') From 64b0ba7d9c4becd854f89ebf90f01b677f4b9a28 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:26:49 -0500 Subject: [PATCH 0215/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index dfbb6148..36e04fe5 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -22,6 +22,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= +Fswebcam.sh 5 & Eog.sh "$CORPORATE_IMAGE/*" & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" From 0407bf0c6991e2309c584feafc0fe78c9a630e42 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:27:42 -0500 Subject: [PATCH 0216/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index 8072d42f..14dfc1b0 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -36,6 +36,7 @@ then NAME=`printf %04d $IMAGE` $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$NAME.jpg IMAGE=$(($IMAGE+1)) + sleep 1 done else From ae95ce0cec0e8ea4962e31a98b0f3b6a99b8ba86 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:28:14 -0500 Subject: [PATCH 0217/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 36e04fe5..7d21d278 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -24,7 +24,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") Fswebcam.sh 5 & Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 +sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From 6e54cce1ddbe14b3fd2520efc5812db5eda40170 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:32:24 -0500 Subject: [PATCH 0218/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index e7b2c57d..7964e17b 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -26,7 +26,7 @@ rm -f $FSWEBCAM_DIRECTORY/* Espeak.sh off spanish \ "Muchas gracias Futuros Ingenieros!. -A nombre del Equipo de Intel, deseamos que hayan tenido un gan visita! +A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! Los esperamos muy pronto!" Fswebcam.sh 100 From 9daf0f37522e5f592efaaf94ce768623bd634b98 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 12:58:17 -0500 Subject: [PATCH 0219/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Visitors/Name.sh | 48 ++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 Hochob/Services/Visitors/Name.sh diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh new file mode 100755 index 00000000..14dfc1b0 --- /dev/null +++ b/Hochob/Services/Visitors/Name.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export FSWEBCAM_PID=$$ +export FSWEBCAM_BINARY=fswebcam +export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" +export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE + +LOCAL_IMAGES="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +IMAGE=1 + +if [ $# -eq 1 ] +then + + while [ $IMAGE -le "$LOCAL_IMAGES" ] + do + DATE=`date +"%Y%m%d%H%M%S"` + NAME=`printf %04d $IMAGE` + $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$NAME.jpg + IMAGE=$(($IMAGE+1)) + sleep 1 + done + +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + + +# End of File From 1ba7d95163b984ef658de3d74e13c4667f07d647 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:00:40 -0500 Subject: [PATCH 0220/1653] Update Name.sh --- Hochob/Services/Visitors/Name.sh | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index 14dfc1b0..e4374f8d 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -8,12 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export FSWEBCAM_PID=$$ -export FSWEBCAM_BINARY=fswebcam -export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" -export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE - -LOCAL_IMAGES="$1" +export NAME_PID=$$ # ============================================================================= # Functions @@ -25,24 +20,6 @@ LOCAL_IMAGES="$1" # Main # ============================================================================= -IMAGE=1 - -if [ $# -eq 1 ] -then - - while [ $IMAGE -le "$LOCAL_IMAGES" ] - do - DATE=`date +"%Y%m%d%H%M%S"` - NAME=`printf %04d $IMAGE` - $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$NAME.jpg - IMAGE=$(($IMAGE+1)) - sleep 1 - done - -else - echo "Invalid number of arguments, see Documentation" - exit 1 -fi - +return "Hi" # End of File From 0ebaabd9677acbb4c2169913e28f8c9cee6120f8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:02:52 -0500 Subject: [PATCH 0221/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Visitors/Name.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index e4374f8d..b4fe9e71 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -20,6 +20,6 @@ export NAME_PID=$$ # Main # ============================================================================= -return "Hi" +echo "Instituto Dummy" # End of File From 1908043fe62a923b649e7ec0ebb42bc05d1312a7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:05:32 -0500 Subject: [PATCH 0222/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 54be1981..52d0f9d9 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -25,6 +25,7 @@ export HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_SERVICES_SO export HOCHOB_SERVER_SERVICES_STREAM=$HOCHOB_SERVER_SERVICES/Stream/ export HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST=$HOCHOB_SERVER_SERVICES_STREAM/Stream2Chromecast/ export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ +export HOCHOB_SERVER_SERVICES_VISITORS=$HOCHOB_SERVER_SERVICES/Visitors/ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS @@ -38,6 +39,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VIDEO +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VISITORS # Hochob Server Media Source Raw From 6cc2e0c0be7d9af4b48b6f7b9b6311de9aed3bd7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:16:28 -0500 Subject: [PATCH 0223/1653] Update Main.sh --- Hochob/Main.sh | 70 +++++++++++++++++++++++++------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 52d0f9d9..b7415292 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -41,41 +41,6 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VIDEO export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VISITORS -# Hochob Server Media Source Raw - -export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ - -export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ -export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ -export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg - -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ - -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.mp3 - -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideo.mp4 -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideoAudio.mp4 - -export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ - -# Hochob Server Media Source Executive - -export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM -export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE -export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK -export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH -export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 -export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG -export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO -export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO - # Hochob Server Media Raw export HOCHOB_SERVER_MEDIA=$HOME/HochobServerMedia/ @@ -118,6 +83,41 @@ export VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC export VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND export VISITORSCENTER_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_VIDEO +# Hochob Server Media Source Raw + +export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ + +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg + +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ + +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.mp3 + +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideo.mp4 +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideoAudio.mp4 + +export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ + +# Hochob Server Media Source Executive + +export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM +export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK +export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH +export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 +export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG +export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO +export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO + # MQ Telemetry Transport MQTT_SERVER_ADDRESS=iot.eclipse.org From 729eb52c2788e5ecab8acc28cbee44d2f2e1d1f6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:32:49 -0500 Subject: [PATCH 0224/1653] Update Main.sh --- Hochob/Main.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index b7415292..12261620 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -89,6 +89,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/*.jpg export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ @@ -102,6 +103,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOC export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/*.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideo.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideoAudio.mp4 @@ -110,11 +112,15 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ # Hochob Server Media Source Executive export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM +export FSWEBCAM_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_ALLFILES export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE + export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 + export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG +export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_ALLFILES export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO From 11d2bdfae2e2aedc9a4dca891da83d9889b0797e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:36:49 -0500 Subject: [PATCH 0225/1653] Update Main.sh --- Hochob/Main.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 12261620..55022220 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -94,10 +94,12 @@ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOU export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING/*.jpg export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/*.* export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.mp3 @@ -115,7 +117,11 @@ export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM export FSWEBCAM_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_ALLFILES export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +export DRAWING_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING +export DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES + export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK +export ESPEAK_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ALLFILES export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 From 27254ffe739c3fe358631845876394612ee8b5bf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:39:05 -0500 Subject: [PATCH 0226/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 55022220..58c28584 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -57,6 +57,7 @@ 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_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES/Video/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/ @@ -76,6 +77,7 @@ export CORPORATE_VIDEO=$HOCHOB_SERVER_MEDIA_CORPORATE_VIDEO 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_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO export VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE From 1f47bc6193a381528cf133f7782e4626f44cf783 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:39:11 -0500 Subject: [PATCH 0227/1653] Update Signed-off-by: Abraham Arce --- .../SouthernMayaHighlands/Aguascalientes.sh | 14 ++--- Hochob/Services/Memories/Memories.sh | 54 +++++++++++++++++++ 2 files changed, 62 insertions(+), 6 deletions(-) create mode 100755 Hochob/Services/Memories/Memories.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 7d21d278..518d09b2 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -22,11 +22,13 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Fswebcam.sh 5 & -Eog.sh "$CORPORATE_IMAGE/*" & -sleep 5 -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" - -kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') +Fswebcam.sh 5 +Institution=`Name.sh` +Memories.sh "$Institution" "Estacion Aguascalientes" +#Eog.sh "$CORPORATE_IMAGE/*" & +#sleep 5 +#Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" + +#kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') # End of File diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh new file mode 100755 index 00000000..8a675f0a --- /dev/null +++ b/Hochob/Services/Memories/Memories.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MEMORIES_PID=$$ + +LOCAL_TYPE="$1" +LOCAL_INSTITUTION_NAME="$(echo "${2}" | tr -d '[:space:]')" +LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" + +LOCAL_PATH=$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 3 ] +then + + if [ "$LOCAL_TYPE" = "camera" ]; then + DIRECTORY=$MEMORIES_CAMERA/$LOCAL_PATH + mkdir -p $DIRECTORY + cp -r $FSWEBCAM_ALLFILES $DIRECTORY + elif [ "$LOCAL_TYPE" = "drawing" ]; then + DIRECTORY=$MEMORIES_DRAWING/$LOCAL_PATH + mkdir -p $DIRECTORY + cp -r $DRAWING_ALLFILES $DIRECTORY + elif [ "$LOCAL_TYPE" = "robot" ]; then + DIRECTORY=$MEMORIES_ROBOT/$LOCAL_PATH + mkdir -p $DIRECTORY + cp -r $ESPEAK_ALLFILES $DIRECTORY + elif [ "$LOCAL_TYPE" = "video" ]; then + DIRECTORY=$MEMORIES_VIDEO/$LOCAL_PATH + mkdir -p $DIRECTORY + cp -r $FFMPEG_ALLFILES $DIRECTORY + fi + +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi +# End of File From ee9efba1f45a6cc617715b2f51c8f2d242efdf3c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:41:46 -0500 Subject: [PATCH 0228/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 58c28584..59cc6c63 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -17,6 +17,7 @@ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS=$HOCHOB_SERVER_SERVICES/Communications/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT=$HOCHOB_SERVER_SERVICES_COMMUNICATIONS/MqttClient/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ +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_SOUND=$HOCHOB_SERVER_SERVICES/Sound/ @@ -31,6 +32,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE +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_SOUND From 6027728ebda0f4cfe1a84c2f151701e8162b2d9e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:45:22 -0500 Subject: [PATCH 0229/1653] Update Name.sh --- Hochob/Services/Visitors/Name.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index b4fe9e71..75a783cb 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -20,6 +20,6 @@ export NAME_PID=$$ # Main # ============================================================================= -echo "Instituto Dummy" +echo `date +"%Y%m%d%H%M%S"` # End of File From 84f2a720e13236ecffedef9d8341e1c84a36b8a4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 13:49:24 -0500 Subject: [PATCH 0230/1653] Update Aguascalientes.sh --- .../Applications/SouthernMayaHighlands/Aguascalientes.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 518d09b2..a8090a65 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -25,10 +25,10 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") Fswebcam.sh 5 Institution=`Name.sh` Memories.sh "$Institution" "Estacion Aguascalientes" -#Eog.sh "$CORPORATE_IMAGE/*" & -#sleep 5 -#Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +Eog.sh "$CORPORATE_IMAGE/*" & +sleep 5 +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" -#kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') # End of File From b1abf3de31ce27171f87b8382694dc11693bfcbf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:02:29 -0500 Subject: [PATCH 0231/1653] Update Ffmpeg.sh --- Hochob/Services/Video/Ffmpeg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index 6e0e151a..a7a0547e 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -10,7 +10,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -s 1920x1080 -framerate 10 -vf fps=10 -pix_fmt yuv420p" +export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" LOCAL_DIRECTORY="$1" From e11fec06e5af4ba7e6938514ffc72b0858be9df4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:02:44 -0500 Subject: [PATCH 0232/1653] Update FfmpegAudio.sh --- Hochob/Services/Video/FfmpegAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegAudio.sh b/Hochob/Services/Video/FfmpegAudio.sh index c6c0466b..543f32da 100755 --- a/Hochob/Services/Video/FfmpegAudio.sh +++ b/Hochob/Services/Video/FfmpegAudio.sh @@ -10,7 +10,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -s 1920x1080 -framerate 10 -vf fps=10 -pix_fmt yuv420p -acodec copy" +export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p -acodec copy" LOCAL_AUDIO=$1 LOCAL_DIRECTORY="$2" From c93a647e2b9aa9e583bed6ce7a8b59068a584049 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:03:00 -0500 Subject: [PATCH 0233/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index a8090a65..36c90118 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -24,9 +24,9 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") Fswebcam.sh 5 Institution=`Name.sh` -Memories.sh "$Institution" "Estacion Aguascalientes" +Memories.sh "camera" "${Institution}" "Estacion Aguascalientes" Eog.sh "$CORPORATE_IMAGE/*" & -sleep 5 +sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From 05b3c7ceee57ced581dd68b3fcccb6669bcb139f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:07:00 -0500 Subject: [PATCH 0234/1653] Update Signed-off-by: Abraham Arce --- .../Applications/SouthernMayaHighlands/Aguascalientes.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 36c90118..c2339110 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export AGUASCALIENTES_PID=$$ +export AGUASCALIENTES_NAME="Aguascalientes Application" export AGUASCALIENTES_PATH=$(readlink -f "$0") export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") @@ -22,13 +23,14 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Fswebcam.sh 5 -Institution=`Name.sh` -Memories.sh "camera" "${Institution}" "Estacion Aguascalientes" +Fswebcam.sh 5 & Eog.sh "$CORPORATE_IMAGE/*" & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +Institution=`Name.sh` +Memories.sh "camera" "${Institution}" "${AGUASCALIENTES_NAME}" + kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') # End of File From d7a726d962f750cc4207b245c431aa4e2c666bb7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:11:03 -0500 Subject: [PATCH 0235/1653] Update Name.sh --- Hochob/Services/Visitors/Name.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index 75a783cb..cdec236e 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -21,5 +21,6 @@ export NAME_PID=$$ # ============================================================================= echo `date +"%Y%m%d%H%M%S"` +echo "Instituto Triki" # End of File From 56c2840b6b2db58765ed1301bfba8b421819646b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:14:03 -0500 Subject: [PATCH 0236/1653] Update Name.sh --- Hochob/Services/Visitors/Name.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index cdec236e..ca38cbe6 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -20,7 +20,7 @@ export NAME_PID=$$ # Main # ============================================================================= -echo `date +"%Y%m%d%H%M%S"` +#echo `date +"%Y%m%d%H%M%S"` echo "Instituto Triki" # End of File From 53306277e417b96bc4049ef91dbc6ac2ea70eec7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:15:04 -0500 Subject: [PATCH 0237/1653] Update Eog.sh --- Hochob/Services/Image/Eog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index 9b23e07d..f0b684dd 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -25,7 +25,7 @@ LOCAL_FILES="$1" if [ $# -eq 1 ] then killall -9 $EOG_BINARY - $EOG_BINARY $EOG_ARGUMENTS $LOCAL_FILES & + $EOG_BINARY $EOG_ARGUMENTS $LOCAL_FILES & else echo "Invalid number of arguments, see Documentation" exit 1 From 76aa87ee4d1a146bfa8833d8bd8d30cd41428a3d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:21:45 -0500 Subject: [PATCH 0238/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index c2339110..ee2a9657 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -23,13 +23,10 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Fswebcam.sh 5 & +Memories.sh "camera" "5" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & -sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" -Institution=`Name.sh` -Memories.sh "camera" "${Institution}" "${AGUASCALIENTES_NAME}" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From 1ab7e9788e1d4340d3cc7d2828a97cb1c4b018eb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:24:29 -0500 Subject: [PATCH 0239/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 8a675f0a..0d18ea87 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -11,9 +11,12 @@ set -x export MEMORIES_PID=$$ LOCAL_TYPE="$1" -LOCAL_INSTITUTION_NAME="$(echo "${2}" | tr -d '[:space:]')" +LOCAL_NUMBER="$2" LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" +LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" + LOCAL_PATH=$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= @@ -28,8 +31,8 @@ LOCAL_PATH=$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION if [ $# -eq 3 ] then - if [ "$LOCAL_TYPE" = "camera" ]; then + Fswebcam.sh $LOCAL_NUMBER & DIRECTORY=$MEMORIES_CAMERA/$LOCAL_PATH mkdir -p $DIRECTORY cp -r $FSWEBCAM_ALLFILES $DIRECTORY From e2be509f9cfca0a5cfbc2e464e00d5d151f13423 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:36:51 -0500 Subject: [PATCH 0240/1653] Update Main.sh --- Hochob/Main.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 59cc6c63..0ae3b7fa 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -62,6 +62,8 @@ export HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES/Drawin export HOCHOB_SERVER_MEDIA_MEMORIES_ROBOT=$HOCHOB_SERVER_MEDIA_MEMORIES/Robot/ export HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES/Video/ +export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/ + export HOCHOB_SERVER_MEDIA_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Image/ export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Music/ @@ -82,6 +84,8 @@ export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING export MEMORIES_ROBOT=$HOCHOB_SERVER_MEDIA_MEMORIES_ROBOT export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO +export VISITORS=$HOCHOB_SERVER_MEDIA_VISITORS + export VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE export VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC export VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND From 6bbd130ccffd35c5f17e094918f7ea2dc4d0bea2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:38:38 -0500 Subject: [PATCH 0241/1653] Create Usb.sh --- Hochob/Services/Visitors/Usb.sh | 44 +++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Hochob/Services/Visitors/Usb.sh diff --git a/Hochob/Services/Visitors/Usb.sh b/Hochob/Services/Visitors/Usb.sh new file mode 100644 index 00000000..12ff90b0 --- /dev/null +++ b/Hochob/Services/Visitors/Usb.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export USB_PID=$$ + +LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" + +LOCAL_PATH=$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +DIRECTORY=$VISITORS/$MEMORIES_CAMERA/$LOCAL_PATH +mkdir -p $DIRECTORY +cp -r $FSWEBCAM_ALLFILES $DIRECTORY + +DIRECTORY=$MEMORIES_DRAWING/$LOCAL_PATH +mkdir -p $DIRECTORY +cp -r $DRAWING_ALLFILES $DIRECTORY + +DIRECTORY=$MEMORIES_ROBOT/$LOCAL_PATH +mkdir -p $DIRECTORY +cp -r $ESPEAK_ALLFILES $DIRECTORY + +DIRECTORY=$MEMORIES_VIDEO/$LOCAL_PATH +mkdir -p $DIRECTORY +cp -r $FFMPEG_ALLFILES $DIRECTORY + +# End of File From a7456c41d926fad812ddded2d7ed9f57b7be8bb7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:38:29 -0500 Subject: [PATCH 0242/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Visitors/Usb.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Visitors/Usb.sh diff --git a/Hochob/Services/Visitors/Usb.sh b/Hochob/Services/Visitors/Usb.sh old mode 100644 new mode 100755 From 5a32636b6b8e639156620a7f51521e21d8bc01c3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:44:05 -0500 Subject: [PATCH 0243/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Visitors/Usb.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Hochob/Services/Visitors/Usb.sh b/Hochob/Services/Visitors/Usb.sh index 12ff90b0..61ebda35 100755 --- a/Hochob/Services/Visitors/Usb.sh +++ b/Hochob/Services/Visitors/Usb.sh @@ -29,16 +29,16 @@ DIRECTORY=$VISITORS/$MEMORIES_CAMERA/$LOCAL_PATH mkdir -p $DIRECTORY cp -r $FSWEBCAM_ALLFILES $DIRECTORY -DIRECTORY=$MEMORIES_DRAWING/$LOCAL_PATH -mkdir -p $DIRECTORY -cp -r $DRAWING_ALLFILES $DIRECTORY +#DIRECTORY=$MEMORIES_DRAWING/$LOCAL_PATH +#mkdir -p $DIRECTORY +#cp -r $DRAWING_ALLFILES $DIRECTORY -DIRECTORY=$MEMORIES_ROBOT/$LOCAL_PATH -mkdir -p $DIRECTORY -cp -r $ESPEAK_ALLFILES $DIRECTORY +#DIRECTORY=$MEMORIES_ROBOT/$LOCAL_PATH +#mkdir -p $DIRECTORY +#cp -r $ESPEAK_ALLFILES $DIRECTORY -DIRECTORY=$MEMORIES_VIDEO/$LOCAL_PATH -mkdir -p $DIRECTORY -cp -r $FFMPEG_ALLFILES $DIRECTORY +#DIRECTORY=$MEMORIES_VIDEO/$LOCAL_PATH +#mkdir -p $DIRECTORY +#cp -r $FFMPEG_ALLFILES $DIRECTORY # End of File From bc355b07d126b87aafe3d0de62e614d6ea3b43aa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:49:33 -0500 Subject: [PATCH 0244/1653] Update and rename Usb.sh to GiftUsb.sh --- Hochob/Services/Visitors/{Usb.sh => GiftUsb.sh} | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) rename Hochob/Services/Visitors/{Usb.sh => GiftUsb.sh} (73%) diff --git a/Hochob/Services/Visitors/Usb.sh b/Hochob/Services/Visitors/GiftUsb.sh similarity index 73% rename from Hochob/Services/Visitors/Usb.sh rename to Hochob/Services/Visitors/GiftUsb.sh index 61ebda35..a3223816 100755 --- a/Hochob/Services/Visitors/Usb.sh +++ b/Hochob/Services/Visitors/GiftUsb.sh @@ -8,13 +8,11 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export USB_PID=$$ +export GIFTUSB_PID=$$ LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" -LOCAL_PATH=$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION - # ============================================================================= # Functions # ============================================================================= @@ -25,20 +23,12 @@ LOCAL_PATH=$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # Main # ============================================================================= -DIRECTORY=$VISITORS/$MEMORIES_CAMERA/$LOCAL_PATH +DIRECTORY=$VISITORS/$LOCAL_INSTITUTION_NAME mkdir -p $DIRECTORY -cp -r $FSWEBCAM_ALLFILES $DIRECTORY -#DIRECTORY=$MEMORIES_DRAWING/$LOCAL_PATH -#mkdir -p $DIRECTORY +cp -r $FSWEBCAM_ALLFILES $DIRECTORY #cp -r $DRAWING_ALLFILES $DIRECTORY - -#DIRECTORY=$MEMORIES_ROBOT/$LOCAL_PATH -#mkdir -p $DIRECTORY #cp -r $ESPEAK_ALLFILES $DIRECTORY - -#DIRECTORY=$MEMORIES_VIDEO/$LOCAL_PATH -#mkdir -p $DIRECTORY #cp -r $FFMPEG_ALLFILES $DIRECTORY # End of File From b6f73d04fd8eb5a9f1d9eacffafc7907d2d9a8db Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:55:29 -0500 Subject: [PATCH 0245/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 31 +++++++--------------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 0d18ea87..17e6b405 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -10,14 +10,13 @@ set -x export MEMORIES_PID=$$ -LOCAL_TYPE="$1" -LOCAL_NUMBER="$2" -LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" +LOCAL_NUMBER="$1" +LOCAL_IDENTIFICATION="$(echo "${2}" | tr -d '[:space:]')" LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" -LOCAL_PATH=$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION +LOCAL_MEMORY_PATH=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= # Functions @@ -29,27 +28,11 @@ LOCAL_PATH=$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # Main # ============================================================================= -if [ $# -eq 3 ] +if [ $# -eq 2 ] then - if [ "$LOCAL_TYPE" = "camera" ]; then - Fswebcam.sh $LOCAL_NUMBER & - DIRECTORY=$MEMORIES_CAMERA/$LOCAL_PATH - mkdir -p $DIRECTORY - cp -r $FSWEBCAM_ALLFILES $DIRECTORY - elif [ "$LOCAL_TYPE" = "drawing" ]; then - DIRECTORY=$MEMORIES_DRAWING/$LOCAL_PATH - mkdir -p $DIRECTORY - cp -r $DRAWING_ALLFILES $DIRECTORY - elif [ "$LOCAL_TYPE" = "robot" ]; then - DIRECTORY=$MEMORIES_ROBOT/$LOCAL_PATH - mkdir -p $DIRECTORY - cp -r $ESPEAK_ALLFILES $DIRECTORY - elif [ "$LOCAL_TYPE" = "video" ]; then - DIRECTORY=$MEMORIES_VIDEO/$LOCAL_PATH - mkdir -p $DIRECTORY - cp -r $FFMPEG_ALLFILES $DIRECTORY - fi - + mkdir -p $LOCAL_MEMORY_PATH + Fswebcam.sh $LOCAL_NUMBER + cp -r $FSWEBCAM_ALLFILES $LOCAL_MEMORY_PATH else echo "Invalid number of arguments, see Documentation" exit 1 From c76f12d85f140c51ca25975e42c11f3a74cfe2a1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 14:57:49 -0500 Subject: [PATCH 0246/1653] Update GiftUsb.sh --- Hochob/Services/Visitors/GiftUsb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Visitors/GiftUsb.sh b/Hochob/Services/Visitors/GiftUsb.sh index a3223816..09d6750a 100755 --- a/Hochob/Services/Visitors/GiftUsb.sh +++ b/Hochob/Services/Visitors/GiftUsb.sh @@ -26,7 +26,7 @@ LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" DIRECTORY=$VISITORS/$LOCAL_INSTITUTION_NAME mkdir -p $DIRECTORY -cp -r $FSWEBCAM_ALLFILES $DIRECTORY +cp -r $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA $DIRECTORY #cp -r $DRAWING_ALLFILES $DIRECTORY #cp -r $ESPEAK_ALLFILES $DIRECTORY #cp -r $FFMPEG_ALLFILES $DIRECTORY From 109d1df27f4034d15ec1ac342f1b7d18928b2ace Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:02:52 -0500 Subject: [PATCH 0247/1653] Update GiftUsb.sh --- Hochob/Services/Visitors/GiftUsb.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Visitors/GiftUsb.sh b/Hochob/Services/Visitors/GiftUsb.sh index 09d6750a..dbf3484a 100755 --- a/Hochob/Services/Visitors/GiftUsb.sh +++ b/Hochob/Services/Visitors/GiftUsb.sh @@ -13,6 +13,8 @@ export GIFTUSB_PID=$$ LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" +LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/ + # ============================================================================= # Functions # ============================================================================= @@ -23,10 +25,11 @@ LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" # Main # ============================================================================= -DIRECTORY=$VISITORS/$LOCAL_INSTITUTION_NAME -mkdir -p $DIRECTORY +LOCAL_VISITORS=$VISITORS/$LOCAL_INSTITUTION_NAME +mkdir -p $LOCAL_VISITORS + +cp -r $LOCAL_MEMORIES_CAMERA $LOCAL_VISITORS -cp -r $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA $DIRECTORY #cp -r $DRAWING_ALLFILES $DIRECTORY #cp -r $ESPEAK_ALLFILES $DIRECTORY #cp -r $FFMPEG_ALLFILES $DIRECTORY From 0ee7e97ac129b90de32ca95060c5068de3699124 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:02:56 -0500 Subject: [PATCH 0248/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 17e6b405..4a21bd6e 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -16,7 +16,7 @@ LOCAL_IDENTIFICATION="$(echo "${2}" | tr -d '[:space:]')" LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" -LOCAL_MEMORY_PATH=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION +LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= # Functions @@ -30,9 +30,9 @@ LOCAL_MEMORY_PATH=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION if [ $# -eq 2 ] then - mkdir -p $LOCAL_MEMORY_PATH + mkdir -p $LOCAL_MEMORIES_CAMERA Fswebcam.sh $LOCAL_NUMBER - cp -r $FSWEBCAM_ALLFILES $LOCAL_MEMORY_PATH + cp -r $FSWEBCAM_ALLFILES $LOCAL_MEMORIES_CAMERA else echo "Invalid number of arguments, see Documentation" exit 1 From 36cda36478ee5c6aa1e52f970fc84593abd1d6ea Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:05:59 -0500 Subject: [PATCH 0249/1653] Update GiftUsb.sh --- Hochob/Services/Visitors/GiftUsb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Visitors/GiftUsb.sh b/Hochob/Services/Visitors/GiftUsb.sh index dbf3484a..34fae900 100755 --- a/Hochob/Services/Visitors/GiftUsb.sh +++ b/Hochob/Services/Visitors/GiftUsb.sh @@ -13,7 +13,7 @@ export GIFTUSB_PID=$$ LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" -LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/ +LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/* # ============================================================================= # Functions From 13e2fb4499d7da56493093b978ce4c269b7cafb6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:07:12 -0500 Subject: [PATCH 0250/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index ee2a9657..29681df1 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -23,7 +23,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Memories.sh "camera" "5" "${AGUASCALIENTES_NAME}" & +Memories.sh "5" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" From a3b3a9f1dcfdb3db3449462f5a46ed2f16ff67ab Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:07:23 -0500 Subject: [PATCH 0251/1653] Update Aguascalientes.sh --- .../Applications/SouthernMayaHighlands/Aguascalientes.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 29681df1..23b7b483 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -24,10 +24,9 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= Memories.sh "5" "${AGUASCALIENTES_NAME}" & -Eog.sh "$CORPORATE_IMAGE/*" & -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +#Eog.sh "$CORPORATE_IMAGE/*" & +#Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" - -kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') # End of File From 71f9d12c2023c446d184833723656ceb895f8dd5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:09:46 -0500 Subject: [PATCH 0252/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 23b7b483..25ea0295 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -23,7 +23,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Memories.sh "5" "${AGUASCALIENTES_NAME}" & +Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & #Eog.sh "$CORPORATE_IMAGE/*" & #Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" From 9e9f5ced6781c24d4915fcbdbfadd2afa7a4a859 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:12:35 -0500 Subject: [PATCH 0253/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 25ea0295..6cd56cf8 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -23,7 +23,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & +Memories.sh "5" "on" "${AGUASCALIENTES_NAME}" & #Eog.sh "$CORPORATE_IMAGE/*" & #Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" From c5125347dba02feb04bea29aebe57cf27fe1bdd8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:16:24 -0500 Subject: [PATCH 0254/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 4a21bd6e..08848896 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -11,12 +11,14 @@ set -x export MEMORIES_PID=$$ LOCAL_NUMBER="$1" -LOCAL_IDENTIFICATION="$(echo "${2}" | tr -d '[:space:]')" +LOCAL_VIDEO="$2" +LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION +LOCAL_MEMORIES_VIDEO=$MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= # Functions @@ -28,11 +30,17 @@ LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICA # Main # ============================================================================= -if [ $# -eq 2 ] +if [ $# -eq 3 ] then mkdir -p $LOCAL_MEMORIES_CAMERA Fswebcam.sh $LOCAL_NUMBER cp -r $FSWEBCAM_ALLFILES $LOCAL_MEMORIES_CAMERA + + if [ "$LOCAL_VIDEO" = "on" ]; then + Ffmpeg.sh $FSWEBCAM_ALLFILES + cp -r $FFMPEG_ALLFILES $LOCAL_MEMORIES_VIDEO + fi + else echo "Invalid number of arguments, see Documentation" exit 1 From 32a5b3e84bb21b08cc47c62068d71b9f02305405 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:18:10 -0500 Subject: [PATCH 0255/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 08848896..7aa54b5a 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -37,7 +37,7 @@ then cp -r $FSWEBCAM_ALLFILES $LOCAL_MEMORIES_CAMERA if [ "$LOCAL_VIDEO" = "on" ]; then - Ffmpeg.sh $FSWEBCAM_ALLFILES + Ffmpeg.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_MEMORIES_VIDEO fi From 1c0d5fa0d691920cde070ee4002561313b6b0cc8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:20:43 -0500 Subject: [PATCH 0256/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 0ae3b7fa..c3be7210 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -134,7 +134,7 @@ export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG -export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_ALLFILES +export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO From 3d82b81345e32f50912528fc6a32003b7674cc44 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:21:35 -0500 Subject: [PATCH 0257/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 7aa54b5a..9246511f 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -37,6 +37,7 @@ then cp -r $FSWEBCAM_ALLFILES $LOCAL_MEMORIES_CAMERA if [ "$LOCAL_VIDEO" = "on" ]; then + mkdir -p $LOCAL_MEMORIES_VIDEO Ffmpeg.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_MEMORIES_VIDEO fi From 12bd4ce92cb0c0ce9698bfa048840e7ea657794c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:22:49 -0500 Subject: [PATCH 0258/1653] Update GiftUsb.sh --- Hochob/Services/Visitors/GiftUsb.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Visitors/GiftUsb.sh b/Hochob/Services/Visitors/GiftUsb.sh index 34fae900..426398ff 100755 --- a/Hochob/Services/Visitors/GiftUsb.sh +++ b/Hochob/Services/Visitors/GiftUsb.sh @@ -14,6 +14,7 @@ LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/* +LOCAL_MEMORIES_VIDEO=$MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME/* # ============================================================================= # Functions @@ -29,6 +30,7 @@ LOCAL_VISITORS=$VISITORS/$LOCAL_INSTITUTION_NAME mkdir -p $LOCAL_VISITORS cp -r $LOCAL_MEMORIES_CAMERA $LOCAL_VISITORS +cp -r $LOCAL_MEMORIES_VIDEO $LOCAL_VISITORS #cp -r $DRAWING_ALLFILES $DIRECTORY #cp -r $ESPEAK_ALLFILES $DIRECTORY From 7f6fa6a15616cfdc0c52ce119490490738e8939e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:25:34 -0500 Subject: [PATCH 0259/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 6cd56cf8..17543950 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -24,9 +24,9 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= Memories.sh "5" "on" "${AGUASCALIENTES_NAME}" & -#Eog.sh "$CORPORATE_IMAGE/*" & -#Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +Eog.sh "$CORPORATE_IMAGE/*" & +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" -#kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') # End of File From b62b029af148c9185b0155925bf62d98795a74ab Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:26:36 -0500 Subject: [PATCH 0260/1653] Update Name.sh --- Hochob/Services/Visitors/Name.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index ca38cbe6..373376c1 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -21,6 +21,6 @@ export NAME_PID=$$ # ============================================================================= #echo `date +"%Y%m%d%H%M%S"` -echo "Instituto Triki" +echo "Instituto Balam" # End of File From 4b0aa50bf3ff06dff86799d60024c1b8ab7d946e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:29:55 -0500 Subject: [PATCH 0261/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 17543950..e3a96678 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -24,6 +24,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # ============================================================================= Memories.sh "5" "on" "${AGUASCALIENTES_NAME}" & + Eog.sh "$CORPORATE_IMAGE/*" & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" From 0fc0e4d60fdacd25463b99b03f058d94307e8e5b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:30:28 -0500 Subject: [PATCH 0262/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 707ad447..c7d97636 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export BAJACALIFORNIANORTE_PID=$$ +export BAJACALIFORNIANORTE_NAME="Baja California Norte Application" export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") @@ -22,6 +23,8 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # Main # ============================================================================= +Memories.sh "5" "on" "${BAJACALIFORNIANORTE_NAME}" & + Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" From 36e755f1ae12cd7d768329ac52607b35d37c6208 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:33:39 -0500 Subject: [PATCH 0263/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index c7d97636..70ba3c7a 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -27,7 +27,8 @@ Memories.sh "5" "on" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & +sleep 19 Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 From 8913b5a39a9fea6b3d84e07b56550f5ffa1692d2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:35:12 -0500 Subject: [PATCH 0264/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 70ba3c7a..001c0564 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -28,7 +28,7 @@ Memories.sh "5" "on" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & -sleep 19 +sleep 18 Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 From 7c3a877dea046e00bd658ee898e7884db2ceac6b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:38:12 -0500 Subject: [PATCH 0265/1653] Update BajaCaliforniaSur.sh --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 282e16a4..0a8e1d4e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -22,20 +22,16 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Silencio.mp4" & -#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte1_v3.mp4" & -#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte2_v2.mp4" & -#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte3_v2.mp4" & -#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & sleep 37.5 && Robot.sh lupe/cerebro 1 sleep 2 Robot.sh lupe/rightup 1 @@ -47,8 +43,7 @@ sleep .25 Robot.sh lupe/leftfold 1 sleep 2 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte4_v2.mp4" & -#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/inteledison 1 sleep 3 Robot.sh lupe/rightdown 1 @@ -60,8 +55,7 @@ sleep .25 Robot.sh lupe/leftunfold 1 sleep 2 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/Parte5_v2.mp4" & -#Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & sleep 75 kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') From 8a17992779df45e44405f597262142e788fbcf4d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:45:43 -0500 Subject: [PATCH 0266/1653] Update Signed-off-by: Abraham Arce --- Hochob/LupeRobot/Virtual/amikoo.js | 6 +++--- Hochob/LupeRobot/Virtual/amikoo.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/LupeRobot/Virtual/amikoo.js b/Hochob/LupeRobot/Virtual/amikoo.js index 90246377..f6bfb7c1 100644 --- a/Hochob/LupeRobot/Virtual/amikoo.js +++ b/Hochob/LupeRobot/Virtual/amikoo.js @@ -1,6 +1,6 @@ -const mqtt = require('mqtt') -//const client = mqtt.connect('mqtt://iot.eclipse.org') -const client = mqtt.connect('mqtt://localhost') +const mqtt = require('mqtt') +const client = mqtt.connect('mqtt://iot.eclipse.org') +//const client = mqtt.connect('mqtt://localhost') var sys = require('sys') var exec = require('child_process').exec; diff --git a/Hochob/LupeRobot/Virtual/amikoo.sh b/Hochob/LupeRobot/Virtual/amikoo.sh index a1ccf2b4..704440c0 100755 --- a/Hochob/LupeRobot/Virtual/amikoo.sh +++ b/Hochob/LupeRobot/Virtual/amikoo.sh @@ -2,9 +2,9 @@ set -x -pacmd set-default-sink 0 +#pacmd set-default-sink 0 #pacmd set-default-source 3 -node /home/hochob/CodeLabs/Hochob/LupeRobot/Virtual/amikoo.js +node amikoo.js # End Of File From cfea0616037ae1612bc99aa91b53a6fe22ac8dea Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:49:23 -0500 Subject: [PATCH 0267/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 0a8e1d4e..d998b76d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -22,6 +22,8 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= +Memories.sh "180" "on" "${BAJACALIFORNIANORTE_NAME}" & + Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 From 87f693471dd3fb0881e359dffc334bf72f222981 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:52:11 -0500 Subject: [PATCH 0268/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index d998b76d..f5564368 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export BAJACALIFORNIASUR_PID=$$ +export BAJACALIFORNIASUR_NAME="Baja California Sur Application" export BAJACALIFORNIASUR_PATH=$(readlink -f "$0") export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") From 1f3ef311c1d4bae0c85d9929c8915d119d08675b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:53:27 -0500 Subject: [PATCH 0269/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index f5564368..d3eb91cc 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Memories.sh "180" "on" "${BAJACALIFORNIANORTE_NAME}" & +Memories.sh "150" "on" "${BAJACALIFORNIANORTE_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 From 63e6d05e13931ba5aac367ac6171a23f2df7c334 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 15:56:11 -0500 Subject: [PATCH 0270/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index d3eb91cc..59acd258 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Memories.sh "150" "on" "${BAJACALIFORNIANORTE_NAME}" & +Memories.sh "100" "on" "${BAJACALIFORNIANORTE_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 From 1c7f5a3736444486bd72805e1f3e8c94010b93de Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:00:14 -0500 Subject: [PATCH 0271/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 59acd258..e564c8dd 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Memories.sh "100" "on" "${BAJACALIFORNIANORTE_NAME}" & +Memories.sh "90" "on" "${BAJACALIFORNIASUR_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 From 8c35729f62026b222d2a9dd498d5e1d3e6ff9fb0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:06:04 -0500 Subject: [PATCH 0272/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index e564c8dd..0ab202f0 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -61,6 +61,7 @@ sleep 2 Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & sleep 75 -kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') +wait +# kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') # End of File From c9c2c722fce7a6fb8eab424bb2eece68d5b07d1e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:11:13 -0500 Subject: [PATCH 0273/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 883dc989..4905f66f 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -22,7 +22,7 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Eog.sh "$CORPORATE_IMAGE/*" & +Eog.sh "$MEMORIES_CAMERA/*" & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" From 40c9325268d159bc9f16bf51888f4c938bc621b9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:13:03 -0500 Subject: [PATCH 0274/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 4905f66f..33825674 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -22,7 +22,7 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Eog.sh "$MEMORIES_CAMERA/*" & +Eog.sh "$FSWEBCAM_ALLFILES" & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" From 207116fa21dde2cf3c6e4dbdb6ad239508dcf992 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:14:58 -0500 Subject: [PATCH 0275/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 33825674..b7a848e2 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -22,7 +22,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Eog.sh "$FSWEBCAM_ALLFILES" & +#Eog.sh "$FSWEBCAM_ALLFILES" & +Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" From 986ab6d1111e0b0e5ce10d1edeaeef459584d560 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:16:00 -0500 Subject: [PATCH 0276/1653] Update Ffmpeg.sh --- Hochob/Services/Video/Ffmpeg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index a7a0547e..ba5ffc96 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -10,7 +10,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" +export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 5 -vf fps=5 -pix_fmt yuv420p" LOCAL_DIRECTORY="$1" From 4feddb7566b3fedd2dd28527c0f6706060b27609 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:23:31 -0500 Subject: [PATCH 0277/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index 14dfc1b0..8072d42f 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -36,7 +36,6 @@ then NAME=`printf %04d $IMAGE` $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$NAME.jpg IMAGE=$(($IMAGE+1)) - sleep 1 done else From cd27d0d6505ea6a662b62ef24a04a43c57259538 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:24:32 -0500 Subject: [PATCH 0278/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 0ab202f0..a10484ae 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Memories.sh "90" "on" "${BAJACALIFORNIASUR_NAME}" & +Memories.sh "270" "on" "${BAJACALIFORNIASUR_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 From 973b57d805bae407d67c8cb7adef27c227048604 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:25:27 -0500 Subject: [PATCH 0279/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index b7a848e2..e0e39943 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export CAMPECHE_PID=$$ +export CAMPECHE_NAME="Campeche Application" export CAMPECHE_PATH=$(readlink -f "$0") export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") @@ -22,7 +23,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -#Eog.sh "$FSWEBCAM_ALLFILES" & +Memories.sh "10" "on" "${CAMPECHE_NAME}" & + Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" From b5226368ec17eee2b92973e4b065bb3b18eb48ff Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:25:52 -0500 Subject: [PATCH 0280/1653] Update Ffmpeg.sh --- Hochob/Services/Video/Ffmpeg.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index ba5ffc96..a7a0547e 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -10,7 +10,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 5 -vf fps=5 -pix_fmt yuv420p" +export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" LOCAL_DIRECTORY="$1" From dec999ccb34c77a959ee0ea5295cd65fcb3ab8a4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:27:08 -0500 Subject: [PATCH 0281/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index e0e39943..825c868f 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -23,8 +23,6 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Memories.sh "10" "on" "${CAMPECHE_NAME}" & - Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" From 27905c13e45ed591e54cadaef0230a080053686a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:32:16 -0500 Subject: [PATCH 0282/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 9246511f..0d160e74 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -32,6 +32,7 @@ LOCAL_MEMORIES_VIDEO=$MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATI if [ $# -eq 3 ] then + rm -f $FSWEBCAM_ALLFILES mkdir -p $LOCAL_MEMORIES_CAMERA Fswebcam.sh $LOCAL_NUMBER cp -r $FSWEBCAM_ALLFILES $LOCAL_MEMORIES_CAMERA From 036282ff6e81f3438ccd27a491f223078238ef5c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:37:11 -0500 Subject: [PATCH 0283/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index e3a96678..5bd88256 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -23,7 +23,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Memories.sh "5" "on" "${AGUASCALIENTES_NAME}" & +Memories.sh "120" "on" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" From 328135ddd639483133cea5d4c4df4fd4012aba5b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:39:22 -0500 Subject: [PATCH 0284/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 5bd88256..34c9146f 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -23,7 +23,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Memories.sh "120" "on" "${AGUASCALIENTES_NAME}" & +Memories.sh "60" "on" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" From 95efa653ea73c57eda2909948847b90f50b3692c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:39:38 -0500 Subject: [PATCH 0285/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 001c0564..ee6fa16a 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # Main # ============================================================================= -Memories.sh "5" "on" "${BAJACALIFORNIANORTE_NAME}" & +Memories.sh "60" "on" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 From 2ae1071e1008d6bae642343bfb52bc7d4952bb09 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:42:03 -0500 Subject: [PATCH 0286/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index a10484ae..dd6afbec 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Memories.sh "270" "on" "${BAJACALIFORNIASUR_NAME}" & +Memories.sh "360" "on" "${BAJACALIFORNIASUR_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 From c8ac54c5a505705d380581d4e205c13da35743ac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:42:17 -0500 Subject: [PATCH 0287/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 34c9146f..79ab2643 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -23,7 +23,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= -Memories.sh "60" "on" "${AGUASCALIENTES_NAME}" & +Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" From e3f2675b098b851e84ca99585dcabbb68c232d17 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:42:30 -0500 Subject: [PATCH 0288/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index ee6fa16a..3673c25b 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # Main # ============================================================================= -Memories.sh "60" "on" "${BAJACALIFORNIANORTE_NAME}" & +Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 From 1df17587d8e3007958b68be196fcabcb05bba735 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:45:30 -0500 Subject: [PATCH 0289/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index c3be7210..a2a4f228 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -138,6 +138,8 @@ export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO +export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS + # MQ Telemetry Transport MQTT_SERVER_ADDRESS=iot.eclipse.org From c367e10b5bb6d7fb5ef6a18abf3807b382de91b7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:46:16 -0500 Subject: [PATCH 0290/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 0d160e74..8de8e459 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -17,8 +17,8 @@ LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" -LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION -LOCAL_MEMORIES_VIDEO=$MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION +LOCAL_MEMORIES_CAMERA=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION +LOCAL_MEMORIES_VIDEO=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= # Functions From 48ea7ecd4254b7c1c4ad159b4ef07ab66c41b6fa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 16:57:47 -0500 Subject: [PATCH 0291/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 8de8e459..597035ec 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -17,8 +17,7 @@ LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" -LOCAL_MEMORIES_CAMERA=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION -LOCAL_MEMORIES_VIDEO=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION +LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= # Functions @@ -30,19 +29,23 @@ LOCAL_MEMORIES_VIDEO=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICAT # Main # ============================================================================= +mkdir -p $LOCAL_VISITORS_INSTITUTION_NAME + if [ $# -eq 3 ] then rm -f $FSWEBCAM_ALLFILES - mkdir -p $LOCAL_MEMORIES_CAMERA Fswebcam.sh $LOCAL_NUMBER - cp -r $FSWEBCAM_ALLFILES $LOCAL_MEMORIES_CAMERA + cp -r $FSWEBCAM_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME if [ "$LOCAL_VIDEO" = "on" ]; then - mkdir -p $LOCAL_MEMORIES_VIDEO Ffmpeg.sh $FSWEBCAM_DIRECTORY - cp -r $FFMPEG_ALLFILES $LOCAL_MEMORIES_VIDEO + cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME + cp $FFMPEG_VIDEO $HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO fi - + + LOCAL_SELECTED_FILE=`find $LOCAL_VISITORS_INSTITUTION_NAME -type f | shuf -n 1` + cp $LOCAL_SELECTED_FILE $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA + else echo "Invalid number of arguments, see Documentation" exit 1 From 16c10537727e2ef9f104558fdff7af647d640475 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:00:50 -0500 Subject: [PATCH 0292/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 597035ec..c4c52a03 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -44,7 +44,7 @@ then fi LOCAL_SELECTED_FILE=`find $LOCAL_VISITORS_INSTITUTION_NAME -type f | shuf -n 1` - cp $LOCAL_SELECTED_FILE $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA + cp $LOCAL_SELECTED_FILE $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME.jpg else echo "Invalid number of arguments, see Documentation" From 9926569f88a0cca297151d89ca8502161667d021 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:01:57 -0500 Subject: [PATCH 0293/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index c4c52a03..9629fdaa 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -37,15 +37,15 @@ then Fswebcam.sh $LOCAL_NUMBER cp -r $FSWEBCAM_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME + LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` + cp $LOCAL_SELECTED_FILE $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME.jpg + if [ "$LOCAL_VIDEO" = "on" ]; then Ffmpeg.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME cp $FFMPEG_VIDEO $HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO fi - LOCAL_SELECTED_FILE=`find $LOCAL_VISITORS_INSTITUTION_NAME -type f | shuf -n 1` - cp $LOCAL_SELECTED_FILE $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME.jpg - else echo "Invalid number of arguments, see Documentation" exit 1 From f3bae4e43a4137833def824d17208526ce886873 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:04:01 -0500 Subject: [PATCH 0294/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 9629fdaa..111f47db 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -38,7 +38,7 @@ then cp -r $FSWEBCAM_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` - cp $LOCAL_SELECTED_FILE $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME.jpg + cp $LOCAL_SELECTED_FILE $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg if [ "$LOCAL_VIDEO" = "on" ]; then Ffmpeg.sh $FSWEBCAM_DIRECTORY From 25929f7cf0f00d67fea681678afe795f2206895c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:07:06 -0500 Subject: [PATCH 0295/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 111f47db..f5c5c435 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -43,7 +43,7 @@ then if [ "$LOCAL_VIDEO" = "on" ]; then Ffmpeg.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME - cp $FFMPEG_VIDEO $HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO + cp $FFMPEG_VIDEO $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 fi else From 008927ec3c518a3a8f4028968f11b216269eb642 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:08:11 -0500 Subject: [PATCH 0296/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index f5c5c435..0cdae1df 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -38,12 +38,12 @@ then cp -r $FSWEBCAM_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` - cp $LOCAL_SELECTED_FILE $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg + cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg if [ "$LOCAL_VIDEO" = "on" ]; then Ffmpeg.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME - cp $FFMPEG_VIDEO $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 + cp $FFMPEG_VIDEO $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 fi else From c678cdb86d5f075d83204b986d54ff819b436192 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:10:08 -0500 Subject: [PATCH 0297/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index dd6afbec..43c42784 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Memories.sh "360" "on" "${BAJACALIFORNIASUR_NAME}" & +Memories.sh "300" "on" "${BAJACALIFORNIASUR_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 From 9b9b65de7071eab332388b7fecb359d0162b36e9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:10:55 -0500 Subject: [PATCH 0298/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 43c42784..3299420c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,7 +23,7 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Memories.sh "300" "on" "${BAJACALIFORNIASUR_NAME}" & +Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 From 837a13a19d6534ddf5804c3aeb01ee7a6f1f4c32 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:16:07 -0500 Subject: [PATCH 0299/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 825c868f..ecbedff9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -23,7 +23,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" +#Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" +Eog.sh "$FSWEBCAM_ALLFILES/*" & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" From 55635f781e6be047f6c2e6f272a0edede4d3473f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:17:10 -0500 Subject: [PATCH 0300/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index ecbedff9..98bcd32f 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -24,7 +24,7 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # ============================================================================= #Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" -Eog.sh "$FSWEBCAM_ALLFILES/*" & +Eog.sh "$FSWEBCAM_ALLFILES" & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" From 8d9c6612bcbd8cf4db8a00b09cd4e65d1d4077ac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:21:08 -0500 Subject: [PATCH 0301/1653] Update GiftUsb.sh --- Hochob/Services/Visitors/GiftUsb.sh | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/Hochob/Services/Visitors/GiftUsb.sh b/Hochob/Services/Visitors/GiftUsb.sh index 426398ff..0f4d4348 100755 --- a/Hochob/Services/Visitors/GiftUsb.sh +++ b/Hochob/Services/Visitors/GiftUsb.sh @@ -13,8 +13,8 @@ export GIFTUSB_PID=$$ LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" -LOCAL_MEMORIES_CAMERA=$MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME/* -LOCAL_MEMORIES_VIDEO=$MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME/* +LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/ +LOCAL_VISITORS=$VISITORS # ============================================================================= # Functions @@ -26,14 +26,6 @@ LOCAL_MEMORIES_VIDEO=$MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME/* # Main # ============================================================================= -LOCAL_VISITORS=$VISITORS/$LOCAL_INSTITUTION_NAME -mkdir -p $LOCAL_VISITORS - -cp -r $LOCAL_MEMORIES_CAMERA $LOCAL_VISITORS -cp -r $LOCAL_MEMORIES_VIDEO $LOCAL_VISITORS - -#cp -r $DRAWING_ALLFILES $DIRECTORY -#cp -r $ESPEAK_ALLFILES $DIRECTORY -#cp -r $FFMPEG_ALLFILES $DIRECTORY +cp -r $LOCAL_VISITORS_INSTITUTION_NAME $LOCAL_VISITORS # End of File From 1a6e989994f608379166483951e6c79eafed5738 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:31:14 -0500 Subject: [PATCH 0302/1653] Update Guanajuato.sh --- Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh b/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh index 00dd26e2..44ae8f6c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export GUANAJUATO_PID=$$ +export GUANAJUATO_NAME="Guanajuato Application" export GUANAJUATO_PATH=$(readlink -f "$0") export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") From 84fe8f3f84ca29ae52587a04e0c506e278690807 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:31:37 -0500 Subject: [PATCH 0303/1653] Update Guerrero.sh --- Hochob/Applications/SouthernMayaHighlands/Guerrero.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh index 6bb0be9b..d4ce2cb4 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export GUERRERO_PID=$$ +export GUERRERO_NAME="Guerrero Application" export GUERRERO_PATH=$(readlink -f "$0") export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") From 3743105cb99b7aa2b0447c780f62599406a8361b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:32:05 -0500 Subject: [PATCH 0304/1653] Update Mexico.sh --- Hochob/Applications/SouthernMayaHighlands/Mexico.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh index 59655c81..982cde16 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export MEXICO_PID=$$ +export MEXICO_NAME="Mexico Application" export MEXICO_PATH=$(readlink -f "$0") export MEXICO_DIRECTORY=$(dirname "$MEXICO_PATH") From 521cc0308a7704fb32a545d310c8efce881910b5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:33:02 -0500 Subject: [PATCH 0305/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index deb5cd10..0f552a01 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export MICHOACAN_PID=$$ +export MICHOACAN_NAME="Michoacan Application" export MICHOACAN_PATH=$(readlink -f "$0") export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") From 8df5f02cf5528e00cdc783159a67f95413a15b1e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:35:56 -0500 Subject: [PATCH 0306/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Robot/Virtual/RobotVirtual.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 Hochob/Services/Robot/Virtual/RobotVirtual.sh diff --git a/Hochob/Services/Robot/Virtual/RobotVirtual.sh b/Hochob/Services/Robot/Virtual/RobotVirtual.sh new file mode 100755 index 00000000..b2775a48 --- /dev/null +++ b/Hochob/Services/Robot/Virtual/RobotVirtual.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MOVEMENT_PID=$$ + +LOCAL_COMMAND="$1" +LOCAL_MESSAGE="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From d02c17604bfde6929cdb3d07c4477bbb0a521817 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:37:49 -0500 Subject: [PATCH 0307/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index a2a4f228..da7da60d 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -20,6 +20,7 @@ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ 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_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/ @@ -35,6 +36,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE 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_SOUND export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_PLAY export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER From 835fd6ef188f71383142fb8031194ffb6ee2a837 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:39:10 -0500 Subject: [PATCH 0308/1653] Update RobotVirtual.sh --- Hochob/Services/Robot/Virtual/RobotVirtual.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Robot/Virtual/RobotVirtual.sh b/Hochob/Services/Robot/Virtual/RobotVirtual.sh index b2775a48..82418cb6 100755 --- a/Hochob/Services/Robot/Virtual/RobotVirtual.sh +++ b/Hochob/Services/Robot/Virtual/RobotVirtual.sh @@ -8,10 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export MOVEMENT_PID=$$ +export ROBOTVIRTUAL_PID=$$ -LOCAL_COMMAND="$1" -LOCAL_MESSAGE="$2" +LOCAL_MESSAGE="$1" # ============================================================================= # Functions @@ -23,9 +22,9 @@ LOCAL_MESSAGE="$2" # Main # ============================================================================= -if [ $# -eq 2 ] +if [ $# -eq 1 ] then - Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE + Espeak.sh on spanish $LOCAL_MESSAGE else echo "Invalid number of arguments, see Documentation" exit 1 From dcb61693a3febca144336fd07cd3749611e768bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:39:28 -0500 Subject: [PATCH 0309/1653] Update Robot.sh --- Hochob/Services/Robot/Remote/Robot.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index b2775a48..7ab7109b 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export MOVEMENT_PID=$$ +export ROBOTREMOTE_PID=$$ LOCAL_COMMAND="$1" LOCAL_MESSAGE="$2" From b66d5e8f78e6a054d7ae8d75ce11c05fe25f8a99 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:41:08 -0500 Subject: [PATCH 0310/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 0f552a01..33b7949c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -28,8 +28,10 @@ sleep .6 Robot.sh lupe/headleft 1 sleep .6 -Fswebcam.sh 5 -cp $FSWEBCAM_DIRECTORY/* $MEMORIES_CAMERA +RobotVirtual.sh "Tomaremos algunas fotos! Estan listos?" +sleep 1 +RobotVirtual.sh "3, 2, 1, Sonrian!" +Memories.sh "10" "off" "${MICHOACAN_NAME}" & kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') From 9d0fc8566e20219028e32aae5583e7137fe48559 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:42:45 -0500 Subject: [PATCH 0311/1653] Update RobotVirtual.sh --- Hochob/Services/Robot/Virtual/RobotVirtual.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Robot/Virtual/RobotVirtual.sh b/Hochob/Services/Robot/Virtual/RobotVirtual.sh index 82418cb6..56848e2e 100755 --- a/Hochob/Services/Robot/Virtual/RobotVirtual.sh +++ b/Hochob/Services/Robot/Virtual/RobotVirtual.sh @@ -24,7 +24,7 @@ LOCAL_MESSAGE="$1" if [ $# -eq 1 ] then - Espeak.sh on spanish $LOCAL_MESSAGE + Espeak.sh "on" "spanish" "$LOCAL_MESSAGE" else echo "Invalid number of arguments, see Documentation" exit 1 From 3b9988ec3465df8b42175a7317e6d906f8bf1314 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:45:51 -0500 Subject: [PATCH 0312/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 3299420c..8ff46cd6 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -62,6 +62,7 @@ Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & sleep 75 wait -# kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') + +kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') # End of File From 767eebdc0a9d204418907454795bd4e646b5a6f5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:50:03 -0500 Subject: [PATCH 0313/1653] Update Signed-off-by: Abraham Arce --- .../SouthernMayaHighlands/Hidalgo.sh | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh new file mode 100755 index 00000000..c691aece --- /dev/null +++ b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export QUERETARO_PID=$$ +export QUERETARO_PATH=$(readlink -f "$0") +export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Eog.sh "$VISITORSCENTER_IMAGE/*" & + +# End of File From 330bfd851b603fa8f1a7f855e933de103d14a2cf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:51:42 -0500 Subject: [PATCH 0314/1653] Update Hidalgo.sh --- Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh index c691aece..1878f57c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh @@ -22,6 +22,6 @@ export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") # Main # ============================================================================= -Eog.sh "$VISITORSCENTER_IMAGE/*" & +Eog.sh "$MEMORIES_VIDEO/*" & # End of File From 1f5c2675872c9ca3cc419bb05dcca03ee1fc0e6e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:52:58 -0500 Subject: [PATCH 0315/1653] Update Hidalgo.sh --- Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh index 1878f57c..450d7385 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export QUERETARO_PID=$$ -export QUERETARO_PATH=$(readlink -f "$0") -export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") +export HIDALGO_PID=$$ +export HIDALGO_PATH=$(readlink -f "$0") +export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") # ============================================================================= # Functions @@ -22,6 +22,6 @@ export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") # Main # ============================================================================= -Eog.sh "$MEMORIES_VIDEO/*" & +Eog.sh "$VISITORSCENTER_IMAGE/*" & # End of File From 17b3def3c55ec1a3f7d2c1868d9f71ab20f9e071 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:53:25 -0500 Subject: [PATCH 0316/1653] Update Queretaro.sh --- Hochob/Applications/SouthernMayaHighlands/Queretaro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh index c691aece..42d72253 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh @@ -22,6 +22,6 @@ export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") # Main # ============================================================================= -Eog.sh "$VISITORSCENTER_IMAGE/*" & +Eog.sh "$MEMORIES_IMAGE/*" & # End of File From c52336a19910ea194867669a41a261a99fcca7a6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:54:22 -0500 Subject: [PATCH 0317/1653] Update Queretaro.sh --- Hochob/Applications/SouthernMayaHighlands/Queretaro.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh index 42d72253..6ae6ca99 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh @@ -22,6 +22,6 @@ export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") # Main # ============================================================================= -Eog.sh "$MEMORIES_IMAGE/*" & +Eog.sh "$MEMORIES_CAMERA/*" & # End of File From eb68cc0277f3258bdc109cf03be582988285486f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 17:55:59 -0500 Subject: [PATCH 0318/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 4 +++- Hochob/Services/Visitors/Name.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 33b7949c..625987e9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -31,7 +31,9 @@ sleep .6 RobotVirtual.sh "Tomaremos algunas fotos! Estan listos?" sleep 1 RobotVirtual.sh "3, 2, 1, Sonrian!" -Memories.sh "10" "off" "${MICHOACAN_NAME}" & +Memories.sh "10" "on" "${MICHOACAN_NAME}" & + +wait kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index 373376c1..ca38cbe6 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -21,6 +21,6 @@ export NAME_PID=$$ # ============================================================================= #echo `date +"%Y%m%d%H%M%S"` -echo "Instituto Balam" +echo "Instituto Triki" # End of File From 7e025460039f7e227426a392e1cb4a76c7013bb2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:12:28 -0500 Subject: [PATCH 0319/1653] Update BajaCaliforniaSur.sh --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 8ff46cd6..66014a7e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -63,6 +63,13 @@ sleep 75 wait +Espeak.sh off spanish \ +"Muchas gracias Futuros Ingenieros!. +A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! +Los esperamos muy pronto!" + +FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY + kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') # End of File From 737718527d085913c13f3aff58eb6a76e7fef20e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:18:21 -0500 Subject: [PATCH 0320/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 66014a7e..36f6db89 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -70,6 +70,8 @@ Los esperamos muy pronto!" FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY +wait + kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') # End of File From 06515178a82a2cc6f44e50ea0ef3246a7c7dc2a8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:24:40 -0500 Subject: [PATCH 0321/1653] Update BajaCaliforniaSur.sh --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 36f6db89..6a25bb18 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -24,6 +24,11 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # ============================================================================= Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & +Espeak.sh off spanish \ +"Muchas gracias Futuros Ingenieros!. +A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! +Los esperamos muy pronto!" + Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 @@ -63,14 +68,14 @@ sleep 75 wait -Espeak.sh off spanish \ -"Muchas gracias Futuros Ingenieros!. -A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! -Los esperamos muy pronto!" +#Espeak.sh off spanish \ +#"Muchas gracias Futuros Ingenieros!. +#A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! +#Los esperamos muy pronto!" -FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY +#FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY -wait +#wait kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') From e88f517716d26198fdfcf8d1f925034606fa22a5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:25:43 -0500 Subject: [PATCH 0322/1653] Update Zacatecas.sh --- .../Applications/SouthernMayaHighlands/Zacatecas.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 7964e17b..c16c84d9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -22,15 +22,9 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -rm -f $FSWEBCAM_DIRECTORY/* - -Espeak.sh off spanish \ -"Muchas gracias Futuros Ingenieros!. -A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! -Los esperamos muy pronto!" - -Fswebcam.sh 100 -FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY +Memories.sh "10" "on" "${BAJACALIFORNIASUR_NAME}" & +Espeak.sh off spanish "Hola Mundo" +#MemoriesAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY #kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') From 5daf0d6fc5a9c26231e06d28716eb886e97cb0c7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:26:56 -0500 Subject: [PATCH 0323/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index c16c84d9..78afc97f 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -22,7 +22,7 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -Memories.sh "10" "on" "${BAJACALIFORNIASUR_NAME}" & +Memories.sh "10" "on" "${BAJACALIFORNIASUR_NAME}" Espeak.sh off spanish "Hola Mundo" #MemoriesAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY From 1090c33a425dbc4d901a7f9bb8975491d3853694 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:29:49 -0500 Subject: [PATCH 0324/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Memories/MemoriesAudio.sh | 53 +++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100755 Hochob/Services/Memories/MemoriesAudio.sh diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh new file mode 100755 index 00000000..0cdae1df --- /dev/null +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -0,0 +1,53 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MEMORIES_PID=$$ + +LOCAL_NUMBER="$1" +LOCAL_VIDEO="$2" +LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" + +LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" + +LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +mkdir -p $LOCAL_VISITORS_INSTITUTION_NAME + +if [ $# -eq 3 ] +then + rm -f $FSWEBCAM_ALLFILES + Fswebcam.sh $LOCAL_NUMBER + cp -r $FSWEBCAM_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME + + LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` + cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg + + if [ "$LOCAL_VIDEO" = "on" ]; then + Ffmpeg.sh $FSWEBCAM_DIRECTORY + cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME + cp $FFMPEG_VIDEO $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 + fi + +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi +# End of File From f4e97981ddd38a3ae710daeae8e9ca7e4a4d2a37 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:34:57 -0500 Subject: [PATCH 0325/1653] Update MemoriesAudio.sh --- Hochob/Services/Memories/MemoriesAudio.sh | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh index 0cdae1df..a77c2bd2 100755 --- a/Hochob/Services/Memories/MemoriesAudio.sh +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -10,9 +10,7 @@ set -x export MEMORIES_PID=$$ -LOCAL_NUMBER="$1" -LOCAL_VIDEO="$2" -LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" +LOCAL_IDENTIFICATION="$(echo "${1}" | tr -d '[:space:]')" LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" @@ -31,21 +29,11 @@ LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_ mkdir -p $LOCAL_VISITORS_INSTITUTION_NAME -if [ $# -eq 3 ] +if [ $# -eq 1 ] then - rm -f $FSWEBCAM_ALLFILES - Fswebcam.sh $LOCAL_NUMBER - cp -r $FSWEBCAM_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME - - LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` - cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg - - if [ "$LOCAL_VIDEO" = "on" ]; then - Ffmpeg.sh $FSWEBCAM_DIRECTORY - cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME - cp $FFMPEG_VIDEO $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 - fi - + + ffmpeg -i $FFMPEG_VIDEO -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO + else echo "Invalid number of arguments, see Documentation" exit 1 From da62b559cd17825e314a2d7993b5283be3feb661 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:35:07 -0500 Subject: [PATCH 0326/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 78afc97f..3b5baab1 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -24,7 +24,7 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") Memories.sh "10" "on" "${BAJACALIFORNIASUR_NAME}" Espeak.sh off spanish "Hola Mundo" -#MemoriesAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY +MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" #kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') From 6ac88a7a6b6fede166342f9478df3736751e2eac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:35:42 -0500 Subject: [PATCH 0327/1653] Update MemoriesAudio.sh --- Hochob/Services/Memories/MemoriesAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh index a77c2bd2..7d37d171 100755 --- a/Hochob/Services/Memories/MemoriesAudio.sh +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -32,7 +32,7 @@ mkdir -p $LOCAL_VISITORS_INSTITUTION_NAME if [ $# -eq 1 ] then - ffmpeg -i $FFMPEG_VIDEO -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO + ffmpeg -y -i $FFMPEG_VIDEO -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO else echo "Invalid number of arguments, see Documentation" From 2157ed2aa4a322d08832db93a8e8a6f9d9200a7c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:36:09 -0500 Subject: [PATCH 0328/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 3b5baab1..5929bdbd 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -22,8 +22,8 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -Memories.sh "10" "on" "${BAJACALIFORNIASUR_NAME}" -Espeak.sh off spanish "Hola Mundo" +Memories.sh "20" "on" "${BAJACALIFORNIASUR_NAME}" +Espeak.sh off spanish "Nel Pastel" MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" #kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') From ffcf07617b856da8f7e22e8f8147b6b44af473d4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:37:32 -0500 Subject: [PATCH 0329/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 5929bdbd..d4b1b931 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -22,9 +22,9 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -Memories.sh "20" "on" "${BAJACALIFORNIASUR_NAME}" +Memories.sh "20" "on" "${ZACATECAS_NAME}" Espeak.sh off spanish "Nel Pastel" -MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" +MemoriesAudio.sh "${ZACATECAS_NAME}" #kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') From 8a3965f5a1dce8fdc36d14ac2175b4079f6b4f1f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:39:48 -0500 Subject: [PATCH 0330/1653] Update BajaCaliforniaSur.sh --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 6a25bb18..cb4a9e32 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -23,12 +23,8 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= -Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & -Espeak.sh off spanish \ -"Muchas gracias Futuros Ingenieros!. -A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! -Los esperamos muy pronto!" +Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 @@ -68,14 +64,14 @@ sleep 75 wait -#Espeak.sh off spanish \ -#"Muchas gracias Futuros Ingenieros!. -#A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! -#Los esperamos muy pronto!" +Espeak.sh off spanish \ +"Muchas gracias Futuros Ingenieros!. +A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! +Los esperamos muy pronto!" -#FfmpegAudio.sh $ESPEAK_SPEECH_MP3 $FSWEBCAM_DIRECTORY +MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" -#wait +wait kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') From 523b6f33d9680e73b5a7039c45bc3c64c7b9522d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:42:05 -0500 Subject: [PATCH 0331/1653] Update MemoriesAudio.sh --- Hochob/Services/Memories/MemoriesAudio.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh index 7d37d171..57d5a116 100755 --- a/Hochob/Services/Memories/MemoriesAudio.sh +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -33,6 +33,7 @@ if [ $# -eq 1 ] then ffmpeg -y -i $FFMPEG_VIDEO -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO + cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME else echo "Invalid number of arguments, see Documentation" From bd3ec1e3639733531408ccf28392ffe43cea6620 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:47:00 -0500 Subject: [PATCH 0332/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index d4b1b931..58688f9d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export ZACATECAS_PID=$$ +export ZACATECAS_NAME="Zacatecas Application" export ZACATECAS_PATH=$(readlink -f "$0") export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") From 306ca09fa4d4944961ef05abe1e3174b35010e07 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:49:05 -0500 Subject: [PATCH 0333/1653] Update QuintanaRoo.sh --- Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh index 7ed7845b..436e7a2e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh +++ b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export QUINTANAROO_PID=$$ +export QUINTANAROO_NAME="Quintana Roo Name" export QUINTANAROO_PATH=$(readlink -f "$0") export QUINTANAROO_DIRECTORY=$(dirname "$QUINTANAROO_PATH") From 7450cd3910ab6e2073e7601fcd3f1e3fc1787ca4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:49:29 -0500 Subject: [PATCH 0334/1653] Update Queretaro.sh --- Hochob/Applications/SouthernMayaHighlands/Queretaro.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh index 6ae6ca99..c1caa0e0 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export QUERETARO_PID=$$ +export QUERETARO_NAME="Queretaro Name" export QUERETARO_PATH=$(readlink -f "$0") export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") From 0269375b1abb45852a5f602632a9b4347f1027ec Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:50:04 -0500 Subject: [PATCH 0335/1653] Update Hidalgo.sh --- Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh index 450d7385..751d09f3 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HIDALGO_PID=$$ +export HIDALGO_NAME="Hidalgo Application" export HIDALGO_PATH=$(readlink -f "$0") export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") From 12768f7f10fc13c326825748bcd4cefffa644a26 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:50:37 -0500 Subject: [PATCH 0336/1653] Update QuintanaRoo.sh --- Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh index 436e7a2e..573b4a3d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh +++ b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export QUINTANAROO_PID=$$ -export QUINTANAROO_NAME="Quintana Roo Name" +export QUINTANAROO_NAME="QuintanaRoo Name" export QUINTANAROO_PATH=$(readlink -f "$0") export QUINTANAROO_DIRECTORY=$(dirname "$QUINTANAROO_PATH") From db6d3e805f3ef4198aea4c427836d29e567b10b0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:57:28 -0500 Subject: [PATCH 0337/1653] Update Signed-off-by: Abraham Arce --- .../CentralMayaLowlands/Veracruz.sh | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 Hochob/Applications/CentralMayaLowlands/Veracruz.sh diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh new file mode 100755 index 00000000..ae0a54a6 --- /dev/null +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export PUERTOVALLARTA_PID=$$ +export PUERTOVALLARTA_PATH=$(readlink -f "$0") +export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" + +kill -- -$(ps -o pgid=$PUERTOVALLARTA_PID | grep -o '[0-9]*') + +# End of File From b7d9cc98ea8cfbee75dd197cf658469e43c10510 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 18:59:52 -0500 Subject: [PATCH 0338/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index ae0a54a6..06d994f4 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export PUERTOVALLARTA_PID=$$ -export PUERTOVALLARTA_PATH=$(readlink -f "$0") -export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") +export VERACRUZ_PID=$$ +export VERACRUZ_PATH=$(readlink -f "$0") +export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") # ============================================================================= # Functions @@ -22,8 +22,9 @@ export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" +Espeak.sh off spanish "1 2 3 4 5 6 7 8 9" +Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$PUERTOVALLARTA_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') # End of File From 3480da61096eed37738c00a2fb78ad8c2d92b5de Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:03:09 -0500 Subject: [PATCH 0339/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 06d994f4..4bdf6bac 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -22,7 +22,11 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") # Main # ============================================================================= -Espeak.sh off spanish "1 2 3 4 5 6 7 8 9" +Espeak.sh off spanish \ +"Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos:" \ +"El Inicio" +"Aqui recordaras a los Mayas, la historia de Intel e Intel Centro de Disenio en Guadalajara" + Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') From 1476de9efe4236e4abb72ae194b565a06c320593 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:04:08 -0500 Subject: [PATCH 0340/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 4bdf6bac..ddebcd27 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -24,7 +24,7 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") Espeak.sh off spanish \ "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos:" \ -"El Inicio" +"El Inicio" \ "Aqui recordaras a los Mayas, la historia de Intel e Intel Centro de Disenio en Guadalajara" Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" From 7e3b2fe3395d8e4f0dd329770778c10c490ea5bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:05:05 -0500 Subject: [PATCH 0341/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index ddebcd27..30d65639 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -23,9 +23,8 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") # ============================================================================= Espeak.sh off spanish \ -"Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos:" \ -"El Inicio" \ -"Aqui recordaras a los Mayas, la historia de Intel e Intel Centro de Disenio en Guadalajara" +"Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ +Aqui recordaras a los Mayas, la historia de Intel e Intel Centro de Disenio en Guadalajara" Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" From 62b3565bf4d1e4c4fe403ea21eb7377bb1108938 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:05:45 -0500 Subject: [PATCH 0342/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 30d65639..fe14ed93 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -24,7 +24,8 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") Espeak.sh off spanish \ "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ -Aqui recordaras a los Mayas, la historia de Intel e Intel Centro de Disenio en Guadalajara" +Aqui recordaras a los Mayas, la historia de Intel e Intel Centro de Disenio en Guadalajara \ +Que las disfrutes" Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" From eac238de70181b5f29288d6f86329c75fabaeb6c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:07:05 -0500 Subject: [PATCH 0343/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index fe14ed93..64b2a16c 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -24,8 +24,8 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") Espeak.sh off spanish \ "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ -Aqui recordaras a los Mayas, la historia de Intel e Intel Centro de Disenio en Guadalajara \ -Que las disfrutes" +Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio. \ +Que disfrutes tu recorrido!" Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" From 07a7521cf601e26ecce22779318e12b0bc4fee8d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:18:11 -0500 Subject: [PATCH 0344/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Mapimi.sh | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/Mapimi.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh new file mode 100755 index 00000000..58688f9d --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ZACATECAS_PID=$$ +export ZACATECAS_NAME="Zacatecas Application" +export ZACATECAS_PATH=$(readlink -f "$0") +export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Memories.sh "20" "on" "${ZACATECAS_NAME}" +Espeak.sh off spanish "Nel Pastel" +MemoriesAudio.sh "${ZACATECAS_NAME}" + +#kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') + +# End of File From 7e57045b7257ca74623a1deaab9c0a33726d8662 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:20:38 -0500 Subject: [PATCH 0345/1653] Update Mapimi.sh --- .../Applications/NorthernMayaLowlands/Mapimi.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 58688f9d..3924ac9d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ZACATECAS_PID=$$ -export ZACATECAS_NAME="Zacatecas Application" -export ZACATECAS_PATH=$(readlink -f "$0") -export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") +export MAPIMI_PID=$$ +export MAPIMI_NAME="Mapimi Application" +export MAPIMI_PATH=$(readlink -f "$0") +export MAPIMI_DIRECTORY=$(dirname "$ZACATECAS_PATH") # ============================================================================= # Functions @@ -23,10 +23,10 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -Memories.sh "20" "on" "${ZACATECAS_NAME}" -Espeak.sh off spanish "Nel Pastel" -MemoriesAudio.sh "${ZACATECAS_NAME}" +Memories.sh "40" "on" "${MAPIMI_NAME}" +Espeak.sh off spanish "Nel Pastel Simona La Mona" +MemoriesAudio.sh "${MAPIMI_NAME}" -#kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') # End of File From b631072ac18653bc60f523e7d196ea5b6ac82b1a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:21:56 -0500 Subject: [PATCH 0346/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 3924ac9d..c5df4f1f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -27,6 +27,8 @@ Memories.sh "40" "on" "${MAPIMI_NAME}" Espeak.sh off spanish "Nel Pastel Simona La Mona" MemoriesAudio.sh "${MAPIMI_NAME}" +Stream2Chromecast.sh "Juum" "1.0" "$FFMPEG_VIDEO_AUDIO" + kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') # End of File From b2400e1b0dce2d33c01474f6cdba65b6d6e5c278 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 19:23:28 -0500 Subject: [PATCH 0347/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index c5df4f1f..246e55d9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -27,7 +27,7 @@ Memories.sh "40" "on" "${MAPIMI_NAME}" Espeak.sh off spanish "Nel Pastel Simona La Mona" MemoriesAudio.sh "${MAPIMI_NAME}" -Stream2Chromecast.sh "Juum" "1.0" "$FFMPEG_VIDEO_AUDIO" +Stream2Chromecast.sh "Eek'" "1.0" "$FFMPEG_VIDEO_AUDIO" kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') From ac9cab260c072ebfc8a1fd08ec24cd13e5102011 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 21:55:02 -0500 Subject: [PATCH 0348/1653] Create Language.sh --- Hochob/Services/Language/Language.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 Hochob/Services/Language/Language.sh diff --git a/Hochob/Services/Language/Language.sh b/Hochob/Services/Language/Language.sh new file mode 100644 index 00000000..58e0146d --- /dev/null +++ b/Hochob/Services/Language/Language.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export LANGUAGE_PID=$$ + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + + +# End of File From 49b79fa3ad8a189528493ef6d6d3fb281964220c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 21:55:48 -0500 Subject: [PATCH 0349/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index da7da60d..1b90b95b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -17,6 +17,7 @@ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS=$HOCHOB_SERVER_SERVICES/Communications/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT=$HOCHOB_SERVER_SERVICES_COMMUNICATIONS/MqttClient/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ +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/ @@ -33,6 +34,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE +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 From 31184c8f0ca2510755ca2f72968b8bcb16171891 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 21:55:55 -0500 Subject: [PATCH 0350/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Language/Language.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Language/Language.sh diff --git a/Hochob/Services/Language/Language.sh b/Hochob/Services/Language/Language.sh old mode 100644 new mode 100755 From 7bcd32ce4f367ee4c0e98d1b4f9dff68ee49f06a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 21:58:42 -0500 Subject: [PATCH 0351/1653] Update Main.sh --- Hochob/Main.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 1b90b95b..5c252241 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -167,8 +167,17 @@ institutionIdentification () { echo "Tbd" } + +# Language Identification + +languageIdentification () { + export +} + # ============================================================================= # Main # ============================================================================= +languageIdentification + # End of File From c41e0335163fc82c0017a2084569989029d0dce0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:22:18 -0500 Subject: [PATCH 0352/1653] Update Main.sh --- Hochob/Main.sh | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 5c252241..96e003ac 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -9,6 +9,10 @@ cd ~/CodeLabs/Hochob/ export HOCHOB_ROOT=`pwd` +export HOCHOB_SERVER_CONFIGURATION=/tmp/hochob/ +test -d $HOCHOB_SERVER_CONFIGURATION || mkdir -p $HOCHOB_SERVER_CONFIGURATION +export HOCHOB_SERVER_CONFIGURATION=$HOCHOB_SERVER_CONFIGURATION/language + # Hochob Server Services export HOCHOB_SERVER_SERVICES=$HOCHOB_ROOT/Services/ @@ -160,24 +164,22 @@ MQTT_SERVER_PORT=1883 # YYYYMMDD-HHMMSS institutionIdentification () { - # If Institution Identification - # - # else - # - echo "Tbd" + # If Institution Identification + # + # else + # + echo "Tbd" } # Language Identification languageIdentification () { - export + test -f $HOCHOB_SERVER_CONFIGURATION || touch $HOCHOB_SERVER_CONFIGURATION } # ============================================================================= # Main # ============================================================================= -languageIdentification - # End of File From 12bdce9af2b3b20edaf90d0446f499a6ddd0303e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:23:23 -0500 Subject: [PATCH 0353/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 96e003ac..3a20d002 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -182,4 +182,6 @@ languageIdentification () { # Main # ============================================================================= +languageIdentification + # End of File From 2cb01518dcc14bcfc7f26661af4b2c16f81181f9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:27:04 -0500 Subject: [PATCH 0354/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 3a20d002..980c8bfa 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -11,7 +11,7 @@ export HOCHOB_ROOT=`pwd` export HOCHOB_SERVER_CONFIGURATION=/tmp/hochob/ test -d $HOCHOB_SERVER_CONFIGURATION || mkdir -p $HOCHOB_SERVER_CONFIGURATION -export HOCHOB_SERVER_CONFIGURATION=$HOCHOB_SERVER_CONFIGURATION/language +export HOCHOB_SERVER_CONFIGURATION_LANGUAGE=$HOCHOB_SERVER_CONFIGURATION/language # Hochob Server Services From d6963a40982c9810d6c40091b605dd1fc69b4865 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:30:02 -0500 Subject: [PATCH 0355/1653] Update Language.sh --- Hochob/Services/Language/Language.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Hochob/Services/Language/Language.sh b/Hochob/Services/Language/Language.sh index 58e0146d..54e8e443 100755 --- a/Hochob/Services/Language/Language.sh +++ b/Hochob/Services/Language/Language.sh @@ -10,6 +10,8 @@ set -x export LANGUAGE_PID=$$ +LOCAL_COMMAND="$1" + # ============================================================================= # Functions # ============================================================================= @@ -20,5 +22,11 @@ export LANGUAGE_PID=$$ # Main # ============================================================================= +if [ -z "$1" ] +then + cat $HOCHOB_SERVER_CONFIGURATION_LANGUAGE +else + echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_LANGUAGE +fi # End of File From 0a8fe25c8879ca0aeccbf998b6fd8ffde4a5ab0a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:32:10 -0500 Subject: [PATCH 0356/1653] Update Aguascalientes.sh --- .../Applications/SouthernMayaHighlands/Aguascalientes.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 79ab2643..a9fe9479 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -26,7 +26,13 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" + +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + echo +elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +fi kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From d50e3b2d492c21b6825bb0de445d608b2c175904 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:39:47 -0500 Subject: [PATCH 0357/1653] Update Aguascalientes.sh --- .../Applications/SouthernMayaHighlands/Aguascalientes.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index a9fe9479..79ab2643 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -26,13 +26,7 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & - -LOCAL_LANGUAGE=`Language.sh` -if [ "$LOCAL_LANGUAGE" = "english" ]; then - echo -elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" -fi +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') From d376a452612e6fcfe4dcf5a91de918adfc29c4f3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:44:09 -0500 Subject: [PATCH 0358/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 75b1007a..656d6ad2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -22,7 +22,12 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" +elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" +fi kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') From 75da6e7144cdef6161ddeaa15e6572c1cdf91761 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:45:08 -0500 Subject: [PATCH 0359/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 656d6ad2..e2a01324 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -24,7 +24,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.wav" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi From cdb48878ec2d3f971223cd8d405fb72faf78da81 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:49:35 -0500 Subject: [PATCH 0360/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index e2a01324..656d6ad2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -24,7 +24,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.wav" + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi From 910d8376430e67c2752ad9bd27a92ce26e81c811 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:50:29 -0500 Subject: [PATCH 0361/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index 79b8ab25..d96ce0e5 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -22,7 +22,12 @@ export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" +elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" +fi kill -- -$(ps -o pgid=$CANCUN_PID | grep -o '[0-9]*') From 061bedf604174e61a4365131e2719d87751aeea0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:51:22 -0500 Subject: [PATCH 0362/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 2d4e9faf..11fee0a2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -22,7 +22,12 @@ export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/HuatulcoEnglish.mp3" +elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" +fi kill -- -$(ps -o pgid=$HUATULCO_PID | grep -o '[0-9]*') From c85b50233833191810ef4d0bb7708f9ddc826209 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:52:06 -0500 Subject: [PATCH 0363/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index e7527d15..6fc3529d 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -22,7 +22,12 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" +elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" +fi kill -- -$(ps -o pgid=$MAZATLAN_PID | grep -o '[0-9]*') From 74916415ba675ac6876bdbfe0a0ee195f8a37828 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:53:15 -0500 Subject: [PATCH 0364/1653] Update PuertoVallarta.sh --- Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index ae0a54a6..c44258c2 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -22,7 +22,12 @@ export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallartaEnglish.mp3" +else: + Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" +fi kill -- -$(ps -o pgid=$PUERTOVALLARTA_PID | grep -o '[0-9]*') From a600569af72080905d6b8e78f33c62cb1f424f33 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:53:28 -0500 Subject: [PATCH 0365/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 6fc3529d..ac6a96c2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -25,7 +25,7 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" -elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then +else: Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" fi From b648d9bc94adb002866181f28dffc2c609c3ea9a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:53:41 -0500 Subject: [PATCH 0366/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 11fee0a2..b76fa738 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -25,7 +25,7 @@ export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/HuatulcoEnglish.mp3" -elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then +else: Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" fi From 2ac7eaad495ba238d332294baf4f6a9800a3e98c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:53:54 -0500 Subject: [PATCH 0367/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index d96ce0e5..e075556f 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -25,7 +25,7 @@ export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" -elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then +else: Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" fi From 82c7b3dd58daa93790a1e5c0f787f4be46bf52be Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:54:08 -0500 Subject: [PATCH 0368/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 656d6ad2..b0736627 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -25,7 +25,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" -elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then +else: Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi From acc819c846308dda44b3e36522703f09962344a2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:56:51 -0500 Subject: [PATCH 0369/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index b0736627..ff3bf187 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -24,9 +24,11 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" + #Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" + echo "english" else: - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + echo "spanish" + #Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') From bd9806fa425aeb8e62f88a55492a8ab7252d6ad7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:57:26 -0500 Subject: [PATCH 0370/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index ff3bf187..7d6c97a0 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -26,7 +26,7 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then #Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" echo "english" -else: +else echo "spanish" #Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi From b4f7c5f0a5196b5e557e867be611c3d2219508e3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:57:50 -0500 Subject: [PATCH 0371/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index e075556f..4e913d75 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -25,7 +25,7 @@ export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" -else: +else Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" fi From 0240c0b969e44b90d6e1093f3d7f45ec44f16b4e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:57:59 -0500 Subject: [PATCH 0372/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index b76fa738..57f73846 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -25,7 +25,7 @@ export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/HuatulcoEnglish.mp3" -else: +else Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" fi From d917b0d90d26da6803ea1c663c411889f7eefada Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:58:08 -0500 Subject: [PATCH 0373/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index ac6a96c2..e666c9a4 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -25,7 +25,7 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" -else: +else Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" fi From 35ccbf8ea18e08b91553d22e6a17359deca27e50 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:58:22 -0500 Subject: [PATCH 0374/1653] Update PuertoVallarta.sh --- Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index c44258c2..326d7984 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -25,7 +25,7 @@ export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallartaEnglish.mp3" -else: +else Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" fi From 2cba69079740adb3ff648dbf48d274153c65e64b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 22:59:01 -0500 Subject: [PATCH 0375/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 7d6c97a0..0ce2a475 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -24,11 +24,9 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - #Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" - echo "english" + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" else - echo "spanish" - #Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') From 211eb41f60223d3ad2d875b8a69769b49bd632c2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 23:02:02 -0500 Subject: [PATCH 0376/1653] Update Veracruz.sh --- .../Applications/CentralMayaLowlands/Veracruz.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 64b2a16c..5fda97d3 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -22,10 +22,18 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") # Main # ============================================================================= -Espeak.sh off spanish \ -"Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ -Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio. \ -Que disfrutes tu recorrido!" +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off spanish \ + "Future Engineers! Welcome to this first hall! We called it: The Beginning. \ + Here we will remember the Mayans, the history of Intel y this Design Center. \ + Enjoy your tour!" +else + Espeak.sh off spanish \ + "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ + Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio. \ + Que disfrutes tu recorrido!" +fi Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" From f8d2640094df600f5a9bb0570f90ac1618af49d2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 4 Jun 2017 23:02:13 -0500 Subject: [PATCH 0377/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 5fda97d3..08ee5042 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -24,7 +24,7 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off spanish \ + Espeak.sh off english \ "Future Engineers! Welcome to this first hall! We called it: The Beginning. \ Here we will remember the Mayans, the history of Intel y this Design Center. \ Enjoy your tour!" From 638404cc1e1c664f1e02b08c115ad14b02ae3975 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 06:02:54 -0500 Subject: [PATCH 0378/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 980c8bfa..ac4bedad 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -120,7 +120,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.mp3 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ -export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/*.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideo.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideoAudio.mp4 From 92a567e722ef626fbbc047cc8b5928b746d5b1e3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 06:05:06 -0500 Subject: [PATCH 0379/1653] Update HochobServerMediaSource.sh --- Hochob/Setup/HochobServerMediaSource.sh | 30 ++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/Hochob/Setup/HochobServerMediaSource.sh b/Hochob/Setup/HochobServerMediaSource.sh index 520d3127..645c91c2 100755 --- a/Hochob/Setup/HochobServerMediaSource.sh +++ b/Hochob/Setup/HochobServerMediaSource.sh @@ -1,5 +1,33 @@ #!/bin/sh -test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ +export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ + +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ + +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ + +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ + +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ + +test -d $HOCHOB_SERVER_MEDIA_SOURCE && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE + +test -d $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA +test -d $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM + +test -d $HOCHOB_SERVER_MEDIA_SOURCE_IMAGE && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_IMAGE +test -d $HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING + +test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND +test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER +test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK + +test -d $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO +test -d $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG # End of File From 3e0c5cc2208c7c396394349e70c877e3f8ebfa67 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 06:06:14 -0500 Subject: [PATCH 0380/1653] Update HochobServerMediaSource.sh --- Hochob/Setup/HochobServerMediaSource.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Setup/HochobServerMediaSource.sh b/Hochob/Setup/HochobServerMediaSource.sh index 645c91c2..b9abacee 100755 --- a/Hochob/Setup/HochobServerMediaSource.sh +++ b/Hochob/Setup/HochobServerMediaSource.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -x + export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ From 39f2711d80627029be4cc17aa3b1e8d929ee5ee7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 06:07:52 -0500 Subject: [PATCH 0381/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index ac4bedad..9be5afc4 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -109,7 +109,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_ALLFILES=$HOCHOB_SERVER_MEDIA_ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE/Drawing/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING/*.jpg export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ From c81e058e4846fb3034ad84a4745b01aa2732b901 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 06:07:57 -0500 Subject: [PATCH 0382/1653] Update HochobServerMediaSource.sh --- Hochob/Setup/HochobServerMediaSource.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup/HochobServerMediaSource.sh b/Hochob/Setup/HochobServerMediaSource.sh index b9abacee..5ee46025 100755 --- a/Hochob/Setup/HochobServerMediaSource.sh +++ b/Hochob/Setup/HochobServerMediaSource.sh @@ -8,7 +8,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ -export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_IMAGE/Drawing/ +export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE/Drawing/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ From beeea760298ef0d0b87474c3917763f79b988475 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 06:49:34 -0500 Subject: [PATCH 0383/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 625987e9..b243e667 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -35,6 +35,11 @@ Memories.sh "10" "on" "${MICHOACAN_NAME}" & wait +Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & +RobotVirtual.sh "Listo! Tenemos nuestra foto del recuerdo! Gracias Futuros Ingenieros!" + +sleep 2 + kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') # End of File From d1cdab25c9e669e9dcf20cd5193cac172146739e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 06:52:15 -0500 Subject: [PATCH 0384/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index 8072d42f..9a0b40ca 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -10,7 +10,8 @@ set -x export FSWEBCAM_PID=$$ export FSWEBCAM_BINARY=fswebcam -export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" +#export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" +export FSWEBCAM_ARGUMENTS="-r 1280x720 --jpeg 100 --no-banner" export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE LOCAL_IMAGES="$1" @@ -35,6 +36,7 @@ then DATE=`date +"%Y%m%d%H%M%S"` NAME=`printf %04d $IMAGE` $FSWEBCAM_BINARY $FSWEBCAM_ARGUMENTS $FSWEBCAM_DIRECTORY/$NAME.jpg + cp $FSWEBCAM_DIRECTORY/$NAME.jpg $FSWEBCAM_IMAGE IMAGE=$(($IMAGE+1)) done From 9a1f1bbdeedb59e78571f7d1026d8a84f7c83a3b Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Wed, 7 Jun 2017 09:24:46 -0500 Subject: [PATCH 0385/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Setup/Packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index d490d2e3..eca4fc94 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -47,6 +47,6 @@ sudo apt install libav-tools # None # Hochob Server Services Video -# None +sudo apt install ffmpeg # End of File From 56638e7a19778d8b5fa0c5610ef495672324409f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 09:46:44 -0500 Subject: [PATCH 0386/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index b243e667..6b14558c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -36,7 +36,7 @@ Memories.sh "10" "on" "${MICHOACAN_NAME}" & wait Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & -RobotVirtual.sh "Listo! Tenemos nuestra foto del recuerdo! Gracias Futuros Ingenieros!" +RobotVirtual.sh "Listo! Tenemos nuestra foto del recuerdo. Gracias Futuros Ingenieros." sleep 2 From 3cd56ebe40c7d523524398a718cbd49a1ca39cea Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 09:48:21 -0500 Subject: [PATCH 0387/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index eaff744c..c76e10f8 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -37,7 +37,7 @@ then if [ "$LOCAL_LANGUAGE" = "english" ]; then export ESPEAK_LANGUAGE="-ven+m5" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - export ESPEAK_LANGUAGE="-ves-la+m5" + export ESPEAK_LANGUAGE="-v es-la -a 200" fi export ESPEAK_INPUT="$LOCAL_TEXT" From 8621f4cbcd3d52c6c3be11f708c6dffcf2bcfd8d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 09:49:22 -0500 Subject: [PATCH 0388/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 6b14558c..ea1d4997 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -28,7 +28,7 @@ sleep .6 Robot.sh lupe/headleft 1 sleep .6 -RobotVirtual.sh "Tomaremos algunas fotos! Estan listos?" +RobotVirtual.sh "Tomaremos algunas fotos. Estan listos?" sleep 1 RobotVirtual.sh "3, 2, 1, Sonrian!" Memories.sh "10" "on" "${MICHOACAN_NAME}" & From 621ddce72ab12961b48b03b102849c4a8a9e5596 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 09:59:04 -0500 Subject: [PATCH 0389/1653] Update Fswebcam.sh --- Hochob/Services/Camera/Fswebcam.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index 9a0b40ca..319edbb5 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -10,8 +10,7 @@ set -x export FSWEBCAM_PID=$$ export FSWEBCAM_BINARY=fswebcam -#export FSWEBCAM_ARGUMENTS="-r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" -export FSWEBCAM_ARGUMENTS="-r 1280x720 --jpeg 100 --no-banner" +export FSWEBCAM_ARGUMENTS="-r 4096x2304 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE LOCAL_IMAGES="$1" From dc6ca5009bbcf5dbf1f7bfae5c45329f9c211b29 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 14:30:20 -0500 Subject: [PATCH 0390/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 9be5afc4..549ad8f8 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -150,7 +150,7 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport -MQTT_SERVER_ADDRESS=iot.eclipse.org +MQTT_SERVER_ADDRESS=127.0.0.1 MQTT_SERVER_PORT=1883 # ============================================================================= From 57ad69ff24e7a1d9212f6cc5a1632ddd6588395c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 14:31:53 -0500 Subject: [PATCH 0391/1653] Update amikoo.js --- Hochob/LupeRobot/Virtual/amikoo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/LupeRobot/Virtual/amikoo.js b/Hochob/LupeRobot/Virtual/amikoo.js index f6bfb7c1..cb68d208 100644 --- a/Hochob/LupeRobot/Virtual/amikoo.js +++ b/Hochob/LupeRobot/Virtual/amikoo.js @@ -1,5 +1,5 @@ const mqtt = require('mqtt') -const client = mqtt.connect('mqtt://iot.eclipse.org') +const client = mqtt.connect('mqtt://127.0.0.1') //const client = mqtt.connect('mqtt://localhost') var sys = require('sys') From 04da9f625b493c8d65580f513d8741e7256226aa Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Wed, 7 Jun 2017 14:40:29 -0500 Subject: [PATCH 0392/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/LupeRobot/Virtual/amikoo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/LupeRobot/Virtual/amikoo.js b/Hochob/LupeRobot/Virtual/amikoo.js index cb68d208..ed9d6173 100644 --- a/Hochob/LupeRobot/Virtual/amikoo.js +++ b/Hochob/LupeRobot/Virtual/amikoo.js @@ -1,5 +1,5 @@ const mqtt = require('mqtt') -const client = mqtt.connect('mqtt://127.0.0.1') +const client = mqtt.connect('mqtt://iot.eclipse.org') //const client = mqtt.connect('mqtt://localhost') var sys = require('sys') @@ -9,7 +9,7 @@ function puts(error, stdout, stderr) { sys.puts(stdout) } function espeak(phrase) { var sleep = require('sleep') - exec("echo " + phrase + " | espeak -ves -w audio.wav", puts); + exec("echo " + phrase + " | espeak -v es-la -a 200 -w audio.wav", puts); sleep.msleep(500); exec("aplay audio.wav", puts); } From 791936508ee57a45f7143a3e884dc1a4976384a2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Wed, 7 Jun 2017 15:11:01 -0500 Subject: [PATCH 0393/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Applications/RobotMayaLands/PocChuc.sh | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100755 Hochob/Applications/RobotMayaLands/PocChuc.sh diff --git a/Hochob/Applications/RobotMayaLands/PocChuc.sh b/Hochob/Applications/RobotMayaLands/PocChuc.sh new file mode 100755 index 00000000..08ee5042 --- /dev/null +++ b/Hochob/Applications/RobotMayaLands/PocChuc.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export VERACRUZ_PID=$$ +export VERACRUZ_PATH=$(readlink -f "$0") +export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "Future Engineers! Welcome to this first hall! We called it: The Beginning. \ + Here we will remember the Mayans, the history of Intel y this Design Center. \ + Enjoy your tour!" +else + Espeak.sh off spanish \ + "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ + Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio. \ + Que disfrutes tu recorrido!" +fi + +Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" + +kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') + +# End of File From c5aacc56ed352c2b9883307bc3c87a929fbafcad Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:14:34 -0500 Subject: [PATCH 0394/1653] Update PocChuc.sh --- Hochob/Applications/RobotMayaLands/PocChuc.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/PocChuc.sh b/Hochob/Applications/RobotMayaLands/PocChuc.sh index 08ee5042..08c906e4 100755 --- a/Hochob/Applications/RobotMayaLands/PocChuc.sh +++ b/Hochob/Applications/RobotMayaLands/PocChuc.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export VERACRUZ_PID=$$ -export VERACRUZ_PATH=$(readlink -f "$0") -export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") +export POCCHUC_PID=$$ +export POCCHUC_PATH=$(readlink -f "$0") +export POCCHUC_DIRECTORY=$(dirname "$POCCHUC_PATH") # ============================================================================= # Functions @@ -26,17 +26,17 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "Future Engineers! Welcome to this first hall! We called it: The Beginning. \ - Here we will remember the Mayans, the history of Intel y this Design Center. \ + Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour!" else Espeak.sh off spanish \ "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ - Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio. \ - Que disfrutes tu recorrido!" + Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio de Intel en Guadalajara. \ + Que disfruten tu recorrido!" fi Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$PCOCHUC_PID | grep -o '[0-9]*') # End of File From 4fca057db5149e70dac4d860e50c3b45c40bd1c7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:15:00 -0500 Subject: [PATCH 0395/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 08ee5042..39e5dbea 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -26,13 +26,13 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "Future Engineers! Welcome to this first hall! We called it: The Beginning. \ - Here we will remember the Mayans, the history of Intel y this Design Center. \ + Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour!" else Espeak.sh off spanish \ "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ - Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio. \ - Que disfrutes tu recorrido!" + Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio de Intel en Guadalajara. \ + Que disfruten tu recorrido!" fi Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" From c07ebd5050a94ccd5412d30a944c3414b89f7b14 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Wed, 7 Jun 2017 15:16:08 -0500 Subject: [PATCH 0396/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Services/Stream/Stream.sh | 37 ++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 Hochob/Services/Stream/Stream.sh diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh new file mode 100755 index 00000000..7e0f0429 --- /dev/null +++ b/Hochob/Services/Stream/Stream.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +export STREAM2CHROMECAST_PID=$$ +export STREAM2CHROMECAST_BINARY=stream2chromecast.py + +LOCAL_DEVICE="$1" +LOCAL_VOLUME="$2" +LOCAL_FILE="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 3 ] +then + killall -9 $STREAM2CHROMECAST_BINARY + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 1956b501850534f548b82b584b7fbab56e8071d3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:21:16 -0500 Subject: [PATCH 0397/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 7e0f0429..7720a927 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -6,8 +6,7 @@ set -x # Variables # ============================================================================= -export STREAM2CHROMECAST_PID=$$ -export STREAM2CHROMECAST_BINARY=stream2chromecast.py +export STREAM_PID=$$ LOCAL_DEVICE="$1" LOCAL_VOLUME="$2" @@ -25,10 +24,12 @@ LOCAL_FILE="$3" if [ $# -eq 3 ] then - killall -9 $STREAM2CHROMECAST_BINARY - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop + if [ "$1" != "" ]; then + then + echo "Hi" + else + Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" + fi else echo "Invalid number of arguments, see Documentation" exit 1 From 85dff06d43931c5f536f469d8b7d1e63740db75d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:24:45 -0500 Subject: [PATCH 0398/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 39e5dbea..3f63cbf0 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -35,7 +35,7 @@ else Que disfruten tu recorrido!" fi -Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') From 9947f9224550c4d19bc23f43db5d9e997a011133 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:26:19 -0500 Subject: [PATCH 0399/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 7720a927..763caa5f 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -24,7 +24,7 @@ LOCAL_FILE="$3" if [ $# -eq 3 ] then - if [ "$1" != "" ]; then + if [ "$HOCHOBDEMO" != "" ]; then then echo "Hi" else From 61806a6c030b27a8debd90301b27510e4f8e1569 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:27:33 -0500 Subject: [PATCH 0400/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 763caa5f..3752794e 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -24,11 +24,11 @@ LOCAL_FILE="$3" if [ $# -eq 3 ] then - if [ "$HOCHOBDEMO" != "" ]; then + if [ "$HOCHOBDEMO" != "1" ]; then then - echo "Hi" - else Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" + else + Mpg123.sh "$ESPEAK_SPEECH_MP3" fi else echo "Invalid number of arguments, see Documentation" From efdd19b497dc5355dc255da47d85851d0ea0e173 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:27:57 -0500 Subject: [PATCH 0401/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 3752794e..5a8c821e 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -24,7 +24,7 @@ LOCAL_FILE="$3" if [ $# -eq 3 ] then - if [ "$HOCHOBDEMO" != "1" ]; then + if [ "$HOCHOBDEMO" != "1" ] then Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" else From 39c1cc1f8a1dc62594aa0980dbe6af8d2a9645cb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:30:32 -0500 Subject: [PATCH 0402/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 0ce2a475..022781db 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -24,9 +24,9 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" + Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" else - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') From acec90f13df77f7f30ef19c1548a56eeed153e91 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:31:32 -0500 Subject: [PATCH 0403/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index 4e913d75..2ebf1e96 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -24,9 +24,9 @@ export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" + Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" else - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" + Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" fi kill -- -$(ps -o pgid=$CANCUN_PID | grep -o '[0-9]*') From 52153c3a349b5d7b75a751a120bfdc8089c75744 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:32:10 -0500 Subject: [PATCH 0404/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 5a8c821e..9263bdd1 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -26,9 +26,9 @@ if [ $# -eq 3 ] then if [ "$HOCHOBDEMO" != "1" ] then - Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" + Stream2Chromecast.sh "Juum" "1.0" "$LOCAL_FILE" else - Mpg123.sh "$ESPEAK_SPEECH_MP3" + Mpg123.sh "$LOCAL_FILE" fi else echo "Invalid number of arguments, see Documentation" From da658cc1b1c3a9a669307f628fc5ac9c332e1ed1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:34:02 -0500 Subject: [PATCH 0405/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 57f73846..624220cc 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -24,9 +24,9 @@ export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/HuatulcoEnglish.mp3" + Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/HuatulcoEnglish.mp3" else - Stream2Chromecast.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" + Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" fi kill -- -$(ps -o pgid=$HUATULCO_PID | grep -o '[0-9]*') From ce95a6202355c9b6dce3e6d265136d2d3296155a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:34:24 -0500 Subject: [PATCH 0406/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index e666c9a4..c6b5a94e 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -24,9 +24,9 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" + Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" else - Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" + Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" fi kill -- -$(ps -o pgid=$MAZATLAN_PID | grep -o '[0-9]*') From 32b9736c205d1413fa49c8b78ffda39efeef30b3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:34:49 -0500 Subject: [PATCH 0407/1653] Update PuertoVallarta.sh --- Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index 326d7984..47870944 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -24,9 +24,9 @@ export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallartaEnglish.mp3" + Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallartaEnglish.mp3" else - Stream2Chromecast.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" + Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" fi kill -- -$(ps -o pgid=$PUERTOVALLARTA_PID | grep -o '[0-9]*') From adb2138fd52341e50ccc897a75c1b4f9930eb698 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:37:10 -0500 Subject: [PATCH 0408/1653] Update ElCielo.sh --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index 43b6cf67..58ac0c4c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -22,7 +22,7 @@ export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" +Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') From 8d9c27e09da60bb9735f4eabac9b1181aa4ce2ec Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:37:24 -0500 Subject: [PATCH 0409/1653] Update LaMichilia.sh --- Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 1ea54e8d..fabcf6f0 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -22,7 +22,7 @@ export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/LaMichilia.mp3" +Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/LaMichilia.mp3" kill -- -$(ps -o pgid=$LAMICHILIA_PID | grep -o '[0-9]*') From 518dfad25f60bb75525664431771781ff5282c8d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:37:42 -0500 Subject: [PATCH 0410/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 246e55d9..6cf0951b 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -27,7 +27,7 @@ Memories.sh "40" "on" "${MAPIMI_NAME}" Espeak.sh off spanish "Nel Pastel Simona La Mona" MemoriesAudio.sh "${MAPIMI_NAME}" -Stream2Chromecast.sh "Eek'" "1.0" "$FFMPEG_VIDEO_AUDIO" +Stream.sh "Eek'" "1.0" "$FFMPEG_VIDEO_AUDIO" kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') From d78e4e8d2d32ea208f3da7e3929b8ab6d59b7c62 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:38:10 -0500 Subject: [PATCH 0411/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 02623c6c..7bc9ad51 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -22,7 +22,7 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" +Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" kill -- -$(ps -o pgid=$MONTESAZULES_PID | grep -o '[0-9]*') From 55d4ff9eb58e68f0f5f564ef415a0ab9aee0bf73 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:38:25 -0500 Subject: [PATCH 0412/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 09bfec65..ef4a4565 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -22,7 +22,7 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") # Main # ============================================================================= -Stream2Chromecast.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" +Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" kill -- -$(ps -o pgid=$OJODELIEBRE_PID | grep -o '[0-9]*') From 585542df5a637f510bf5f15d5381a7c021022c45 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:38:54 -0500 Subject: [PATCH 0413/1653] Update PocChuc.sh --- Hochob/Applications/RobotMayaLands/PocChuc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/RobotMayaLands/PocChuc.sh b/Hochob/Applications/RobotMayaLands/PocChuc.sh index 08c906e4..d2fce162 100755 --- a/Hochob/Applications/RobotMayaLands/PocChuc.sh +++ b/Hochob/Applications/RobotMayaLands/PocChuc.sh @@ -35,7 +35,7 @@ else Que disfruten tu recorrido!" fi -Stream2Chromecast.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$PCOCHUC_PID | grep -o '[0-9]*') From 42dfcc562dc72e2b9c8747e34c6aaa6ee659327a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:54:50 -0500 Subject: [PATCH 0414/1653] Update Acapulco.sh --- .../CentralMayaLowlands/Acapulco.sh | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 022781db..dae9eed0 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -22,6 +22,23 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= +$Eog.sh $VISITORSCENTER_IMAGE/RP/RPP-May052017-4536.jpg + +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "Future Engineers. Welcome to this first hall! We called it: The Beginning. \ + Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ + Enjoy your tour." +else + Espeak.sh off spanish \ + "Futuros Ingenieros. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ + Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio de Intel en Guadalajara. \ + Que disfruten tu recorrido." +fi + +Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" + LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" @@ -29,6 +46,18 @@ else Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "Future Engineers. Welcome to this first hall! We called it: The Beginning. \ + Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ + Enjoy your tour." +else + Espeak.sh off spanish \ + "Futuros Ingenieros. " +fi + +wait + kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') # End of File From f76c3b05450408141617682e7068d3ddee23c1e1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:55:12 -0500 Subject: [PATCH 0415/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index dae9eed0..39892836 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -22,7 +22,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -$Eog.sh $VISITORSCENTER_IMAGE/RP/RPP-May052017-4536.jpg +Eog.sh $VISITORSCENTER_IMAGE/RP/RPP-May052017-4536.jpg & LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then From d2b369a4bb333543270bfb0ae1a9566859d43316 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 15:59:04 -0500 Subject: [PATCH 0416/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 39892836..3c99bb15 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -46,18 +46,6 @@ else Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi -if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ - "Future Engineers. Welcome to this first hall! We called it: The Beginning. \ - Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ - Enjoy your tour." -else - Espeak.sh off spanish \ - "Futuros Ingenieros. " -fi - -wait - kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') # End of File From a6ddd9c1b5011a2c52ef31ad5521f66939b83370 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:03:43 -0500 Subject: [PATCH 0417/1653] Update Mazatlan.sh --- .../Applications/CentralMayaLowlands/Mazatlan.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index c6b5a94e..57e8cf8e 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -23,6 +23,20 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") # ============================================================================= LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "Future Engineers. Welcome to this first hall! We called it: The Beginning. \ + Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ + Enjoy your tour." +else + Espeak.sh off spanish \ + "Futuros Ingenieros. Ahora que saben mas acerca de Intel podemos pasar a la siguiente seccion \ + en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas y nuestros Laboratorios. Acompanienme." +fi + +Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" + if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" else From ab95f697184582d606d2b326c8e24422edf43286 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:06:50 -0500 Subject: [PATCH 0418/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 57e8cf8e..16666cc9 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -26,8 +26,8 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ - "Future Engineers. Welcome to this first hall! We called it: The Beginning. \ - Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ + "Future Engineers. You know more about Intel, now let's get into the next hall\ + where we will find information about our Microproccesors, our Fabs and Laboratories. \ Enjoy your tour." else Espeak.sh off spanish \ From 76f1fc93e6b49d239941e71fc22c9cc69fd3548a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:09:40 -0500 Subject: [PATCH 0419/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 3f63cbf0..07ad6fa6 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -25,14 +25,10 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ - "Future Engineers! Welcome to this first hall! We called it: The Beginning. \ - Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ - Enjoy your tour!" + "Hi There" else Espeak.sh off spanish \ - "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ - Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio de Intel en Guadalajara. \ - Que disfruten tu recorrido!" + "Hola a todos" fi Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" From 31c57b5a4f0cf77037dbe39dc6cae05df66db022 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:16:18 -0500 Subject: [PATCH 0420/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index ef4a4565..98b9a32f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -22,6 +22,12 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") # Main # ============================================================================= +Espeak.sh off spanish \ + "Ya vimos la importancia de nuestra Fabricas y Laboratorios. Ahora entraremos a una seccion \ + que nos permite jugar y conocer de cerca la tecnologia. Siganme." + +Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" + Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" kill -- -$(ps -o pgid=$OJODELIEBRE_PID | grep -o '[0-9]*') From e4b6e881023dea724d5247c460822f8d8286666b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:16:32 -0500 Subject: [PATCH 0421/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 98b9a32f..6954a482 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -26,7 +26,7 @@ Espeak.sh off spanish \ "Ya vimos la importancia de nuestra Fabricas y Laboratorios. Ahora entraremos a una seccion \ que nos permite jugar y conocer de cerca la tecnologia. Siganme." -Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" From 9c2ac991c8c6bb3eeb8b2b68c38fd8a976a8cf89 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:17:40 -0500 Subject: [PATCH 0422/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 6954a482..f94d8053 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -24,7 +24,7 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") Espeak.sh off spanish \ "Ya vimos la importancia de nuestra Fabricas y Laboratorios. Ahora entraremos a una seccion \ - que nos permite jugar y conocer de cerca la tecnologia. Siganme." + que nos permite jugar y conocer de cerca la tecnología. Siganme." Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 6ce84d034e85c61494ec9a3ac2c4fc190d1ecfa9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:17:59 -0500 Subject: [PATCH 0423/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index f94d8053..14cc1666 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -23,7 +23,7 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") # ============================================================================= Espeak.sh off spanish \ - "Ya vimos la importancia de nuestra Fabricas y Laboratorios. Ahora entraremos a una seccion \ + "Futuros Ingenieros. Ya vimos la importancia de nuestra Fabricas y Laboratorios. Ahora entraremos a una seccion \ que nos permite jugar y conocer de cerca la tecnología. Siganme." Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 00812642735e0f5f72f706d0f43e83b5ee50bfc1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:18:18 -0500 Subject: [PATCH 0424/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 14cc1666..5ccdb467 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -23,7 +23,7 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") # ============================================================================= Espeak.sh off spanish \ - "Futuros Ingenieros. Ya vimos la importancia de nuestra Fabricas y Laboratorios. Ahora entraremos a una seccion \ + "Futuros Ingenieros. Ya vimos la importancia de nuestras Fabricas y Laboratorios. Ahora entraremos a una seccion \ que nos permite jugar y conocer de cerca la tecnología. Siganme." Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 00481c3d9fbdcffaed19fa93a29d804db1816a32 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:22:36 -0500 Subject: [PATCH 0425/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 58688f9d..5aa0ae08 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -24,7 +24,9 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # ============================================================================= Memories.sh "20" "on" "${ZACATECAS_NAME}" -Espeak.sh off spanish "Nel Pastel" +Espeak.sh off spanish \ + "Me da mucho gusto conocerlos y que hayan venido a Intel. \ + Regresen pronto" MemoriesAudio.sh "${ZACATECAS_NAME}" #kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') From 0a9be6ae51cbcd897accb03a8b32e2c6f4c79a50 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:24:53 -0500 Subject: [PATCH 0426/1653] Update ElCielo.sh --- .../Applications/NorthernMayaLowlands/ElCielo.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index 58ac0c4c..d17564b7 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -22,7 +22,19 @@ export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") # Main # ============================================================================= -Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" +#Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" + +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "To be written" +else + Espeak.sh off spanish \ + "Me da mucho gusto conocerlos y que hayan venido a Intel. \ + Regresen pronto!" +fi + +Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') From 3e7d72ad20b939affa734db6af87fd89b289a076 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:28:23 -0500 Subject: [PATCH 0427/1653] Update ElCielo.sh --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index d17564b7..d3ed3c2f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -24,6 +24,8 @@ export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") #Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" +Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & + LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ From 9088e32dc0183999c38b3cecec0999c842198edc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:29:35 -0500 Subject: [PATCH 0428/1653] Update ElCielo.sh --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index d3ed3c2f..c8307142 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -22,7 +22,7 @@ export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") # Main # ============================================================================= -#Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" +Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & @@ -38,6 +38,6 @@ fi Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') # End of File From ae193a113a0876e5dafd7cebbb2a2a8b5edf143d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:35:57 -0500 Subject: [PATCH 0429/1653] Update LaMichilia.sh --- .../NorthernMayaLowlands/LaMichilia.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index fabcf6f0..7b056d50 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -22,7 +22,20 @@ export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") # Main # ============================================================================= -Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/LaMichilia.mp3" +#Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/LaMichilia.mp3" + +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "To be written" +else + Espeak.sh off spanish \ + "Intel no solo se queda en la tierra, es tal el alcance del Microprocesador que puede \ + estar en el universo, por ejemplo, ha trabajado con la NASA para crear cohetes y vehiculos \ + no tripulados. Mira el siguiente video." +fi + +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$LAMICHILIA_PID | grep -o '[0-9]*') From 86bf14ba5a5f662f1ad36ab6fea4d08ab3c23683 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:37:59 -0500 Subject: [PATCH 0430/1653] Update ElCielo.sh --- .../Applications/NorthernMayaLowlands/ElCielo.sh | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index c8307142..58ac0c4c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -24,20 +24,6 @@ export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" -Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & - -LOCAL_LANGUAGE=`Language.sh` -if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ - "To be written" -else - Espeak.sh off spanish \ - "Me da mucho gusto conocerlos y que hayan venido a Intel. \ - Regresen pronto!" -fi - -Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" - -#kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') # End of File From 968405b59267808e10a920fbe2f8a02e751bac5f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:39:50 -0500 Subject: [PATCH 0431/1653] Update Mapimi.sh --- .../NorthernMayaLowlands/Mapimi.sh | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 6cf0951b..d204d1d6 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -23,11 +23,25 @@ export MAPIMI_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -Memories.sh "40" "on" "${MAPIMI_NAME}" -Espeak.sh off spanish "Nel Pastel Simona La Mona" -MemoriesAudio.sh "${MAPIMI_NAME}" +#Memories.sh "40" "on" "${MAPIMI_NAME}" +#Espeak.sh off spanish "Nel Pastel Simona La Mona" +#MemoriesAudio.sh "${MAPIMI_NAME}" -Stream.sh "Eek'" "1.0" "$FFMPEG_VIDEO_AUDIO" +#Stream.sh "Eek'" "1.0" "$FFMPEG_VIDEO_AUDIO" + +Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & + +LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "To be written" +else + Espeak.sh off spanish \ + "Me da mucho gusto conocerlos y que hayan venido a Intel. \ + Regresen pronto!" +fi + +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') From f2dfbe8c47d581d56078cf61f798bad68f9f711d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:48:25 -0500 Subject: [PATCH 0432/1653] Update BajaCaliforniaNorte.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 3673c25b..ebc8de88 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -29,6 +29,7 @@ Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18 +Espeak.sh on spanish "ah ah" Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 From 7bf988a2bda5a22c0a17de431ea38f4142cff221 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:49:29 -0500 Subject: [PATCH 0433/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index ebc8de88..3f8aab48 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -28,7 +28,7 @@ Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & -sleep 18 +sleep 21 Espeak.sh on spanish "ah ah" Robot.sh lupe/headright 1 sleep .6 From fb5a79766edadcb75130b9dcbecd095951b29138 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:50:33 -0500 Subject: [PATCH 0434/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 3f8aab48..75a89a60 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -28,7 +28,7 @@ Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & -sleep 21 +sleep 19.5 Espeak.sh on spanish "ah ah" Robot.sh lupe/headright 1 sleep .6 From 66bc6754190b2898ca1f7d27857bf3890d578719 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:51:28 -0500 Subject: [PATCH 0435/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 75a89a60..b8d67eec 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -29,7 +29,7 @@ Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 19.5 -Espeak.sh on spanish "ah ah" +Espeak.sh on spanish "Nel" Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 From d008aa0ac8dc486fbeb25c2aa23b734706184def Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:52:22 -0500 Subject: [PATCH 0436/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index b8d67eec..2b40f798 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -28,7 +28,7 @@ Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & -sleep 19.5 +sleep 19.2 Espeak.sh on spanish "Nel" Robot.sh lupe/headright 1 sleep .6 From f3b139768b74346bdb4545416f661a892e97ade1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 7 Jun 2017 16:55:19 -0500 Subject: [PATCH 0437/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 549ad8f8..9be5afc4 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -150,7 +150,7 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport -MQTT_SERVER_ADDRESS=127.0.0.1 +MQTT_SERVER_ADDRESS=iot.eclipse.org MQTT_SERVER_PORT=1883 # ============================================================================= From 7c575febaeac73004d29005ce9c7b15e1a6c2072 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 02:46:12 -0500 Subject: [PATCH 0438/1653] Update Signed-off-by: Abraham Arce Moreno --- .../SouthernMayaHighlands/BajaCaliforniaNorte.sh | 4 ++-- Hochob/Services/Robot/Remote/Robot.sh | 12 +++++++++++- Hochob/Services/Stream/Stream.sh | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 2b40f798..221cd492 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -29,7 +29,7 @@ Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 19.2 -Espeak.sh on spanish "Nel" +Robot.sh lupe/say "Nel" Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 @@ -41,7 +41,7 @@ sleep .6 Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/resetall 1 -sleep 10 +sleep 5 kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index 7ab7109b..2313dfdf 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -25,7 +25,17 @@ LOCAL_MESSAGE="$2" if [ $# -eq 2 ] then - Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE + if [ "$HOCHOBDEMO" != "1" ] + then + echo "Here" + #Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE + else + echo "There" + if [ "$LOCAL_MESSAGE" != "1" ] + then + Espeak.sh on spanish "$LOCAL_MESSAGE" + fi + fi else echo "Invalid number of arguments, see Documentation" exit 1 diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 9263bdd1..12ab6a8f 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -22,7 +22,7 @@ LOCAL_FILE="$3" # Main # ============================================================================= -if [ $# -eq 3 ] +if [ $# -eq 3 ] then if [ "$HOCHOBDEMO" != "1" ] then From 03ec290b0c8843fc5d4e6b59ed0ea2ba6acfd3ab Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 07:08:20 -0500 Subject: [PATCH 0439/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Main.sh | 14 ++++++++------ Hochob/Setup/HochobServerMediaSource.sh | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 9be5afc4..6078c970 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -4,15 +4,17 @@ # Variables # ============================================================================= -# Hochob Server Root Directory - -cd ~/CodeLabs/Hochob/ -export HOCHOB_ROOT=`pwd` +# Hochob Server Configuration export HOCHOB_SERVER_CONFIGURATION=/tmp/hochob/ test -d $HOCHOB_SERVER_CONFIGURATION || mkdir -p $HOCHOB_SERVER_CONFIGURATION export HOCHOB_SERVER_CONFIGURATION_LANGUAGE=$HOCHOB_SERVER_CONFIGURATION/language +# Hochob Server Root + +cd ~/CodeLabs/Hochob/ +export HOCHOB_ROOT=`pwd` + # Hochob Server Services export HOCHOB_SERVER_SERVICES=$HOCHOB_ROOT/Services/ @@ -101,7 +103,7 @@ export VISITORSCENTER_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_VIDEO # Hochob Server Media Source Raw -export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ +export HOCHOB_SERVER_MEDIA_SOURCE=$HOME/HochobServerMediaSource/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ @@ -150,7 +152,7 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport -MQTT_SERVER_ADDRESS=iot.eclipse.org +MQTT_SERVER_ADDRESS=127.0.0.1 MQTT_SERVER_PORT=1883 # ============================================================================= diff --git a/Hochob/Setup/HochobServerMediaSource.sh b/Hochob/Setup/HochobServerMediaSource.sh index 5ee46025..eb1a5f34 100755 --- a/Hochob/Setup/HochobServerMediaSource.sh +++ b/Hochob/Setup/HochobServerMediaSource.sh @@ -2,7 +2,7 @@ set -x -export HOCHOB_SERVER_MEDIA_SOURCE=/tmp/HochobServerMediaSource/ +export HOCHOB_SERVER_MEDIA_SOURCE=$HOME/HochobServerMediaSource/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ From c3ca7b5795d7f67e9d5583a412abf6a924eede1f Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 07:09:53 -0500 Subject: [PATCH 0440/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Services/Robot/Remote/Robot.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index 2313dfdf..8ef8e08a 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -27,10 +27,8 @@ if [ $# -eq 2 ] then if [ "$HOCHOBDEMO" != "1" ] then - echo "Here" - #Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE else - echo "There" if [ "$LOCAL_MESSAGE" != "1" ] then Espeak.sh on spanish "$LOCAL_MESSAGE" From 6c0855fc27e3001511c9bfa17ec9f7b016f2791e Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 09:15:19 -0500 Subject: [PATCH 0441/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/LupeRobot/Virtual/amikoo.js | 19 ++++++++++++++++--- Hochob/Main.sh | 4 +++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Hochob/LupeRobot/Virtual/amikoo.js b/Hochob/LupeRobot/Virtual/amikoo.js index ed9d6173..3e6eeef7 100644 --- a/Hochob/LupeRobot/Virtual/amikoo.js +++ b/Hochob/LupeRobot/Virtual/amikoo.js @@ -1,24 +1,31 @@ const mqtt = require('mqtt') const client = mqtt.connect('mqtt://iot.eclipse.org') -//const client = mqtt.connect('mqtt://localhost') var sys = require('sys') var exec = require('child_process').exec; function puts(error, stdout, stderr) { sys.puts(stdout) } -function espeak(phrase) { +function espeakDecir(phrase) { var sleep = require('sleep') exec("echo " + phrase + " | espeak -v es-la -a 200 -w audio.wav", puts); sleep.msleep(500); exec("aplay audio.wav", puts); } +function espeakSay(phrase) { + var sleep = require('sleep') + exec("echo " + phrase + " | espeak -v es-us -a 200 -w audio.wav", puts); + sleep.msleep(500); + exec("aplay audio.wav", puts); +} + var state = 'closed' client.on('connect', function () { client.subscribe('lupe/open') client.subscribe('lupe/close') + client.subscribe('lupe/decir') client.subscribe('lupe/say') client.subscribe('lupe/resetall') @@ -64,6 +71,8 @@ client.on('message', function (topic, message) { return handleRequestOpen(message) case 'lupe/close': return handleRequestClose(message) + case 'lupe/decir': + return handleRequestDecir(message) case 'lupe/say': return handleRequestSay(message) @@ -161,8 +170,12 @@ function handleRequestClose (message) { } } +function handleRequestDecir (message) { + espeakDecir(message) +} + function handleRequestSay (message) { - espeak(message) + espeakSay(message) } function handleLupe (message) { diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 6078c970..bd757fa2 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -8,7 +8,9 @@ export HOCHOB_SERVER_CONFIGURATION=/tmp/hochob/ test -d $HOCHOB_SERVER_CONFIGURATION || mkdir -p $HOCHOB_SERVER_CONFIGURATION + export HOCHOB_SERVER_CONFIGURATION_LANGUAGE=$HOCHOB_SERVER_CONFIGURATION/language +export HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE=$HOCHOB_SERVER_CONFIGURATION/robotavailable # Hochob Server Root @@ -152,7 +154,7 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport -MQTT_SERVER_ADDRESS=127.0.0.1 +MQTT_SERVER_ADDRESS=iot.eclipse.org MQTT_SERVER_PORT=1883 # ============================================================================= From fa3a2eaf7c915e86920e31f64aa71132d23d0506 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 09:15:54 -0500 Subject: [PATCH 0442/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Services/Robot/RobotAvailable.sh | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 Hochob/Services/Robot/RobotAvailable.sh diff --git a/Hochob/Services/Robot/RobotAvailable.sh b/Hochob/Services/Robot/RobotAvailable.sh new file mode 100755 index 00000000..91811741 --- /dev/null +++ b/Hochob/Services/Robot/RobotAvailable.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ROBOTAVAILABLE_PID=$$ + +LOCAL_COMMAND="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ -z "$1" ] +then + cat $HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE +else + echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE +fi + +# End of File From 6bddecafaee23eb42214487965bf99e2ae1497c7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 09:23:53 -0500 Subject: [PATCH 0443/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/LupeRobot/Virtual/amikoo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/LupeRobot/Virtual/amikoo.js b/Hochob/LupeRobot/Virtual/amikoo.js index 3e6eeef7..ef178c94 100644 --- a/Hochob/LupeRobot/Virtual/amikoo.js +++ b/Hochob/LupeRobot/Virtual/amikoo.js @@ -15,7 +15,7 @@ function espeakDecir(phrase) { function espeakSay(phrase) { var sleep = require('sleep') - exec("echo " + phrase + " | espeak -v es-us -a 200 -w audio.wav", puts); + exec("echo " + phrase + " | espeak -v en-us -a 200 -w audio.wav", puts); sleep.msleep(500); exec("aplay audio.wav", puts); } From d9716e23a547c4e78727fa0eee62d37914abe194 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 09:43:56 -0500 Subject: [PATCH 0444/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Main.sh | 7 ++++++- Hochob/Services/Robot/Remote/Robot.sh | 10 ++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index bd757fa2..6253989c 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -9,6 +9,7 @@ export HOCHOB_SERVER_CONFIGURATION=/tmp/hochob/ test -d $HOCHOB_SERVER_CONFIGURATION || mkdir -p $HOCHOB_SERVER_CONFIGURATION +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 @@ -19,6 +20,8 @@ export HOCHOB_ROOT=`pwd` # Hochob Server Services +export HOCHOB_SERVER=$HOCHOB_ROOT + export HOCHOB_SERVER_SERVICES=$HOCHOB_ROOT/Services/ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ @@ -38,6 +41,8 @@ export HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST=$HOCHOB_SERVER_SERVICES_S export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ export HOCHOB_SERVER_SERVICES_VISITORS=$HOCHOB_SERVER_SERVICES/Visitors/ +export PATH=$PATH:$HOCHOB_SERVER +export PATH=$PATH:$HOCHOB_SERVER_SERVICES export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT @@ -154,7 +159,7 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport -MQTT_SERVER_ADDRESS=iot.eclipse.org +MQTT_SERVER_ADDRESS=localhost MQTT_SERVER_PORT=1883 # ============================================================================= diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index 8ef8e08a..39dd3515 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -25,15 +25,17 @@ LOCAL_MESSAGE="$2" if [ $# -eq 2 ] then - if [ "$HOCHOBDEMO" != "1" ] - then - Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE - else + + LOCAL_DEMO=`Demo.sh` + if [ "$LOCAL_DEMO" -eq "1" ]; then if [ "$LOCAL_MESSAGE" != "1" ] then Espeak.sh on spanish "$LOCAL_MESSAGE" fi + else + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE fi + else echo "Invalid number of arguments, see Documentation" exit 1 From 36354c90d31e4172c164546b19701139957d0144 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 16:44:07 -0500 Subject: [PATCH 0445/1653] Update Signed-off-by: Abraham Arce Moreno --- .../BajaCaliforniaNorte.sh.Backup | 55 +++++++++++++++++ .../BajaCaliforniaSurLocal.sh | 58 ++++++++++++++++++ Hochob/Photography/Media/__init__.py | 0 Hochob/Photography/selfie.py | 35 ----------- Hochob/Photography/xcamera.py | 39 ------------ Hochob/{ => Sandbox}/Audio/.asoundrc | 0 Hochob/{ => Sandbox}/Audio/Kill.sh | 0 Hochob/{ => Sandbox}/Audio/Pause.sh | 0 Hochob/{ => Sandbox}/Audio/Play.sh | 0 Hochob/{ => Sandbox}/Audio/Section01.sh | 0 Hochob/{ => Sandbox}/Audio/Section02.sh | 0 Hochob/{ => Sandbox}/Audio/Section03.sh | 0 Hochob/{ => Sandbox}/Audio/Section04.sh | 0 Hochob/{ => Sandbox}/Audio/Section05.sh | 0 Hochob/{ => Sandbox}/Audio/Section06.sh | 0 Hochob/{ => Sandbox}/Audio/Section07.sh | 0 Hochob/{ => Sandbox}/Audio/Section08.sh | 0 Hochob/{ => Sandbox}/Audio/Section09.sh | 0 Hochob/{ => Sandbox}/Audio/Section10.sh | 0 Hochob/{ => Sandbox}/Audio/Section11.sh | 0 Hochob/{ => Sandbox}/Audio/Section12.sh | 0 Hochob/{ => Sandbox}/Audio/Stop.sh | 0 .../Audio/configuration/default.pa | 0 .../Audio/configuration/default.pa.kali | 0 .../{ => Sandbox}/LupeRobot/Hochob/.cproject | 0 .../{ => Sandbox}/LupeRobot/Hochob/.project | 0 .../.settings/com.intel.core.project.prefs | 0 .../com.intel.iotdevkit.packages.prefs | 0 .../Hochob/.settings/language.settings.xml | 0 .../org.eclipse.cdt.codan.core.prefs | 0 .../.settings/org.eclipse.cdt.core.prefs | 0 .../org.eclipse.cdt.managedbuilder.core.prefs | 0 .../LupeRobot/Hochob/Debug/Hochob | Bin .../Hochob/Debug/src/Intel_Edison_BT_SPP.o | Bin .../Hochob/Debug/src/SparkFun_TB6612_Edison.o | Bin .../Debug/src/SparkFun_pca9685_Edison.o | Bin .../LupeRobot/Hochob/Debug/src/blink.o | Bin .../LupeRobot/Hochob/Hochob.launch | 0 .../{ => Sandbox}/LupeRobot/Hochob/README.md | 0 .../LupeRobot/Hochob/Release/lupefinal.js | 0 .../LupeRobot/Hochob/Release/music.wav | Bin .../LupeRobot/Hochob/Release/roboto_short.wav | Bin .../Release/src/SparkFun_TB6612_Edison.o | Bin .../Release/src/SparkFun_pca9685_Edison.o | Bin .../LupeRobot/Hochob/src/bluetoothspp.cpp | 0 .../LupeRobot/Hochob/src/bluetoothspp.hpp | 0 .../LupeRobot/Hochob/src/cpp.json | 0 .../LupeRobot/Hochob/src/main.cpp | 0 .../LupeRobot/Hochob/src/pca9685.cpp | 0 .../LupeRobot/Hochob/src/pca9685.h | 0 .../LupeRobot/Hochob/src/tb6612.cpp | 0 .../LupeRobot/Hochob/src/tb6612.h | 0 .../Learning/Presentation/Presentation.sh | 0 .../Learning/Recognize/PyAudioPlay.py | 0 .../LupeRobot/Learning/Recognize/Recognize.sh | 0 .../Learning/Recognize/SrGoogleEn.py | 0 .../Learning/Recognize/SrGoogleEs.py | 0 .../LupeRobot/Learning/Recognize/__init__.py | 0 .../LupeRobot/Learning/Recognize/beep.wav | Bin .../LupeRobot/Sandbox/SPP-loopback.py | 0 .../LupeRobot/Sandbox/bluetoothlr.sh | 0 .../LupeRobot/Sandbox/bluetoothspp.py | 0 .../{ => Sandbox}/LupeRobot/Sandbox/btup.sh | 0 .../LupeRobot/Scripts/servicesoff.sh | 0 .../LupeRobot/Scripts/serviceson.sh | 0 Hochob/{ => Sandbox}/LupeRobot/Scripts/tts.sh | 0 .../{ => Sandbox}/LupeRobot/Show/LupeRobot.sh | 0 .../LupeRobot/Show/LupeRobot01.sh | 0 .../LupeRobot/Show/LupeRobot1080p.sh | 0 .../LupeRobot/Show/LupeRobot1080p01.sh | 0 .../LupeRobot/Show/LupeRobot720p.sh | 0 .../LupeRobot/Show/LupeRobot720p01.sh | 0 .../LupeRobot/Show/LupeRobotKill.sh | 0 .../{ => Sandbox}/LupeRobot/Virtual/amikoo.js | 0 .../{ => Sandbox}/LupeRobot/Virtual/amikoo.sh | 0 .../LupeRobot/Virtual/command.js | 0 .../{ => Sandbox}/LupeRobot/Virtual/ispeak.js | 0 .../LupeRobot/Virtual/testing.sh | 0 Hochob/{ => Sandbox}/Usb/wiusb.sh | 0 Hochob/{ => Sandbox}/Usb/wiusb0.sh | 0 .../Sound}/PulseAudio/default.pa | 0 81 files changed, 113 insertions(+), 74 deletions(-) create mode 100755 Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup create mode 100755 Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh delete mode 100644 Hochob/Photography/Media/__init__.py delete mode 100755 Hochob/Photography/selfie.py delete mode 100755 Hochob/Photography/xcamera.py rename Hochob/{ => Sandbox}/Audio/.asoundrc (100%) rename Hochob/{ => Sandbox}/Audio/Kill.sh (100%) rename Hochob/{ => Sandbox}/Audio/Pause.sh (100%) rename Hochob/{ => Sandbox}/Audio/Play.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section01.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section02.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section03.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section04.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section05.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section06.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section07.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section08.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section09.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section10.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section11.sh (100%) rename Hochob/{ => Sandbox}/Audio/Section12.sh (100%) rename Hochob/{ => Sandbox}/Audio/Stop.sh (100%) rename Hochob/{ => Sandbox}/Audio/configuration/default.pa (100%) rename Hochob/{ => Sandbox}/Audio/configuration/default.pa.kali (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/.cproject (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/.project (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/.settings/com.intel.core.project.prefs (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/.settings/com.intel.iotdevkit.packages.prefs (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/.settings/language.settings.xml (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/.settings/org.eclipse.cdt.codan.core.prefs (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/.settings/org.eclipse.cdt.core.prefs (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/.settings/org.eclipse.cdt.managedbuilder.core.prefs (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Debug/Hochob (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Debug/src/Intel_Edison_BT_SPP.o (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Debug/src/SparkFun_TB6612_Edison.o (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Debug/src/SparkFun_pca9685_Edison.o (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Debug/src/blink.o (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Hochob.launch (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/README.md (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Release/lupefinal.js (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Release/music.wav (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Release/roboto_short.wav (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Release/src/SparkFun_TB6612_Edison.o (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/Release/src/SparkFun_pca9685_Edison.o (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/src/bluetoothspp.cpp (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/src/bluetoothspp.hpp (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/src/cpp.json (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/src/main.cpp (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/src/pca9685.cpp (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/src/pca9685.h (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/src/tb6612.cpp (100%) rename Hochob/{ => Sandbox}/LupeRobot/Hochob/src/tb6612.h (100%) rename Hochob/{ => Sandbox}/LupeRobot/Learning/Presentation/Presentation.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Learning/Recognize/PyAudioPlay.py (100%) rename Hochob/{ => Sandbox}/LupeRobot/Learning/Recognize/Recognize.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Learning/Recognize/SrGoogleEn.py (100%) rename Hochob/{ => Sandbox}/LupeRobot/Learning/Recognize/SrGoogleEs.py (100%) rename Hochob/{ => Sandbox}/LupeRobot/Learning/Recognize/__init__.py (100%) rename Hochob/{ => Sandbox}/LupeRobot/Learning/Recognize/beep.wav (100%) rename Hochob/{ => Sandbox}/LupeRobot/Sandbox/SPP-loopback.py (100%) rename Hochob/{ => Sandbox}/LupeRobot/Sandbox/bluetoothlr.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Sandbox/bluetoothspp.py (100%) rename Hochob/{ => Sandbox}/LupeRobot/Sandbox/btup.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Scripts/servicesoff.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Scripts/serviceson.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Scripts/tts.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Show/LupeRobot.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Show/LupeRobot01.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Show/LupeRobot1080p.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Show/LupeRobot1080p01.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Show/LupeRobot720p.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Show/LupeRobot720p01.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Show/LupeRobotKill.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Virtual/amikoo.js (100%) rename Hochob/{ => Sandbox}/LupeRobot/Virtual/amikoo.sh (100%) rename Hochob/{ => Sandbox}/LupeRobot/Virtual/command.js (100%) rename Hochob/{ => Sandbox}/LupeRobot/Virtual/ispeak.js (100%) rename Hochob/{ => Sandbox}/LupeRobot/Virtual/testing.sh (100%) rename Hochob/{ => Sandbox}/Usb/wiusb.sh (100%) rename Hochob/{ => Sandbox}/Usb/wiusb0.sh (100%) rename Hochob/{ => Services/Sound}/PulseAudio/default.pa (100%) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup new file mode 100755 index 00000000..c5ed8a67 --- /dev/null +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup @@ -0,0 +1,55 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export BAJACALIFORNIANORTE_PID=$$ +export BAJACALIFORNIANORTE_NAME="Baja California Norte Application" +export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") +export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & + +Eog.sh "$VISITORSCENTER_IMAGE/*" & +sleep 5 +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & +sleep 19.2 + +LOCAL_ROBOTAVAILABLE=`RobotAvailable.sh` +if [ "$LOCAL_ROBOTAVAILABLE" -eq "0" ]; then + Espeak.sh on spanish "Nel" +else + Robot.sh lupe/say "Nel" +fi + +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/resetall 1 +sleep 5 + +kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh new file mode 100755 index 00000000..73e00040 --- /dev/null +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -0,0 +1,58 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export BAJACALIFORNIASUR_PID=$$ +export BAJACALIFORNIASUR_NAME="Baja California Sur Application" +export BAJACALIFORNIASUR_PATH=$(readlink -f "$0") +export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & + +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" +Robot.sh lupe/say "Hola a todos" + +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" +sleep 6.35 && Robot.sh lupe/say "Perdon! Lo se!, Es que me emociono!" + +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" +sleep 2.7 && Robot.sh lupe/say "Por supuesto" + +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" +sleep 37.5 && Robot.sh lupe/say "En mi caso, mi cerebro esta aqui, en la caja azul!" + +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" +sleep 25.5 && Robot.sh lupe/say "Yo funciono con la plataforma Intel Edison" + +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" + +wait + +Espeak.sh off spanish \ +"Muchas gracias Futuros Ingenieros!. +A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! +Los esperamos muy pronto!" + +MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" + +wait + +kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') + +# End of File diff --git a/Hochob/Photography/Media/__init__.py b/Hochob/Photography/Media/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/Hochob/Photography/selfie.py b/Hochob/Photography/selfie.py deleted file mode 100755 index 1ebca67c..00000000 --- a/Hochob/Photography/selfie.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python - -import os -import time - -from xcamera import takePhoto -from subprocess import call - -if __name__ == "__main__": - - directorycurrent = os.path.dirname(os.path.realpath(__file__)) - - mediapath = directorycurrent + "/Media/" - - picturename = time.strftime("%Y%m%d-%H%M%S") + ".jpg" - picturepath = mediapath + picturename - - videoname = time.strftime("%Y%m%d-%H%M%S") + ".mp4" - videopath = mediapath + videoname - - for i in range(1,240): - name = "%02d" % i + ".jpg" - picture = mediapath + name - call(["cp", picture, "/home/hochob/Pictures/"]) - takePhoto(picture) - - takePhoto(picturename) - - pictures = mediapath + "%02d.jpg" - #call(["ffmpeg", "-framerate", "30", "-i", pictures, "-vf", "fps=30", "-pix_fmt", "yuv420p", videopath]) - call(["ffmpeg", "-framerate", "10", "-i", pictures, "-vf", "fps=10", "-pix_fmt", "yuv420p", videopath]) - call(["cp", videopath, "/home/hochob/VideosSelfies/"]) - call(["mv", videopath, "/home/hochob/VideosSelfies/latest.mp4"]) - -# End of File diff --git a/Hochob/Photography/xcamera.py b/Hochob/Photography/xcamera.py deleted file mode 100755 index 39e00732..00000000 --- a/Hochob/Photography/xcamera.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/python - -import commands -import logging -import os - -class xCamera(object): - - def __init__(self, media="Pictures/photo.jpg"): - self.picturefswebcam = media - - def __del__(self): - pass - - def filepath(self): - return self.picturefswebcam - - def setup(self): - self.fswebcam = 'fswebcam' - self.fswebcamarguments = ' -r 1280x720 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner ' - #self.fswebcamarguments = ' -r 1280x720 --jpeg 100 --no-banner ' - self.fswebcamcommand = self.fswebcam + self.fswebcamarguments + self.picturefswebcam - - def capture(self): - - self.setup() - status, output = commands.getstatusoutput(self.fswebcamcommand) - -def takePhoto(photoname): - - idCamera = xCamera(photoname) - idCamera.capture() - -if __name__ == "__main__": - - idCamera = xCamera() - idCamera.capture() - -# End of File diff --git a/Hochob/Audio/.asoundrc b/Hochob/Sandbox/Audio/.asoundrc similarity index 100% rename from Hochob/Audio/.asoundrc rename to Hochob/Sandbox/Audio/.asoundrc diff --git a/Hochob/Audio/Kill.sh b/Hochob/Sandbox/Audio/Kill.sh similarity index 100% rename from Hochob/Audio/Kill.sh rename to Hochob/Sandbox/Audio/Kill.sh diff --git a/Hochob/Audio/Pause.sh b/Hochob/Sandbox/Audio/Pause.sh similarity index 100% rename from Hochob/Audio/Pause.sh rename to Hochob/Sandbox/Audio/Pause.sh diff --git a/Hochob/Audio/Play.sh b/Hochob/Sandbox/Audio/Play.sh similarity index 100% rename from Hochob/Audio/Play.sh rename to Hochob/Sandbox/Audio/Play.sh diff --git a/Hochob/Audio/Section01.sh b/Hochob/Sandbox/Audio/Section01.sh similarity index 100% rename from Hochob/Audio/Section01.sh rename to Hochob/Sandbox/Audio/Section01.sh diff --git a/Hochob/Audio/Section02.sh b/Hochob/Sandbox/Audio/Section02.sh similarity index 100% rename from Hochob/Audio/Section02.sh rename to Hochob/Sandbox/Audio/Section02.sh diff --git a/Hochob/Audio/Section03.sh b/Hochob/Sandbox/Audio/Section03.sh similarity index 100% rename from Hochob/Audio/Section03.sh rename to Hochob/Sandbox/Audio/Section03.sh diff --git a/Hochob/Audio/Section04.sh b/Hochob/Sandbox/Audio/Section04.sh similarity index 100% rename from Hochob/Audio/Section04.sh rename to Hochob/Sandbox/Audio/Section04.sh diff --git a/Hochob/Audio/Section05.sh b/Hochob/Sandbox/Audio/Section05.sh similarity index 100% rename from Hochob/Audio/Section05.sh rename to Hochob/Sandbox/Audio/Section05.sh diff --git a/Hochob/Audio/Section06.sh b/Hochob/Sandbox/Audio/Section06.sh similarity index 100% rename from Hochob/Audio/Section06.sh rename to Hochob/Sandbox/Audio/Section06.sh diff --git a/Hochob/Audio/Section07.sh b/Hochob/Sandbox/Audio/Section07.sh similarity index 100% rename from Hochob/Audio/Section07.sh rename to Hochob/Sandbox/Audio/Section07.sh diff --git a/Hochob/Audio/Section08.sh b/Hochob/Sandbox/Audio/Section08.sh similarity index 100% rename from Hochob/Audio/Section08.sh rename to Hochob/Sandbox/Audio/Section08.sh diff --git a/Hochob/Audio/Section09.sh b/Hochob/Sandbox/Audio/Section09.sh similarity index 100% rename from Hochob/Audio/Section09.sh rename to Hochob/Sandbox/Audio/Section09.sh diff --git a/Hochob/Audio/Section10.sh b/Hochob/Sandbox/Audio/Section10.sh similarity index 100% rename from Hochob/Audio/Section10.sh rename to Hochob/Sandbox/Audio/Section10.sh diff --git a/Hochob/Audio/Section11.sh b/Hochob/Sandbox/Audio/Section11.sh similarity index 100% rename from Hochob/Audio/Section11.sh rename to Hochob/Sandbox/Audio/Section11.sh diff --git a/Hochob/Audio/Section12.sh b/Hochob/Sandbox/Audio/Section12.sh similarity index 100% rename from Hochob/Audio/Section12.sh rename to Hochob/Sandbox/Audio/Section12.sh diff --git a/Hochob/Audio/Stop.sh b/Hochob/Sandbox/Audio/Stop.sh similarity index 100% rename from Hochob/Audio/Stop.sh rename to Hochob/Sandbox/Audio/Stop.sh diff --git a/Hochob/Audio/configuration/default.pa b/Hochob/Sandbox/Audio/configuration/default.pa similarity index 100% rename from Hochob/Audio/configuration/default.pa rename to Hochob/Sandbox/Audio/configuration/default.pa diff --git a/Hochob/Audio/configuration/default.pa.kali b/Hochob/Sandbox/Audio/configuration/default.pa.kali similarity index 100% rename from Hochob/Audio/configuration/default.pa.kali rename to Hochob/Sandbox/Audio/configuration/default.pa.kali diff --git a/Hochob/LupeRobot/Hochob/.cproject b/Hochob/Sandbox/LupeRobot/Hochob/.cproject similarity index 100% rename from Hochob/LupeRobot/Hochob/.cproject rename to Hochob/Sandbox/LupeRobot/Hochob/.cproject diff --git a/Hochob/LupeRobot/Hochob/.project b/Hochob/Sandbox/LupeRobot/Hochob/.project similarity index 100% rename from Hochob/LupeRobot/Hochob/.project rename to Hochob/Sandbox/LupeRobot/Hochob/.project diff --git a/Hochob/LupeRobot/Hochob/.settings/com.intel.core.project.prefs b/Hochob/Sandbox/LupeRobot/Hochob/.settings/com.intel.core.project.prefs similarity index 100% rename from Hochob/LupeRobot/Hochob/.settings/com.intel.core.project.prefs rename to Hochob/Sandbox/LupeRobot/Hochob/.settings/com.intel.core.project.prefs diff --git a/Hochob/LupeRobot/Hochob/.settings/com.intel.iotdevkit.packages.prefs b/Hochob/Sandbox/LupeRobot/Hochob/.settings/com.intel.iotdevkit.packages.prefs similarity index 100% rename from Hochob/LupeRobot/Hochob/.settings/com.intel.iotdevkit.packages.prefs rename to Hochob/Sandbox/LupeRobot/Hochob/.settings/com.intel.iotdevkit.packages.prefs diff --git a/Hochob/LupeRobot/Hochob/.settings/language.settings.xml b/Hochob/Sandbox/LupeRobot/Hochob/.settings/language.settings.xml similarity index 100% rename from Hochob/LupeRobot/Hochob/.settings/language.settings.xml rename to Hochob/Sandbox/LupeRobot/Hochob/.settings/language.settings.xml diff --git a/Hochob/LupeRobot/Hochob/.settings/org.eclipse.cdt.codan.core.prefs b/Hochob/Sandbox/LupeRobot/Hochob/.settings/org.eclipse.cdt.codan.core.prefs similarity index 100% rename from Hochob/LupeRobot/Hochob/.settings/org.eclipse.cdt.codan.core.prefs rename to Hochob/Sandbox/LupeRobot/Hochob/.settings/org.eclipse.cdt.codan.core.prefs diff --git a/Hochob/LupeRobot/Hochob/.settings/org.eclipse.cdt.core.prefs b/Hochob/Sandbox/LupeRobot/Hochob/.settings/org.eclipse.cdt.core.prefs similarity index 100% rename from Hochob/LupeRobot/Hochob/.settings/org.eclipse.cdt.core.prefs rename to Hochob/Sandbox/LupeRobot/Hochob/.settings/org.eclipse.cdt.core.prefs diff --git a/Hochob/LupeRobot/Hochob/.settings/org.eclipse.cdt.managedbuilder.core.prefs b/Hochob/Sandbox/LupeRobot/Hochob/.settings/org.eclipse.cdt.managedbuilder.core.prefs similarity index 100% rename from Hochob/LupeRobot/Hochob/.settings/org.eclipse.cdt.managedbuilder.core.prefs rename to Hochob/Sandbox/LupeRobot/Hochob/.settings/org.eclipse.cdt.managedbuilder.core.prefs diff --git a/Hochob/LupeRobot/Hochob/Debug/Hochob b/Hochob/Sandbox/LupeRobot/Hochob/Debug/Hochob similarity index 100% rename from Hochob/LupeRobot/Hochob/Debug/Hochob rename to Hochob/Sandbox/LupeRobot/Hochob/Debug/Hochob diff --git a/Hochob/LupeRobot/Hochob/Debug/src/Intel_Edison_BT_SPP.o b/Hochob/Sandbox/LupeRobot/Hochob/Debug/src/Intel_Edison_BT_SPP.o similarity index 100% rename from Hochob/LupeRobot/Hochob/Debug/src/Intel_Edison_BT_SPP.o rename to Hochob/Sandbox/LupeRobot/Hochob/Debug/src/Intel_Edison_BT_SPP.o diff --git a/Hochob/LupeRobot/Hochob/Debug/src/SparkFun_TB6612_Edison.o b/Hochob/Sandbox/LupeRobot/Hochob/Debug/src/SparkFun_TB6612_Edison.o similarity index 100% rename from Hochob/LupeRobot/Hochob/Debug/src/SparkFun_TB6612_Edison.o rename to Hochob/Sandbox/LupeRobot/Hochob/Debug/src/SparkFun_TB6612_Edison.o diff --git a/Hochob/LupeRobot/Hochob/Debug/src/SparkFun_pca9685_Edison.o b/Hochob/Sandbox/LupeRobot/Hochob/Debug/src/SparkFun_pca9685_Edison.o similarity index 100% rename from Hochob/LupeRobot/Hochob/Debug/src/SparkFun_pca9685_Edison.o rename to Hochob/Sandbox/LupeRobot/Hochob/Debug/src/SparkFun_pca9685_Edison.o diff --git a/Hochob/LupeRobot/Hochob/Debug/src/blink.o b/Hochob/Sandbox/LupeRobot/Hochob/Debug/src/blink.o similarity index 100% rename from Hochob/LupeRobot/Hochob/Debug/src/blink.o rename to Hochob/Sandbox/LupeRobot/Hochob/Debug/src/blink.o diff --git a/Hochob/LupeRobot/Hochob/Hochob.launch b/Hochob/Sandbox/LupeRobot/Hochob/Hochob.launch similarity index 100% rename from Hochob/LupeRobot/Hochob/Hochob.launch rename to Hochob/Sandbox/LupeRobot/Hochob/Hochob.launch diff --git a/Hochob/LupeRobot/Hochob/README.md b/Hochob/Sandbox/LupeRobot/Hochob/README.md similarity index 100% rename from Hochob/LupeRobot/Hochob/README.md rename to Hochob/Sandbox/LupeRobot/Hochob/README.md diff --git a/Hochob/LupeRobot/Hochob/Release/lupefinal.js b/Hochob/Sandbox/LupeRobot/Hochob/Release/lupefinal.js similarity index 100% rename from Hochob/LupeRobot/Hochob/Release/lupefinal.js rename to Hochob/Sandbox/LupeRobot/Hochob/Release/lupefinal.js diff --git a/Hochob/LupeRobot/Hochob/Release/music.wav b/Hochob/Sandbox/LupeRobot/Hochob/Release/music.wav similarity index 100% rename from Hochob/LupeRobot/Hochob/Release/music.wav rename to Hochob/Sandbox/LupeRobot/Hochob/Release/music.wav diff --git a/Hochob/LupeRobot/Hochob/Release/roboto_short.wav b/Hochob/Sandbox/LupeRobot/Hochob/Release/roboto_short.wav similarity index 100% rename from Hochob/LupeRobot/Hochob/Release/roboto_short.wav rename to Hochob/Sandbox/LupeRobot/Hochob/Release/roboto_short.wav diff --git a/Hochob/LupeRobot/Hochob/Release/src/SparkFun_TB6612_Edison.o b/Hochob/Sandbox/LupeRobot/Hochob/Release/src/SparkFun_TB6612_Edison.o similarity index 100% rename from Hochob/LupeRobot/Hochob/Release/src/SparkFun_TB6612_Edison.o rename to Hochob/Sandbox/LupeRobot/Hochob/Release/src/SparkFun_TB6612_Edison.o diff --git a/Hochob/LupeRobot/Hochob/Release/src/SparkFun_pca9685_Edison.o b/Hochob/Sandbox/LupeRobot/Hochob/Release/src/SparkFun_pca9685_Edison.o similarity index 100% rename from Hochob/LupeRobot/Hochob/Release/src/SparkFun_pca9685_Edison.o rename to Hochob/Sandbox/LupeRobot/Hochob/Release/src/SparkFun_pca9685_Edison.o diff --git a/Hochob/LupeRobot/Hochob/src/bluetoothspp.cpp b/Hochob/Sandbox/LupeRobot/Hochob/src/bluetoothspp.cpp similarity index 100% rename from Hochob/LupeRobot/Hochob/src/bluetoothspp.cpp rename to Hochob/Sandbox/LupeRobot/Hochob/src/bluetoothspp.cpp diff --git a/Hochob/LupeRobot/Hochob/src/bluetoothspp.hpp b/Hochob/Sandbox/LupeRobot/Hochob/src/bluetoothspp.hpp similarity index 100% rename from Hochob/LupeRobot/Hochob/src/bluetoothspp.hpp rename to Hochob/Sandbox/LupeRobot/Hochob/src/bluetoothspp.hpp diff --git a/Hochob/LupeRobot/Hochob/src/cpp.json b/Hochob/Sandbox/LupeRobot/Hochob/src/cpp.json similarity index 100% rename from Hochob/LupeRobot/Hochob/src/cpp.json rename to Hochob/Sandbox/LupeRobot/Hochob/src/cpp.json diff --git a/Hochob/LupeRobot/Hochob/src/main.cpp b/Hochob/Sandbox/LupeRobot/Hochob/src/main.cpp similarity index 100% rename from Hochob/LupeRobot/Hochob/src/main.cpp rename to Hochob/Sandbox/LupeRobot/Hochob/src/main.cpp diff --git a/Hochob/LupeRobot/Hochob/src/pca9685.cpp b/Hochob/Sandbox/LupeRobot/Hochob/src/pca9685.cpp similarity index 100% rename from Hochob/LupeRobot/Hochob/src/pca9685.cpp rename to Hochob/Sandbox/LupeRobot/Hochob/src/pca9685.cpp diff --git a/Hochob/LupeRobot/Hochob/src/pca9685.h b/Hochob/Sandbox/LupeRobot/Hochob/src/pca9685.h similarity index 100% rename from Hochob/LupeRobot/Hochob/src/pca9685.h rename to Hochob/Sandbox/LupeRobot/Hochob/src/pca9685.h diff --git a/Hochob/LupeRobot/Hochob/src/tb6612.cpp b/Hochob/Sandbox/LupeRobot/Hochob/src/tb6612.cpp similarity index 100% rename from Hochob/LupeRobot/Hochob/src/tb6612.cpp rename to Hochob/Sandbox/LupeRobot/Hochob/src/tb6612.cpp diff --git a/Hochob/LupeRobot/Hochob/src/tb6612.h b/Hochob/Sandbox/LupeRobot/Hochob/src/tb6612.h similarity index 100% rename from Hochob/LupeRobot/Hochob/src/tb6612.h rename to Hochob/Sandbox/LupeRobot/Hochob/src/tb6612.h diff --git a/Hochob/LupeRobot/Learning/Presentation/Presentation.sh b/Hochob/Sandbox/LupeRobot/Learning/Presentation/Presentation.sh similarity index 100% rename from Hochob/LupeRobot/Learning/Presentation/Presentation.sh rename to Hochob/Sandbox/LupeRobot/Learning/Presentation/Presentation.sh diff --git a/Hochob/LupeRobot/Learning/Recognize/PyAudioPlay.py b/Hochob/Sandbox/LupeRobot/Learning/Recognize/PyAudioPlay.py similarity index 100% rename from Hochob/LupeRobot/Learning/Recognize/PyAudioPlay.py rename to Hochob/Sandbox/LupeRobot/Learning/Recognize/PyAudioPlay.py diff --git a/Hochob/LupeRobot/Learning/Recognize/Recognize.sh b/Hochob/Sandbox/LupeRobot/Learning/Recognize/Recognize.sh similarity index 100% rename from Hochob/LupeRobot/Learning/Recognize/Recognize.sh rename to Hochob/Sandbox/LupeRobot/Learning/Recognize/Recognize.sh diff --git a/Hochob/LupeRobot/Learning/Recognize/SrGoogleEn.py b/Hochob/Sandbox/LupeRobot/Learning/Recognize/SrGoogleEn.py similarity index 100% rename from Hochob/LupeRobot/Learning/Recognize/SrGoogleEn.py rename to Hochob/Sandbox/LupeRobot/Learning/Recognize/SrGoogleEn.py diff --git a/Hochob/LupeRobot/Learning/Recognize/SrGoogleEs.py b/Hochob/Sandbox/LupeRobot/Learning/Recognize/SrGoogleEs.py similarity index 100% rename from Hochob/LupeRobot/Learning/Recognize/SrGoogleEs.py rename to Hochob/Sandbox/LupeRobot/Learning/Recognize/SrGoogleEs.py diff --git a/Hochob/LupeRobot/Learning/Recognize/__init__.py b/Hochob/Sandbox/LupeRobot/Learning/Recognize/__init__.py similarity index 100% rename from Hochob/LupeRobot/Learning/Recognize/__init__.py rename to Hochob/Sandbox/LupeRobot/Learning/Recognize/__init__.py diff --git a/Hochob/LupeRobot/Learning/Recognize/beep.wav b/Hochob/Sandbox/LupeRobot/Learning/Recognize/beep.wav similarity index 100% rename from Hochob/LupeRobot/Learning/Recognize/beep.wav rename to Hochob/Sandbox/LupeRobot/Learning/Recognize/beep.wav diff --git a/Hochob/LupeRobot/Sandbox/SPP-loopback.py b/Hochob/Sandbox/LupeRobot/Sandbox/SPP-loopback.py similarity index 100% rename from Hochob/LupeRobot/Sandbox/SPP-loopback.py rename to Hochob/Sandbox/LupeRobot/Sandbox/SPP-loopback.py diff --git a/Hochob/LupeRobot/Sandbox/bluetoothlr.sh b/Hochob/Sandbox/LupeRobot/Sandbox/bluetoothlr.sh similarity index 100% rename from Hochob/LupeRobot/Sandbox/bluetoothlr.sh rename to Hochob/Sandbox/LupeRobot/Sandbox/bluetoothlr.sh diff --git a/Hochob/LupeRobot/Sandbox/bluetoothspp.py b/Hochob/Sandbox/LupeRobot/Sandbox/bluetoothspp.py similarity index 100% rename from Hochob/LupeRobot/Sandbox/bluetoothspp.py rename to Hochob/Sandbox/LupeRobot/Sandbox/bluetoothspp.py diff --git a/Hochob/LupeRobot/Sandbox/btup.sh b/Hochob/Sandbox/LupeRobot/Sandbox/btup.sh similarity index 100% rename from Hochob/LupeRobot/Sandbox/btup.sh rename to Hochob/Sandbox/LupeRobot/Sandbox/btup.sh diff --git a/Hochob/LupeRobot/Scripts/servicesoff.sh b/Hochob/Sandbox/LupeRobot/Scripts/servicesoff.sh similarity index 100% rename from Hochob/LupeRobot/Scripts/servicesoff.sh rename to Hochob/Sandbox/LupeRobot/Scripts/servicesoff.sh diff --git a/Hochob/LupeRobot/Scripts/serviceson.sh b/Hochob/Sandbox/LupeRobot/Scripts/serviceson.sh similarity index 100% rename from Hochob/LupeRobot/Scripts/serviceson.sh rename to Hochob/Sandbox/LupeRobot/Scripts/serviceson.sh diff --git a/Hochob/LupeRobot/Scripts/tts.sh b/Hochob/Sandbox/LupeRobot/Scripts/tts.sh similarity index 100% rename from Hochob/LupeRobot/Scripts/tts.sh rename to Hochob/Sandbox/LupeRobot/Scripts/tts.sh diff --git a/Hochob/LupeRobot/Show/LupeRobot.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot.sh similarity index 100% rename from Hochob/LupeRobot/Show/LupeRobot.sh rename to Hochob/Sandbox/LupeRobot/Show/LupeRobot.sh diff --git a/Hochob/LupeRobot/Show/LupeRobot01.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot01.sh similarity index 100% rename from Hochob/LupeRobot/Show/LupeRobot01.sh rename to Hochob/Sandbox/LupeRobot/Show/LupeRobot01.sh diff --git a/Hochob/LupeRobot/Show/LupeRobot1080p.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh similarity index 100% rename from Hochob/LupeRobot/Show/LupeRobot1080p.sh rename to Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh diff --git a/Hochob/LupeRobot/Show/LupeRobot1080p01.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p01.sh similarity index 100% rename from Hochob/LupeRobot/Show/LupeRobot1080p01.sh rename to Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p01.sh diff --git a/Hochob/LupeRobot/Show/LupeRobot720p.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p.sh similarity index 100% rename from Hochob/LupeRobot/Show/LupeRobot720p.sh rename to Hochob/Sandbox/LupeRobot/Show/LupeRobot720p.sh diff --git a/Hochob/LupeRobot/Show/LupeRobot720p01.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p01.sh similarity index 100% rename from Hochob/LupeRobot/Show/LupeRobot720p01.sh rename to Hochob/Sandbox/LupeRobot/Show/LupeRobot720p01.sh diff --git a/Hochob/LupeRobot/Show/LupeRobotKill.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobotKill.sh similarity index 100% rename from Hochob/LupeRobot/Show/LupeRobotKill.sh rename to Hochob/Sandbox/LupeRobot/Show/LupeRobotKill.sh diff --git a/Hochob/LupeRobot/Virtual/amikoo.js b/Hochob/Sandbox/LupeRobot/Virtual/amikoo.js similarity index 100% rename from Hochob/LupeRobot/Virtual/amikoo.js rename to Hochob/Sandbox/LupeRobot/Virtual/amikoo.js diff --git a/Hochob/LupeRobot/Virtual/amikoo.sh b/Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh similarity index 100% rename from Hochob/LupeRobot/Virtual/amikoo.sh rename to Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh diff --git a/Hochob/LupeRobot/Virtual/command.js b/Hochob/Sandbox/LupeRobot/Virtual/command.js similarity index 100% rename from Hochob/LupeRobot/Virtual/command.js rename to Hochob/Sandbox/LupeRobot/Virtual/command.js diff --git a/Hochob/LupeRobot/Virtual/ispeak.js b/Hochob/Sandbox/LupeRobot/Virtual/ispeak.js similarity index 100% rename from Hochob/LupeRobot/Virtual/ispeak.js rename to Hochob/Sandbox/LupeRobot/Virtual/ispeak.js diff --git a/Hochob/LupeRobot/Virtual/testing.sh b/Hochob/Sandbox/LupeRobot/Virtual/testing.sh similarity index 100% rename from Hochob/LupeRobot/Virtual/testing.sh rename to Hochob/Sandbox/LupeRobot/Virtual/testing.sh diff --git a/Hochob/Usb/wiusb.sh b/Hochob/Sandbox/Usb/wiusb.sh similarity index 100% rename from Hochob/Usb/wiusb.sh rename to Hochob/Sandbox/Usb/wiusb.sh diff --git a/Hochob/Usb/wiusb0.sh b/Hochob/Sandbox/Usb/wiusb0.sh similarity index 100% rename from Hochob/Usb/wiusb0.sh rename to Hochob/Sandbox/Usb/wiusb0.sh diff --git a/Hochob/PulseAudio/default.pa b/Hochob/Services/Sound/PulseAudio/default.pa similarity index 100% rename from Hochob/PulseAudio/default.pa rename to Hochob/Services/Sound/PulseAudio/default.pa From 8615fe47b6ad5282dd5f4765181cd81ae4b91210 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 16:44:30 -0500 Subject: [PATCH 0446/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Demo.sh | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100755 Hochob/Demo.sh diff --git a/Hochob/Demo.sh b/Hochob/Demo.sh new file mode 100755 index 00000000..db183f09 --- /dev/null +++ b/Hochob/Demo.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export DEMO_PID=$$ + +LOCAL_COMMAND="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ -z "$1" ] +then + cat $HOCHOB_SERVER_CONFIGURATION_DEMO +else + echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_DEMO +fi + +# End of File From 500cbe4750925b9fd16a8dd6c7f54a84a3c5b81b Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 18:07:58 -0500 Subject: [PATCH 0447/1653] Update Signed-off-by: Abraham Arce Moreno --- .../Applications/SouthernMayaHighlands/Aguascalientes.sh | 4 +++- .../SouthernMayaHighlands/BajaCaliforniaNorte.sh | 4 +++- .../SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup | 4 +++- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 3 ++- .../SouthernMayaHighlands/BajaCaliforniaSurLocal.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Guerrero.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Mexico.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Queretaro.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 8 ++++++-- Hochob/Main.sh | 5 +++++ 15 files changed, 49 insertions(+), 15 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 79ab2643..1121ffba 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export AGUASCALIENTES_PID=$$ -export AGUASCALIENTES_NAME="Aguascalientes Application" +export AGUASCALIENTES_NAME="Aguascalientes" export AGUASCALIENTES_PATH=$(readlink -f "$0") export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") @@ -23,6 +23,8 @@ export AGUASCALIENTES_DIRECTORY=$(dirname "$AGUASCALIENTES_PATH") # Main # ============================================================================= +LogPid.sh $AGUASCALIENTES_PID $AGUASCALIENTES_NAME + Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 221cd492..7b4f0a13 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export BAJACALIFORNIANORTE_PID=$$ -export BAJACALIFORNIANORTE_NAME="Baja California Norte Application" +export BAJACALIFORNIANORTE_NAME="BajaCaliforniaNorte" export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") @@ -23,6 +23,8 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # Main # ============================================================================= +LogPid.sh $BAJACALIFORNIANORTE_PID $BAJACALIFORNIANORTE_NAME + Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup index c5ed8a67..3a46d814 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export BAJACALIFORNIANORTE_PID=$$ -export BAJACALIFORNIANORTE_NAME="Baja California Norte Application" +export BAJACALIFORNIANORTE_NAME="BajaCaliforniaNorte" export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") @@ -23,6 +23,8 @@ export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") # Main # ============================================================================= +LogPid.sh $BAJACALIFORNIANORTE_PID $BAJACALIFORNIANORTE_NAME + Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index cb4a9e32..8e97cd4a 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export BAJACALIFORNIASUR_PID=$$ -export BAJACALIFORNIASUR_NAME="Baja California Sur Application" +export BAJACALIFORNIASUR_NAME="BajaCaliforniaSur" export BAJACALIFORNIASUR_PATH=$(readlink -f "$0") export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") @@ -23,6 +23,7 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= +LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index 73e00040..6d2bc5c4 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export BAJACALIFORNIASUR_PID=$$ -export BAJACALIFORNIASUR_NAME="Baja California Sur Application" +export BAJACALIFORNIASUR_NAME="BajaCaliforniaSur" export BAJACALIFORNIASUR_PATH=$(readlink -f "$0") export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") @@ -23,6 +23,8 @@ export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") # Main # ============================================================================= +LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME + Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 98bcd32f..1bdd7629 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export CAMPECHE_PID=$$ -export CAMPECHE_NAME="Campeche Application" +export CAMPECHE_NAME="Campeche" export CAMPECHE_PATH=$(readlink -f "$0") export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") @@ -23,6 +23,8 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= +LogPid.sh $CAMPECHE_PID $CAMPECHE_NAME + #Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" Eog.sh "$FSWEBCAM_ALLFILES" & sleep 1 diff --git a/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh b/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh index 44ae8f6c..77988c48 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export GUANAJUATO_PID=$$ -export GUANAJUATO_NAME="Guanajuato Application" +export GUANAJUATO_NAME="Guanajuato" export GUANAJUATO_PATH=$(readlink -f "$0") export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") @@ -23,6 +23,8 @@ export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") # Main # ============================================================================= +LogPid.sh $GUANAJUATO_PID $GUANAJUATO_NAME + Eog.sh "$CORPORATE_IMAGE/*" & # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh index d4ce2cb4..d8ad7909 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export GUERRERO_PID=$$ -export GUERRERO_NAME="Guerrero Application" +export GUERRERO_NAME="Guerrero" export GUERRERO_PATH=$(readlink -f "$0") export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") @@ -23,6 +23,8 @@ export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") # Main # ============================================================================= +LogPid.sh $GUERRERO_PID $GUERRERO_NAME + Vlc.sh "on" "$CORPORATE_VIDEO/*" # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh index 751d09f3..c1ec452f 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export HIDALGO_PID=$$ -export HIDALGO_NAME="Hidalgo Application" +export HIDALGO_NAME="Hidalgo" export HIDALGO_PATH=$(readlink -f "$0") export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") @@ -23,6 +23,8 @@ export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") # Main # ============================================================================= +LogPid.sh $HIDALGO_PID $HIDALGO_NAME + Eog.sh "$VISITORSCENTER_IMAGE/*" & # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh index 982cde16..a8608238 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export MEXICO_PID=$$ -export MEXICO_NAME="Mexico Application" +export MEXICO_NAME="Mexico" export MEXICO_PATH=$(readlink -f "$0") export MEXICO_DIRECTORY=$(dirname "$MEXICO_PATH") @@ -23,6 +23,8 @@ export MEXICO_DIRECTORY=$(dirname "$MEXICO_PATH") # Main # ============================================================================= +LogPid.sh $MEXICO_PID $MEXICO_NAME + Fswebcam.sh 360 # find dirname -type f | shuf -n 5 diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index ea1d4997..b001b3e6 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export MICHOACAN_PID=$$ -export MICHOACAN_NAME="Michoacan Application" +export MICHOACAN_NAME="Michoacan" export MICHOACAN_PATH=$(readlink -f "$0") export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") @@ -23,6 +23,8 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") # Main # ============================================================================= +LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME + Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 diff --git a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh index c1caa0e0..4f4bece9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export QUERETARO_PID=$$ -export QUERETARO_NAME="Queretaro Name" +export QUERETARO_NAME="Queretaro" export QUERETARO_PATH=$(readlink -f "$0") export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") @@ -23,6 +23,8 @@ export QUERETARO_DIRECTORY=$(dirname "$QUERETARO_PATH") # Main # ============================================================================= +LogPid.sh $QUERETARO_PID $QUERETARO_NAME + Eog.sh "$MEMORIES_CAMERA/*" & # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh index 573b4a3d..9fbb085e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh +++ b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export QUINTANAROO_PID=$$ -export QUINTANAROO_NAME="QuintanaRoo Name" +export QUINTANAROO_NAME="QuintanaRoo" export QUINTANAROO_PATH=$(readlink -f "$0") export QUINTANAROO_DIRECTORY=$(dirname "$QUINTANAROO_PATH") @@ -23,6 +23,8 @@ export QUINTANAROO_DIRECTORY=$(dirname "$QUINTANAROO_PATH") # Main # ============================================================================= +LogPid.sh $QUINTANAROO_PID $QUINTANAROO_NAME + Vlc.sh "on" "$MEMORIES_VIDEO/*" # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 5aa0ae08..7891f180 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export ZACATECAS_PID=$$ -export ZACATECAS_NAME="Zacatecas Application" +export ZACATECAS_NAME="Zacatecas" export ZACATECAS_PATH=$(readlink -f "$0") export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") @@ -23,12 +23,16 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= +LogPid.sh $ZACATECAS_PID $ZACATECAS_NAME + Memories.sh "20" "on" "${ZACATECAS_NAME}" Espeak.sh off spanish \ "Me da mucho gusto conocerlos y que hayan venido a Intel. \ Regresen pronto" MemoriesAudio.sh "${ZACATECAS_NAME}" -#kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') +sync + +kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') # End of File diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 6253989c..2e8db65b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -7,7 +7,10 @@ # Hochob Server Configuration export HOCHOB_SERVER_CONFIGURATION=/tmp/hochob/ +export HOCHOB_SERVER_CONFIGURATION_PID=$HOCHOB_SERVER_CONFIGURATION/pid/ + test -d $HOCHOB_SERVER_CONFIGURATION || mkdir -p $HOCHOB_SERVER_CONFIGURATION +test -d $HOCHOB_SERVER_CONFIGURATION_PID || mkdir -p $HOCHOB_SERVER_CONFIGURATION_PID export HOCHOB_SERVER_CONFIGURATION_DEMO=$HOCHOB_SERVER_CONFIGURATION/demo export HOCHOB_SERVER_CONFIGURATION_LANGUAGE=$HOCHOB_SERVER_CONFIGURATION/language @@ -28,6 +31,7 @@ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS=$HOCHOB_SERVER_SERVICES/Communications/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT=$HOCHOB_SERVER_SERVICES_COMMUNICATIONS/MqttClient/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ +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/ @@ -47,6 +51,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_KILL export PATH=$PATH:$HOCHOB_SERVER_SERVICES_LANGUAGE export PATH=$PATH:$HOCHOB_SERVER_SERVICES_MEMORIES export PATH=$PATH:$HOCHOB_SERVER_SERVICES_ROBOT From da94f44741515c60387c7e5603748bb3ce7183ae Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 22:17:14 -0500 Subject: [PATCH 0448/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 3 +-- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 1121ffba..62194c8a 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -29,7 +29,6 @@ Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh "$CORPORATE_IMAGE/*" & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" - -kill -- -$(ps -o pgid=$AGUASCALIENTES_PID | grep -o '[0-9]*') +KillApp.sh "eog" # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 7b4f0a13..410a3d3d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -45,6 +45,7 @@ sleep .6 Robot.sh lupe/resetall 1 sleep 5 -kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') +KillApp.sh "eog" +KillApp.sh "mpg123" # End of File From 30329490932f12b4c8756a1b051145d03574e1ef Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Thu, 8 Jun 2017 23:39:46 -0500 Subject: [PATCH 0449/1653] Update Signed-off-by: Abraham Arce Moreno --- .../Applications/CentralMayaLowlands/Acapulco.sh | 4 ++-- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 3 +-- .../Applications/CentralMayaLowlands/Huatulco.sh | 3 +-- .../Applications/CentralMayaLowlands/Mazatlan.sh | 2 -- .../CentralMayaLowlands/PuertoVallarta.sh | 3 +-- .../SouthernMayaHighlands/BajaCaliforniaNorte.sh | 3 ++- .../BajaCaliforniaSurLocal.sh | 15 ++++++++------- .../SouthernMayaHighlands/Campeche.sh | 3 ++- Hochob/Services/Video/Vlc.sh | 1 - 9 files changed, 17 insertions(+), 20 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 3c99bb15..28c31820 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -25,6 +25,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") Eog.sh $VISITORSCENTER_IMAGE/RP/RPP-May052017-4536.jpg & LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "Future Engineers. Welcome to this first hall! We called it: The Beginning. \ @@ -40,12 +41,11 @@ fi Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" else Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi -kill -- -$(ps -o pgid=$ACAPULCO_PID | grep -o '[0-9]*') - # End of File diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index 2ebf1e96..2d6a48ae 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -23,12 +23,11 @@ export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") # ============================================================================= LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" else Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" fi -kill -- -$(ps -o pgid=$CANCUN_PID | grep -o '[0-9]*') - # End of File diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 624220cc..675cebec 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -23,12 +23,11 @@ export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") # ============================================================================= LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/HuatulcoEnglish.mp3" else Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" fi -kill -- -$(ps -o pgid=$HUATULCO_PID | grep -o '[0-9]*') - # End of File diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 16666cc9..d3bd790c 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -43,6 +43,4 @@ else Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" fi -kill -- -$(ps -o pgid=$MAZATLAN_PID | grep -o '[0-9]*') - # End of File diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index 47870944..20e794c1 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -23,12 +23,11 @@ export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") # ============================================================================= LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallartaEnglish.mp3" else Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" fi -kill -- -$(ps -o pgid=$PUERTOVALLARTA_PID | grep -o '[0-9]*') - # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 410a3d3d..5eab1762 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -28,10 +28,11 @@ LogPid.sh $BAJACALIFORNIANORTE_PID $BAJACALIFORNIANORTE_NAME Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & -sleep 5 +sleep 2 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 19.2 Robot.sh lupe/say "Nel" +sleep .6 Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index 6d2bc5c4..d793b3c9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -27,19 +27,19 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & Robot.sh lupe/say "Hola a todos" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/say "Perdon! Lo se!, Es que me emociono!" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/say "Por supuesto" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" -sleep 37.5 && Robot.sh lupe/say "En mi caso, mi cerebro esta aqui, en la caja azul!" +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & +sleep 37.5 && Robot.sh lupe/say "En mi caso, mi cerebro esta aqui, en la caja azul!" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/say "Yo funciono con la plataforma Intel Edison" Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" @@ -55,6 +55,7 @@ MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" wait -kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') +KillApp.sh "cvlc" +KillApp.sh "vlc" # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 1bdd7629..949424a5 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -30,6 +30,7 @@ Eog.sh "$FSWEBCAM_ALLFILES" & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" -kill -- -$(ps -o pgid=$CAMPECHE_PID | grep -o '[0-9]*') +KillApp.sh "eog" +KillApp.sh "mpg123" # End of File diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/Vlc.sh index b0166ccd..d10f31e9 100755 --- a/Hochob/Services/Video/Vlc.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -26,7 +26,6 @@ LOCAL_FILE="$2" if [ $# -eq 2 ] then - killall -9 $VLC_BINARY if [ "$LOCAL_LOOP" = "on" ]; then $VLC_BINARY $VLC_ARGUMENTS $VLC_LOOP $LOCAL_FILE & elif [ "$LOCAL_LOOP" = "off" ]; then From cc0f680510b766d7a7390f437d7f45b56af5e580 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 8 Jun 2017 23:43:27 -0500 Subject: [PATCH 0450/1653] Create Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index b001b3e6..96193458 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -30,15 +30,15 @@ sleep .6 Robot.sh lupe/headleft 1 sleep .6 -RobotVirtual.sh "Tomaremos algunas fotos. Estan listos?" +Robot.sh lupe/say "Tomaremos algunas fotos. Estan listos?" sleep 1 -RobotVirtual.sh "3, 2, 1, Sonrian!" +Robot.sh lupe/say "3, 2, 1, Sonrian!" Memories.sh "10" "on" "${MICHOACAN_NAME}" & wait Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & -RobotVirtual.sh "Listo! Tenemos nuestra foto del recuerdo. Gracias Futuros Ingenieros." +Robot.sh lupe/say "Listo! Tenemos nuestra foto del recuerdo. Gracias Futuros Ingenieros." sleep 2 From 3d8037e80e266e28b5772e5af0ef9eca4ebeb435 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 8 Jun 2017 23:47:31 -0500 Subject: [PATCH 0451/1653] Create Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 96193458..307bdbc9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -33,12 +33,12 @@ sleep .6 Robot.sh lupe/say "Tomaremos algunas fotos. Estan listos?" sleep 1 Robot.sh lupe/say "3, 2, 1, Sonrian!" -Memories.sh "10" "on" "${MICHOACAN_NAME}" & +Memories.sh "5" "on" "${MICHOACAN_NAME}" & wait Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & -Robot.sh lupe/say "Listo! Tenemos nuestra foto del recuerdo. Gracias Futuros Ingenieros." +Robot.sh lupe/say "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." sleep 2 From 61b654770bed3f67d73b9f95677f2c668153bc5b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 8 Jun 2017 23:51:16 -0500 Subject: [PATCH 0452/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 307bdbc9..a32d2c10 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -42,6 +42,4 @@ Robot.sh lupe/say "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el re sleep 2 -kill -- -$(ps -o pgid=$MICHOACAN_PID | grep -o '[0-9]*') - # End of File From cf6b6bd37fac1dae021ad6103c12d970c612e05d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 8 Jun 2017 23:53:02 -0500 Subject: [PATCH 0453/1653] Create Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index a32d2c10..b561e398 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -40,6 +40,8 @@ wait Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & Robot.sh lupe/say "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." -sleep 2 +sleep 5 + +KillApp.sh "eog" # End of File From 82541c7430a136970e074f3920d0b2087098e541 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Fri, 9 Jun 2017 00:10:17 -0500 Subject: [PATCH 0454/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- Hochob/Services/Stream/Stream.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 28c31820..8ebebfcc 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -22,7 +22,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -Eog.sh $VISITORSCENTER_IMAGE/RP/RPP-May052017-4536.jpg & +#Eog.sh $VISITORSCENTER_IMAGE/RP/RPP-May052017-4536.jpg & LOCAL_LANGUAGE=`Language.sh` diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 12ab6a8f..f05cc887 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -6,6 +6,8 @@ set -x # Variables # ============================================================================= +. ~/CodeLabs/Hochob/Main.sh + export STREAM_PID=$$ LOCAL_DEVICE="$1" @@ -24,11 +26,12 @@ LOCAL_FILE="$3" if [ $# -eq 3 ] then - if [ "$HOCHOBDEMO" != "1" ] + LOCAL_DEMO=`Demo.sh` + if [ "$LOCAL_DEMO" -eq "1" ] then - Stream2Chromecast.sh "Juum" "1.0" "$LOCAL_FILE" - else Mpg123.sh "$LOCAL_FILE" + else + Stream2Chromecast.sh "Juum" "1.0" "$LOCAL_FILE" fi else echo "Invalid number of arguments, see Documentation" From 45128dd85796924f83eac2397cf70b58d9a4c54e Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Fri, 9 Jun 2017 00:11:05 -0500 Subject: [PATCH 0455/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Services/Kill/GetPid.sh | 27 +++++++++++++++++++++ Hochob/Services/Kill/KillApp.sh | 27 +++++++++++++++++++++ Hochob/Services/Kill/KillPid.sh | 42 +++++++++++++++++++++++++++++++++ Hochob/Services/Kill/LogPid.sh | 28 ++++++++++++++++++++++ 4 files changed, 124 insertions(+) create mode 100755 Hochob/Services/Kill/GetPid.sh create mode 100755 Hochob/Services/Kill/KillApp.sh create mode 100755 Hochob/Services/Kill/KillPid.sh create mode 100755 Hochob/Services/Kill/LogPid.sh diff --git a/Hochob/Services/Kill/GetPid.sh b/Hochob/Services/Kill/GetPid.sh new file mode 100755 index 00000000..96d3d16d --- /dev/null +++ b/Hochob/Services/Kill/GetPid.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export GETPID_PID=$$ + +LOCAL_NAME="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +cat $HOCHOB_SERVER_CONFIGURATION_PID/$LOCAL_NAME + +# End of File diff --git a/Hochob/Services/Kill/KillApp.sh b/Hochob/Services/Kill/KillApp.sh new file mode 100755 index 00000000..69f39049 --- /dev/null +++ b/Hochob/Services/Kill/KillApp.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export KILLAPP_PID=$$ + +LOCAL_NAME="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +killall -9 $LOCAL_NAME + +# End of File diff --git a/Hochob/Services/Kill/KillPid.sh b/Hochob/Services/Kill/KillPid.sh new file mode 100755 index 00000000..73f7b99b --- /dev/null +++ b/Hochob/Services/Kill/KillPid.sh @@ -0,0 +1,42 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export KILLPID_PID=$$ + +LOCAL_NAME="$1" +LOCAL_PID=0 + +# ============================================================================= +# Functions +# ============================================================================= + +list_descendants () +{ + local children=$(ps -o pid= --ppid "$1") + + for pid in $children + do + list_descendants "$pid" + done + + echo "$children" +} + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_PID=`GetPid.sh "$LOCAL_NAME"` +#kill -- -$(ps -o pgid=$LOCAL_PID | grep -o '[0-9]*') +#kill `pstree -p $LOCAL_PID | sed 's/(/\n(/g' | grep '(' | sed 's/(\(.*\)).*/\1/' | tr "\n" " "` +#kill $(ps -s $$ -o pid=) +kill $(list_descendants ${LOCAL_PID}) + +# End of File diff --git a/Hochob/Services/Kill/LogPid.sh b/Hochob/Services/Kill/LogPid.sh new file mode 100755 index 00000000..fe9e051f --- /dev/null +++ b/Hochob/Services/Kill/LogPid.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export LOGPID_PID=$$ + +LOCAL_PID="$1" +LOCAL_NAME="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +echo $LOCAL_PID > $HOCHOB_SERVER_CONFIGURATION_PID/$LOCAL_NAME + +# End of File From 70a86a129e459641ad3bb4fbbc28dff7a71e33f7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 9 Jun 2017 00:15:24 -0500 Subject: [PATCH 0456/1653] Create BajaCaliforniaSurLocal.sh --- .../SouthernMayaHighlands/BajaCaliforniaSurLocal.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index d793b3c9..ed90add6 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -48,8 +48,7 @@ wait Espeak.sh off spanish \ "Muchas gracias Futuros Ingenieros!. -A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! -Los esperamos muy pronto!" +A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita." MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" From b083f3157ecd7accae48fe06f6d19bfefa6903d5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 9 Jun 2017 00:15:43 -0500 Subject: [PATCH 0457/1653] Create BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 8e97cd4a..a6cec1a9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -67,8 +67,7 @@ wait Espeak.sh off spanish \ "Muchas gracias Futuros Ingenieros!. -A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita! -Los esperamos muy pronto!" +A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita." MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" From 3c2c683b9b7c0c9fadfab5a79776482acc053fc4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Fri, 9 Jun 2017 00:16:12 -0500 Subject: [PATCH 0458/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 5ccdb467..db5ce058 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -25,7 +25,7 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") Espeak.sh off spanish \ "Futuros Ingenieros. Ya vimos la importancia de nuestras Fabricas y Laboratorios. Ahora entraremos a una seccion \ que nos permite jugar y conocer de cerca la tecnología. Siganme." - + Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" From cb4173d5b3d83e573d2edadd3d698528f6639dae Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 9 Jun 2017 00:22:43 -0500 Subject: [PATCH 0459/1653] Create Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 8ebebfcc..7e0ec3c2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -24,6 +24,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") #Eog.sh $VISITORSCENTER_IMAGE/RP/RPP-May052017-4536.jpg & +LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then @@ -33,12 +34,12 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then Enjoy your tour." else Espeak.sh off spanish \ - "Futuros Ingenieros. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ + "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio de Intel en Guadalajara. \ Que disfruten tu recorrido." fi -Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +#Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" LOCAL_LANGUAGE=`Language.sh` From 13bdd2db5a67da2dd7445974677d009780705c70 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 9 Jun 2017 00:23:31 -0500 Subject: [PATCH 0460/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 7e0ec3c2..030f2e1d 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -39,7 +39,7 @@ else Que disfruten tu recorrido." fi -#Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" LOCAL_LANGUAGE=`Language.sh` From dd5e98b14a144dafa1474b477da3323f6703fc10 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Fri, 9 Jun 2017 00:26:23 -0500 Subject: [PATCH 0461/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Services/Visitors/Name.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index ca38cbe6..b5aaa9fa 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -21,6 +21,6 @@ export NAME_PID=$$ # ============================================================================= #echo `date +"%Y%m%d%H%M%S"` -echo "Instituto Triki" +echo "Consejo Zacatecano de Ciencia y Tecnología" # End of File From 15a8336fa3fc7c622e655e6aa89cb88941219097 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Fri, 9 Jun 2017 07:07:37 -0500 Subject: [PATCH 0462/1653] Update Signed-off-by: Abraham Arce Moreno --- .../SouthernMayaHighlands/BajaCaliforniaSurLocal.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index ed90add6..6dd5df7b 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -42,18 +42,19 @@ sleep 37.5 && Robot.sh lupe/say "En mi caso, mi cerebro esta aqui, en la caja az Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/say "Yo funciono con la plataforma Intel Edison" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" - -wait +Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & +LOCAL_INSTITUTION=`Name.sh` Espeak.sh off spanish \ -"Muchas gracias Futuros Ingenieros!. +"Muchas gracias Futuros Ingenieros del ${LOCAL_INSTITUTION}. A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita." MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" wait +sleep 15 + KillApp.sh "cvlc" KillApp.sh "vlc" From 31e70f891b61d87a05735de1fadaeda58ca18f35 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Fri, 9 Jun 2017 07:57:48 -0500 Subject: [PATCH 0463/1653] Update Signed-off-by: Abraham Arce Moreno --- .../HomeAssistant/configuration.yaml.2.0 | 248 ++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 new file mode 100644 index 00000000..365fcd08 --- /dev/null +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -0,0 +1,248 @@ +homeassistant: + # Name of the location where Home Assistant is running + name: Home + # Location required to calculate the time the sun rises and sets + latitude: 20.35 + longitude: -102 + # Impacts weather/sunrise data (altitude above sea level in meters) + elevation: 1674 + # metric for Metric, imperial for Imperial + unit_system: metric + # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones + time_zone: America/Mexico_City + customize: + + # Southern Maya Highlands : 1 Introduccion + + script.aguascalientes: + friendly_name: 1.1 Bienvenida y Protocolo de Seguridad + icon: mdi:audiobook + + # Southern Maya Highlands : 2 Video + + script.bajacalifornianorte: + friendly_name: 2.1 Antes del video + icon: mdi:audiobook + script.bajacaliforniasur: + friendly_name: 2.2 Video + icon: mdi:video + script.michoacan: + friendly_name: 2.3 Digan "Whiskey" + icon: mdi:video + script.campeche: + friendly_name: 2.4 Despues del video + icon: mdi:audiobook + + # Southern Maya Highlands : Corporate : + + switch.guanajuato: + friendly_name: Corporate Image Showcase + icon: mdi:camera + switch.guerrero: + friendly_name: Corporate Video Showcase + icon: mdi:camera + + # Southern Maya Highlands : Visitors Center + + switch.hidalgo: + friendly_name: Visitors Center Image Showcase + icon: mdi:camera + + # Southern Maya Highlands : Memories + + switch.queretaro: + friendly_name: Memories Image Showcase + icon: mdi:camera + switch.quintanaroo: + friendly_name: Memories Video Showcase + icon: mdi:camera + + # Central Maya Lowlands + + script.acapulco: + friendly_name: 1 Antes del inicio + icon: mdi:audiobook + script.cancun: + friendly_name: 2 Intel + icon: mdi:audiobook + script.huatulco: + friendly_name: 3. Intel GDC + icon: mdi:audiobook + script.mazatlan: + friendly_name: 4. El microprocesador + icon: mdi:audiobook + script.puertovallarta: + friendly_name: 5. Labs y Fabs + icon: mdi:audiobook + +# Enables the frontend +frontend: + +http: + # Uncomment this to add a password (recommended!) + # api_password: PASSWORD + # Uncomment this if you are using SSL or running in Docker etc + # base_url: example.duckdns.org:8123 + +# Checks for available updates +updater: + +# Discover some devices automatically +discovery: + +# Allows you to issue voice commands from the frontend in enabled browsers +conversation: + +# Enables support for tracking state changes over time. +history: + +# View all events in a logbook +logbook: + +script: + + # Southern Maya Highlands + + aguascalientes: + sequence: + - service: shell_command.aguascalientes + + bajacalifornianorte: + sequence: + - service: shell_command.bajacalifornianorte + + bajacaliforniasur: + sequence: + - service: shell_command.bajacaliforniasur + + campeche: + sequence: + - service: shell_command.campeche + + michoacan: + sequence: + - service: shell_command.michoacan + + # Central Maya Lowlands + + acapulco: + sequence: + - service: shell_command.acapulco + + cancun: + sequence: + - service: shell_command.cancun + + huatulco: + sequence: + - service: shell_command.huatulco + + mazatlan: + sequence: + - service: shell_command.mazatlan + + puertovallarta: + sequence: + - service: shell_command.puertovallarta + +shell_command: + + # Southern Maya Highlands + + aguascalientes: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & + bajacalifornianorte: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh & + bajacaliforniasur: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh & + campeche: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Campeche.sh & + michoacan: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & + + # Central Maya Lowlands + + acapulco: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Acapulco.sh & + cancun: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Cancun.sh & + huatulco: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Huatulco.sh & + mazatlan: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh & + puertovallarta: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh & + +switch: + - platform: command_line + switches: + + # Southern Maya Highlands: Corporate + + guanajuato: + command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + guerrero: + command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" + + # Southern Maya Highlands: Visitors Center + + hidalgo: + command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + + # Southern Maya Highlands: Memories + + queretaro: + command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + quintanaroo: + command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" + +group: + + default_view: + view: yes + entities: + - group.introduction + - group.video + - group.corporate + - group.visitorscenter + - group.memories + + centralmayalowlands: + view: yes + name: The Beginning + entities: + - group.centralmayalowlandsstations + + introduction: + name: 1 Introduccion + entities: + - script.aguascalientes + + video: + name: 2 Video + entities: + - script.bajacalifornianorte + - script.bajacaliforniasur + - script.michoacan + - script.campeche + + corporate: + name: 3 Corporate + entities: + - switch.guanajuato + - switch.guerrero + + visitorscenter: + name: 4 Visitors Center + entities: + - switch.hidalgo + + memories: + name: 5 Memories + entities: + - switch.queretaro + - switch.quintanaroo + + centralmayalowlandsstations: + name: Stations + entities: + - script.acapulco + - script.cancun + - script.huatulco + - script.mazatlan + - script.puertovallarta From 08d1538c4f6aa77b100dbd807f78486e8525489e Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Fri, 9 Jun 2017 08:11:25 -0500 Subject: [PATCH 0464/1653] Update Signed-off-by: Abraham Arce Moreno --- Hochob/Services/Camera/Fswebcam.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index 319edbb5..cd4644e1 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -10,7 +10,7 @@ set -x export FSWEBCAM_PID=$$ export FSWEBCAM_BINARY=fswebcam -export FSWEBCAM_ARGUMENTS="-r 4096x2304 -s brightness=65% -s Contrast=50% -s Gamma=100% --jpeg 100 --no-banner" +export FSWEBCAM_ARGUMENTS="-r 4096x2304 -s brightness=50% -s Contrast=50% -s Gamma=50% --jpeg 100 --no-banner" export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE LOCAL_IMAGES="$1" From b7f8b5539fa3483a5ad0ae8dfabae9014e750dd7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Fri, 9 Jun 2017 09:00:53 -0500 Subject: [PATCH 0465/1653] Update Signed-off-by: Abraham Arce Moreno --- .../SouthernMayaHighlands/Campeche.sh | 6 +++- Hochob/Main.sh | 2 ++ .../HomeAssistant/configuration.yaml.2.0 | 25 ++++++------- Hochob/Services/Image/ConvertText.sh | 35 +++++++++++++++++++ Hochob/Services/Visitors/Name.sh | 3 +- 5 files changed, 57 insertions(+), 14 deletions(-) create mode 100755 Hochob/Services/Image/ConvertText.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 949424a5..ed3ccef7 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -25,8 +25,12 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") LogPid.sh $CAMPECHE_PID $CAMPECHE_NAME +Memories.sh "1" "off" "${BAJACALIFORNIANORTE_NAME}" #Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" -Eog.sh "$FSWEBCAM_ALLFILES" & +LOCAL_INSTITUTION=`Name.sh` +ConvertText.sh "$LOCAL_INSTITUTION" +eog -f $FSWEBCAM_IMAGE_TEXT & +#Eog.sh "$FSWEBCAM_ALLFILES" & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 2e8db65b..11d3a566 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -121,6 +121,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE/Camera/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA/Fswebcam/ export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/*.jpg export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImage.jpg +export HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE_TEXT=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM/FswebcamImageText.jpg export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE/Drawing/ @@ -146,6 +147,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM export FSWEBCAM_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_ALLFILES export FSWEBCAM_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE +export FSWEBCAM_IMAGE_TEXT=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE_TEXT export DRAWING_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING export DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 365fcd08..3c202979 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -15,19 +15,19 @@ homeassistant: # Southern Maya Highlands : 1 Introduccion script.aguascalientes: - friendly_name: 1.1 Bienvenida y Protocolo de Seguridad + friendly_name: 1.1 Bienvenida Intel, Protocolo de Seguridad icon: mdi:audiobook # Southern Maya Highlands : 2 Video script.bajacalifornianorte: - friendly_name: 2.1 Antes del video + friendly_name: 2.1 Bienvenida Guadalajara Design Center icon: mdi:audiobook script.bajacaliforniasur: - friendly_name: 2.2 Video + friendly_name: 2.2 Lupe Robot Show icon: mdi:video script.michoacan: - friendly_name: 2.3 Digan "Whiskey" + friendly_name: 2.3 Lupe Robot Group Picture icon: mdi:video script.campeche: friendly_name: 2.4 Despues del video @@ -36,25 +36,25 @@ homeassistant: # Southern Maya Highlands : Corporate : switch.guanajuato: - friendly_name: Corporate Image Showcase + friendly_name: Image Showcase icon: mdi:camera switch.guerrero: - friendly_name: Corporate Video Showcase + friendly_name: Video Showcase icon: mdi:camera # Southern Maya Highlands : Visitors Center switch.hidalgo: - friendly_name: Visitors Center Image Showcase + friendly_name: Image Showcase icon: mdi:camera # Southern Maya Highlands : Memories switch.queretaro: - friendly_name: Memories Image Showcase + friendly_name: Image Showcase icon: mdi:camera switch.quintanaroo: - friendly_name: Memories Video Showcase + friendly_name: Video Showcase icon: mdi:camera # Central Maya Lowlands @@ -222,18 +222,18 @@ group: - script.campeche corporate: - name: 3 Corporate + name: Corporate entities: - switch.guanajuato - switch.guerrero visitorscenter: - name: 4 Visitors Center + name: Visitors Center entities: - switch.hidalgo memories: - name: 5 Memories + name: Memories entities: - switch.queretaro - switch.quintanaroo @@ -246,3 +246,4 @@ group: - script.huatulco - script.mazatlan - script.puertovallarta + diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh new file mode 100755 index 00000000..b3634c2e --- /dev/null +++ b/Hochob/Services/Image/ConvertText.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CONVERTTEXT_PID=$$ +export CONVERTTEXT_BINARY=convert +export CONVERTTEXT_ARGUMENTS="-pointsize 75 -fill yellow -draw" + +LOCAL_TEXT="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + $CONVERTTEXT_BINARY $CONVERTTEXT_ARGUMENTS "text 20,700 \"$LOCAL_TEXT\"" $FSWEBCAM_IMAGE $FSWEBCAM_IMAGE_TEXT +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index b5aaa9fa..4f917238 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -21,6 +21,7 @@ export NAME_PID=$$ # ============================================================================= #echo `date +"%Y%m%d%H%M%S"` -echo "Consejo Zacatecano de Ciencia y Tecnología" +#echo "Consejo Zacatecano de Ciencia y Tecnología" +echo "Instituto Balam" # End of File From 15acd46ab65c6938e273da0916f05f1ccc751248 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Sat, 10 Jun 2017 08:54:27 -0500 Subject: [PATCH 0466/1653] Update Signed-off-by: Abraham Arce Moreno --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++---- Hochob/Services/Visitors/Name.sh | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 3c202979..910c859b 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -15,22 +15,22 @@ homeassistant: # Southern Maya Highlands : 1 Introduccion script.aguascalientes: - friendly_name: 1.1 Bienvenida Intel, Protocolo de Seguridad + friendly_name: 1.1 Bienvenidos Intel, Protocolo de Seguridad icon: mdi:audiobook # Southern Maya Highlands : 2 Video script.bajacalifornianorte: - friendly_name: 2.1 Bienvenida Guadalajara Design Center + friendly_name: 2.1 Bienvenidos Guadalajara Design Center icon: mdi:audiobook script.bajacaliforniasur: friendly_name: 2.2 Lupe Robot Show icon: mdi:video script.michoacan: - friendly_name: 2.3 Lupe Robot Group Picture + friendly_name: 2.3 Lupe Robot Foto Grupal icon: mdi:video script.campeche: - friendly_name: 2.4 Despues del video + friendly_name: 2.4 Bienvenidos Recorrido icon: mdi:audiobook # Southern Maya Highlands : Corporate : diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index 4f917238..3c6939c0 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -21,7 +21,6 @@ export NAME_PID=$$ # ============================================================================= #echo `date +"%Y%m%d%H%M%S"` -#echo "Consejo Zacatecano de Ciencia y Tecnología" -echo "Instituto Balam" +echo "Instituto Triki Tran" # End of File From fc2e004b3649d48b03e55487ff77b8b3d34f8e30 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 08:35:04 -0500 Subject: [PATCH 0467/1653] Create Name.sh --- Hochob/Services/Calendar/Name.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 Hochob/Services/Calendar/Name.sh diff --git a/Hochob/Services/Calendar/Name.sh b/Hochob/Services/Calendar/Name.sh new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/Hochob/Services/Calendar/Name.sh @@ -0,0 +1 @@ + From e745e057579e20753e6673327cb2499233cc76e8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 08:36:07 -0500 Subject: [PATCH 0468/1653] Update Name.sh --- Hochob/Services/Calendar/Name.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Hochob/Services/Calendar/Name.sh b/Hochob/Services/Calendar/Name.sh index 8b137891..f3c636ed 100644 --- a/Hochob/Services/Calendar/Name.sh +++ b/Hochob/Services/Calendar/Name.sh @@ -1 +1,25 @@ +#!/bin/sh +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export NAME_PID=$$ + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +echo "Instituto Triki Tran" + +# End of File From 9e436d96226bde9fc83af832758ea1cee0eb264f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 10:19:15 -0500 Subject: [PATCH 0469/1653] Update Signed-off-by: Abraham Arce --- .../HomeAssistant/configuration.yaml.1.0 | 891 ++++++++++++++++++ Hochob/Services/Image/ConvertText.sh | 2 +- Hochob/Services/Sound/Play/Mpg123.sh | 6 +- 3 files changed, 896 insertions(+), 3 deletions(-) create mode 100644 Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 new file mode 100644 index 00000000..330c612e --- /dev/null +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 @@ -0,0 +1,891 @@ +homeassistant: + # Name of the location where Home Assistant is running + name: Home + # Location required to calculate the time the sun rises and sets + latitude: 20.6208618 + longitude: -103.4254426 + # Impacts weather/sunrise data (altitude above sea level in meters) + elevation: 1579 + # metric for Metric, imperial for Imperial + unit_system: metric + # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones + time_zone: America/Mexico_City + customize: + + # Home : 1 Introduccion + + script.audiosectionone: + friendly_name: 1.1 Bienvenida y Protocolo de Seguridad + icon: mdi:audiobook + + + # Home : 2 Video + + script.audiosectiontwo: + friendly_name: 2.1 Antes del video + icon: mdi:audiobook + switch.luperobot: + friendly_name: 2.2 Video + icon: mdi:video + script.luperobot: + friendly_name: 2.3 Lupe robot + icon: mdi:human-greeting + script.audiosectionthree: + friendly_name: 2.4 Despues del video + icon: mdi:audiobook + + # Home : 3 Fotografia + + script.photography: + friendly_name: Grabacion de fotografia + icon: mdi:camera + switch.imagescorporate: + friendly_name: Imagenes corporativas + icon: mdi:camera + switch.imagesvisitorscenter: + friendly_name: Imagenes centro visitantes + icon: mdi:camera + + # Home : 4 Technical Center + + script.help: + friendly_name: Visitor Center Needs Technical Help + icon: mdi:block-helper + + # Lupe Robot + + switch.leftup: + friendly_name: Up + icon: mdi:human-handsup + switch.leftdown: + friendly_name: Down + icon: mdi:human-handsup + switch.leftfold: + friendly_name: Fold + icon: mdi:gesture-swipe-up + switch.leftunfold: + friendly_name: Unfold + icon: mdi:gesture-swipe-up + + switch.rightup: + friendly_name: Up + icon: mdi:human-handsup + switch.rightdown: + friendly_name: Down + icon: mdi:human-handsup + switch.rightfold: + friendly_name: Fold + icon: mdi:gesture-swipe-up + switch.rightunfold: + friendly_name: Unfold + icon: mdi:gesture-swipe-up + + switch.moveleft: + friendly_name: Move Left + icon: mdi:arrow-left-thick + switch.moveright: + friendly_name: Move Right + icon: mdi:arrow-right-thick + switch.moveforward: + friendly_name: Move Forward + icon: mdi:arrow-up-thick + switch.movebackward: + friendly_name: Move Backward + icon: mdi:arrow-down-thick + switch.movestop: + friendly_name: Move Stop + icon: mdi:stop + + switch.headleft: + friendly_name: Head Left + icon: mdi:arrow-left-thick + switch.headright: + friendly_name: Head Right + icon: mdi:arrow-right-thick + switch.resetall: + friendly_name: Reset + icon: mdi:lock-reset + + switch.bienvenida: + friendly_name: Welcome Everyone! + icon: mdi:human-greeting + switch.agradece: + friendly_name: Thanks Everyone! + icon: mdi:music + switch.dance: + friendly_name: Let's Dance + icon: mdi:heart + switch.creador: + friendly_name: My Creator Speech + icon: mdi:face + switch.norte: + friendly_name: Mexican Northern + icon: mdi:function + + # Beginning + + script.audiosectionfour: + friendly_name: 1. Antes del inicio + icon: mdi:audiobook + script.audiosectionfive: + friendly_name: 2. Intel + icon: mdi:audiobook + script.audiosectionsix: + friendly_name: 3. Intel GDC + icon: mdi:audiobook + script.audiosectionseven: + friendly_name: 4. El microprocesador + icon: mdi:audiobook + script.audiosectioneight: + friendly_name: 5. Labs y Fabs + icon: mdi:audiobook + + script.audiostopjuum: + friendly_name: Stop Juum + icon: mdi:stop + script.audiopausejuum: + friendly_name: Pause Juum + icon: mdi:pause + script.audioplayjuum: + friendly_name: Play Juum + icon: mdi:play + + # Experience + + script.audiosectionnine: + friendly_name: 1. Amazon Echo + icon: mdi:audiobook + script.audiosectionten: + friendly_name: 2. Binario + icon: mdi:audiobook + script.audiosectioneleven: + friendly_name: 3. Piano Cosmico I + icon: mdi:audiobook + script.audiosectiontwelve: + friendly_name: 4. Piano Cosmico II + icon: mdi:audiobook + + script.audiostopeek: + friendly_name: Stop Eek' + icon: mdi:stop + script.audiopauseeek: + friendly_name: Pause Eek' + icon: mdi:pause + script.audioplayeek: + friendly_name: Play Eek' + icon: mdi:play + + # Support : Lupe + + script.luperecognize: + friendly_name: Recognize Speech + icon: mdi:microphone + + # Support : Camera + + switch.camerapreview: + friendly_name: Camera Preview + icon: mdi:video + switch.cameravideolatest: + friendly_name: Camera Play Latest + icon: mdi:video + switch.cameravideoloop: + friendly_name: Camera Play All In A Loop + icon: mdi:video + + # Hidden + + media_player.main: + hidden: yes + automation.lupe_robot_text_to_speech: + hidden: yes + automation.lupe_robot_telegram: + hidden: yes + +# Show links to resources in log and frontend +#introduction: + +# Enables the frontend +frontend: + +# Enables configuration UI +config: + +http: + # Uncomment this to add a password (recommended!) + # api_password: PASSWORD + # Uncomment this if you are using SSL or running in Docker etc + # base_url: example.duckdns.org:8123 + +# Checks for available updates +updater: + +# Discover some devices automatically +# discovery: + +# Allows you to issue voice commands from the frontend in enabled browsers +conversation: + +# Enables support for tracking state changes over time. +history: + +# View all events in a logbook +logbook: + +# Track the sun +#sun: + +#group: !include groups.yaml + +# Text to speech +tts: + - platform: google + #cache: true + #cache_dir: /tmp/tts + #time_memory: 300 + #- platform: voicerss + # api_key: 'XXXXXXXX' + #- platform: amazon_polly + # aws_access_key_id: AWS_ACCESS_KEY_ID + # aws_secret_access_key: AWS_SECRET_ACCESS_KEY + # profile_name: AWS_PROFILE + # region_name: 'us-east-1' + +#sensor: +# - platform: plex +# - platform: yr + +mqtt: +# broker: iot.eclipse.org + broker: 127.0.0.1 + port: 1883 + client_id: hochob + keepalive: 60 + +script: + luperobot: + alias: Lupe Robot + sequence: + - alias: Bienvenidos a Intel Guadalajara + service: tts.google_say + data: + message: "Hola! Estan listos para jugar con Lupe?" + language: 'es' + photography: + alias: Photography + sequence: + - alias: Photography Record + service: shell_command.photography + help: + alias: Help Needed + sequence: + - alias: Hocho Bot Notification + service: notify.telegram + data: + message: "Visitor Center needs technical help!" + + # Audio + + audiosectionone: + alias: Audio Section One + sequence: + - alias: Audio Section One + service: shell_command.audiosectionone + audiosectiontwo: + alias: Audio Section Two + sequence: + - alias: Audio Section Two + service: shell_command.audiosectiontwo + audiosectionthree: + alias: Audio Section Three + sequence: + - alias: Audio Section Three + service: shell_command.audiosectionthree + audiosectionfour: + alias: Audio Section Four + sequence: + - alias: Audio Section Four + service: shell_command.audiosectionfour + audiosectionfive: + alias: Audio Section Five + sequence: + - alias: Audio Section Five + service: shell_command.audiosectionfive + audiosectionsix: + alias: Audio Section Six + sequence: + - alias: Audio Section Six + service: shell_command.audiosectionsix + audiosectionseven: + alias: Audio Section Seven + sequence: + - alias: Audio Section Seven + service: shell_command.audiosectionseven + audiosectioneight: + alias: Audio Section Eight + sequence: + - alias: Audio Section Eight + service: shell_command.audiosectioneight + audiosectionnine: + alias: Audio Section Nine + sequence: + - alias: Audio Section Nine + service: shell_command.audiosectionnine + audiosectionten: + alias: Audio Section Ten + sequence: + - alias: Audio Section Ten + service: shell_command.audiosectionten + audiosectioneleven: + alias: Audio Section Eleven + sequence: + - alias: Audio Section Eleven + service: shell_command.audiosectioneleven + audiosectiontwelve: + alias: Audio Section Twelve + sequence: + - alias: Audio Section Twelve + service: shell_command.audiosectiontwelve + + audiostopjuum: + alias: Audio Stop Juum + sequence: + - alias: Audio Stop Juum + service: shell_command.audiostopjuum + audiopausejuum: + alias: Audio Pause Juum + sequence: + - alias: Audio Pause Juum + service: shell_command.audiopausejuum + audioplayjuum: + alias: Audio Play Juum + sequence: + - alias: Audio Play Juum + service: shell_command.audioplayjuum + + audiostopeek: + alias: Audio Stop Eek' + sequence: + - alias: Audio Stop Eek' + service: shell_command.audiostopeek + audiopauseeek: + alias: Audio Pause Eek' + sequence: + - alias: Audio Pause Eek' + service: shell_command.audiopauseeek + audioplayeek: + alias: Audio Play Eek' + sequence: + - alias: Audio Play Eek' + service: shell_command.audioplayeek + + # Lupe Center + + lupevirtualstart: + alias: Lupe Virtual Start + sequence: + - alias: Lupe Virtual Start + service: shell_command.lupevirtualstart + lupevirtualstop: + alias: Lupe Virtual Stop + sequence: + - alias: Lupe Virtual Stop + service: shell_command.lupevirtualstop + + lupepresentation: + alias: Lupe Presentation + sequence: + - alias: Presentation + service: shell_command.lupepresentation + luperecognize: + alias: Lupe Recognize + sequence: + - alias: Recognize Speech + service: shell_command.luperecognize + + lupe_arm_left: + alias: Lupe Arm Left + sequence: + - alias: Lupe Arm Up + service: tts.google_say + data: + message: "Lupe Moviendo Brazo Izquierdo" + language: 'es' + lupe_arm_right: + alias: Lupe Arm Right + sequence: + - alias: Lupe Arm Right + service: tts.google_say + data: + message: "Lupe Moviendo Brazo Derecho" + language: 'es' + lupe_dance: + alias: Lupe Dance + sequence: + - alias: Lupe Dance + service: tts.google_say + data: + message: "Lupe Bailando" + language: 'es' + +shell_command: + restart_ha: sudo systemctl restart home-assistant.service & + photography: python /home/hochob/CodeLabs/Hochob/Photography/selfie.py & + lupepresentation: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Presentation/Presentation.sh & + luperecognize: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Recognize/Recognize.sh & + audiosectionone: bash /home/hochob/CodeLabs/Hochob/Audio/Section01.sh & + audiosectiontwo: bash /home/hochob/CodeLabs/Hochob/Audio/Section02.sh & + audiosectionthree: bash /home/hochob/CodeLabs/Hochob/Audio/Section03.sh & + audiosectionfour: bash /home/hochob/CodeLabs/Hochob/Audio/Section04.sh & + audiosectionfive: bash /home/hochob/CodeLabs/Hochob/Audio/Section05.sh & + audiosectionsix: bash /home/hochob/CodeLabs/Hochob/Audio/Section06.sh & + audiosectionseven: bash /home/hochob/CodeLabs/Hochob/Audio/Section07.sh & + audiosectioneight: bash /home/hochob/CodeLabs/Hochob/Audio/Section08.sh & + audiosectionnine: bash /home/hochob/CodeLabs/Hochob/Audio/Section09.sh & + audiosectionten: bash /home/hochob/CodeLabs/Hochob/Audio/Section10.sh & + audiosectioneleven: bash /home/hochob/CodeLabs/Hochob/Audio/Section11.sh & + audiosectiontwelve: bash /home/hochob/CodeLabs/Hochob/Audio/Section12.sh & + audiostopjuum: bash /home/hochob/CodeLabs/Hochob/Audio/Stop.sh "Juum" & + audiopausejuum: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh "Juum" & + audioplayjuum: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh "Juum" & + audiostopeek: bash /home/hochob/CodeLabs/Hochob/Audio/Stop.sh "Eek'" & + audiopauseeek: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh "Eek'" & + audioplayeek: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh "Eek'" & + lupevirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeRobot/Virtual/amikoo.sh & + lupevirtualstop: pkill node & + +switch: + - platform: command_line + switches: + luperobot: + command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot1080p.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" + lupecomplete: + command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" + camerapreview: + command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0 &" + command_off: "pkill -9 vlc" + cameravideolatest: + command_on: "cvlc --no-video-title-show --fullscreen /home/hochob/VideosSelfies/latest.mp4 &" + command_off: "pkill -9 vlc" + cameravideoloop: + command_on: "cvlc --no-video-title-show --fullscreen --loop /home/hochob/VideosSelfies/*.mp4 &" + command_off: "pkill -9 vlc" + imagescorporate: + command_on: "eog -sf /home/hochob/Images/Corporate/* &" + command_off: "pkill -9 eog" + imagesvisitorscenter: + command_on: "eog -sf /home/hochob/Images/VisitorsCenter/* &" + command_off: "pkill -9 eog" + +# Lupe Switches + +switch 00: + - platform: mqtt + name: leftup + command_topic: "lupe/leftup" + state_topic: "lupe/leftup/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 01: + - platform: mqtt + name: leftdown + command_topic: "lupe/leftdown" + state_topic: "lupe/leftdown/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 02: + - platform: mqtt + name: leftfold + command_topic: "lupe/leftfold" + state_topic: "lupe/leftfold/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 03: + - platform: mqtt + name: leftunfold + command_topic: "lupe/leftunfold" + state_topic: "lupe/leftunfold/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 04: + - platform: mqtt + name: rightup + command_topic: "lupe/rightup" + state_topic: "lupe/rightup/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 05: + - platform: mqtt + name: rightdown + command_topic: "lupe/rightdown" + state_topic: "lupe/rightdown/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 06: + - platform: mqtt + name: rightfold + command_topic: "lupe/rightfold" + state_topic: "lupe/rightfold/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 07: + - platform: mqtt + name: rightunfold + command_topic: "lupe/rightunfold" + state_topic: "lupe/rightunfold/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 08: + - platform: mqtt + name: moveleft + command_topic: "lupe/moveleft" + state_topic: "lupe/moveleft/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 09: + - platform: mqtt + name: moveright + command_topic: "lupe/moveright" + state_topic: "lupe/moveright/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 10: + - platform: mqtt + name: moveforward + command_topic: "lupe/moveforward" + state_topic: "lupe/moveforward/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 11: + - platform: mqtt + name: movebackward + command_topic: "lupe/movebackward" + state_topic: "lupe/movebackward/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 12: + - platform: mqtt + name: movestop + command_topic: "lupe/movestop" + state_topic: "lupe/movestop/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 13: + - platform: mqtt + name: headleft + command_topic: "lupe/headleft" + state_topic: "lupe/headleft/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 14: + - platform: mqtt + name: headright + command_topic: "lupe/headright" + state_topic: "lupe/headright/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 15: + - platform: mqtt + name: resetall + command_topic: "lupe/resetall" + state_topic: "lupe/resetall/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 16: + - platform: mqtt + name: bienvenida + command_topic: "lupe/bienvenida" + state_topic: "lupe/bienvenida/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 17: + - platform: mqtt + name: agradece + command_topic: "lupe/agradece" + state_topic: "lupe/agradece/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 18: + - platform: mqtt + name: dance + command_topic: "lupe/dance" + state_topic: "lupe/dance/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 19: + - platform: mqtt + name: creador + command_topic: "lupe/creador" + state_topic: "lupe/creador/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +switch 20: + - platform: mqtt + name: norte + command_topic: "lupe/norte" + state_topic: "lupe/norte/state" + payload_on: 1 + payload_off: 0 + qos: 1 + +media_player: + - platform: vlc + name: main +# - platform: cast +# host: Hochob +# name: Nursery +# - platform: plex +# - platform: cast +# - platform: kodi +# host: 127.0.0.1 +# user: kodi +# password: kodi + +notify: + - platform: telegram + name: telegram + api_key: 301796470:AAHTZ7pYgjqVwOAzBDIIHfGziMvCrIFc_oc + chat_id: 166426442 + +light: + platform: hue + +automation: +# - alias: Lupe Robot Text To Speech +# hide_entity: True +# trigger: +# platform: state +# entity_id: switch.lupe +# state: 'on' +# action: +# service: tts.google_say +# data: +# message: "Bienvenido Robot Lupe" +# language: 'es' + - alias: Lupe Robot Telegram + #hide_entity: True + trigger: + platform: state + entity_id: switch.lupe + state: 'on' + action: + service: notify.telegram + data: + message: "Lupe Robot Station has been activated" + +group: + + default_view: + view: yes + entities: + - group.introduction + - group.video + - group.photography + - group.technical + + # Views + + lupeview: + view: yes + name: Lupe Robot + entities: + - group.lupearmleft + - group.lupearmright + - group.lupelegs + - group.lupehead + - group.lupeactivities + - group.lupediagnostics + + beginningview: + view: yes + name: Beginning + entities: + - group.audiosectionbeginning + - group.audiocontrolsbeginning + + experienceview: + view: yes + name: Experience + entities: + - group.audiosectionexperience + - group.audiocontrolsexperience + + supportview: + view: yes + name: Support + entities: + - group.lupevirtual + - group.lupeskills + - group.camera + + # Groups : Default + + introduction: + name: 1 Introduccion + entities: + - script.audiosectionone + + video: + name: 2 Video + entities: + - script.audiosectiontwo + - switch.luperobot + - script.luperobot + - script.audiosectionthree + #- switch.lupecomplete + + photography: + name: Fotografia + entities: + - script.photography + - switch.imagescorporate + - switch.imagesvisitorscenter + + technical: + name: Technical Center + entities: + - script.help + + # Groups : Lupe Robot + + lupeactivities: + name: Activities + entities: + - switch.bienvenida + - switch.agradece + - switch.dance + - switch.creador + - switch.norte + + lupearmleft: + name: Arm Left + entities: + - switch.leftup + - switch.leftdown + - switch.leftfold + - switch.leftunfold + + lupearmright: + name: Arm Right + entities: + - switch.rightup + - switch.rightdown + - switch.rightfold + - switch.rightunfold + + lupelegs: + name: Legs + entities: + - switch.moveleft + - switch.moveright + - switch.moveforward + - switch.movebackward + - switch.movestop + + lupehead: + name: Head + entities: + - switch.headleft + - switch.headright + + lupediagnostics: + name: Diagnostics + entities: + - switch.resetall + + # Groups : Beginning + + audiosectionbeginning: + name: Stations + entities: + - script.audiosectionfour + - script.audiosectionfive + - script.audiosectionsix + - script.audiosectionseven + - script.audiosectioneight + + audiocontrolsbeginning: + name: Controls + entities: + - script.audiostopjuum + - script.audiopausejuum + - script.audioplayjuum + + # Groups : Experience + + audiosectionexperience: + name: Stations + entities: + - script.audiosectionten + - script.audiosectionnine + - script.audiosectioneleven + - script.audiosectiontwelve + + audiocontrolsexperience: + name: Controls + entities: + - script.audiostopeek + - script.audiopauseeek + - script.audioplayeek + + # Groups : Support + + lupevirtual: + name: Lupe Virtual + entities: + - script.lupevirtualstart + - script.lupevirtualstop + + lupeskills: + name: Lupe Skills + entities: + - script.luperecognize + + camera: + name: Camera + entities: + - switch.camerapreview + - switch.cameravideolatest + - switch.cameravideoloop diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index b3634c2e..e440bf4a 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -26,7 +26,7 @@ LOCAL_TEXT="$1" if [ $# -eq 1 ] then - $CONVERTTEXT_BINARY $CONVERTTEXT_ARGUMENTS "text 20,700 \"$LOCAL_TEXT\"" $FSWEBCAM_IMAGE $FSWEBCAM_IMAGE_TEXT + $CONVERTTEXT_BINARY $CONVERTTEXT_ARGUMENTS "text 100,1000 \"$LOCAL_TEXT\"" $FSWEBCAM_IMAGE $FSWEBCAM_IMAGE_TEXT else echo "Invalid number of arguments, see Documentation" exit 1 diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 0b8037f6..52b358c9 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -7,7 +7,9 @@ set -x # ============================================================================= export MPG123_PID=$$ -export MPG123_BINARY=mpg123 +#export MPG123_BINARY=mpg123 +export MPG123_BINARY=cvlc +export MPG123_ARGUMENTS=--play-and-exit LOCAL_FILE="$1" @@ -23,7 +25,7 @@ LOCAL_FILE="$1" if [ $# -eq 1 ] then - $MPG123_BINARY $LOCAL_FILE + $MPG123_BINARY $MPG123_ARGUMENTS $LOCAL_FILE else echo "Invalid number of arguments, see Documentation" exit 1 From ab9dec43b0df36ffb65fc39a3535f1fc401384b1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 10:21:42 -0500 Subject: [PATCH 0470/1653] Update Signed-off-by: Abraham Arce --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 5eab1762..e4f7ca15 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -30,7 +30,7 @@ Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 2 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & -sleep 19.2 +sleep 18.8 Robot.sh lupe/say "Nel" sleep .6 Robot.sh lupe/headright 1 diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 910c859b..1313c534 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -151,7 +151,7 @@ shell_command: aguascalientes: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & bajacalifornianorte: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh & - bajacaliforniasur: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh & + bajacaliforniasur: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh & campeche: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Campeche.sh & michoacan: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & From fc7bbf4d070148f25c9b2b96203a8f76d59b8d52 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 10:27:29 -0500 Subject: [PATCH 0471/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 1313c534..5a0c927b 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -75,6 +75,28 @@ homeassistant: friendly_name: 5. Labs y Fabs icon: mdi:audiobook + # Northern Maya Lowlands + + script.ojodeliebre: + friendly_name: 1 Primera Parte + icon: mdi:audiobook + + script.montesazules: + friendly_name: 1 Parte + icon: mdi:audiobook + + script.lamichilia: + friendly_name: 1 Parte + icon: mdi:audiobook + + script.elcielo: + friendly_name: 1 Parte + icon: mdi:audiobook + + script.mapimi: + friendly_name: 1 Parte + icon: mdi:audiobook + # Enables the frontend frontend: From 4f95157ee74e7a5f1de74d7a83e40a71a2376893 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 10:29:08 -0500 Subject: [PATCH 0472/1653] Update LaMichilia.sh --- Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 7b056d50..2b929eb9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -32,7 +32,7 @@ else Espeak.sh off spanish \ "Intel no solo se queda en la tierra, es tal el alcance del Microprocesador que puede \ estar en el universo, por ejemplo, ha trabajado con la NASA para crear cohetes y vehiculos \ - no tripulados. Mira el siguiente video." + no tripulados. Veamos el siguiente video." fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From a8dd8e7d3cbe4f30da5e43a374c048fb64b4ad12 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 11:17:58 -0500 Subject: [PATCH 0473/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 44 +++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 5a0c927b..8bacd736 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -82,19 +82,19 @@ homeassistant: icon: mdi:audiobook script.montesazules: - friendly_name: 1 Parte + friendly_name: 1 Segunda Parte icon: mdi:audiobook script.lamichilia: - friendly_name: 1 Parte + friendly_name: 1 Tercera Parte icon: mdi:audiobook script.elcielo: - friendly_name: 1 Parte + friendly_name: 1 Cuarta Parte icon: mdi:audiobook script.mapimi: - friendly_name: 1 Parte + friendly_name: 1 Cierre icon: mdi:audiobook # Enables the frontend @@ -167,6 +167,28 @@ script: sequence: - service: shell_command.puertovallarta + # Northern Maya Lowlands + + ojodeliebre: + sequence: + - service: shell_command.ojodeliebre + + montesazules: + sequence: + - service: shell_command.montesazules + + lamichilia: + sequence: + - service: shell_command.lamichilia + + elcielo: + sequence: + - service: shell_command.elcielo + + mapimi: + sequence: + - service: shell_command.mapimi + shell_command: # Southern Maya Highlands @@ -185,6 +207,14 @@ shell_command: mazatlan: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh & puertovallarta: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh & + # Northern Maya Lowlands + + ojodeliebre: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & + montesazules: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh & + lamichilia: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & + elcielo: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & + mapimi: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & + switch: - platform: command_line switches: @@ -268,4 +298,10 @@ group: - script.huatulco - script.mazatlan - script.puertovallarta + + northernmayalowlandsstations: + name: Stations + entities: + - script.ojodeliebre + - script. From cab818e6ee22b9415d864431e44656c3e8363db3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 12:17:55 -0500 Subject: [PATCH 0474/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 8bacd736..e37b81b2 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -303,5 +303,8 @@ group: name: Stations entities: - script.ojodeliebre - - script. - + - script.montesazules + - script.lamichilia + - script.elcielo + - script.mapimi + From 3149e5a68360cbeed8fd04c59bbe0448e51a4a0f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 13:24:08 -0500 Subject: [PATCH 0475/1653] Update Signed-off-by: Abraham Arce --- .../BajaCaliforniaNorte.sh | 2 +- .../SouthernMayaHighlands/Michoacan.sh | 7 ++-- Hochob/Main.sh | 2 +- .../Communications/MqttClient/Mosquitto.sh | 14 +++++++ Hochob/Services/Robot/Remote/Robot.sh | 41 +++++++++++++------ .../Sound/SpeechSynthetizer/Espeak.sh | 1 - 6 files changed, 49 insertions(+), 18 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index e4f7ca15..55e9026d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -31,7 +31,7 @@ Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 2 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 -Robot.sh lupe/say "Nel" +Robot.sh lupe/message "Nel" sleep .6 Robot.sh lupe/headright 1 sleep .6 diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index b561e398..8dc31981 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -30,15 +30,16 @@ sleep .6 Robot.sh lupe/headleft 1 sleep .6 -Robot.sh lupe/say "Tomaremos algunas fotos. Estan listos?" +Robot.sh lupe/message "Tomaremos algunas fotos. Estan listos?" + sleep 1 -Robot.sh lupe/say "3, 2, 1, Sonrian!" +Robot.sh lupe/message "3, 2, 1, Sonrian!" Memories.sh "5" "on" "${MICHOACAN_NAME}" & wait Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & -Robot.sh lupe/say "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." +Robot.sh lupe/message "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." sleep 5 diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 11d3a566..6bbf8025 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -166,7 +166,7 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport -MQTT_SERVER_ADDRESS=localhost +MQTT_SERVER_ADDRESS=10.215.56.158 MQTT_SERVER_PORT=1883 # ============================================================================= diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index b1d4d591..4b92958b 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -26,6 +26,20 @@ LOCAL_MESSAGE="$2" # Main # ============================================================================= +i=0 +for var in "$@" +do + if [ "$i" -gt 1 ]; then + LOCAL_MESSAGE=$LOCAL_MESSAGE" $var " + echo $LOCAL_MESSAGE + fi + i=`expr $i + 1` +done + +$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\"" + +exit 0 + if [ $# -eq 2 ] then $MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index 39dd3515..8299cd47 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -11,7 +11,7 @@ set -x export ROBOTREMOTE_PID=$$ LOCAL_COMMAND="$1" -LOCAL_MESSAGE="$2" +LOCAL_MESSAGE="" # ============================================================================= # Functions @@ -23,22 +23,39 @@ LOCAL_MESSAGE="$2" # Main # ============================================================================= -if [ $# -eq 2 ] -then +i=0 +for var in "$@" +do + if [ "$i" -ne 0 ]; then + LOCAL_MESSAGE=$LOCAL_MESSAGE"$var" + echo $LOCAL_MESSAGE + fi + i=`expr $i + 1` +done + +echo $LOCAL_MESSAGE - LOCAL_DEMO=`Demo.sh` - if [ "$LOCAL_DEMO" -eq "1" ]; then - if [ "$LOCAL_MESSAGE" != "1" ] - then - Espeak.sh on spanish "$LOCAL_MESSAGE" - fi +if [ "$LOCAL_COMMAND" = "lupe/message" ]; then + LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then + Mosquitto.sh lupe/say $LOCAL_MESSAGE else - Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE + Mosquitto.sh lupe/decir $LOCAL_MESSAGE fi +else + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE +fi + +exit 0 +LOCAL_DEMO=`Demo.sh` +if [ "$LOCAL_DEMO" -eq "1" ]; then + if [ "$LOCAL_MESSAGE" != "1" ] + then + Espeak.sh on spanish "$LOCAL_MESSAGE" + fi else - echo "Invalid number of arguments, see Documentation" - exit 1 + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE fi # End of File diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index c76e10f8..fe82a7de 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -31,7 +31,6 @@ LOCAL_TEXT="$3" # Main # ============================================================================= - if [ $# -eq 3 ] then if [ "$LOCAL_LANGUAGE" = "english" ]; then From df6deb71cd4e8f9db37d41622ac1aa7ba1cdb3fe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 13:59:15 -0500 Subject: [PATCH 0476/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index e37b81b2..17f77b68 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -260,6 +260,12 @@ group: entities: - group.centralmayalowlandsstations + northernmayalowlands: + view: yes + name: The Experience + entities: + - group.northernmayalowlandsstations + introduction: name: 1 Introduccion entities: @@ -299,12 +305,12 @@ group: - script.mazatlan - script.puertovallarta - northernmayalowlandsstations: - name: Stations - entities: - - script.ojodeliebre - - script.montesazules - - script.lamichilia - - script.elcielo - - script.mapimi + northernmayalowlandsstations: + name: Stations + entities: + - script.ojodeliebre + - script.montesazules + - script.lamichilia + - script.elcielo + - script.mapimi From 300f5edae16887f2ec50443af674fa05a8f31366 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 14:07:39 -0500 Subject: [PATCH 0477/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index f05cc887..9fe19ee1 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -31,7 +31,7 @@ then then Mpg123.sh "$LOCAL_FILE" else - Stream2Chromecast.sh "Juum" "1.0" "$LOCAL_FILE" + Stream2Chromecast.sh $LOCAL_DEVICE "1.0" "$LOCAL_FILE" fi else echo "Invalid number of arguments, see Documentation" From f6ba48dd8dd887b028b812de07f3b9be0f7247be Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 14:34:05 -0500 Subject: [PATCH 0478/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index db5ce058..ef4a4565 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -22,12 +22,6 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") # Main # ============================================================================= -Espeak.sh off spanish \ - "Futuros Ingenieros. Ya vimos la importancia de nuestras Fabricas y Laboratorios. Ahora entraremos a una seccion \ - que nos permite jugar y conocer de cerca la tecnología. Siganme." - -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" - Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" kill -- -$(ps -o pgid=$OJODELIEBRE_PID | grep -o '[0-9]*') From 86466fd2c69da8e23ba1d2666bbe7a3313da4b55 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 14:34:10 -0500 Subject: [PATCH 0479/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 7bc9ad51..f6d284f5 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -22,6 +22,12 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") # Main # ============================================================================= +Espeak.sh off spanish \ + "Futuros Ingenieros. Ya vimos la importancia de nuestras Fabricas y Laboratorios. Ahora entraremos a una seccion \ + que nos permite jugar y conocer de cerca la tecnología. Siganme." + +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" + Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" kill -- -$(ps -o pgid=$MONTESAZULES_PID | grep -o '[0-9]*') From 3b5b0c74d9de662d75de1d702fc795be7ab17f8a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 14:47:29 -0500 Subject: [PATCH 0480/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 17f77b68..47cf375a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -60,10 +60,10 @@ homeassistant: # Central Maya Lowlands script.acapulco: - friendly_name: 1 Antes del inicio + friendly_name: 1. Antes del inicio icon: mdi:audiobook script.cancun: - friendly_name: 2 Intel + friendly_name: 2. Intel icon: mdi:audiobook script.huatulco: friendly_name: 3. Intel GDC @@ -77,24 +77,24 @@ homeassistant: # Northern Maya Lowlands - script.ojodeliebre: - friendly_name: 1 Primera Parte + script.montesazules: + friendly_name: 1. Bienvenida Experiencia Intel icon: mdi:audiobook - script.montesazules: - friendly_name: 1 Segunda Parte + script.ojodeliebre: + friendly_name: 2. Juego Binario icon: mdi:audiobook script.lamichilia: - friendly_name: 1 Tercera Parte + friendly_name: 3. Intel en el Espacio icon: mdi:audiobook script.elcielo: - friendly_name: 1 Cuarta Parte + friendly_name: 4. Los Muones icon: mdi:audiobook script.mapimi: - friendly_name: 1 Cierre + friendly_name: 5. Hasta Pronto icon: mdi:audiobook # Enables the frontend @@ -209,8 +209,8 @@ shell_command: # Northern Maya Lowlands - ojodeliebre: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & montesazules: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh & + ojodeliebre: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & lamichilia: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & elcielo: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & mapimi: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & @@ -308,9 +308,8 @@ group: northernmayalowlandsstations: name: Stations entities: - - script.ojodeliebre - script.montesazules + - script.ojodeliebre - script.lamichilia - script.elcielo - script.mapimi - From eb85dae7205a0da7d162c5d43294f4e5f376819b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 15:10:29 -0500 Subject: [PATCH 0481/1653] Update --- .../SouthernMayaHighlands/Michoacan.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 8dc31981..3767bae4 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -30,6 +30,20 @@ sleep .6 Robot.sh lupe/headleft 1 sleep .6 +Robot.sh lupe/moveleft 1 +sleep 1.6 +Robot.sh lupe/movestop 1 +sleep .6 +Robot.sh lupe/moveforward 1 +sleep 4.5 +Robot.sh lupe/movestop 1 +sleep .6 +Robot.sh lupe/moveleft 1 +sleep 3.6 +Robot.sh lupe/movestop 1 +sleep .6 + + Robot.sh lupe/message "Tomaremos algunas fotos. Estan listos?" sleep 1 From a5d208da7840424fa42ed5cf1f5ec31a556fd5c2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 15:10:36 -0500 Subject: [PATCH 0482/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 47cf375a..a63da876 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -188,6 +188,68 @@ script: mapimi: sequence: - service: shell_command.mapimi + + # Robot Maya Lands + + headleft: + sequence: + - service: shell_command.headleft + + headright: + sequence: + - service: shell_command.headright + + rightup: + sequence: + - service: shell_command.rightup + + rightdown: + sequence: + - service: shell_command.rightdown + + rightfold: + sequence: + - service: shell_command.rightfold + + rightunfold: + sequence: + - service: shell_command.rightunfold + + leftup: + sequence: + - service: shell_command.leftup + + leftdown: + sequence: + - service: shell_command.leftdown + + leftfold: + sequence: + - service: shell_command.leftfold + + leftunfold: + sequence: + - service: shell_command.leftunfold + + moveforward: + sequence: + - service: shell_command.moveforward + + movebackward: + sequence: + - service: shell_command.movebackward + + moveleft: + sequence: + - service: shell_command.moveleft + + moveright: + sequence: + - service: shell_command.moveright + + movestop: + sequence: + - service: shell_command.movestop shell_command: @@ -214,6 +276,11 @@ shell_command: lamichilia: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & elcielo: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & mapimi: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & + + # Robot Maya Lands + + headleft: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 + headright: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 switch: - platform: command_line @@ -313,3 +380,8 @@ group: - script.lamichilia - script.elcielo - script.mapimi + + robotmayalandscommands: + name: Commands + entities: + - From ee53769b73b36beee92f04dfb0969eeb3c2b92db Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 15:25:10 -0500 Subject: [PATCH 0483/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 142 ++++++++++++++++-- 1 file changed, 129 insertions(+), 13 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index a63da876..b4e0c684 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -97,6 +97,62 @@ homeassistant: friendly_name: 5. Hasta Pronto icon: mdi:audiobook + # Robot Maya Lands + + script.resetall: + friendly_name: Reset + icon: mdi:lock-reset + + script.headright: + friendly_name: Head Right + icon: mdi:arrow-right-thick + script.headleft: + friendly_name: Head Left + icon: mdi:arrow-left-thick + + script.rightup: + friendly_name: Up + icon: mdi:human-handsup + script.rightdown: + friendly_name: Down + icon: mdi:human-handsup + script.rightfold: + friendly_name: Fold + icon: mdi:gesture-swipe-up + script.rightunfold: + friendly_name: Unfold + icon: mdi:gesture-swipe-up + + script.leftup: + friendly_name: Up + icon: mdi:human-handsup + script.leftdown: + friendly_name: Down + icon: mdi:human-handsup + script.leftfold: + friendly_name: Fold + icon: mdi:gesture-swipe-up + script.leftunfold: + friendly_name: Unfold + icon: mdi:gesture-swipe-up + + + script.moveright: + friendly_name: Move Right + icon: mdi:arrow-right-thick + script.moveleft: + friendly_name: Move Left + icon: mdi:arrow-left-thick + script.moveforward: + friendly_name: Move Forward + icon: mdi:arrow-up-thick + script.movebackward: + friendly_name: Move Backward + icon: mdi:arrow-down-thick + script.movestop: + friendly_name: Move Stop + icon: mdi:stop + # Enables the frontend frontend: @@ -191,14 +247,18 @@ script: # Robot Maya Lands - headleft: + resetall: sequence: - - service: shell_command.headleft + - service: shell_command.resetall headright: sequence: - service: shell_command.headright + headleft: + sequence: + - service: shell_command.headleft + rightup: sequence: - service: shell_command.rightup @@ -231,21 +291,21 @@ script: sequence: - service: shell_command.leftunfold - moveforward: - sequence: - - service: shell_command.moveforward - - movebackward: + moveright: sequence: - - service: shell_command.movebackward + - service: shell_command.moveright moveleft: sequence: - service: shell_command.moveleft - moveright: + moveforward: sequence: - - service: shell_command.moveright + - service: shell_command.moveforward + + movebackward: + sequence: + - service: shell_command.movebackward movestop: sequence: @@ -279,9 +339,27 @@ shell_command: # Robot Maya Lands + resetall: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 + headleft: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 headright: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 + rightup: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightup + rightdown: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightdown + rightfold: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightfold + rightunfold: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightunfold + + leftup: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftup + lefttdown: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftdown + leftfold: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftfold + leftunfold: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftunfold + + moveright: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveright + moveleft: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveleft + moveforward: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveforward + movebackward: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movebackward + movestop: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movestop + switch: - platform: command_line switches: @@ -321,6 +399,12 @@ group: - group.visitorscenter - group.memories + robotmayalands: + view: yes + name: The Robot + entities: + group. + centralmayalowlands: view: yes name: The Beginning @@ -381,7 +465,39 @@ group: - script.elcielo - script.mapimi - robotmayalandscommands: - name: Commands + robotmayalandsreset: + name: Reset + entities: + - script.resetall + + robotmayalandshead: + name: Head + entities: + - script.headright + - script.headleft + + robotmayalandsarmright: + name: Arm Right + entities: + - script.rightup + - script.rightdown + - script.rightfold + - script.rightunfold + + robotmayalandsarmleft: + name: Arm Left + entities: + - script.leftup + - script.lefttdown + - script.leftfold + - script.leftunfold + + robotmayalandslegs: + name: Legs entities: - - + - script.moveright + - script.moveleft + - script.moveforward + - script.movebackward + - script.movestop + From 8d19dbdd979aada715659cedf07f49b1198f0235 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 15:36:05 -0500 Subject: [PATCH 0484/1653] Update --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b4e0c684..a8007ef8 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -136,7 +136,6 @@ homeassistant: friendly_name: Unfold icon: mdi:gesture-swipe-up - script.moveright: friendly_name: Move Right icon: mdi:arrow-right-thick @@ -166,7 +165,7 @@ http: updater: # Discover some devices automatically -discovery: +#discovery: # Allows you to issue voice commands from the frontend in enabled browsers conversation: @@ -403,7 +402,11 @@ group: view: yes name: The Robot entities: - group. + - group.robotmayalandsreset + - group.robotmayalandshead + - group.robotmayalandsarmright + - group.robotmayalandsarmleft + - group.robotmayalandslegs centralmayalowlands: view: yes From 315bac243d99ffecc83fbb4ffb984332e740a582 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 15:42:17 -0500 Subject: [PATCH 0485/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index a8007ef8..0f57416d 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -12,6 +12,12 @@ homeassistant: time_zone: America/Mexico_City customize: + # Language + + switch.language: + friendly_name: Lenguaje Espanol / English + icon: mdi:audiobook + # Southern Maya Highlands : 1 Introduccion script.aguascalientes: @@ -363,6 +369,12 @@ switch: - platform: command_line switches: + # Language + + language: + command_on: "/home/hochob/CodeLabs/Hochob/Services/Language/Language.sh spanish &" + command_off: "/home/hochob/CodeLabs/Hochob/Services/Language/Language.sh english" + # Southern Maya Highlands: Corporate guanajuato: From ea33386b75512ee2292e73d029e0be5af643b96b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 15:46:20 -0500 Subject: [PATCH 0486/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0f57416d..bd55b1a4 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -15,7 +15,7 @@ homeassistant: # Language switch.language: - friendly_name: Lenguaje Espanol / English + friendly_name: Idioma Espanol / English icon: mdi:audiobook # Southern Maya Highlands : 1 Introduccion @@ -432,6 +432,11 @@ group: entities: - group.northernmayalowlandsstations + language: + name: Idioma + entities: + - switch.language + introduction: name: 1 Introduccion entities: From 601781f4b7cdefb1f4a34537f22661f8bdee9edd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 15:48:12 -0500 Subject: [PATCH 0487/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index bd55b1a4..e811e794 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -404,6 +404,7 @@ group: default_view: view: yes entities: + - group.language - group.introduction - group.video - group.corporate From 368c003f3de19bab467b71299bbdd972efc558a7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 16:08:22 -0500 Subject: [PATCH 0488/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index e811e794..39ce335a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -15,7 +15,7 @@ homeassistant: # Language switch.language: - friendly_name: Idioma Espanol / English + friendly_name: Idioma English / Espanol icon: mdi:audiobook # Southern Maya Highlands : 1 Introduccion From a0604d756533b36105afe280a8c441d4d9cccb67 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 16:12:27 -0500 Subject: [PATCH 0489/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 3767bae4..e6b4df72 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -25,6 +25,10 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME +Robot.sh lupe/message "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" + +Robot.sh lupe/message "?" + Robot.sh lupe/headright 1 sleep .6 Robot.sh lupe/headleft 1 @@ -43,10 +47,10 @@ sleep 3.6 Robot.sh lupe/movestop 1 sleep .6 +Robot.sh lupe/message "Estan listos?" -Robot.sh lupe/message "Tomaremos algunas fotos. Estan listos?" +sleep 3 -sleep 1 Robot.sh lupe/message "3, 2, 1, Sonrian!" Memories.sh "5" "on" "${MICHOACAN_NAME}" & From 3d31c33de8435a428893eab65afaac5526668cd1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 16:19:12 -0500 Subject: [PATCH 0490/1653] Update Michoacan.sh --- .../SouthernMayaHighlands/Michoacan.sh | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index e6b4df72..6a64b124 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -25,9 +25,9 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME -Robot.sh lupe/message "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" - -Robot.sh lupe/message "?" +#Robot.sh lupe/message "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" +Espeak.sh on spanish \ + "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" Robot.sh lupe/headright 1 sleep .6 @@ -47,17 +47,26 @@ sleep 3.6 Robot.sh lupe/movestop 1 sleep .6 -Robot.sh lupe/message "Estan listos?" +Espeak.sh on spanish \ + "Estan listos?" sleep 3 -Robot.sh lupe/message "3, 2, 1, Sonrian!" +Espeak.sh on spanish \ + "3, 2, 1, Sonrian!" + +#Robot.sh lupe/message "Estan listos?" +#sleep 3 +#Robot.sh lupe/message "3, 2, 1, Sonrian!" + Memories.sh "5" "on" "${MICHOACAN_NAME}" & wait Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & -Robot.sh lupe/message "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." +#Robot.sh lupe/message "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." +Espeak.sh on spanish \ + "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." sleep 5 From 129e52a6a445c8dd9f7576e4fbf369c0a74c4c8b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 18:02:50 -0500 Subject: [PATCH 0491/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 030f2e1d..3a3542c7 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -29,7 +29,7 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ - "Future Engineers. Welcome to this first hall! We called it: The Beginning. \ + "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour." else From 7745703499579b6e9388490e664a771083958c4b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 18:03:52 -0500 Subject: [PATCH 0492/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index d3bd790c..c5cd81a3 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -26,12 +26,12 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ - "Future Engineers. You know more about Intel, now let's get into the next hall\ + "${LOCAL_INSTITUTION}, you know more about Intel, now let's get into the next hall\ where we will find information about our Microproccesors, our Fabs and Laboratories. \ Enjoy your tour." else Espeak.sh off spanish \ - "Futuros Ingenieros. Ahora que saben mas acerca de Intel podemos pasar a la siguiente seccion \ + "${LOCAL_INSTITUTION}, ahora que saben mas acerca de Intel podemos pasar a la siguiente seccion \ en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas y nuestros Laboratorios. Acompanienme." fi From e7589a23d900a117da054ed22d90119d5303a701 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 18:06:08 -0500 Subject: [PATCH 0493/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index f6d284f5..288cd18c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -22,8 +22,10 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") # Main # ============================================================================= +LOCAL_INSTITUTION=`Name.sh` + Espeak.sh off spanish \ - "Futuros Ingenieros. Ya vimos la importancia de nuestras Fabricas y Laboratorios. Ahora entraremos a una seccion \ + "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Ya vimos la importancia de nuestras Fabricas y Laboratorios. Ahora entraremos a una seccion \ que nos permite jugar y conocer de cerca la tecnología. Siganme." Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From bc270f2893edf1bb396b5896249c80eab7497987 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Jun 2017 18:08:10 -0500 Subject: [PATCH 0494/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index d204d1d6..cbd0bd09 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -31,14 +31,16 @@ export MAPIMI_DIRECTORY=$(dirname "$ZACATECAS_PATH") Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & +LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "To be written" else Espeak.sh off spanish \ "Me da mucho gusto conocerlos y que hayan venido a Intel. \ - Regresen pronto!" + Regresen pronto futuros Ingenieros de ${LOCAL_INSTITUTION}" fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 9e538504efb2e8dd8843d0aae642a50fd65915fa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 10:52:16 -0500 Subject: [PATCH 0495/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 39ce335a..dda2ab53 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -103,7 +103,7 @@ homeassistant: friendly_name: 5. Hasta Pronto icon: mdi:audiobook - # Robot Maya Lands + # Robot Maya Techlands script.resetall: friendly_name: Reset @@ -250,7 +250,7 @@ script: sequence: - service: shell_command.mapimi - # Robot Maya Lands + # Robot Maya Techlands resetall: sequence: @@ -342,7 +342,7 @@ shell_command: elcielo: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & mapimi: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & - # Robot Maya Lands + # Robot Maya Techlands resetall: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 @@ -403,6 +403,7 @@ group: default_view: view: yes + name: The Home entities: - group.language - group.introduction From f5c15081fd9c26b4edbd31dfcc77f46336401d0b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:15:26 -0500 Subject: [PATCH 0496/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index dda2ab53..354a9c6f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -24,7 +24,7 @@ homeassistant: friendly_name: 1.1 Bienvenidos Intel, Protocolo de Seguridad icon: mdi:audiobook - # Southern Maya Highlands : 2 Video + # Southern Maya Highlands : 2 Robot script.bajacalifornianorte: friendly_name: 2.1 Bienvenidos Guadalajara Design Center From af40fe9bb61d44d125fe2738c5c950093b1eb2bd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:32:59 -0500 Subject: [PATCH 0497/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index ed3ccef7..dc035546 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -28,7 +28,7 @@ LogPid.sh $CAMPECHE_PID $CAMPECHE_NAME Memories.sh "1" "off" "${BAJACALIFORNIANORTE_NAME}" #Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" LOCAL_INSTITUTION=`Name.sh` -ConvertText.sh "$LOCAL_INSTITUTION" +ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" eog -f $FSWEBCAM_IMAGE_TEXT & #Eog.sh "$FSWEBCAM_ALLFILES" & sleep 1 From 189456269a3106165257f74b55885bc355ff990d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:36:03 -0500 Subject: [PATCH 0498/1653] Update ConvertText.sh --- Hochob/Services/Image/ConvertText.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index e440bf4a..77bc3430 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -10,7 +10,7 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert -export CONVERTTEXT_ARGUMENTS="-pointsize 75 -fill yellow -draw" +export CONVERTTEXT_ARGUMENTS="-pointsize 120 -fill darkred -stroke yellow -draw" LOCAL_TEXT="$1" From 0a9a17e4d020d9883ccf9f25c346763282bfbdec Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:36:29 -0500 Subject: [PATCH 0499/1653] Update ConvertText.sh --- Hochob/Services/Image/ConvertText.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index 77bc3430..0f5584ac 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -10,7 +10,7 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert -export CONVERTTEXT_ARGUMENTS="-pointsize 120 -fill darkred -stroke yellow -draw" +export CONVERTTEXT_ARGUMENTS="-pointsize 80 -fill darkred -stroke yellow -draw" LOCAL_TEXT="$1" From 5d2908944cc06108e568ae80dff76c3273133ede Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:37:29 -0500 Subject: [PATCH 0500/1653] Update ConvertText.sh --- Hochob/Services/Image/ConvertText.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index 0f5584ac..5cf43d1d 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -10,7 +10,8 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert -export CONVERTTEXT_ARGUMENTS="-pointsize 80 -fill darkred -stroke yellow -draw" +export CONVERTTEXT_ARGUMENTS="-font Bookman-DemiItalic -pointsize 80 \ + -fill darkred -stroke yellow -draw" LOCAL_TEXT="$1" From db8340fb558ababcdcaa8cc15d19b55514fd156a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:39:15 -0500 Subject: [PATCH 0501/1653] Update ConvertText.sh --- Hochob/Services/Image/ConvertText.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index 5cf43d1d..4c8ab423 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -10,8 +10,8 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert -export CONVERTTEXT_ARGUMENTS="-font Bookman-DemiItalic -pointsize 80 \ - -fill darkred -stroke yellow -draw" +export CONVERTTEXT_ARGUMENTS="-font Robot -pointsize 80 \ + -fill darkblue -stroke yellow -draw" LOCAL_TEXT="$1" From ca15cf2d72b47b12330738847fe50b0d0c81b965 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:40:46 -0500 Subject: [PATCH 0502/1653] Update ConvertText.sh --- Hochob/Services/Image/ConvertText.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index 4c8ab423..dea0af2b 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -11,7 +11,7 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert export CONVERTTEXT_ARGUMENTS="-font Robot -pointsize 80 \ - -fill darkblue -stroke yellow -draw" + -fill "rgb(0,174,239)" -stroke yellow -draw" LOCAL_TEXT="$1" From f8c45c799650b9d8777b7724e54c2cf56523b940 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:41:27 -0500 Subject: [PATCH 0503/1653] Update ConvertText.sh --- Hochob/Services/Image/ConvertText.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index dea0af2b..cb2e6578 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -10,7 +10,7 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert -export CONVERTTEXT_ARGUMENTS="-font Robot -pointsize 80 \ +export CONVERTTEXT_ARGUMENTS="-font Roboto-Bold -pointsize 80 \ -fill "rgb(0,174,239)" -stroke yellow -draw" LOCAL_TEXT="$1" From 663401fffce620d6ca404ca717d8bd46969539a3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:42:05 -0500 Subject: [PATCH 0504/1653] Update ConvertText.sh --- Hochob/Services/Image/ConvertText.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index cb2e6578..a3df5495 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -11,7 +11,7 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert export CONVERTTEXT_ARGUMENTS="-font Roboto-Bold -pointsize 80 \ - -fill "rgb(0,174,239)" -stroke yellow -draw" + -fill \"rgb(0,174,239)\" -stroke yellow -draw" LOCAL_TEXT="$1" From 4ede1575a83d602549a167b902c159c6e59e6ead Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:43:58 -0500 Subject: [PATCH 0505/1653] Update ConvertText.sh --- Hochob/Services/Image/ConvertText.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index a3df5495..0587e83d 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -11,7 +11,7 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert export CONVERTTEXT_ARGUMENTS="-font Roboto-Bold -pointsize 80 \ - -fill \"rgb(0,174,239)\" -stroke yellow -draw" + -fill DeepSkyBlue -stroke yellow -draw" LOCAL_TEXT="$1" From b3d8c0c55296a56caf2b6f377413b7346fd540d7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:55:30 -0500 Subject: [PATCH 0506/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 6a64b124..6439788c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -25,6 +25,8 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME +LOCAL_INSTITUTION=`Name.sh` + #Robot.sh lupe/message "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" Espeak.sh on spanish \ "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" @@ -66,7 +68,7 @@ wait Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & #Robot.sh lupe/message "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." Espeak.sh on spanish \ - "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." + "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido ${LOCAL_INSTITUTION}" sleep 5 From 91b9238ddf7e04fd874d20390233072b1db5dc8e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 11:56:03 -0500 Subject: [PATCH 0507/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 6439788c..a292a70a 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -29,7 +29,7 @@ LOCAL_INSTITUTION=`Name.sh` #Robot.sh lupe/message "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" Espeak.sh on spanish \ - "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" + "Tomaremos algunas fotos. Acomódense mientras yo me voy a mi lugar preferido" Robot.sh lupe/headright 1 sleep .6 From 853b60c492419814ec2626a21a05cc9af374a047 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:03:34 -0500 Subject: [PATCH 0508/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index a292a70a..e2e3b6c7 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -27,6 +27,12 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` +#Robot.sh lupe/message "" +Espeak.sh on spanish \ + "Bienvenidos {LOCAL_INSTITUTION} a mi casa, su casa." + +exit 0 + #Robot.sh lupe/message "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" Espeak.sh on spanish \ "Tomaremos algunas fotos. Acomódense mientras yo me voy a mi lugar preferido" From b0fa7bd29255d6235002220ff56b4636b73a2331 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:03:59 -0500 Subject: [PATCH 0509/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index e2e3b6c7..f4acb1e4 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -29,7 +29,7 @@ LOCAL_INSTITUTION=`Name.sh` #Robot.sh lupe/message "" Espeak.sh on spanish \ - "Bienvenidos {LOCAL_INSTITUTION} a mi casa, su casa." + "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa." exit 0 From b837a426dab9ed13e9cfc0a5e163902b7d897dbb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:19:14 -0500 Subject: [PATCH 0510/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index f4acb1e4..b8128a11 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -27,9 +27,15 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` -#Robot.sh lupe/message "" +#Robot.sh lupe/message "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ + Es un gusto conocerlos. Hace rato estaba un poco chiviado \ + pero ya estoy listo para mostrarles lo interesante que es el mundo \ + de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas." Espeak.sh on spanish \ - "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa." + "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ + Es un gusto conocerlos. Hace rato estaba un poco chiviado \ + pero ya estoy listo para mostrarles lo interesante que es el mundo \ + de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas." exit 0 From d46c6f2a807154f62924c1a53f7234446617ff64 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:19:36 -0500 Subject: [PATCH 0511/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index b8128a11..21dfff37 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -28,9 +28,10 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` #Robot.sh lupe/message "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ - Es un gusto conocerlos. Hace rato estaba un poco chiviado \ - pero ya estoy listo para mostrarles lo interesante que es el mundo \ - de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas." +# Es un gusto conocerlos. Hace rato estaba un poco chiviado \ +# pero ya estoy listo para mostrarles lo interesante que es el mundo \ +# de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas." + Espeak.sh on spanish \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ Es un gusto conocerlos. Hace rato estaba un poco chiviado \ From 450d41db44c02ec022f7db71477e7af79243c30a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:27:43 -0500 Subject: [PATCH 0512/1653] Update Michoacan.sh --- .../SouthernMayaHighlands/Michoacan.sh | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 21dfff37..63b639a7 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -27,22 +27,29 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` -#Robot.sh lupe/message "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ -# Es un gusto conocerlos. Hace rato estaba un poco chiviado \ -# pero ya estoy listo para mostrarles lo interesante que es el mundo \ -# de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas." +#Robot.sh lupe/message \ +# "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ +# Es un gusto conocerlos. Hace rato estaba un poco chiviado \ +# pero ya estoy listo para mostrarles lo interesante que es el mundo \ +# de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas. \ +# A nombre de cada uno de los Ingenieros que aquí trabajamos les deseamos \ +# las mejor de las experiencias. Muchas gracias por haber venido." Espeak.sh on spanish \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ Es un gusto conocerlos. Hace rato estaba un poco chiviado \ pero ya estoy listo para mostrarles lo interesante que es el mundo \ - de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas." + de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas. \ + A nombre de cada uno de los Ingenieros que aquí trabajamos les deseamos \ + las mejor de las experiencias. Muchas gracias por haber venido." exit 0 -#Robot.sh lupe/message "Tomaremos algunas fotos. Acomodense mientras yo me voy a mi lugar preferido" +#Robot.sh lupe/message \ +# "Ahora tomaremos una foto para el recuerdo. Acomodense mientras yo me voy a mi lugar preferido." + Espeak.sh on spanish \ - "Tomaremos algunas fotos. Acomódense mientras yo me voy a mi lugar preferido" + "Ahora tomaremos una foto para el recuerdo. Acomodense mientras yo me voy a mi lugar preferido." Robot.sh lupe/headright 1 sleep .6 @@ -62,26 +69,26 @@ sleep 3.6 Robot.sh lupe/movestop 1 sleep .6 +#Robot.sh lupe/message \ +# "Estan listos?" Espeak.sh on spanish \ "Estan listos?" sleep 3 +#Robot.sh lupe/message \ +# "3, 2, 1, Sonrian!" Espeak.sh on spanish \ "3, 2, 1, Sonrian!" -#Robot.sh lupe/message "Estan listos?" -#sleep 3 -#Robot.sh lupe/message "3, 2, 1, Sonrian!" - Memories.sh "5" "on" "${MICHOACAN_NAME}" & - wait - Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & -#Robot.sh lupe/message "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." + +#Robot.sh lupe/message \ +# "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." Espeak.sh on spanish \ - "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido ${LOCAL_INSTITUTION}" + "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." sleep 5 From 5e1b93210ce68b0de56e7530c04a929a21d2e875 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:33:05 -0500 Subject: [PATCH 0513/1653] Update Michoacan.sh --- .../SouthernMayaHighlands/Michoacan.sh | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 63b639a7..7b596d89 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -29,19 +29,21 @@ LOCAL_INSTITUTION=`Name.sh` #Robot.sh lupe/message \ # "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ -# Es un gusto conocerlos. Hace rato estaba un poco chiviado \ -# pero ya estoy listo para mostrarles lo interesante que es el mundo \ -# de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas. \ -# A nombre de cada uno de los Ingenieros que aquí trabajamos les deseamos \ -# las mejor de las experiencias. Muchas gracias por haber venido." +# Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ +# hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ +# lo interesante que es el mundo de las Ciencias, la Tecnología, \ +# las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ +# que aquí trabajamos les deseamos las mejor de las experiencias. \ +# Muchas gracias por haber venido." Espeak.sh on spanish \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ - Es un gusto conocerlos. Hace rato estaba un poco chiviado \ - pero ya estoy listo para mostrarles lo interesante que es el mundo \ - de las Ciencias, la Tecnología, las Ingenierías y las Matemáticas. \ - A nombre de cada uno de los Ingenieros que aquí trabajamos les deseamos \ - las mejor de las experiencias. Muchas gracias por haber venido." + Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ + hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ + lo interesante que es el mundo de las Ciencias, la Tecnología, \ + las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ + que aquí trabajamos les deseamos las mejor de las experiencias. \ + Muchas gracias por haber venido." exit 0 From 299f9e8dd5031fa69f806bc30262e24bdbd24190 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:33:52 -0500 Subject: [PATCH 0514/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 7b596d89..b859fdbb 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -33,7 +33,7 @@ LOCAL_INSTITUTION=`Name.sh` # hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ # lo interesante que es el mundo de las Ciencias, la Tecnología, \ # las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ -# que aquí trabajamos les deseamos las mejor de las experiencias. \ +# que aquí trabajamos les deseamos la mejor de las experiencias. \ # Muchas gracias por haber venido." Espeak.sh on spanish \ @@ -42,7 +42,7 @@ Espeak.sh on spanish \ hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ lo interesante que es el mundo de las Ciencias, la Tecnología, \ las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ - que aquí trabajamos les deseamos las mejor de las experiencias. \ + que aquí trabajamos les deseamos la mejor de las experiencias. \ Muchas gracias por haber venido." exit 0 From cc55c6abe3c0a79961b9acf23ec454f310658795 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:34:35 -0500 Subject: [PATCH 0515/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index b859fdbb..75a4c08b 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -71,12 +71,14 @@ sleep 3.6 Robot.sh lupe/movestop 1 sleep .6 +sleep 5 + #Robot.sh lupe/message \ # "Estan listos?" Espeak.sh on spanish \ "Estan listos?" -sleep 3 +sleep 5 #Robot.sh lupe/message \ # "3, 2, 1, Sonrian!" From e354951f9e5d099db0d7f7800a09fcc318cef4fe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:39:16 -0500 Subject: [PATCH 0516/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 354a9c6f..4ef8c99f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -320,50 +320,50 @@ shell_command: # Southern Maya Highlands - aguascalientes: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & - bajacalifornianorte: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh & - bajacaliforniasur: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh & - campeche: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Campeche.sh & - michoacan: /home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & + aguascalientes: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & + bajacalifornianorte: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh & + bajacaliforniasur: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh & + campeche: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Campeche.sh & + michoacan: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & # Central Maya Lowlands - acapulco: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Acapulco.sh & - cancun: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Cancun.sh & - huatulco: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Huatulco.sh & - mazatlan: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh & - puertovallarta: /home/hochob/CodeLabs/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh & + acapulco: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Acapulco.sh & + cancun: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Cancun.sh & + huatulco: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Huatulco.sh & + mazatlan: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh & + puertovallarta: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh & # Northern Maya Lowlands - montesazules: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh & - ojodeliebre: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & - lamichilia: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & - elcielo: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & - mapimi: /home/hochob/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & + montesazules: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh & + ojodeliebre: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & + lamichilia: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & + elcielo: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & + mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & # Robot Maya Techlands - resetall: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 + resetall: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 - headleft: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 - headright: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 - - rightup: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightup - rightdown: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightdown - rightfold: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightfold - rightunfold: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightunfold - - leftup: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftup - lefttdown: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftdown - leftfold: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftfold - leftunfold: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftunfold + headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 + headright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 + + rightup: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightup + rightdown: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightdown + rightfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightfold + rightunfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightunfold + + leftup: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftup + lefttdown: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftdown + leftfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftfold + leftunfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftunfold - moveright: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveright - moveleft: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveleft - moveforward: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveforward - movebackward: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movebackward - movestop: /home/hochob/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movestop + moveright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveright + moveleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveleft + moveforward: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveforward + movebackward: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movebackward + movestop: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movestop switch: - platform: command_line @@ -372,32 +372,32 @@ switch: # Language language: - command_on: "/home/hochob/CodeLabs/Hochob/Services/Language/Language.sh spanish &" - command_off: "/home/hochob/CodeLabs/Hochob/Services/Language/Language.sh english" + command_on: "~/CodeLabs/Hochob/Services/Language/Language.sh spanish &" + command_off: "~/CodeLabs/Hochob/Services/Language/Language.sh english" # Southern Maya Highlands: Corporate guanajuato: - command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh &" + command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh &" command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" guerrero: - command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" + command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" # Southern Maya Highlands: Visitors Center hidalgo: - command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" # Southern Maya Highlands: Memories queretaro: - command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" quintanaroo: - command_on: "/home/hochob/CodeLabs/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" + command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" group: From e44b02c122c8cbd25e22538a9ed1a247e318dd7e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:41:52 -0500 Subject: [PATCH 0517/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 75a4c08b..491d13d1 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -30,26 +30,22 @@ LOCAL_INSTITUTION=`Name.sh` #Robot.sh lupe/message \ # "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ # Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ -# hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ +# hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ # lo interesante que es el mundo de las Ciencias, la Tecnología, \ # las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ # que aquí trabajamos les deseamos la mejor de las experiencias. \ # Muchas gracias por haber venido." - Espeak.sh on spanish \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ - hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ + hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ lo interesante que es el mundo de las Ciencias, la Tecnología, \ las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ que aquí trabajamos les deseamos la mejor de las experiencias. \ Muchas gracias por haber venido." -exit 0 - #Robot.sh lupe/message \ # "Ahora tomaremos una foto para el recuerdo. Acomodense mientras yo me voy a mi lugar preferido." - Espeak.sh on spanish \ "Ahora tomaremos una foto para el recuerdo. Acomodense mientras yo me voy a mi lugar preferido." From eb898ef039c944ba6d762ed77654d178e74715b8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:51:37 -0500 Subject: [PATCH 0518/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 4ef8c99f..006f0e51 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -35,8 +35,11 @@ homeassistant: script.michoacan: friendly_name: 2.3 Lupe Robot Foto Grupal icon: mdi:video + + # Southern Maya Highlands : 3 Tour + script.campeche: - friendly_name: 2.4 Bienvenidos Recorrido + friendly_name: 3.1 Bienvenidos Recorrido icon: mdi:audiobook # Southern Maya Highlands : Corporate : @@ -407,7 +410,8 @@ group: entities: - group.language - group.introduction - - group.video + - group.robot + - group.tour - group.corporate - group.visitorscenter - group.memories @@ -444,14 +448,19 @@ group: entities: - script.aguascalientes - video: - name: 2 Video + robot: + name: 2 Robot entities: - script.bajacalifornianorte - script.bajacaliforniasur - script.michoacan - script.campeche + tour: + name: 3 Tour + entities: + - script.campeche + corporate: name: Corporate entities: From 10610688e2714601e431eae5ef03495a029bf0f4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:58:59 -0500 Subject: [PATCH 0519/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index dc035546..c5c8c264 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -25,10 +25,10 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") LogPid.sh $CAMPECHE_PID $CAMPECHE_NAME -Memories.sh "1" "off" "${BAJACALIFORNIANORTE_NAME}" +#Memories.sh "1" "off" "${BAJACALIFORNIANORTE_NAME}" #Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" -LOCAL_INSTITUTION=`Name.sh` -ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" +#LOCAL_INSTITUTION=`Name.sh` +#ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" eog -f $FSWEBCAM_IMAGE_TEXT & #Eog.sh "$FSWEBCAM_ALLFILES" & sleep 1 From cdfad7e486c67c11d7c214e279ab7f4aa6f47ed7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 12:59:03 -0500 Subject: [PATCH 0520/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 491d13d1..1cbe6c6e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -82,8 +82,9 @@ Espeak.sh on spanish \ "3, 2, 1, Sonrian!" Memories.sh "5" "on" "${MICHOACAN_NAME}" & +ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" wait -Eog.sh "$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE" & +Eog.sh "$FSWEBCAM_IMAGE" & #Robot.sh lupe/message \ # "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." From a0cff45d7a34954c2210e3447e3a7540d8ef207f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:00:08 -0500 Subject: [PATCH 0521/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 1cbe6c6e..efdd15e3 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -44,6 +44,8 @@ Espeak.sh on spanish \ que aquí trabajamos les deseamos la mejor de las experiencias. \ Muchas gracias por haber venido." +sleep 1 + #Robot.sh lupe/message \ # "Ahora tomaremos una foto para el recuerdo. Acomodense mientras yo me voy a mi lugar preferido." Espeak.sh on spanish \ From a88ee24bebad3d5239b9804c8f24102fa120ec1d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:12:13 -0500 Subject: [PATCH 0522/1653] Update Michoacan.sh --- .../SouthernMayaHighlands/Michoacan.sh | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index efdd15e3..1c22a39b 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -47,9 +47,11 @@ Espeak.sh on spanish \ sleep 1 #Robot.sh lupe/message \ -# "Ahora tomaremos una foto para el recuerdo. Acomodense mientras yo me voy a mi lugar preferido." +# "Ahora tomaremos una foto para el recuerdo. \ +# Primero, me iré a mi lugar preferido, denme unos segundos." Espeak.sh on spanish \ - "Ahora tomaremos una foto para el recuerdo. Acomodense mientras yo me voy a mi lugar preferido." + "Ahora tomaremos una foto para el recuerdo. \ + Primero, me iré a mi lugar preferido, denme unos segundos." Robot.sh lupe/headright 1 sleep .6 @@ -69,12 +71,21 @@ sleep 3.6 Robot.sh lupe/movestop 1 sleep .6 -sleep 5 +#Robot.sh lupe/message \ +# "Estoy listo! Ahora les toca a ustedes acomodarse. \ +# Con mucho cuidado ponganse a ambos lados de mi, \ +# viendo hacia la pantalla y sonrían." +Espeak.sh on spanish \ + "Estoy listo! Ahora les toca a ustedes acomodarse. \ + Con mucho cuidado ponganse a ambos lados de mi, \ + viendo hacia la pantalla y sonrían." + +sleep 10 #Robot.sh lupe/message \ -# "Estan listos?" +# "Como van? Ya la tomamos?" Espeak.sh on spanish \ - "Estan listos?" + "Como van? Ya la tomamos?" sleep 5 From 8ff9f4ca259081ad717d244dd709a2b25e428e1f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:18:33 -0500 Subject: [PATCH 0523/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 1c22a39b..511b6689 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -83,16 +83,16 @@ Espeak.sh on spanish \ sleep 10 #Robot.sh lupe/message \ -# "Como van? Ya la tomamos?" +# "Están listos ${LOCAL_INSTITUTION}?" Espeak.sh on spanish \ - "Como van? Ya la tomamos?" + "Están listos ${LOCAL_INSTITUTION}?" sleep 5 #Robot.sh lupe/message \ -# "3, 2, 1, Sonrian!" +# "Ya listos! Tomemos la foto! A la cuenta de 3. 1, 2 y 3, Sonrian!" Espeak.sh on spanish \ - "3, 2, 1, Sonrian!" + "Ya listos! Tomemos la foto! A la cuenta de 3. 1, 2 y 3, Sonrían!" Memories.sh "5" "on" "${MICHOACAN_NAME}" & ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" @@ -102,7 +102,7 @@ Eog.sh "$FSWEBCAM_IMAGE" & #Robot.sh lupe/message \ # "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." Espeak.sh on spanish \ - "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." + "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." sleep 5 From 17b434fc4352e91b217b7f6b37e5393d00b9d0df Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:22:09 -0500 Subject: [PATCH 0524/1653] Update Michoacan.sh --- .../Applications/SouthernMayaHighlands/Michoacan.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 511b6689..6312b464 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -90,9 +90,16 @@ Espeak.sh on spanish \ sleep 5 #Robot.sh lupe/message \ -# "Ya listos! Tomemos la foto! A la cuenta de 3. 1, 2 y 3, Sonrian!" +# "Ya listos? Tomemos la foto, a la cuenta de 3." Espeak.sh on spanish \ - "Ya listos! Tomemos la foto! A la cuenta de 3. 1, 2 y 3, Sonrían!" + "Ya listos? Tomemos la foto, a la cuenta de 3." + +sleep 1 + +#Robot.sh lupe/message \ +# "1, 2 y 3, Sonrian." +Espeak.sh on spanish \ + "1, 2 y 3, Sonrían." Memories.sh "5" "on" "${MICHOACAN_NAME}" & ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" From 98d086926942a0062ae0fdee020b6ea4ebdc6a61 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:25:32 -0500 Subject: [PATCH 0525/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index c5c8c264..50ab67b5 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -29,8 +29,8 @@ LogPid.sh $CAMPECHE_PID $CAMPECHE_NAME #Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" #LOCAL_INSTITUTION=`Name.sh` #ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" -eog -f $FSWEBCAM_IMAGE_TEXT & -#Eog.sh "$FSWEBCAM_ALLFILES" & +#eog -f $FSWEBCAM_IMAGE_TEXT & +Eog.sh $FSWEBCAM_IMAGE_TEXT & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" From 9c27ff4966f3aeaaf7e0c05d4eec4abdb3e01bce Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:26:18 -0500 Subject: [PATCH 0526/1653] Update Eog.sh --- Hochob/Services/Image/Eog.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index f0b684dd..f461c668 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -8,7 +8,7 @@ set -x export EOG_PID=$$ export EOG_BINARY=eog -export EOG_ARGUMENTS="-sf" +export EOG_ARGUMENTS="-f" LOCAL_FILES="$1" From 1a16a854bf2d334e4d2f603a4ed2311f0e5f0039 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:34:16 -0500 Subject: [PATCH 0527/1653] Update Eog.sh --- Hochob/Services/Image/Eog.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Image/Eog.sh b/Hochob/Services/Image/Eog.sh index f461c668..d3436c3b 100755 --- a/Hochob/Services/Image/Eog.sh +++ b/Hochob/Services/Image/Eog.sh @@ -8,7 +8,7 @@ set -x export EOG_PID=$$ export EOG_BINARY=eog -export EOG_ARGUMENTS="-f" +export EOG_ARGUMENTS="-sf" LOCAL_FILES="$1" @@ -25,6 +25,9 @@ LOCAL_FILES="$1" if [ $# -eq 1 ] then killall -9 $EOG_BINARY + if [ -f "${LOCAL_FILES}" ]; then + export EOG_ARGUMENTS="-f" + fi $EOG_BINARY $EOG_ARGUMENTS $LOCAL_FILES & else echo "Invalid number of arguments, see Documentation" From 5d7436d6116b048bd074b783f3421c73763fd7ef Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:37:38 -0500 Subject: [PATCH 0528/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 62194c8a..588a8080 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -27,7 +27,7 @@ LogPid.sh $AGUASCALIENTES_PID $AGUASCALIENTES_NAME Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & -Eog.sh "$CORPORATE_IMAGE/*" & +Eog.sh $CORPORATE_IMAGE & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" KillApp.sh "eog" From 00fc41abe458ef22c837ba62e61509ef5f01aad3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:38:52 -0500 Subject: [PATCH 0529/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 588a8080..bdd6a957 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -27,8 +27,10 @@ LogPid.sh $AGUASCALIENTES_PID $AGUASCALIENTES_NAME Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & -Eog.sh $CORPORATE_IMAGE & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +Eog.sh $CORPORATE_IMAGE & + KillApp.sh "eog" +KillApp.sh "mpg123" # End of File From bff654971d0c5291b8c5e5b6c400fa416eddbfc8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:39:49 -0500 Subject: [PATCH 0530/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index bdd6a957..bbf6bc9b 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -27,7 +27,7 @@ LogPid.sh $AGUASCALIENTES_PID $AGUASCALIENTES_NAME Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" & Eog.sh $CORPORATE_IMAGE & KillApp.sh "eog" From 8a06bce024f4f90f5507dbe705537c54ba88ba29 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:40:56 -0500 Subject: [PATCH 0531/1653] Update Mpg123.sh --- Hochob/Services/Sound/Play/Mpg123.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 52b358c9..2d5af717 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -25,7 +25,7 @@ LOCAL_FILE="$1" if [ $# -eq 1 ] then - $MPG123_BINARY $MPG123_ARGUMENTS $LOCAL_FILE + $MPG123_BINARY $MPG123_ARGUMENTS $LOCAL_FILE & else echo "Invalid number of arguments, see Documentation" exit 1 From 9a1d588c1c2a1fcb645afc546c0f25f316e2b2ef Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:43:21 -0500 Subject: [PATCH 0532/1653] Update Mpg123.sh --- Hochob/Services/Sound/Play/Mpg123.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 2d5af717..52b358c9 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -25,7 +25,7 @@ LOCAL_FILE="$1" if [ $# -eq 1 ] then - $MPG123_BINARY $MPG123_ARGUMENTS $LOCAL_FILE & + $MPG123_BINARY $MPG123_ARGUMENTS $LOCAL_FILE else echo "Invalid number of arguments, see Documentation" exit 1 From 87e73f78cc997dce42b83ab4f15b40f798769a30 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:44:41 -0500 Subject: [PATCH 0533/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index bbf6bc9b..556f464d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -27,10 +27,9 @@ LogPid.sh $AGUASCALIENTES_PID $AGUASCALIENTES_NAME Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" & Eog.sh $CORPORATE_IMAGE & - +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +sleep 80 KillApp.sh "eog" -KillApp.sh "mpg123" # End of File From 24a246ad1f2a2078c224bb2e522df4420e042cc3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:48:49 -0500 Subject: [PATCH 0534/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 50ab67b5..0dfde101 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -34,7 +34,7 @@ Eog.sh $FSWEBCAM_IMAGE_TEXT & sleep 1 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" -KillApp.sh "eog" KillApp.sh "mpg123" +KillApp.sh "eog" # End of File From 64adc77d024f73dc8dd4b425ae3f5bfb15e705c3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 17 Jun 2017 13:49:04 -0500 Subject: [PATCH 0535/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 556f464d..29d9ba65 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -29,7 +29,8 @@ Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh $CORPORATE_IMAGE & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" -sleep 80 + +KillApp.sh "mpg123" KillApp.sh "eog" # End of File From 7b49445b32c2177b4ce2b6d0447f2e83e481454f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:06:02 -0500 Subject: [PATCH 0536/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 3a3542c7..318d8f82 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -39,7 +39,7 @@ else Que disfruten tu recorrido." fi -Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Triki" "1.0" "$ESPEAK_SPEECH_MP3" LOCAL_LANGUAGE=`Language.sh` From 1af4dbe1f381d5f20f0e1981fbfc3a3e09a1fef6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:13:17 -0500 Subject: [PATCH 0537/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 318d8f82..59d55725 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -35,7 +35,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else Espeak.sh off spanish \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ - Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio de Intel en Guadalajara. \ + Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ Que disfruten tu recorrido." fi From 021dba612135e46a21efdd668185230a9a5e2eaa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:21:28 -0500 Subject: [PATCH 0538/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index c5cd81a3..47086d5c 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -24,6 +24,8 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") LOCAL_LANGUAGE=`Language.sh` +LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "${LOCAL_INSTITUTION}, you know more about Intel, now let's get into the next hall\ @@ -36,7 +38,6 @@ else fi Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" - if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" else From 5e60f02fe88b04f726761854155297d7dc87ca80 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:26:24 -0500 Subject: [PATCH 0539/1653] Update Huatulco.sh --- .../CentralMayaLowlands/Huatulco.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 675cebec..7f656aa5 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -30,4 +30,21 @@ else Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" fi +LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "${LOCAL_INSTITUTION}, you know more about the Mayans, Intel and Intel Guadalajara Design Center, \ + now let's get into the next hall where we will find information about our Microproccesors, \ + our Fabs and Laboratories. Follow me." +else + Espeak.sh off spanish \ + "${LOCAL_INSTITUTION}, ahora que saben más acerca de los Mayas, \ + Intel e Intel Guadalajara Centro de Diseño podemos pasar a la siguiente seccion \ + en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas \ + y nuestros Laboratorios. Acompañenme." +fi + +Stream.sh "Triki" "1.0" "$ESPEAK_SPEECH_MP3" + # End of File From 862741b448de563cbdc2313ebe8c3a4d186fae99 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:27:37 -0500 Subject: [PATCH 0540/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 7f656aa5..a4eae2f6 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -36,13 +36,13 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "${LOCAL_INSTITUTION}, you know more about the Mayans, Intel and Intel Guadalajara Design Center, \ now let's get into the next hall where we will find information about our Microproccesors, \ - our Fabs and Laboratories. Follow me." + our Fabs and Laboratories. Let's go." else Espeak.sh off spanish \ "${LOCAL_INSTITUTION}, ahora que saben más acerca de los Mayas, \ Intel e Intel Guadalajara Centro de Diseño podemos pasar a la siguiente seccion \ en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas \ - y nuestros Laboratorios. Acompañenme." + y nuestros Laboratorios. Vamos." fi Stream.sh "Triki" "1.0" "$ESPEAK_SPEECH_MP3" From 8806db23e1739f07369338c4302ae4bfad19baaf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:34:26 -0500 Subject: [PATCH 0541/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 47086d5c..82b3061e 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -28,13 +28,10 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ - "${LOCAL_INSTITUTION}, you know more about Intel, now let's get into the next hall\ - where we will find information about our Microproccesors, our Fabs and Laboratories. \ - Enjoy your tour." + "" else Espeak.sh off spanish \ - "${LOCAL_INSTITUTION}, ahora que saben mas acerca de Intel podemos pasar a la siguiente seccion \ - en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas y nuestros Laboratorios. Acompanienme." + "" fi Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" From ba903e393fb0765bd53f065dfa355ad250d02d59 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:34:50 -0500 Subject: [PATCH 0542/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 82b3061e..3a9d77a2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -24,8 +24,6 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") LOCAL_LANGUAGE=`Language.sh` -LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "" From 99562077d3f2282076d386299f910dbb56bfaae0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:35:12 -0500 Subject: [PATCH 0543/1653] Update PuertoVallarta.sh --- .../CentralMayaLowlands/PuertoVallarta.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index 20e794c1..7cd2c21d 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -30,4 +30,15 @@ else Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" fi +LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "" +else + Espeak.sh off spanish \ + "" +fi + + # End of File From d78809ac469ed256548e1a4d3f837ed78d118877 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:35:30 -0500 Subject: [PATCH 0544/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 3a9d77a2..68a61695 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -33,6 +33,7 @@ else fi Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" + if [ "$LOCAL_LANGUAGE" = "english" ]; then Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" else From 9afd4a50aa9ed0070dca1186cde46929a24aa175 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:36:19 -0500 Subject: [PATCH 0545/1653] Update PuertoVallarta.sh --- Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index 7cd2c21d..210ca1c4 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -30,8 +30,6 @@ else Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" fi -LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "" @@ -40,5 +38,6 @@ else "" fi +Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" # End of File From 0dc809b4efe267fb49fcc6462197b1c75eeb62c7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 09:41:39 -0500 Subject: [PATCH 0546/1653] Update MontesAzules.sh --- .../NorthernMayaLowlands/MontesAzules.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 288cd18c..6319fc91 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -23,14 +23,24 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` -Espeak.sh off spanish \ - "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Ya vimos la importancia de nuestras Fabricas y Laboratorios. Ahora entraremos a una seccion \ - que nos permite jugar y conocer de cerca la tecnología. Siganme." +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "" +else + Espeak.sh off spanish \ + "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Ya vimos la importancia de nuestras Fabricas y Laboratorios. \ + Ahora entraremos a una seccion que nos permite jugar y conocer de cerca la tecnología. Siganme." +fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" -Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" +if [ "$LOCAL_LANGUAGE" = "english" ]; then + echo "Tbd" +else + Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" +fi kill -- -$(ps -o pgid=$MONTESAZULES_PID | grep -o '[0-9]*') From 219888a310d42e1a05c90a9b242d27860557f7d6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 12:42:32 -0500 Subject: [PATCH 0547/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 6319fc91..74bc19ed 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -30,8 +30,8 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "" else Espeak.sh off spanish \ - "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Ya vimos la importancia de nuestras Fabricas y Laboratorios. \ - Ahora entraremos a una seccion que nos permite jugar y conocer de cerca la tecnología. Siganme." + "Futuros Matemáticos de ${LOCAL_INSTITUTION}. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ + Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología. Siganme." fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 46ea8895a9bac21494844d2b04410c6838a52d71 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 12:43:50 -0500 Subject: [PATCH 0548/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 59d55725..9a6d3a76 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -36,7 +36,7 @@ else Espeak.sh off spanish \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ - Que disfruten tu recorrido." + Que disfruten su recorrido." fi Stream.sh "Triki" "1.0" "$ESPEAK_SPEECH_MP3" From 15138c76fcc09675aaa0309223054405d2c48b36 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 12:49:04 -0500 Subject: [PATCH 0549/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index a4eae2f6..38db3a4c 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -30,8 +30,6 @@ else Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" fi -LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "${LOCAL_INSTITUTION}, you know more about the Mayans, Intel and Intel Guadalajara Design Center, \ From 047c7674ed2c8e0b28f981b118fdf86a0c9780b8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 12:50:05 -0500 Subject: [PATCH 0550/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 38db3a4c..f3825fa6 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -38,7 +38,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else Espeak.sh off spanish \ "${LOCAL_INSTITUTION}, ahora que saben más acerca de los Mayas, \ - Intel e Intel Guadalajara Centro de Diseño podemos pasar a la siguiente seccion \ + de Intel y del Centro de Diseño de Intel en Guadalajara, podemos pasar a la siguiente seccion \ en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas \ y nuestros Laboratorios. Vamos." fi From 9f6c843dc9084f679d082165c8f983f1d7715b74 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 12:56:21 -0500 Subject: [PATCH 0551/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 9fe19ee1..c6614d1b 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -38,4 +38,17 @@ else exit 1 fi +exit 0 + +# ============================================================================= +# Sandbox +# ============================================================================= + +LOCAL_ROBOTAVAILABLE=`RobotAvailable.sh` +if [ "$LOCAL_ROBOTAVAILABLE" -eq "0" ]; then + Espeak.sh on spanish "Nel" +else + Robot.sh lupe/say "Nel" +fi + # End of File From b2e5b8f2c7c798f0dea026adb63de2cf0baa368e Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Sun, 18 Jun 2017 13:14:13 -0500 Subject: [PATCH 0552/1653] Update Signed-off-by: Abraham Arce Moreno --- .../NorthernMayaLowlands/SianKaan.sh | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/SianKaan.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh new file mode 100755 index 00000000..cbd0bd09 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MAPIMI_PID=$$ +export MAPIMI_NAME="Mapimi Application" +export MAPIMI_PATH=$(readlink -f "$0") +export MAPIMI_DIRECTORY=$(dirname "$ZACATECAS_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +#Memories.sh "40" "on" "${MAPIMI_NAME}" +#Espeak.sh off spanish "Nel Pastel Simona La Mona" +#MemoriesAudio.sh "${MAPIMI_NAME}" + +#Stream.sh "Eek'" "1.0" "$FFMPEG_VIDEO_AUDIO" + +Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & + +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "To be written" +else + Espeak.sh off spanish \ + "Me da mucho gusto conocerlos y que hayan venido a Intel. \ + Regresen pronto futuros Ingenieros de ${LOCAL_INSTITUTION}" +fi + +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" + +kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') + +# End of File From 9f72fb2e5cf9ea6bce90e3513bc6903f0abce70f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 13:16:30 -0500 Subject: [PATCH 0553/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index cbd0bd09..4239a7b9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -11,7 +11,7 @@ set -x export MAPIMI_PID=$$ export MAPIMI_NAME="Mapimi Application" export MAPIMI_PATH=$(readlink -f "$0") -export MAPIMI_DIRECTORY=$(dirname "$ZACATECAS_PATH") +export MAPIMI_DIRECTORY=$(dirname "$MAPIMI_PATH") # ============================================================================= # Functions From 63f5de4fd746f5d7ff7bd2fc3701a1cb1e99bce1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 13:17:27 -0500 Subject: [PATCH 0554/1653] Update SianKaan.sh --- .../NorthernMayaLowlands/SianKaan.sh | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index cbd0bd09..b2c33c3d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export MAPIMI_PID=$$ -export MAPIMI_NAME="Mapimi Application" -export MAPIMI_PATH=$(readlink -f "$0") -export MAPIMI_DIRECTORY=$(dirname "$ZACATECAS_PATH") +export SIANKAAN_PID=$$ +export SIANKAAN_NAME="Mapimi Application" +export SIANKAAN_PATH=$(readlink -f "$0") +export SIANKAAN_DIRECTORY=$(dirname "$SIANKAAN_PATH") # ============================================================================= # Functions @@ -23,14 +23,6 @@ export MAPIMI_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -#Memories.sh "40" "on" "${MAPIMI_NAME}" -#Espeak.sh off spanish "Nel Pastel Simona La Mona" -#MemoriesAudio.sh "${MAPIMI_NAME}" - -#Stream.sh "Eek'" "1.0" "$FFMPEG_VIDEO_AUDIO" - -Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & - LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` @@ -45,6 +37,6 @@ fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') # End of File From c19be8b88f928af32a6f3c9e71ffc1b9157aca17 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 13:17:55 -0500 Subject: [PATCH 0555/1653] Update SianKaan.sh --- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index b2c33c3d..3415622a 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -31,8 +31,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "To be written" else Espeak.sh off spanish \ - "Me da mucho gusto conocerlos y que hayan venido a Intel. \ - Regresen pronto futuros Ingenieros de ${LOCAL_INSTITUTION}" + "Por escribirse, ${LOCAL_INSTITUTION}" fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 2db4c863489fa63612b242cf73747343745aad63 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 13:19:34 -0500 Subject: [PATCH 0556/1653] Update SianKaan.sh --- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 3415622a..3f9da73c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -34,7 +34,7 @@ else "Por escribirse, ${LOCAL_INSTITUTION}" fi -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Tipo'" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') From 53ab6d31eeb8b76a42038854d91e072c2bdc60c1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 13:20:17 -0500 Subject: [PATCH 0557/1653] Update SianKaan.sh --- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 3f9da73c..ad909736 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -34,7 +34,7 @@ else "Por escribirse, ${LOCAL_INSTITUTION}" fi -Stream.sh "Tipo'" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Tipo" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') From e9e2a8771e92f722a27d637a50609d6414d63558 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 13:24:05 -0500 Subject: [PATCH 0558/1653] Update SianKaan.sh --- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index ad909736..3415622a 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -34,7 +34,7 @@ else "Por escribirse, ${LOCAL_INSTITUTION}" fi -Stream.sh "Tipo" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') From 3eb9c0eb8f668a5b6bad6ade7f258871cc245674 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 13:26:38 -0500 Subject: [PATCH 0559/1653] Update SianKaan.sh --- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 3415622a..6e4d1b39 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -34,7 +34,7 @@ else "Por escribirse, ${LOCAL_INSTITUTION}" fi -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') From d99ada10f3b38b8340d10e52b6186f0ae889ec67 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 13:31:54 -0500 Subject: [PATCH 0560/1653] Update SianKaan.sh --- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 6e4d1b39..2354e8a9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -34,7 +34,14 @@ else "Por escribirse, ${LOCAL_INSTITUTION}" fi -Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" + +Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & + +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') From 12ff751c96b2a096e56bbda4e92f29f9774bcda3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Moreno Date: Sun, 18 Jun 2017 16:24:54 -0500 Subject: [PATCH 0561/1653] Update Signed-off-by: Abraham Arce Moreno --- .../NorthernMayaLowlands/Calakmul.sh | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/Calakmul.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh new file mode 100755 index 00000000..2354e8a9 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export SIANKAAN_PID=$$ +export SIANKAAN_NAME="Mapimi Application" +export SIANKAAN_PATH=$(readlink -f "$0") +export SIANKAAN_DIRECTORY=$(dirname "$SIANKAAN_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "To be written" +else + Espeak.sh off spanish \ + "Por escribirse, ${LOCAL_INSTITUTION}" +fi + +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" + +Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & + +Robot.sh lupe/headright 1 +sleep .6 +Robot.sh lupe/headleft 1 +sleep .6 + +kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') + +# End of File From df96025f36a2d4505ea958440dd71da89f769ef1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 16:48:53 -0500 Subject: [PATCH 0562/1653] Update Calakmul.sh --- .../NorthernMayaLowlands/Calakmul.sh | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 2354e8a9..ff595bc1 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export SIANKAAN_PID=$$ -export SIANKAAN_NAME="Mapimi Application" -export SIANKAAN_PATH=$(readlink -f "$0") -export SIANKAAN_DIRECTORY=$(dirname "$SIANKAAN_PATH") +export CALAKMUL_PID=$$ +export CALAKMUL_NAME="Mapimi Application" +export CALAKMUL_PATH=$(readlink -f "$0") +export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") # ============================================================================= # Functions @@ -31,18 +31,18 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "To be written" else Espeak.sh off spanish \ - "Por escribirse, ${LOCAL_INSTITUTION}" + "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ + Te gustaria entender porque la Tierra gira alrededor del Sol? \ + O porque las cosas caen hacia el suelo? \ + El cientifico es una persona que se dedica a entender el mundo y saber como se comporta. \ + Cualquiera puede pensar como un científico. Cuando seas grande, te gustaria ser Cientifico? \ + " fi -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" - -Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & +#Los que aplican los descubrimientos de la ciencia para hacer cosas útiles se llaman Ingenieros. -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/headleft 1 -sleep .6 +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') +kill -- -$(ps -o pgid=$CALAKMUL_PID | grep -o '[0-9]*') # End of File From 2d094df8954148d8d1328e7206022f51ecdab6bd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 16:55:06 -0500 Subject: [PATCH 0563/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index ff595bc1..d45dfef4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -32,9 +32,11 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else Espeak.sh off spanish \ "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ + La ciencia es observar el mundo, escuchar y registrar lo que se aprender. \ Te gustaria entender porque la Tierra gira alrededor del Sol? \ - O porque las cosas caen hacia el suelo? \ - El cientifico es una persona que se dedica a entender el mundo y saber como se comporta. \ + Porque las cosas caen hacia el suelo? \ + Que hace a los pajaros volar? \ + El cientifico es una persona que se dedica a entender el mundo y el universor y saber como se comportan. \ Cualquiera puede pensar como un científico. Cuando seas grande, te gustaria ser Cientifico? \ " fi From f694169215f4668ad5c621cf30e6267241cb023a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 17:00:24 -0500 Subject: [PATCH 0564/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index d45dfef4..c9221607 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -32,12 +32,12 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else Espeak.sh off spanish \ "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ - La ciencia es observar el mundo, escuchar y registrar lo que se aprender. \ - Te gustaria entender porque la Tierra gira alrededor del Sol? \ + La ciencia es observar el mundo, escuchar y registrar lo que se aprende. \ + Te gustaría entender porque la Tierra gira alrededor del Sol? \ Porque las cosas caen hacia el suelo? \ Que hace a los pajaros volar? \ - El cientifico es una persona que se dedica a entender el mundo y el universor y saber como se comportan. \ - Cualquiera puede pensar como un científico. Cuando seas grande, te gustaria ser Cientifico? \ + El científico es una persona que se dedica a entender el mundo y saber como se comporta. \ + Cualquiera puede pensar como un científico, y a ti, te gustaría ser científico? \ " fi From 0cd12617d4576dc667b54dde41c969aac8796175 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 17:01:37 -0500 Subject: [PATCH 0565/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index c9221607..2dfbdfb5 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -x +set -x0 # ============================================================================= # Variables @@ -35,7 +35,7 @@ else La ciencia es observar el mundo, escuchar y registrar lo que se aprende. \ Te gustaría entender porque la Tierra gira alrededor del Sol? \ Porque las cosas caen hacia el suelo? \ - Que hace a los pajaros volar? \ + Que hace a los pájaros volar? \ El científico es una persona que se dedica a entender el mundo y saber como se comporta. \ Cualquiera puede pensar como un científico, y a ti, te gustaría ser científico? \ " From 977f97db2cda7a278ab20a8c102e88ece999d992 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 17:02:07 -0500 Subject: [PATCH 0566/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 2dfbdfb5..654395a0 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -x0 +set -x # ============================================================================= # Variables From 970867f0110741751edc928711df0a044cc6ca54 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 17:11:41 -0500 Subject: [PATCH 0567/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 6312b464..27910753 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -37,8 +37,13 @@ LOCAL_INSTITUTION=`Name.sh` # Muchas gracias por haber venido." Espeak.sh on spanish \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ - Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ - hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ + Es un gusto conocerlos. Ya saben mi nombre, soy Lupe, \ + tengo 2 años robot y estudio el primer año de primaria robot. \ + Mis pasatiempos favoritos son compartir tiempo con mi familia, jugar al aire libre, \ + leer cuentos divertidos, hacer ejercicio y aprender con mis familiares y amigos \ + todo el conocimiento científico y tecnológico que está presente en nuestra vida cotidiana. \ + También soy guia en este emocionante Centro de Visitantes. \ + Hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ lo interesante que es el mundo de las Ciencias, la Tecnología, \ las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ que aquí trabajamos les deseamos la mejor de las experiencias. \ From 5a44571f9e491f1bcbf68af51c8add1538ae57fb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 17:15:42 -0500 Subject: [PATCH 0568/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 27910753..6a130f16 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -85,7 +85,7 @@ Espeak.sh on spanish \ Con mucho cuidado ponganse a ambos lados de mi, \ viendo hacia la pantalla y sonrían." -sleep 10 +sleep 15 #Robot.sh lupe/message \ # "Están listos ${LOCAL_INSTITUTION}?" From c4eaf9529fe96ebd81a795fb9a009d4b8d001ab8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 18 Jun 2017 17:19:07 -0500 Subject: [PATCH 0569/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 654395a0..8f1b6e7c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -33,8 +33,8 @@ else Espeak.sh off spanish \ "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ La ciencia es observar el mundo, escuchar y registrar lo que se aprende. \ - Te gustaría entender porque la Tierra gira alrededor del Sol? \ - Porque las cosas caen hacia el suelo? \ + Te gustaría entender porqué la Tierra gira alrededor del Sol? \ + Porqué las cosas caen hacia el suelo? \ Que hace a los pájaros volar? \ El científico es una persona que se dedica a entender el mundo y saber como se comporta. \ Cualquiera puede pensar como un científico, y a ti, te gustaría ser científico? \ From aee0062cca8b08df63f5608915e9332eb13854b7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 19 Jun 2017 15:19:02 -0500 Subject: [PATCH 0570/1653] Update --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 3 ++- Hochob/Services/Image/ConvertText.sh | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 6a130f16..f5206eb3 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -107,7 +107,8 @@ Espeak.sh on spanish \ "1, 2 y 3, Sonrían." Memories.sh "5" "on" "${MICHOACAN_NAME}" & -ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" +sleep 2 +ConvertText.sh "$FSWEBCAM_IMAGE" "Bienvenidos ${LOCAL_INSTITUTION}" wait Eog.sh "$FSWEBCAM_IMAGE" & diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index 0587e83d..c47a6471 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -10,10 +10,11 @@ set -x export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert -export CONVERTTEXT_ARGUMENTS="-font Roboto-Bold -pointsize 80 \ +export CONVERTTEXT_ARGUMENTS="-font Times-Bold -pointsize 80 \ -fill DeepSkyBlue -stroke yellow -draw" -LOCAL_TEXT="$1" +LOCAL_IMAGE="$1" +LOCAL_TEXT="$2" # ============================================================================= # Functions @@ -25,9 +26,9 @@ LOCAL_TEXT="$1" # Main # ============================================================================= -if [ $# -eq 1 ] +if [ $# -eq 2 ] then - $CONVERTTEXT_BINARY $CONVERTTEXT_ARGUMENTS "text 100,1000 \"$LOCAL_TEXT\"" $FSWEBCAM_IMAGE $FSWEBCAM_IMAGE_TEXT + $CONVERTTEXT_BINARY $CONVERTTEXT_ARGUMENTS "text 100,1000 \"$LOCAL_TEXT\"" $LOCAL_IMAGE $FSWEBCAM_IMAGE_TEXT else echo "Invalid number of arguments, see Documentation" exit 1 From e1390470f5042d1efe0e2dc1a8a53c8f0acdcb6f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 19 Jun 2017 16:59:59 -0500 Subject: [PATCH 0571/1653] Update --- .../Applications/SouthernMayaHighlands/Aguascalientes.sh | 4 +++- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 9 +++------ Hochob/Applications/SouthernMayaHighlands/Guerrero.sh | 2 +- Hochob/Services/Sound/Play/Mpg123.sh | 2 +- Hochob/Services/Video/Vlc.sh | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 29d9ba65..92fcc734 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -28,7 +28,9 @@ LogPid.sh $AGUASCALIENTES_PID $AGUASCALIENTES_NAME Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh $CORPORATE_IMAGE & -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" & + +sleep 85 KillApp.sh "mpg123" KillApp.sh "eog" diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 0dfde101..4ee59b65 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -25,14 +25,11 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") LogPid.sh $CAMPECHE_PID $CAMPECHE_NAME -#Memories.sh "1" "off" "${BAJACALIFORNIANORTE_NAME}" -#Vlc.sh on "$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO" -#LOCAL_INSTITUTION=`Name.sh` -#ConvertText.sh "Bienvenidos ${LOCAL_INSTITUTION}" -#eog -f $FSWEBCAM_IMAGE_TEXT & Eog.sh $FSWEBCAM_IMAGE_TEXT & sleep 1 -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" +Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" & + +sleep 28 KillApp.sh "mpg123" KillApp.sh "eog" diff --git a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh index d8ad7909..35837f03 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh @@ -25,6 +25,6 @@ export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") LogPid.sh $GUERRERO_PID $GUERRERO_NAME -Vlc.sh "on" "$CORPORATE_VIDEO/*" +Vlc.sh "off" "$CORPORATE_VIDEO/" # End of File diff --git a/Hochob/Services/Sound/Play/Mpg123.sh b/Hochob/Services/Sound/Play/Mpg123.sh index 52b358c9..2d5af717 100755 --- a/Hochob/Services/Sound/Play/Mpg123.sh +++ b/Hochob/Services/Sound/Play/Mpg123.sh @@ -25,7 +25,7 @@ LOCAL_FILE="$1" if [ $# -eq 1 ] then - $MPG123_BINARY $MPG123_ARGUMENTS $LOCAL_FILE + $MPG123_BINARY $MPG123_ARGUMENTS $LOCAL_FILE & else echo "Invalid number of arguments, see Documentation" exit 1 diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/Vlc.sh index d10f31e9..e9e59ccf 100755 --- a/Hochob/Services/Video/Vlc.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -29,7 +29,7 @@ then if [ "$LOCAL_LOOP" = "on" ]; then $VLC_BINARY $VLC_ARGUMENTS $VLC_LOOP $LOCAL_FILE & elif [ "$LOCAL_LOOP" = "off" ]; then - $VLC_BINARY $VLC_ARGUMENTS $LOCAL_FILE & + $VLC_BINARY --play-and-pause $VLC_ARGUMENTS $LOCAL_FILE & fi else echo "Invalid number of arguments, see Documentation" From e546a0df0fa279c74a2f759d94092dfa3b295d08 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 19 Jun 2017 17:44:30 -0500 Subject: [PATCH 0572/1653] Update --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- Hochob/Services/Camera/Fswebcam.sh | 2 +- Hochob/Services/Image/ConvertText.sh | 2 +- Hochob/Services/Kill/GetPid.sh | 2 +- Hochob/Services/Kill/KillApp.sh | 2 +- Hochob/Services/Kill/KillPid.sh | 2 +- Hochob/Services/Kill/LogPid.sh | 2 +- Hochob/Services/Language/Language.sh | 2 ++ Hochob/Services/Memories/Memories.sh | 2 +- Hochob/Services/Memories/MemoriesAudio.sh | 2 +- Hochob/Services/Robot/Remote/Robot.sh | 2 +- Hochob/Services/Robot/RobotAvailable.sh | 2 +- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 2 +- Hochob/Services/Stream/Stream.sh | 2 +- Hochob/Services/Video/Ffmpeg.sh | 2 +- Hochob/Services/Video/FfmpegAudio.sh | 2 +- Hochob/Services/Visitors/GiftUsb.sh | 2 +- Hochob/Services/Visitors/Name.sh | 2 +- 18 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index a6cec1a9..bbaac6e4 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -73,6 +73,6 @@ MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" wait -kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') # End of File diff --git a/Hochob/Services/Camera/Fswebcam.sh b/Hochob/Services/Camera/Fswebcam.sh index cd4644e1..1059fc3a 100755 --- a/Hochob/Services/Camera/Fswebcam.sh +++ b/Hochob/Services/Camera/Fswebcam.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export FSWEBCAM_PID=$$ export FSWEBCAM_BINARY=fswebcam diff --git a/Hochob/Services/Image/ConvertText.sh b/Hochob/Services/Image/ConvertText.sh index c47a6471..b6b384a5 100755 --- a/Hochob/Services/Image/ConvertText.sh +++ b/Hochob/Services/Image/ConvertText.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export CONVERTTEXT_PID=$$ export CONVERTTEXT_BINARY=convert diff --git a/Hochob/Services/Kill/GetPid.sh b/Hochob/Services/Kill/GetPid.sh index 96d3d16d..5aca1376 100755 --- a/Hochob/Services/Kill/GetPid.sh +++ b/Hochob/Services/Kill/GetPid.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export GETPID_PID=$$ diff --git a/Hochob/Services/Kill/KillApp.sh b/Hochob/Services/Kill/KillApp.sh index 69f39049..4657c22a 100755 --- a/Hochob/Services/Kill/KillApp.sh +++ b/Hochob/Services/Kill/KillApp.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export KILLAPP_PID=$$ diff --git a/Hochob/Services/Kill/KillPid.sh b/Hochob/Services/Kill/KillPid.sh index 73f7b99b..f4a61b37 100755 --- a/Hochob/Services/Kill/KillPid.sh +++ b/Hochob/Services/Kill/KillPid.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export KILLPID_PID=$$ diff --git a/Hochob/Services/Kill/LogPid.sh b/Hochob/Services/Kill/LogPid.sh index fe9e051f..674bbf6a 100755 --- a/Hochob/Services/Kill/LogPid.sh +++ b/Hochob/Services/Kill/LogPid.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export LOGPID_PID=$$ diff --git a/Hochob/Services/Language/Language.sh b/Hochob/Services/Language/Language.sh index 54e8e443..2d25f427 100755 --- a/Hochob/Services/Language/Language.sh +++ b/Hochob/Services/Language/Language.sh @@ -26,6 +26,8 @@ if [ -z "$1" ] then cat $HOCHOB_SERVER_CONFIGURATION_LANGUAGE else + + test -d $HOCHOB_SERVER_MEDIA_SOURCE || mkdir $HOCHOB_SERVER_MEDIA_SOURCE echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_LANGUAGE fi diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 0cdae1df..a886a36d 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export MEMORIES_PID=$$ diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh index 57d5a116..13703f49 100755 --- a/Hochob/Services/Memories/MemoriesAudio.sh +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export MEMORIES_PID=$$ diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index 8299cd47..a98eba97 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export ROBOTREMOTE_PID=$$ diff --git a/Hochob/Services/Robot/RobotAvailable.sh b/Hochob/Services/Robot/RobotAvailable.sh index 91811741..f670a347 100755 --- a/Hochob/Services/Robot/RobotAvailable.sh +++ b/Hochob/Services/Robot/RobotAvailable.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export ROBOTAVAILABLE_PID=$$ diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index fe82a7de..f37e4fdf 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export ESPEAK_PID=$$ export ESPEAK_BINARY=espeak diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index c6614d1b..aa15012e 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export STREAM_PID=$$ diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index a7a0547e..dd73e1fd 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg diff --git a/Hochob/Services/Video/FfmpegAudio.sh b/Hochob/Services/Video/FfmpegAudio.sh index 543f32da..bfeb323c 100755 --- a/Hochob/Services/Video/FfmpegAudio.sh +++ b/Hochob/Services/Video/FfmpegAudio.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg diff --git a/Hochob/Services/Visitors/GiftUsb.sh b/Hochob/Services/Visitors/GiftUsb.sh index 0f4d4348..56e37ce7 100755 --- a/Hochob/Services/Visitors/GiftUsb.sh +++ b/Hochob/Services/Visitors/GiftUsb.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export GIFTUSB_PID=$$ diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh index 3c6939c0..1530de3a 100755 --- a/Hochob/Services/Visitors/Name.sh +++ b/Hochob/Services/Visitors/Name.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -. ~/CodeLabs/Hochob/Main.sh +#. ~/CodeLabs/Hochob/Main.sh export NAME_PID=$$ From d3cb8f217644632770558e80b291e4b89e234a53 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 19 Jun 2017 17:59:00 -0500 Subject: [PATCH 0573/1653] Update --- Hochob/Applications/SouthernMayaHighlands/Guerrero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh index 35837f03..02ebb9ee 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh @@ -25,6 +25,6 @@ export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") LogPid.sh $GUERRERO_PID $GUERRERO_NAME -Vlc.sh "off" "$CORPORATE_VIDEO/" +Vlc.sh "on" "$CORPORATE_VIDEO/" # End of File From 559491ec711fdd75e28dcfad9b0e2a2832f1c666 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 20 Jun 2017 11:14:16 -0500 Subject: [PATCH 0574/1653] Update --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 2 +- Hochob/Services/Robot/Remote/Robot.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 4b92958b..97c877d0 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -30,7 +30,7 @@ i=0 for var in "$@" do if [ "$i" -gt 1 ]; then - LOCAL_MESSAGE=$LOCAL_MESSAGE" $var " + LOCAL_MESSAGE=$LOCAL_MESSAGE" $var" echo $LOCAL_MESSAGE fi i=`expr $i + 1` diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index a98eba97..9d1e1d20 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh +. ~/CodeLabs/Hochob/Main.sh export ROBOTREMOTE_PID=$$ @@ -55,7 +55,7 @@ if [ "$LOCAL_DEMO" -eq "1" ]; then Espeak.sh on spanish "$LOCAL_MESSAGE" fi else - Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE + Mosquitto.sh $LOCAL_COMMAND "$LOCAL_MESSAGE" fi # End of File From a075daa477e58418cf461963ea29b848cd7dc3bb Mon Sep 17 00:00:00 2001 From: Alfredo Reyes Date: Tue, 20 Jun 2017 11:59:40 -0700 Subject: [PATCH 0575/1653] Update --- Hochob/Services/Calendar/client_secret.json | 1 + Hochob/Services/Calendar/democalendar.py | 84 +++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 Hochob/Services/Calendar/client_secret.json create mode 100644 Hochob/Services/Calendar/democalendar.py diff --git a/Hochob/Services/Calendar/client_secret.json b/Hochob/Services/Calendar/client_secret.json new file mode 100644 index 00000000..916b5af0 --- /dev/null +++ b/Hochob/Services/Calendar/client_secret.json @@ -0,0 +1 @@ +{"installed":{"client_id":"199573476774-n9louvdbg84sl4c6hblehrcnqjingkkm.apps.googleusercontent.com","project_id":"inlaid-sentinel-168814","auth_uri":"https://accounts.google.com/o/oauth2/auth","token_uri":"https://accounts.google.com/o/oauth2/token","auth_provider_x509_cert_url":"https://www.googleapis.com/oauth2/v1/certs","client_secret":"Y3d1jXCP8aR9XghbDbEk9P_R","redirect_uris":["urn:ietf:wg:oauth:2.0:oob","http://localhost"]}} \ No newline at end of file diff --git a/Hochob/Services/Calendar/democalendar.py b/Hochob/Services/Calendar/democalendar.py new file mode 100644 index 00000000..54878b81 --- /dev/null +++ b/Hochob/Services/Calendar/democalendar.py @@ -0,0 +1,84 @@ + +from __future__ import print_function +import httplib2 +import os + +from apiclient import discovery +from oauth2client import client +from oauth2client import tools +from oauth2client.file import Storage + +import datetime + +try: + import argparse + flags = argparse.ArgumentParser(parents=[tools.argparser]).parse_args() +except ImportError: + flags = None + +# If modifying these scopes, delete your previously saved credentials +# at ~/.credentials/calendar-python-quickstart.json +SCOPES = 'https://www.googleapis.com/auth/calendar.readonly' +CLIENT_SECRET_FILE = 'client_secret.json' +APPLICATION_NAME = 'Google Calendar API Python Quickstart' + + +def get_credentials(): + """Gets valid user credentials from storage. + + If nothing has been stored, or if the stored credentials are invalid, + the OAuth2 flow is completed to obtain the new credentials. + + Returns: + Credentials, the obtained credential. + """ + home_dir = os.path.expanduser('~') + credential_dir = os.path.join(home_dir, '.credentials') + if not os.path.exists(credential_dir): + os.makedirs(credential_dir) + credential_path = os.path.join(credential_dir, + 'calendar-python-quickstart.json') + + store = Storage(credential_path) + credentials = store.get() + if not credentials or credentials.invalid: + flow = client.flow_from_clientsecrets(CLIENT_SECRET_FILE, SCOPES) + flow.user_agent = APPLICATION_NAME + if flags: + credentials = tools.run_flow(flow, store, flags) + else: # Needed only for compatibility with Python 2.6 + credentials = tools.run(flow, store) + print('Storing credentials to ' + credential_path) + return credentials + +def main(): + """Shows basic usage of the Google Calendar API. + + Creates a Google Calendar API service object and outputs a list of the next + 10 events on the user's calendar. + """ + credentials = get_credentials() + http = credentials.authorize(httplib2.Http()) + service = discovery.build('calendar', 'v3', http=http) + + now = datetime.datetime.utcnow() - datetime.timedelta(hours=+2) + now = now.isoformat() + 'Z' + #now = datetime.datetime.utcnow().isoformat() + 'Z' # 'Z' indicates UTC time + eventsResult = service.events().list( + calendarId='primary', timeMin=now, maxResults=1, singleEvents=True, + orderBy='startTime').execute() + events = eventsResult.get('items', []) + + if not events: + """ print('No upcoming events found.')""" + for event in events: + start = event['start'].get('dateTime', event['start'].get('date')) + print(start, event['summary']) + titulo=" Bienvenidos \n"+event['summary'] + instruccion="convert -pointsize 90 -fill white -draw \'text 50,100 \" "+str(titulo)+" \" \' intel.jpg intel2.jpg" + os.system(instruccion) + os.system("feh --fullscreen intel2.jpg") + + +if __name__ == '__main__': + main() From cd7396a41b0bced67c985302a3c0d4f76ea7698e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 08:09:17 -0500 Subject: [PATCH 0576/1653] Update --- .../CentralMayaLowlands/Mazatlan.sh | 14 +++++----- .../NorthernMayaLowlands/Mapimi.sh | 4 +-- .../NorthernMayaLowlands/MontesAzules.sh | 2 +- .../SouthernMayaHighlands/Aguascalientes.sh | 2 +- .../BajaCaliforniaNorte.sh | 2 +- .../BajaCaliforniaSur.sh | 1 + .../SouthernMayaHighlands/Michoacan.sh | 16 ++++++------ .../Stream2Chromecast/Stream2Chromecast.sh | 2 +- Hochob/Services/Visitors/Name.sh | 26 ------------------- 9 files changed, 23 insertions(+), 46 deletions(-) delete mode 100755 Hochob/Services/Visitors/Name.sh diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 68a61695..52c52409 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -24,6 +24,14 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") LOCAL_LANGUAGE=`Language.sh` +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" +else + Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" +fi + +exit 0 + if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "" @@ -34,10 +42,4 @@ fi Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" -if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" -else - Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" -fi - # End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 4239a7b9..107cbe98 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -39,8 +39,8 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "To be written" else Espeak.sh off spanish \ - "Me da mucho gusto conocerlos y que hayan venido a Intel. \ - Regresen pronto futuros Ingenieros de ${LOCAL_INSTITUTION}" + "Me da mucho gusto conocerlas y que hayan venido a Intel. \ + Regresen pronto futuras Ingenieros" fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 74bc19ed..3948bef5 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -30,7 +30,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "" else Espeak.sh off spanish \ - "Futuros Matemáticos de ${LOCAL_INSTITUTION}. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ + "Futuras Matemáticas. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología. Siganme." fi diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 92fcc734..863b3ed1 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -30,7 +30,7 @@ Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh $CORPORATE_IMAGE & Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" & -sleep 85 +sleep 75 KillApp.sh "mpg123" KillApp.sh "eog" diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 55e9026d..1b35f331 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -31,7 +31,7 @@ Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 2 Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 -Robot.sh lupe/message "Nel" +Robot.sh lupe/decir "Nel Pastel" sleep .6 Robot.sh lupe/headright 1 sleep .6 diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index bbaac6e4..10bc35b7 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -73,6 +73,7 @@ MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" wait +KillApp.sh "vlc" #kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') # End of File diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index f5206eb3..daebafca 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -36,8 +36,8 @@ LOCAL_INSTITUTION=`Name.sh` # que aquí trabajamos les deseamos la mejor de las experiencias. \ # Muchas gracias por haber venido." Espeak.sh on spanish \ - "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ - Es un gusto conocerlos. Ya saben mi nombre, soy Lupe, \ + "Bienvenidas ${LOCAL_INSTITUTION} a mi casa, su casa. \ + Es un gusto conocerlas. Ya saben mi nombre, soy Lupe, \ tengo 2 años robot y estudio el primer año de primaria robot. \ Mis pasatiempos favoritos son compartir tiempo con mi familia, jugar al aire libre, \ leer cuentos divertidos, hacer ejercicio y aprender con mis familiares y amigos \ @@ -88,16 +88,16 @@ Espeak.sh on spanish \ sleep 15 #Robot.sh lupe/message \ -# "Están listos ${LOCAL_INSTITUTION}?" +# "Están listas ${LOCAL_INSTITUTION}?" Espeak.sh on spanish \ - "Están listos ${LOCAL_INSTITUTION}?" + "Están listas ${LOCAL_INSTITUTION}?" sleep 5 #Robot.sh lupe/message \ -# "Ya listos? Tomemos la foto, a la cuenta de 3." +# "Ya listas? Tomemos la foto, a la cuenta de 3." Espeak.sh on spanish \ - "Ya listos? Tomemos la foto, a la cuenta de 3." + "Ya listas? Tomemos la foto, a la cuenta de 3." sleep 1 @@ -113,9 +113,9 @@ wait Eog.sh "$FSWEBCAM_IMAGE" & #Robot.sh lupe/message \ -# "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." +# "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras ingenieras." Espeak.sh on spanish \ - "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuros ingenieros." + "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras ingenieras." sleep 5 diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 7e0f0429..34d1888b 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -10,7 +10,7 @@ export STREAM2CHROMECAST_PID=$$ export STREAM2CHROMECAST_BINARY=stream2chromecast.py LOCAL_DEVICE="$1" -LOCAL_VOLUME="$2" +LOCAL_VOLUME=0.75 LOCAL_FILE="$3" # ============================================================================= diff --git a/Hochob/Services/Visitors/Name.sh b/Hochob/Services/Visitors/Name.sh deleted file mode 100755 index 1530de3a..00000000 --- a/Hochob/Services/Visitors/Name.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -#. ~/CodeLabs/Hochob/Main.sh - -export NAME_PID=$$ - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -#echo `date +"%Y%m%d%H%M%S"` -echo "Instituto Triki Tran" - -# End of File From eaaa5db74b74a1496fad1a0810e67a8e307a3028 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 08:21:09 -0500 Subject: [PATCH 0577/1653] Update --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 34d1888b..1656f456 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -10,7 +10,7 @@ export STREAM2CHROMECAST_PID=$$ export STREAM2CHROMECAST_BINARY=stream2chromecast.py LOCAL_DEVICE="$1" -LOCAL_VOLUME=0.75 +LOCAL_VOLUME=0.50 LOCAL_FILE="$3" # ============================================================================= From 876d2ce2e6f63d1de364603533af12490ea4ec7a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:27:20 -0500 Subject: [PATCH 0578/1653] Update Veracruz.sh --- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 07ad6fa6..f143b585 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -33,6 +33,6 @@ fi Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') +# kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') # End of File From cb353df9633ad9920a1a795c52d86dbdbca83f45 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:28:38 -0500 Subject: [PATCH 0579/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 8f1b6e7c..9733cad6 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -32,7 +32,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else Espeak.sh off spanish \ "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ - La ciencia es observar el mundo, escuchar y registrar lo que se aprende. \ + Es observarlo, escucharlo y registrar lo que se aprende. \ Te gustaría entender porqué la Tierra gira alrededor del Sol? \ Porqué las cosas caen hacia el suelo? \ Que hace a los pájaros volar? \ @@ -45,6 +45,6 @@ fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$CALAKMUL_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$CALAKMUL_PID | grep -o '[0-9]*') # End of File From 44cec18150b7e7f2a681cb0c1a9e26b4d87a38c7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:29:05 -0500 Subject: [PATCH 0580/1653] Update ElCielo.sh --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index 58ac0c4c..30cf4a3c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -24,6 +24,6 @@ export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" -kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') # End of File From 417d37c0ce52c5ce33fbc53af2c2be29ecca0dc8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:29:26 -0500 Subject: [PATCH 0581/1653] Update LaMichilia.sh --- Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 2b929eb9..78bbce8f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -37,6 +37,6 @@ fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$LAMICHILIA_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$LAMICHILIA_PID | grep -o '[0-9]*') # End of File From 1ffe7b4655639b90080b0e19697a4e4b7b6f03da Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:31:37 -0500 Subject: [PATCH 0582/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 107cbe98..b02af555 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -39,12 +39,12 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "To be written" else Espeak.sh off spanish \ - "Me da mucho gusto conocerlas y que hayan venido a Intel. \ - Regresen pronto futuras Ingenieros" + "Me da mucho gusto conocerlos y que hayan venido a Intel. \ + Regresen pronto futuros Ingenieros" fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" -kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') # End of File From 42f698bd2ea0dd5b2f8705cc52e50ddadc7f7772 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:32:59 -0500 Subject: [PATCH 0583/1653] Update SianKaan.sh --- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 2354e8a9..5f806c71 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -34,7 +34,7 @@ else "Por escribirse, ${LOCAL_INSTITUTION}" fi -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" +#Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & @@ -43,6 +43,6 @@ sleep .6 Robot.sh lupe/headleft 1 sleep .6 -kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') # End of File From 07453615875c37cc5be97d8d55bc5ca15519ab47 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:34:30 -0500 Subject: [PATCH 0584/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 3948bef5..1864f7db 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -30,8 +30,8 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "" else Espeak.sh off spanish \ - "Futuras Matemáticas. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ - Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología. Siganme." + "Futuras y futuros Matemáticos. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ + Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología." fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" @@ -42,6 +42,6 @@ else Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" fi -kill -- -$(ps -o pgid=$MONTESAZULES_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$MONTESAZULES_PID | grep -o '[0-9]*') # End of File From 24c765f4d2016f3582f5f5d18a269923747cedc3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:35:19 -0500 Subject: [PATCH 0585/1653] Update Mexico.sh --- Hochob/Applications/SouthernMayaHighlands/Mexico.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh index a8608238..0d7b4039 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh @@ -28,6 +28,4 @@ LogPid.sh $MEXICO_PID $MEXICO_NAME Fswebcam.sh 360 # find dirname -type f | shuf -n 5 -kill -- -$(ps -o pgid=$MEXICO_PID | grep -o '[0-9]*') - # End of File From 635a76d09703b9830f25cdd5ca21f2d58268640f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:35:56 -0500 Subject: [PATCH 0586/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 7891f180..8a9a7770 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -33,6 +33,4 @@ MemoriesAudio.sh "${ZACATECAS_NAME}" sync -kill -- -$(ps -o pgid=$ZACATECAS_PID | grep -o '[0-9]*') - # End of File From d8a3eab81cd12a1fcaeb6253f09261e4a8b8c3ef Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:38:03 -0500 Subject: [PATCH 0587/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index b02af555..24d10f40 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -45,6 +45,4 @@ fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" -#kill -- -$(ps -o pgid=$MAPIMI_PID | grep -o '[0-9]*') - # End of File From 86f3554fadc08eac4580c092cf677f43a304b482 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:41:39 -0500 Subject: [PATCH 0588/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index ef4a4565..f001c2ab 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -24,6 +24,6 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" -kill -- -$(ps -o pgid=$OJODELIEBRE_PID | grep -o '[0-9]*') +#kill -- -$(ps -o pgid=$OJODELIEBRE_PID | grep -o '[0-9]*') # End of File From 917105478bf645742fad17f20de2a4bb2d1d63a0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:41:52 -0500 Subject: [PATCH 0589/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index f001c2ab..8fb01716 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -24,6 +24,4 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" -#kill -- -$(ps -o pgid=$OJODELIEBRE_PID | grep -o '[0-9]*') - # End of File From d7e425ce52198fe3518b92f91d654594b8ac6dc1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:44:22 -0500 Subject: [PATCH 0590/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 9733cad6..44c6a8c8 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -45,6 +45,4 @@ fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" -#kill -- -$(ps -o pgid=$CALAKMUL_PID | grep -o '[0-9]*') - # End of File From a9055ace4034a238b5400c3d4660a168988a3de6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:49:10 -0500 Subject: [PATCH 0591/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 10bc35b7..d5bcc525 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -74,6 +74,5 @@ MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" wait KillApp.sh "vlc" -#kill -- -$(ps -o pgid=$BAJACALIFORNIASUR_PID | grep -o '[0-9]*') # End of File From 7eb692957a7dfd06342ff05a06bec30bda95833c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 10:58:31 -0500 Subject: [PATCH 0592/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 24d10f40..0d01a780 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -40,7 +40,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else Espeak.sh off spanish \ "Me da mucho gusto conocerlos y que hayan venido a Intel. \ - Regresen pronto futuros Ingenieros" + Regresen pronto futuras y futuros ingenieros" fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 4764b59e236e51e408774b160134a6c559015420 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 11:01:18 -0500 Subject: [PATCH 0593/1653] Update BajaCaliforniaSur.sh --- Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index d5bcc525..3721d2c4 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -67,7 +67,7 @@ wait Espeak.sh off spanish \ "Muchas gracias Futuros Ingenieros!. -A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita." +A nombre del Equipo de Intel, deseamos que hayan tenido una gran visita." MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" From 83794dbbf902590a1acdeda06e65ced94acc91f0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 11:02:41 -0500 Subject: [PATCH 0594/1653] Update BajaCaliforniaSur.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 3721d2c4..163fdcd1 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -66,8 +66,8 @@ sleep 75 wait Espeak.sh off spanish \ -"Muchas gracias Futuros Ingenieros!. -A nombre del Equipo de Intel, deseamos que hayan tenido una gran visita." +"Muchas gracias futuras y futuros ingenieros!. +A nombre del equipo de Intel, deseamos que hayan tenido una gran visita." MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" From 315570c7cb87abb118c2d9e2eafcbb0891158e52 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 13:43:32 -0500 Subject: [PATCH 0595/1653] Update --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 4 ++-- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 97c877d0..6d86f320 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -36,13 +36,13 @@ 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 if [ $# -eq 2 ] then - $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 else echo "Invalid number of arguments, see Documentation" exit 1 diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 1656f456..34d1888b 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -10,7 +10,7 @@ export STREAM2CHROMECAST_PID=$$ export STREAM2CHROMECAST_BINARY=stream2chromecast.py LOCAL_DEVICE="$1" -LOCAL_VOLUME=0.50 +LOCAL_VOLUME=0.75 LOCAL_FILE="$3" # ============================================================================= From 52b7c46a4a94d0d2c7f385df909eea7e14b272c4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 13:48:58 -0500 Subject: [PATCH 0596/1653] Update --- .../Applications/SouthernMayaHighlands/Michoacan.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index daebafca..f585f578 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -1,3 +1,4 @@ + #!/bin/sh set -x @@ -27,7 +28,7 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` -#Robot.sh lupe/message \ +#Robot.sh lupe/decir \ # "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ # Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ # hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ @@ -36,7 +37,7 @@ LOCAL_INSTITUTION=`Name.sh` # que aquí trabajamos les deseamos la mejor de las experiencias. \ # Muchas gracias por haber venido." Espeak.sh on spanish \ - "Bienvenidas ${LOCAL_INSTITUTION} a mi casa, su casa. \ + "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ Es un gusto conocerlas. Ya saben mi nombre, soy Lupe, \ tengo 2 años robot y estudio el primer año de primaria robot. \ Mis pasatiempos favoritos son compartir tiempo con mi familia, jugar al aire libre, \ @@ -88,9 +89,9 @@ Espeak.sh on spanish \ sleep 15 #Robot.sh lupe/message \ -# "Están listas ${LOCAL_INSTITUTION}?" +# "Están listos ${LOCAL_INSTITUTION}?" Espeak.sh on spanish \ - "Están listas ${LOCAL_INSTITUTION}?" + "Están listos ${LOCAL_INSTITUTION}?" sleep 5 @@ -113,9 +114,9 @@ wait Eog.sh "$FSWEBCAM_IMAGE" & #Robot.sh lupe/message \ -# "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras ingenieras." +# "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." Espeak.sh on spanish \ - "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras ingenieras." + "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." sleep 5 From 63e68a063456a5b687e2ac8daa49181ef4163034 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 13:52:54 -0500 Subject: [PATCH 0597/1653] Update --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index f585f578..28e3f129 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -38,7 +38,7 @@ LOCAL_INSTITUTION=`Name.sh` # Muchas gracias por haber venido." Espeak.sh on spanish \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ - Es un gusto conocerlas. Ya saben mi nombre, soy Lupe, \ + Es un gusto conocerlas y conocerlos. Ya saben mi nombre, soy Lupe, \ tengo 2 años robot y estudio el primer año de primaria robot. \ Mis pasatiempos favoritos son compartir tiempo con mi familia, jugar al aire libre, \ leer cuentos divertidos, hacer ejercicio y aprender con mis familiares y amigos \ From 810e15178a411ef413118a1c161be687470a98f0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 23 Jun 2017 13:57:00 -0500 Subject: [PATCH 0598/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 28e3f129..f59b38cd 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -91,14 +91,14 @@ sleep 15 #Robot.sh lupe/message \ # "Están listos ${LOCAL_INSTITUTION}?" Espeak.sh on spanish \ - "Están listos ${LOCAL_INSTITUTION}?" + "Están listas? listos? ${LOCAL_INSTITUTION}?" sleep 5 #Robot.sh lupe/message \ -# "Ya listas? Tomemos la foto, a la cuenta de 3." +# "Tomemos la foto, a la cuenta de 3." Espeak.sh on spanish \ - "Ya listas? Tomemos la foto, a la cuenta de 3." + "Tomemos la foto, a la cuenta de 3." sleep 1 From cc8f1f3394ea705d7ae5acd3f32ab013ace0cf5b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 07:38:41 -0500 Subject: [PATCH 0599/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Sound/Play/Vlc.sh | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100755 Hochob/Services/Sound/Play/Vlc.sh diff --git a/Hochob/Services/Sound/Play/Vlc.sh b/Hochob/Services/Sound/Play/Vlc.sh new file mode 100755 index 00000000..be959a4f --- /dev/null +++ b/Hochob/Services/Sound/Play/Vlc.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +export VLC_PID=$$ +export VLC_BINARY=cvlc +export VLC_ARGUMENTS=--play-and-exit + +LOCAL_FILE="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + $VLC_BINARY $VLC_ARGUMENTS $LOCAL_FILE & +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 3c347fac238e7337bedfa7a44a23614819f8871d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 07:41:39 -0500 Subject: [PATCH 0600/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 863b3ed1..67c78cf7 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -28,7 +28,7 @@ LogPid.sh $AGUASCALIENTES_PID $AGUASCALIENTES_NAME Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & Eog.sh $CORPORATE_IMAGE & -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" & sleep 75 From 65972e325b11c08c11bf5e1792aef27c94ff9ad1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 07:41:56 -0500 Subject: [PATCH 0601/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 1b35f331..2b7cedfa 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -29,7 +29,7 @@ Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 2 -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 Robot.sh lupe/decir "Nel Pastel" sleep .6 From d99dad5404dfb604acd6c0358682e4524711ba8c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 07:42:10 -0500 Subject: [PATCH 0602/1653] Update BajaCaliforniaNorte.sh.Backup --- .../SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup index 3a46d814..073d8aba 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup @@ -29,7 +29,7 @@ Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 5 -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 19.2 LOCAL_ROBOTAVAILABLE=`RobotAvailable.sh` From 97ef15467788dd26ab8eec613188c660ea0a2a04 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 07:43:07 -0500 Subject: [PATCH 0603/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 4ee59b65..55a17cbd 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -27,7 +27,7 @@ LogPid.sh $CAMPECHE_PID $CAMPECHE_NAME Eog.sh $FSWEBCAM_IMAGE_TEXT & sleep 1 -Mpg123.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" & sleep 28 From 9967514f0f3b52813a1978a0f384e07d6d492e23 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 08:18:17 -0500 Subject: [PATCH 0604/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 006f0e51..965226bd 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -376,7 +376,7 @@ switch: language: command_on: "~/CodeLabs/Hochob/Services/Language/Language.sh spanish &" - command_off: "~/CodeLabs/Hochob/Services/Language/Language.sh english" + command_off: "~/CodeLabs/Hochob/Services/Language/Language.sh english &" # Southern Maya Highlands: Corporate From 61c6d74af45ddbb2fb9105624ccaa0f4cbbf873e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 09:41:49 -0500 Subject: [PATCH 0605/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/TiburonBallena.sh | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh new file mode 100755 index 00000000..44c6a8c8 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -0,0 +1,48 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CALAKMUL_PID=$$ +export CALAKMUL_NAME="Mapimi Application" +export CALAKMUL_PATH=$(readlink -f "$0") +export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Espeak.sh off english \ + "To be written" +else + Espeak.sh off spanish \ + "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ + Es observarlo, escucharlo y registrar lo que se aprende. \ + Te gustaría entender porqué la Tierra gira alrededor del Sol? \ + Porqué las cosas caen hacia el suelo? \ + Que hace a los pájaros volar? \ + El científico es una persona que se dedica a entender el mundo y saber como se comporta. \ + Cualquiera puede pensar como un científico, y a ti, te gustaría ser científico? \ + " +fi + +#Los que aplican los descubrimientos de la ciencia para hacer cosas útiles se llaman Ingenieros. + +Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" + +# End of File From 676f97e5e015feeaa615299e5c975fabf866209d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 09:42:55 -0500 Subject: [PATCH 0606/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Image/ConvertResize.sh | 37 ++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100755 Hochob/Services/Image/ConvertResize.sh diff --git a/Hochob/Services/Image/ConvertResize.sh b/Hochob/Services/Image/ConvertResize.sh new file mode 100755 index 00000000..b6b384a5 --- /dev/null +++ b/Hochob/Services/Image/ConvertResize.sh @@ -0,0 +1,37 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +#. ~/CodeLabs/Hochob/Main.sh + +export CONVERTTEXT_PID=$$ +export CONVERTTEXT_BINARY=convert +export CONVERTTEXT_ARGUMENTS="-font Times-Bold -pointsize 80 \ + -fill DeepSkyBlue -stroke yellow -draw" + +LOCAL_IMAGE="$1" +LOCAL_TEXT="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + $CONVERTTEXT_BINARY $CONVERTTEXT_ARGUMENTS "text 100,1000 \"$LOCAL_TEXT\"" $LOCAL_IMAGE $FSWEBCAM_IMAGE_TEXT +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 42c0e7e52b14c922d1ef9336ab38a3780c49717d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 09:46:00 -0500 Subject: [PATCH 0607/1653] Update ConvertResize.sh --- Hochob/Services/Image/ConvertResize.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Image/ConvertResize.sh b/Hochob/Services/Image/ConvertResize.sh index b6b384a5..5efbbdfd 100755 --- a/Hochob/Services/Image/ConvertResize.sh +++ b/Hochob/Services/Image/ConvertResize.sh @@ -8,13 +8,11 @@ set -x #. ~/CodeLabs/Hochob/Main.sh -export CONVERTTEXT_PID=$$ -export CONVERTTEXT_BINARY=convert -export CONVERTTEXT_ARGUMENTS="-font Times-Bold -pointsize 80 \ - -fill DeepSkyBlue -stroke yellow -draw" +export CONVERTRESIZE_PID=$$ +export CONVERTRESIZE_BINARY=convert +export CONVERTRESIZE_ARGUMENTS="-resize 4096x2304\!" LOCAL_IMAGE="$1" -LOCAL_TEXT="$2" # ============================================================================= # Functions @@ -26,9 +24,9 @@ LOCAL_TEXT="$2" # Main # ============================================================================= -if [ $# -eq 2 ] +if [ $# -eq 1 ] then - $CONVERTTEXT_BINARY $CONVERTTEXT_ARGUMENTS "text 100,1000 \"$LOCAL_TEXT\"" $LOCAL_IMAGE $FSWEBCAM_IMAGE_TEXT + $CONVERTRESIZE_BINARY $LOCAL_IMAGE $CONVERTRESIZE_ARGUMENTS $LOCAL_IMAGE else echo "Invalid number of arguments, see Documentation" exit 1 From 591558dde74a5d105339c5e2e82ab7de4ebcc65c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 09:56:01 -0500 Subject: [PATCH 0608/1653] Update ConvertResize.sh --- Hochob/Services/Image/ConvertResize.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Image/ConvertResize.sh b/Hochob/Services/Image/ConvertResize.sh index 5efbbdfd..b0947a84 100755 --- a/Hochob/Services/Image/ConvertResize.sh +++ b/Hochob/Services/Image/ConvertResize.sh @@ -26,7 +26,8 @@ LOCAL_IMAGE="$1" if [ $# -eq 1 ] then - $CONVERTRESIZE_BINARY $LOCAL_IMAGE $CONVERTRESIZE_ARGUMENTS $LOCAL_IMAGE + $CONVERTRESIZE_BINARY $LOCAL_IMAGE $CONVERTRESIZE_ARGUMENTS $LOCAL_IMAGE.temp + mv $LOCAL_IMAGE.temp mv $LOCAL_IMAGE else echo "Invalid number of arguments, see Documentation" exit 1 From 0ab121a6603947fde5e61012f7318daa733e5e22 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 10:02:15 -0500 Subject: [PATCH 0609/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 44c6a8c8..af63dfb9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CALAKMUL_PID=$$ -export CALAKMUL_NAME="Mapimi Application" -export CALAKMUL_PATH=$(readlink -f "$0") -export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") +export TIBURONBALLENA_PID=$$ +export TIBURONBALLENA_NAME="Mapimi Application" +export TIBURONBALLENA_PATH=$(readlink -f "$0") +export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") # ============================================================================= # Functions @@ -31,18 +31,9 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "To be written" else Espeak.sh off spanish \ - "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ - Es observarlo, escucharlo y registrar lo que se aprende. \ - Te gustaría entender porqué la Tierra gira alrededor del Sol? \ - Porqué las cosas caen hacia el suelo? \ - Que hace a los pájaros volar? \ - El científico es una persona que se dedica a entender el mundo y saber como se comporta. \ - Cualquiera puede pensar como un científico, y a ti, te gustaría ser científico? \ " fi -#Los que aplican los descubrimientos de la ciencia para hacer cosas útiles se llaman Ingenieros. - Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" # End of File From 7eaa236f667f5e4896069ecab3036f049a187c33 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:17:44 -0500 Subject: [PATCH 0610/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index af63dfb9..97c8372a 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -32,6 +32,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else Espeak.sh off spanish \ " + Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" fi Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 2805ae25dfb8d427edda8bed89bb8828122ab2b8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:18:30 -0500 Subject: [PATCH 0611/1653] Update Signed-off-by: Abraham Arce --- .../Sound/SpeechSynthetizer/VoiceRss.py | 38 +++++++++++++ .../Sound/SpeechSynthetizer/VoiceRss.sh | 55 +++++++++++++++++++ .../Sound/SpeechSynthetizer/VoiceRssLib.py | 52 ++++++++++++++++++ 3 files changed, 145 insertions(+) create mode 100755 Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py create mode 100755 Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh create mode 100755 Hochob/Services/Sound/SpeechSynthetizer/VoiceRssLib.py diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py new file mode 100755 index 00000000..e4a3d2ed --- /dev/null +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- + +import voicerssurllib +import subprocess + +voice = voicerssurllib.speech({ + 'key': '9fbff2d35eb54b62998515ccbc656a07', + 'hl': 'en-us', + 'src': 'Hello World Python Text To Speech X Platform', + #'src': 'Hace mucho tiempo existieron civilizaciones muy inteligentes que lograron hacer descubrimientos que cambiaron la forma de vivir y desarrollaron tecnología que aún hoy en día utilizamos. Entre esas civilizaciones importantes como Babilonia, India y China se encontraban los mayas. ¿Quién de ustedes sabe que hicieron los mayas?, o ¿Por qué son tan importantes?. Los mayas han sido un pueblo muy avanzado, sin duda una de las grandes civilizaciones mundiales. Uno de los aspectos destacados de su cultura fue su gran avance en las matemáticas, pues su sistema numérico, desarrollado de forma independiente al resto del mundo era muy avanzado y complejo. Tanto que hasta contaban con la noción del Cero y su simbología, fue la primera cultura que representó en América el número 0. Es decir, de alguna manera, los mayas ya entendían el concepto de “cero” y “nada”. Y se preguntarán ¿de qué manera trascendió este uso de cero y su sistema numérico con la tecnología? Gracias al uso de 0 y 1, fue posible crear un lenguaje binario (es decir solo de dos números), con el cual se constituyó una forma de comunicación entre las máquinas tecnológicas y los humanos. A su vez, a partir de este sistema binario y otros componentes tecnológicos/electrónicos se pudo inventar el microprocesador y ya se imaginarán qué empresa pudo haber sido la creadora de esta magnífica invención. ¿Pueden adivinar cuál?!, ¡Claro, Intel! ¿Y cómo es que pasó todo esto? Pasa al siguiente exhibidor de tu derecha donde tendrás la respuesta', + #'src': 'Hace mucho tiempo existieron civilizaciones muy inteligentes que lograron hacer descubrimientos que cambiaron la forma de vivir y desarrollaron tecnología que aún hoy en día utilizamos. Entre esas civilizaciones importantes como Babilonia, India y China se encontraban los mayas. ¿Quién de ustedes sabe que hicieron los mayas?', + #'src': 'o ¿Por qué son tan importantes?', + #'src': 'Los mayas han sido un pueblo muy avanzado, sin duda una de las grandes civilizaciones mundiales. Uno de los aspectos destacados de su cultura fue su gran avance en las matemáticas, pues su sistema numérico, desarrollado de forma independiente al resto del mundo era muy avanzado y complejo. Tanto que hasta contaban con la noción del Cero y su simbología, fue la primera cultura que representó en América el número 0. Es decir, de alguna manera, los mayas ya entendían el concepto de “cero” y “nada”. Y se preguntarán ¿de qué manera trascendió este uso de cero y su sistema numérico con la tecnología? Gracias al uso de 0 y 1, fue posible crear un lenguaje binario (es decir solo de dos números), con el cual se constituyó una forma de comunicación entre las máquinas tecnológicas y los humanos. A su vez, a partir de este sistema binario y otros componentes tecnológicos/electrónicos se pudo inventar el microprocesador y ya se imaginarán qué empresa pudo haber sido la creadora de esta magnífica invención. ¿Pueden adivinar cuál?!', + #'src': '¡Claro, Intel! ¿Y cómo es que pasó todo esto? Pasa al siguiente exhibidor de tu derecha donde tendrás la respuesta', + #'src': '', + #'src': '¿Qué es Intel? ¿Cómo y en dónde nació Intel? Desde que llegaron hoy a Intel ya han escuchado que esta empresa fue la creadora de los microprocesadores, esto fue gracias a sus fundadores estadounidenses, Gordon Moore, Robert Noyce y Andy Grov, ingenieros inteligentes, apasionados y con muchísima creatividad para desarrollar mecanismos que pudieran facilitar cálculos y procesos matemáticos. Sin embargo, antes de llegar a la invención de los microprocesadores, se dedicaban a hacer memorias para dispositivos electrónicos. ¿Ustedes han hecho uso de alguna memoria? o ¿saben qué dispositivos han utilizado que tengan memorias? Conforme fue pasando el tiempo se dieron cuenta que podían innovar de formas distintas y no solo hacer memorias para guardar información, así que pensaron en trabajar en algo que pudiera procesar todo tipo de información. Es así como desarrollan el microprocesador. Es tal el éxito de su creación, que inician su empresa en 1968 en California, Estados Unidos; dándole el nombre de Intel el cual son las abreviaturas de Integreired Electronic. No se detuvo la historia ahí, ya que continuaron perfeccionando el microprocesador haciéndolo cada vez más rápido y pequeño. En su cuarta entrega Intel logra la revolución de la microcomputadora con el diseño del 8080 y a partir de ahí Intel desarrolla el 8086 y 8088, con estos dos procesadores obtuvieron en solamente un año 2,500 premios de diseño. ¡Imagínense cuántos premios en un año! Y fue tal el impacto y su reconocimiento al trabajo que hacía Intel que no fue suficiente tener sede en California, sino que comenzaron a expandirse por el mundo; un ejemplo de ello es Intel GDC, es decir, Intel Guadalajara Centro de Diseño. Para conocer lo que hace Intel Guadalajara, ve al exhibit que está detrás de ti y lo identificarás con el calendario azteca, ¿ya viste cuál?', + #'src': '¿Qué es Intel? ¿Cómo y en dónde nació Intel? Desde que llegaron hoy a Intel ya han escuchado que esta empresa fue la creadora de los microprocesadores, esto fue gracias a sus fundadores estadounidenses, Gordon Moore, Robert Noyce y Andy Grove, ingenieros inteligentes, apasionados y con muchísima creatividad para desarrollar mecanismos que pudieran facilitar cálculos y procesos matemáticos. Sin embargo, antes de llegar a la invención de los microprocesadores, se dedicaban a hacer memorias para dispositivos electrónicos. ¿Ustedes han hecho uso de alguna memoria? o ¿saben qué dispositivos han utilizado que tengan memorias?', + #'src': 'Conforme fue pasando el tiempo se dieron cuenta que podían innovar de formas distintas y no solo hacer memorias para guardar información, así que pensaron en trabajar en algo que pudiera procesar todo tipo de información. Es así como desarrollan el microprocesador. Es tal el éxito de su creación, que inician su empresa en 1968 en California, Estados Unidos; dándole el nombre de Intel el cual son las abreviaturas de Integrated Electronic. No se detuvo la historia ahí, ya que continuaron perfeccionando el microprocesador haciéndolo cada vez más rápido y pequeño.', + #'src': 'En su cuarta entrega Intel logra la revolución de la microcomputadora con el diseño del 8080 y a partir de ahí Intel desarrolla el 8086 y 8088, con estos dos procesadores obtuvieron en solamente un año 2,500 premios de diseño. ¡Imagínense cuántos premios en un año! Y fue tal el impacto y su reconocimiento al trabajo que hacía Intel que no fue suficiente tener sede en California, sino que comenzaron a expandirse por el mundo; un ejemplo de ello es Intel GDC, es decir, Intel Guadalajara Centro de Diseño. Para conocer lo que hace Intel Guadalajara, ve al exhibit que está detrás de ti y lo identificarás con el calendario azteca, ¿ya viste cuál?', + #'src': '', + #'src': 'Intel Guadalajara Centro de Diseño, GDC, no era como lo conocen hoy. Todo comenzó con una pequeña empresa de Telecomunicaciones que había creado y estaba a cargo de Jesús Palomino y en la que solo eran 34 ingenieros. Sin embargo Intel se percató del talento que se tenía en México en dicha empresa y decidió apostarle para comenzar operaciones aquí en Guadalajara. Pueden ver en la pantalla algunos de los datos más representativos y fotos de aquel entonces. Desde el principio, Intel integró rápidamente a estos ingenieros como parte de su corporación, al mismo tiempo que empezaron más responsabilidades y proyectos qué cumplir con impacto mundial. Guadalajara fue el primer lugar en Latinoamérica que adopta Intel para que sea un laboratorio de investigación, comenzando sus operaciones en el 2001. Hoy por hoy en Intel GDC son más de 1,400 personas dedicados a la investigación e innovación. Algunos datos curiosos de Intel GDC son: Grandes resultados con talento, el cual el 98% de los empleados son mexicanos. Ha adquirido proyectos con impacto mundial y en donde varios chips y circuitos desarrollados han salido al mercado. Los y las ingenieras que trabajan aquí, tienen la posibilidad de colaborar con otros profesionales de distintas partes de Europa, Asia y América. Intel trabaja muy de cerca con el gobierno, las universidades y la sociedad civil para el desarrollo del talento y de la innovación.', + #'src': 'Intel Guadalajara Centro de Diseño, GDC, no era como lo conocen hoy. Todo comenzó con una pequeña empresa de Telecomunicaciones que había creado y estaba a cargo de Jesús Palomino y en la que solo eran 34 ingenieros. Sin embargo Intel se percató del talento que se tenía en México en dicha empresa y decidió apostarle para comenzar operaciones aquí en Guadalajara. Pueden ver en la pantalla algunos de los datos más representativos y fotos de aquel entonces.', + #'src': 'Desde el principio, Intel integró rápidamente a estos ingenieros como parte de su corporación, al mismo tiempo que empezaron más responsabilidades y proyectos qué cumplir con impacto mundial. Guadalajara fue el primer lugar en Latinoamérica que adopta Intel para que sea un laboratorio de investigación, comenzando sus operaciones en el 2001. Hoy por hoy en Intel GDC son más de 1,400 personas dedicados a la investigación e innovación.', + #'src': 'Algunos datos curiosos de Intel GDC son: Grandes resultados con talento, el cual el 98% de los empleados son mexicanos. Ha adquirido proyectos con impacto mundial y en donde varios chips y circuitos desarrollados han salido al mercado. Los y las ingenieras que trabajan aquí, tienen la posibilidad de colaborar con otros profesionales de distintas partes de Europa, Asia y América. Intel trabaja muy de cerca con el gobierno, las universidades y la sociedad civil para el desarrollo del talento y de la innovación.', + 'r': '0', + 'c': 'wav', + 'f': '44khz_16bit_stereo', + 'ssml': 'false', + 'b64': 'false' +}) + +file = 'audio.wav' + +newFile = open (file, "wb") +newFile.write(voice['response']) +newFile.close() + +player = subprocess.Popen(["aplay", file]) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh new file mode 100755 index 00000000..f37e4fdf --- /dev/null +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh @@ -0,0 +1,55 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +#. ~/CodeLabs/Hochob/Main.sh + +export ESPEAK_PID=$$ +export ESPEAK_BINARY=espeak +export ESPEAK_ARGUMENTS="--stdout" +export ESPEAK_PLAY="-w" +export ESPEAK_LANGUAGE="-ven+m5" +export ESPEAK_INPUT="No input has been provided" +export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK +export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH + +LOCAL_PLAY="$1" +LOCAL_LANGUAGE="$2" +LOCAL_TEXT="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 3 ] +then + if [ "$LOCAL_LANGUAGE" = "english" ]; then + export ESPEAK_LANGUAGE="-ven+m5" + elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + export ESPEAK_LANGUAGE="-v es-la -a 200" + fi + + export ESPEAK_INPUT="$LOCAL_TEXT" + + if [ "$LOCAL_PLAY" = "on" ]; then + $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_SPEECH | aplay - + elif [ "$LOCAL_PLAY" = "off" ]; then + $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" + ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 + fi +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRssLib.py b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRssLib.py new file mode 100755 index 00000000..f58725b2 --- /dev/null +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRssLib.py @@ -0,0 +1,52 @@ +import httplib, urllib + +def speech(settings): + __validate(settings) + return __request(settings) + +def __validate(settings): + if not settings: raise RuntimeError('The settings are undefined') + if 'key' not in settings or not settings['key']: raise RuntimeError('The API key is undefined') + if 'src' not in settings or not settings['src']: raise RuntimeError('The text is undefined') + if 'hl' not in settings or not settings['hl']: raise RuntimeError('The language is undefined') + +def __request(settings): + result = {'error': None, 'response': None} + + headers = {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'} + params = urllib.urlencode(__buildRequest(settings)) + + if 'ssl' in settings and settings['ssl']: + conn = httplib.HTTPSConnection('api.voicerss.org:443') + else: + conn = httplib.HTTPConnection('api.voicerss.org:80') + + conn.request('POST', '/', params, headers) + + response = conn.getresponse() + content = response.read() + + if response.status != 200: + result['error'] = response.reason + elif content.find('ERROR') == 0: + result['error'] = content + else: + result['response'] = content + + conn.close() + + return result + +def __buildRequest(settings): + params = {'key': '', 'src': '', 'hl': '', 'r': '', 'c': '', 'f': '', 'ssml': '', 'b64': ''} + + if 'key' in settings: params['key'] = settings['key'] + if 'src' in settings: params['src'] = settings['src'] + if 'hl' in settings: params['hl'] = settings['hl'] + if 'r' in settings: params['r'] = settings['r'] + if 'c' in settings: params['c'] = settings['c'] + if 'f' in settings: params['f'] = settings['f'] + if 'ssml' in settings: params['ssml'] = settings['ssml'] + if 'b64' in settings: params['b64'] = settings['b64'] + + return params From c2ceb27246f1cd4db0637344b3d1d961ade39d0f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:22:47 -0500 Subject: [PATCH 0612/1653] Update VoiceRss.sh --- .../Sound/SpeechSynthetizer/VoiceRss.sh | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh index f37e4fdf..6f8dbe67 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh @@ -8,14 +8,14 @@ set -x #. ~/CodeLabs/Hochob/Main.sh -export ESPEAK_PID=$$ -export ESPEAK_BINARY=espeak -export ESPEAK_ARGUMENTS="--stdout" -export ESPEAK_PLAY="-w" -export ESPEAK_LANGUAGE="-ven+m5" -export ESPEAK_INPUT="No input has been provided" -export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK -export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH +export VOICERSS_PID=$$ +export VOICERSS_BINARY=VoiceRss.py +export VOICERSS_ARGUMENTS="--stdout" +export VOICERSS_PLAY="-w" +export VOICERSS_LANGUAGE="-ven+m5" +export VOICERSS_INPUT="No input has been provided" +export VOICERSS_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS +export VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH LOCAL_PLAY="$1" LOCAL_LANGUAGE="$2" @@ -34,18 +34,18 @@ LOCAL_TEXT="$3" if [ $# -eq 3 ] then if [ "$LOCAL_LANGUAGE" = "english" ]; then - export ESPEAK_LANGUAGE="-ven+m5" + export VOICERSS_LANGUAGE="-ven+m5" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - export ESPEAK_LANGUAGE="-v es-la -a 200" + export VOICERSS_LANGUAGE="-v es-la -a 200" fi - export ESPEAK_INPUT="$LOCAL_TEXT" + export VOICERSS_INPUT="$LOCAL_TEXT" if [ "$LOCAL_PLAY" = "on" ]; then - $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_SPEECH | aplay - + $VOICERSS_BINARY $VOICERSS_LANGUAGE $VOICERSS_ARGUMENTS "$VOICERSS_INPUT" | tee $VOICERSS_SPEECH | aplay - elif [ "$LOCAL_PLAY" = "off" ]; then - $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" - ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 + $VOICERSS_BINARY $VOICERSS_PLAY $VOICERSS_SPEECH $VOICERSS_LANGUAGE "$VOICERSS_INPUT" + ffmpeg -y -i $VOICERSS_SPEECH $VOICERSS_SPEECH_MP3 fi else echo "Invalid number of arguments, see Documentation" From f05e78651ed745c728df6e062f02ae39576b6301 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:23:04 -0500 Subject: [PATCH 0613/1653] Update VoiceRss.sh --- Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh index 6f8dbe67..5d73e6e8 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh +. ~/CodeLabs/Hochob/Main.sh export VOICERSS_PID=$$ export VOICERSS_BINARY=VoiceRss.py From dc580eb01f10dd9a285f308943af43ce9ff73f20 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:25:18 -0500 Subject: [PATCH 0614/1653] Update Main.sh --- Hochob/Main.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 6bbf8025..a2a402e6 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -134,6 +134,11 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ALLFILES=$HOCHO export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.mp3 +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/VoiceRss/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS/*.* +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS/VoiceRssSpeech.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS/VoiceRssSpeech.mp3 + export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/*.mp4 From 8f1db69ea7805e9e18c1eabb74a506bc8829ecbf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:26:58 -0500 Subject: [PATCH 0615/1653] Update Main.sh --- Hochob/Main.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index a2a402e6..fe59c834 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -162,6 +162,11 @@ export ESPEAK_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEA export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 +export VOICERSS_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS +export VOICERSS_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_ALLFILES +export VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH +export VOICERSS_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH_MP3 + export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO From e4a7b7db60733604d9ccb0d0cfeecb8f12c90238 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:28:07 -0500 Subject: [PATCH 0616/1653] Update HochobServerMediaSource.sh --- Hochob/Setup/HochobServerMediaSource.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Setup/HochobServerMediaSource.sh b/Hochob/Setup/HochobServerMediaSource.sh index eb1a5f34..1675f790 100755 --- a/Hochob/Setup/HochobServerMediaSource.sh +++ b/Hochob/Setup/HochobServerMediaSource.sh @@ -13,6 +13,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_SOURCE_IMAG export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/VoiceRss/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ @@ -28,6 +29,7 @@ test -d $HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING && echo "Directory exists" || test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK +test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS test -d $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO test -d $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG From 7794f8dba4695ee98280065bcf874b6fdfc1a391 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:29:34 -0500 Subject: [PATCH 0617/1653] Update VoiceRss.py --- Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py index e4a3d2ed..e96c787b 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -import voicerssurllib import subprocess +import VoiceRssLib voice = voicerssurllib.speech({ 'key': '9fbff2d35eb54b62998515ccbc656a07', From 6d7a92aacb143babb21832783e74feb00d9fb921 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:29:50 -0500 Subject: [PATCH 0618/1653] Update VoiceRss.py --- Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py index e96c787b..cdd281d6 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py @@ -3,7 +3,7 @@ import subprocess import VoiceRssLib -voice = voicerssurllib.speech({ +voice = VoiceRssLib.speech({ 'key': '9fbff2d35eb54b62998515ccbc656a07', 'hl': 'en-us', 'src': 'Hello World Python Text To Speech X Platform', From 042df1f1c6535b6cc5a25f03b7bb05e66053fa9e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 11:30:27 -0500 Subject: [PATCH 0619/1653] Update VoiceRss.py --- .../Services/Sound/SpeechSynthetizer/VoiceRss.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py index cdd281d6..e06d8009 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py @@ -7,21 +7,6 @@ 'key': '9fbff2d35eb54b62998515ccbc656a07', 'hl': 'en-us', 'src': 'Hello World Python Text To Speech X Platform', - #'src': 'Hace mucho tiempo existieron civilizaciones muy inteligentes que lograron hacer descubrimientos que cambiaron la forma de vivir y desarrollaron tecnología que aún hoy en día utilizamos. Entre esas civilizaciones importantes como Babilonia, India y China se encontraban los mayas. ¿Quién de ustedes sabe que hicieron los mayas?, o ¿Por qué son tan importantes?. Los mayas han sido un pueblo muy avanzado, sin duda una de las grandes civilizaciones mundiales. Uno de los aspectos destacados de su cultura fue su gran avance en las matemáticas, pues su sistema numérico, desarrollado de forma independiente al resto del mundo era muy avanzado y complejo. Tanto que hasta contaban con la noción del Cero y su simbología, fue la primera cultura que representó en América el número 0. Es decir, de alguna manera, los mayas ya entendían el concepto de “cero” y “nada”. Y se preguntarán ¿de qué manera trascendió este uso de cero y su sistema numérico con la tecnología? Gracias al uso de 0 y 1, fue posible crear un lenguaje binario (es decir solo de dos números), con el cual se constituyó una forma de comunicación entre las máquinas tecnológicas y los humanos. A su vez, a partir de este sistema binario y otros componentes tecnológicos/electrónicos se pudo inventar el microprocesador y ya se imaginarán qué empresa pudo haber sido la creadora de esta magnífica invención. ¿Pueden adivinar cuál?!, ¡Claro, Intel! ¿Y cómo es que pasó todo esto? Pasa al siguiente exhibidor de tu derecha donde tendrás la respuesta', - #'src': 'Hace mucho tiempo existieron civilizaciones muy inteligentes que lograron hacer descubrimientos que cambiaron la forma de vivir y desarrollaron tecnología que aún hoy en día utilizamos. Entre esas civilizaciones importantes como Babilonia, India y China se encontraban los mayas. ¿Quién de ustedes sabe que hicieron los mayas?', - #'src': 'o ¿Por qué son tan importantes?', - #'src': 'Los mayas han sido un pueblo muy avanzado, sin duda una de las grandes civilizaciones mundiales. Uno de los aspectos destacados de su cultura fue su gran avance en las matemáticas, pues su sistema numérico, desarrollado de forma independiente al resto del mundo era muy avanzado y complejo. Tanto que hasta contaban con la noción del Cero y su simbología, fue la primera cultura que representó en América el número 0. Es decir, de alguna manera, los mayas ya entendían el concepto de “cero” y “nada”. Y se preguntarán ¿de qué manera trascendió este uso de cero y su sistema numérico con la tecnología? Gracias al uso de 0 y 1, fue posible crear un lenguaje binario (es decir solo de dos números), con el cual se constituyó una forma de comunicación entre las máquinas tecnológicas y los humanos. A su vez, a partir de este sistema binario y otros componentes tecnológicos/electrónicos se pudo inventar el microprocesador y ya se imaginarán qué empresa pudo haber sido la creadora de esta magnífica invención. ¿Pueden adivinar cuál?!', - #'src': '¡Claro, Intel! ¿Y cómo es que pasó todo esto? Pasa al siguiente exhibidor de tu derecha donde tendrás la respuesta', - #'src': '', - #'src': '¿Qué es Intel? ¿Cómo y en dónde nació Intel? Desde que llegaron hoy a Intel ya han escuchado que esta empresa fue la creadora de los microprocesadores, esto fue gracias a sus fundadores estadounidenses, Gordon Moore, Robert Noyce y Andy Grov, ingenieros inteligentes, apasionados y con muchísima creatividad para desarrollar mecanismos que pudieran facilitar cálculos y procesos matemáticos. Sin embargo, antes de llegar a la invención de los microprocesadores, se dedicaban a hacer memorias para dispositivos electrónicos. ¿Ustedes han hecho uso de alguna memoria? o ¿saben qué dispositivos han utilizado que tengan memorias? Conforme fue pasando el tiempo se dieron cuenta que podían innovar de formas distintas y no solo hacer memorias para guardar información, así que pensaron en trabajar en algo que pudiera procesar todo tipo de información. Es así como desarrollan el microprocesador. Es tal el éxito de su creación, que inician su empresa en 1968 en California, Estados Unidos; dándole el nombre de Intel el cual son las abreviaturas de Integreired Electronic. No se detuvo la historia ahí, ya que continuaron perfeccionando el microprocesador haciéndolo cada vez más rápido y pequeño. En su cuarta entrega Intel logra la revolución de la microcomputadora con el diseño del 8080 y a partir de ahí Intel desarrolla el 8086 y 8088, con estos dos procesadores obtuvieron en solamente un año 2,500 premios de diseño. ¡Imagínense cuántos premios en un año! Y fue tal el impacto y su reconocimiento al trabajo que hacía Intel que no fue suficiente tener sede en California, sino que comenzaron a expandirse por el mundo; un ejemplo de ello es Intel GDC, es decir, Intel Guadalajara Centro de Diseño. Para conocer lo que hace Intel Guadalajara, ve al exhibit que está detrás de ti y lo identificarás con el calendario azteca, ¿ya viste cuál?', - #'src': '¿Qué es Intel? ¿Cómo y en dónde nació Intel? Desde que llegaron hoy a Intel ya han escuchado que esta empresa fue la creadora de los microprocesadores, esto fue gracias a sus fundadores estadounidenses, Gordon Moore, Robert Noyce y Andy Grove, ingenieros inteligentes, apasionados y con muchísima creatividad para desarrollar mecanismos que pudieran facilitar cálculos y procesos matemáticos. Sin embargo, antes de llegar a la invención de los microprocesadores, se dedicaban a hacer memorias para dispositivos electrónicos. ¿Ustedes han hecho uso de alguna memoria? o ¿saben qué dispositivos han utilizado que tengan memorias?', - #'src': 'Conforme fue pasando el tiempo se dieron cuenta que podían innovar de formas distintas y no solo hacer memorias para guardar información, así que pensaron en trabajar en algo que pudiera procesar todo tipo de información. Es así como desarrollan el microprocesador. Es tal el éxito de su creación, que inician su empresa en 1968 en California, Estados Unidos; dándole el nombre de Intel el cual son las abreviaturas de Integrated Electronic. No se detuvo la historia ahí, ya que continuaron perfeccionando el microprocesador haciéndolo cada vez más rápido y pequeño.', - #'src': 'En su cuarta entrega Intel logra la revolución de la microcomputadora con el diseño del 8080 y a partir de ahí Intel desarrolla el 8086 y 8088, con estos dos procesadores obtuvieron en solamente un año 2,500 premios de diseño. ¡Imagínense cuántos premios en un año! Y fue tal el impacto y su reconocimiento al trabajo que hacía Intel que no fue suficiente tener sede en California, sino que comenzaron a expandirse por el mundo; un ejemplo de ello es Intel GDC, es decir, Intel Guadalajara Centro de Diseño. Para conocer lo que hace Intel Guadalajara, ve al exhibit que está detrás de ti y lo identificarás con el calendario azteca, ¿ya viste cuál?', - #'src': '', - #'src': 'Intel Guadalajara Centro de Diseño, GDC, no era como lo conocen hoy. Todo comenzó con una pequeña empresa de Telecomunicaciones que había creado y estaba a cargo de Jesús Palomino y en la que solo eran 34 ingenieros. Sin embargo Intel se percató del talento que se tenía en México en dicha empresa y decidió apostarle para comenzar operaciones aquí en Guadalajara. Pueden ver en la pantalla algunos de los datos más representativos y fotos de aquel entonces. Desde el principio, Intel integró rápidamente a estos ingenieros como parte de su corporación, al mismo tiempo que empezaron más responsabilidades y proyectos qué cumplir con impacto mundial. Guadalajara fue el primer lugar en Latinoamérica que adopta Intel para que sea un laboratorio de investigación, comenzando sus operaciones en el 2001. Hoy por hoy en Intel GDC son más de 1,400 personas dedicados a la investigación e innovación. Algunos datos curiosos de Intel GDC son: Grandes resultados con talento, el cual el 98% de los empleados son mexicanos. Ha adquirido proyectos con impacto mundial y en donde varios chips y circuitos desarrollados han salido al mercado. Los y las ingenieras que trabajan aquí, tienen la posibilidad de colaborar con otros profesionales de distintas partes de Europa, Asia y América. Intel trabaja muy de cerca con el gobierno, las universidades y la sociedad civil para el desarrollo del talento y de la innovación.', - #'src': 'Intel Guadalajara Centro de Diseño, GDC, no era como lo conocen hoy. Todo comenzó con una pequeña empresa de Telecomunicaciones que había creado y estaba a cargo de Jesús Palomino y en la que solo eran 34 ingenieros. Sin embargo Intel se percató del talento que se tenía en México en dicha empresa y decidió apostarle para comenzar operaciones aquí en Guadalajara. Pueden ver en la pantalla algunos de los datos más representativos y fotos de aquel entonces.', - #'src': 'Desde el principio, Intel integró rápidamente a estos ingenieros como parte de su corporación, al mismo tiempo que empezaron más responsabilidades y proyectos qué cumplir con impacto mundial. Guadalajara fue el primer lugar en Latinoamérica que adopta Intel para que sea un laboratorio de investigación, comenzando sus operaciones en el 2001. Hoy por hoy en Intel GDC son más de 1,400 personas dedicados a la investigación e innovación.', - #'src': 'Algunos datos curiosos de Intel GDC son: Grandes resultados con talento, el cual el 98% de los empleados son mexicanos. Ha adquirido proyectos con impacto mundial y en donde varios chips y circuitos desarrollados han salido al mercado. Los y las ingenieras que trabajan aquí, tienen la posibilidad de colaborar con otros profesionales de distintas partes de Europa, Asia y América. Intel trabaja muy de cerca con el gobierno, las universidades y la sociedad civil para el desarrollo del talento y de la innovación.', 'r': '0', 'c': 'wav', 'f': '44khz_16bit_stereo', From 04c16ee5bd174a12b6f8a80d6a767d5b52895708 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:08:21 -0500 Subject: [PATCH 0620/1653] Update Signed-off-by: Abraham Arce --- .../Sound/SpeechSynthetizer/VoiceRss.py | 36 ++++++++----------- .../Sound/SpeechSynthetizer/VoiceRss.sh | 17 ++++----- 2 files changed, 22 insertions(+), 31 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py index cdd281d6..50eabac2 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py @@ -1,27 +1,21 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*- import subprocess +import sys import VoiceRssLib +print 'Number of arguments:', len(sys.argv), 'arguments.' +print 'Argument List:', str(sys.argv) + +language = str(sys.argv[1]) +text = str(sys.argv[3]) +file = str(sys.argv[2]) + voice = VoiceRssLib.speech({ 'key': '9fbff2d35eb54b62998515ccbc656a07', - 'hl': 'en-us', - 'src': 'Hello World Python Text To Speech X Platform', - #'src': 'Hace mucho tiempo existieron civilizaciones muy inteligentes que lograron hacer descubrimientos que cambiaron la forma de vivir y desarrollaron tecnología que aún hoy en día utilizamos. Entre esas civilizaciones importantes como Babilonia, India y China se encontraban los mayas. ¿Quién de ustedes sabe que hicieron los mayas?, o ¿Por qué son tan importantes?. Los mayas han sido un pueblo muy avanzado, sin duda una de las grandes civilizaciones mundiales. Uno de los aspectos destacados de su cultura fue su gran avance en las matemáticas, pues su sistema numérico, desarrollado de forma independiente al resto del mundo era muy avanzado y complejo. Tanto que hasta contaban con la noción del Cero y su simbología, fue la primera cultura que representó en América el número 0. Es decir, de alguna manera, los mayas ya entendían el concepto de “cero” y “nada”. Y se preguntarán ¿de qué manera trascendió este uso de cero y su sistema numérico con la tecnología? Gracias al uso de 0 y 1, fue posible crear un lenguaje binario (es decir solo de dos números), con el cual se constituyó una forma de comunicación entre las máquinas tecnológicas y los humanos. A su vez, a partir de este sistema binario y otros componentes tecnológicos/electrónicos se pudo inventar el microprocesador y ya se imaginarán qué empresa pudo haber sido la creadora de esta magnífica invención. ¿Pueden adivinar cuál?!, ¡Claro, Intel! ¿Y cómo es que pasó todo esto? Pasa al siguiente exhibidor de tu derecha donde tendrás la respuesta', - #'src': 'Hace mucho tiempo existieron civilizaciones muy inteligentes que lograron hacer descubrimientos que cambiaron la forma de vivir y desarrollaron tecnología que aún hoy en día utilizamos. Entre esas civilizaciones importantes como Babilonia, India y China se encontraban los mayas. ¿Quién de ustedes sabe que hicieron los mayas?', - #'src': 'o ¿Por qué son tan importantes?', - #'src': 'Los mayas han sido un pueblo muy avanzado, sin duda una de las grandes civilizaciones mundiales. Uno de los aspectos destacados de su cultura fue su gran avance en las matemáticas, pues su sistema numérico, desarrollado de forma independiente al resto del mundo era muy avanzado y complejo. Tanto que hasta contaban con la noción del Cero y su simbología, fue la primera cultura que representó en América el número 0. Es decir, de alguna manera, los mayas ya entendían el concepto de “cero” y “nada”. Y se preguntarán ¿de qué manera trascendió este uso de cero y su sistema numérico con la tecnología? Gracias al uso de 0 y 1, fue posible crear un lenguaje binario (es decir solo de dos números), con el cual se constituyó una forma de comunicación entre las máquinas tecnológicas y los humanos. A su vez, a partir de este sistema binario y otros componentes tecnológicos/electrónicos se pudo inventar el microprocesador y ya se imaginarán qué empresa pudo haber sido la creadora de esta magnífica invención. ¿Pueden adivinar cuál?!', - #'src': '¡Claro, Intel! ¿Y cómo es que pasó todo esto? Pasa al siguiente exhibidor de tu derecha donde tendrás la respuesta', - #'src': '', - #'src': '¿Qué es Intel? ¿Cómo y en dónde nació Intel? Desde que llegaron hoy a Intel ya han escuchado que esta empresa fue la creadora de los microprocesadores, esto fue gracias a sus fundadores estadounidenses, Gordon Moore, Robert Noyce y Andy Grov, ingenieros inteligentes, apasionados y con muchísima creatividad para desarrollar mecanismos que pudieran facilitar cálculos y procesos matemáticos. Sin embargo, antes de llegar a la invención de los microprocesadores, se dedicaban a hacer memorias para dispositivos electrónicos. ¿Ustedes han hecho uso de alguna memoria? o ¿saben qué dispositivos han utilizado que tengan memorias? Conforme fue pasando el tiempo se dieron cuenta que podían innovar de formas distintas y no solo hacer memorias para guardar información, así que pensaron en trabajar en algo que pudiera procesar todo tipo de información. Es así como desarrollan el microprocesador. Es tal el éxito de su creación, que inician su empresa en 1968 en California, Estados Unidos; dándole el nombre de Intel el cual son las abreviaturas de Integreired Electronic. No se detuvo la historia ahí, ya que continuaron perfeccionando el microprocesador haciéndolo cada vez más rápido y pequeño. En su cuarta entrega Intel logra la revolución de la microcomputadora con el diseño del 8080 y a partir de ahí Intel desarrolla el 8086 y 8088, con estos dos procesadores obtuvieron en solamente un año 2,500 premios de diseño. ¡Imagínense cuántos premios en un año! Y fue tal el impacto y su reconocimiento al trabajo que hacía Intel que no fue suficiente tener sede en California, sino que comenzaron a expandirse por el mundo; un ejemplo de ello es Intel GDC, es decir, Intel Guadalajara Centro de Diseño. Para conocer lo que hace Intel Guadalajara, ve al exhibit que está detrás de ti y lo identificarás con el calendario azteca, ¿ya viste cuál?', - #'src': '¿Qué es Intel? ¿Cómo y en dónde nació Intel? Desde que llegaron hoy a Intel ya han escuchado que esta empresa fue la creadora de los microprocesadores, esto fue gracias a sus fundadores estadounidenses, Gordon Moore, Robert Noyce y Andy Grove, ingenieros inteligentes, apasionados y con muchísima creatividad para desarrollar mecanismos que pudieran facilitar cálculos y procesos matemáticos. Sin embargo, antes de llegar a la invención de los microprocesadores, se dedicaban a hacer memorias para dispositivos electrónicos. ¿Ustedes han hecho uso de alguna memoria? o ¿saben qué dispositivos han utilizado que tengan memorias?', - #'src': 'Conforme fue pasando el tiempo se dieron cuenta que podían innovar de formas distintas y no solo hacer memorias para guardar información, así que pensaron en trabajar en algo que pudiera procesar todo tipo de información. Es así como desarrollan el microprocesador. Es tal el éxito de su creación, que inician su empresa en 1968 en California, Estados Unidos; dándole el nombre de Intel el cual son las abreviaturas de Integrated Electronic. No se detuvo la historia ahí, ya que continuaron perfeccionando el microprocesador haciéndolo cada vez más rápido y pequeño.', - #'src': 'En su cuarta entrega Intel logra la revolución de la microcomputadora con el diseño del 8080 y a partir de ahí Intel desarrolla el 8086 y 8088, con estos dos procesadores obtuvieron en solamente un año 2,500 premios de diseño. ¡Imagínense cuántos premios en un año! Y fue tal el impacto y su reconocimiento al trabajo que hacía Intel que no fue suficiente tener sede en California, sino que comenzaron a expandirse por el mundo; un ejemplo de ello es Intel GDC, es decir, Intel Guadalajara Centro de Diseño. Para conocer lo que hace Intel Guadalajara, ve al exhibit que está detrás de ti y lo identificarás con el calendario azteca, ¿ya viste cuál?', - #'src': '', - #'src': 'Intel Guadalajara Centro de Diseño, GDC, no era como lo conocen hoy. Todo comenzó con una pequeña empresa de Telecomunicaciones que había creado y estaba a cargo de Jesús Palomino y en la que solo eran 34 ingenieros. Sin embargo Intel se percató del talento que se tenía en México en dicha empresa y decidió apostarle para comenzar operaciones aquí en Guadalajara. Pueden ver en la pantalla algunos de los datos más representativos y fotos de aquel entonces. Desde el principio, Intel integró rápidamente a estos ingenieros como parte de su corporación, al mismo tiempo que empezaron más responsabilidades y proyectos qué cumplir con impacto mundial. Guadalajara fue el primer lugar en Latinoamérica que adopta Intel para que sea un laboratorio de investigación, comenzando sus operaciones en el 2001. Hoy por hoy en Intel GDC son más de 1,400 personas dedicados a la investigación e innovación. Algunos datos curiosos de Intel GDC son: Grandes resultados con talento, el cual el 98% de los empleados son mexicanos. Ha adquirido proyectos con impacto mundial y en donde varios chips y circuitos desarrollados han salido al mercado. Los y las ingenieras que trabajan aquí, tienen la posibilidad de colaborar con otros profesionales de distintas partes de Europa, Asia y América. Intel trabaja muy de cerca con el gobierno, las universidades y la sociedad civil para el desarrollo del talento y de la innovación.', - #'src': 'Intel Guadalajara Centro de Diseño, GDC, no era como lo conocen hoy. Todo comenzó con una pequeña empresa de Telecomunicaciones que había creado y estaba a cargo de Jesús Palomino y en la que solo eran 34 ingenieros. Sin embargo Intel se percató del talento que se tenía en México en dicha empresa y decidió apostarle para comenzar operaciones aquí en Guadalajara. Pueden ver en la pantalla algunos de los datos más representativos y fotos de aquel entonces.', - #'src': 'Desde el principio, Intel integró rápidamente a estos ingenieros como parte de su corporación, al mismo tiempo que empezaron más responsabilidades y proyectos qué cumplir con impacto mundial. Guadalajara fue el primer lugar en Latinoamérica que adopta Intel para que sea un laboratorio de investigación, comenzando sus operaciones en el 2001. Hoy por hoy en Intel GDC son más de 1,400 personas dedicados a la investigación e innovación.', - #'src': 'Algunos datos curiosos de Intel GDC son: Grandes resultados con talento, el cual el 98% de los empleados son mexicanos. Ha adquirido proyectos con impacto mundial y en donde varios chips y circuitos desarrollados han salido al mercado. Los y las ingenieras que trabajan aquí, tienen la posibilidad de colaborar con otros profesionales de distintas partes de Europa, Asia y América. Intel trabaja muy de cerca con el gobierno, las universidades y la sociedad civil para el desarrollo del talento y de la innovación.', + 'hl': language, + 'src': text, 'r': '0', 'c': 'wav', 'f': '44khz_16bit_stereo', @@ -29,10 +23,10 @@ 'b64': 'false' }) -file = 'audio.wav' - -newFile = open (file, "wb") +newFile = open (file, "w+") newFile.write(voice['response']) newFile.close() -player = subprocess.Popen(["aplay", file]) +# player = subprocess.Popen(["aplay", file]) + +# End Of File diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh index 5d73e6e8..823e5c9f 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh @@ -9,11 +9,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh export VOICERSS_PID=$$ -export VOICERSS_BINARY=VoiceRss.py +export VOICERSS_BINARY=$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER/VoiceRss.py export VOICERSS_ARGUMENTS="--stdout" export VOICERSS_PLAY="-w" -export VOICERSS_LANGUAGE="-ven+m5" -export VOICERSS_INPUT="No input has been provided" export VOICERSS_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS export VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH @@ -34,18 +32,17 @@ LOCAL_TEXT="$3" if [ $# -eq 3 ] then if [ "$LOCAL_LANGUAGE" = "english" ]; then - export VOICERSS_LANGUAGE="-ven+m5" + export VOICERSS_LANGUAGE="en-us" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - export VOICERSS_LANGUAGE="-v es-la -a 200" + export VOICERSS_LANGUAGE="es-mx" fi - export VOICERSS_INPUT="$LOCAL_TEXT" + export VOICERSS_INPUT="${LOCAL_TEXT}" + + $VOICERSS_BINARY $VOICERSS_LANGUAGE $VOICERSS_SPEECH "\"$VOICERSS_INPUT\"" if [ "$LOCAL_PLAY" = "on" ]; then - $VOICERSS_BINARY $VOICERSS_LANGUAGE $VOICERSS_ARGUMENTS "$VOICERSS_INPUT" | tee $VOICERSS_SPEECH | aplay - - elif [ "$LOCAL_PLAY" = "off" ]; then - $VOICERSS_BINARY $VOICERSS_PLAY $VOICERSS_SPEECH $VOICERSS_LANGUAGE "$VOICERSS_INPUT" - ffmpeg -y -i $VOICERSS_SPEECH $VOICERSS_SPEECH_MP3 + aplay $VOICERSS_SPEECH fi else echo "Invalid number of arguments, see Documentation" From a16d1bed6021bca0262e50d40f0d807e1b02a2b7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:09:04 -0500 Subject: [PATCH 0621/1653] Update TiburonBallena.sh --- .../Applications/NorthernMayaLowlands/TiburonBallena.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 97c8372a..6ae2d880 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,11 +30,12 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "To be written" else + VoiceRss.sh on spanish \ + "Hola Lupe, como estas?" + #Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH_MP3" Espeak.sh off spanish \ - " - Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" + "Super bien, y tu? + #Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" fi -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" - # End of File From 06340c1ef2cb10f5eed5002ef27022c65fea4e2f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:12:01 -0500 Subject: [PATCH 0622/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 6ae2d880..a777d69a 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -34,7 +34,7 @@ else "Hola Lupe, como estas?" #Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH_MP3" Espeak.sh off spanish \ - "Super bien, y tu? + "Super bien, y tu?" #Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" fi From 7f634b1ea1097280f1f375b5a6070049d5032e3f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:12:30 -0500 Subject: [PATCH 0623/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index a777d69a..f98b624a 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -33,7 +33,7 @@ else VoiceRss.sh on spanish \ "Hola Lupe, como estas?" #Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH_MP3" - Espeak.sh off spanish \ + Espeak.sh on spanish \ "Super bien, y tu?" #Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" fi From 84130f1740dbdb70161ec6be9f66c8aaf16951b9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:13:57 -0500 Subject: [PATCH 0624/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index f98b624a..6965d047 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -31,10 +31,10 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "To be written" else VoiceRss.sh on spanish \ - "Hola Lupe, como estas?" + "Hola Lupe, muy buenos dias!" #Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH_MP3" Espeak.sh on spanish \ - "Super bien, y tu?" + "Buenos dias! Estoy listo para platicar sobre el espacio" #Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" fi From f11337386c31871a27f98e6197ca18c0a23f6eb9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:14:57 -0500 Subject: [PATCH 0625/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 6965d047..dbd42e66 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -31,7 +31,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "To be written" else VoiceRss.sh on spanish \ - "Hola Lupe, muy buenos dias!" + "Hola Lupe muy buenos dias" #Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH_MP3" Espeak.sh on spanish \ "Buenos dias! Estoy listo para platicar sobre el espacio" From af257cc90d74235c23e5190d5c3ee68479b5764e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:16:03 -0500 Subject: [PATCH 0626/1653] Update VoiceRss.py --- Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py index 0454aeb9..50eabac2 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.py @@ -14,13 +14,8 @@ voice = VoiceRssLib.speech({ 'key': '9fbff2d35eb54b62998515ccbc656a07', -<<<<<<< HEAD 'hl': language, 'src': text, -======= - 'hl': 'en-us', - 'src': 'Hello World Python Text To Speech X Platform', ->>>>>>> a16d1bed6021bca0262e50d40f0d807e1b02a2b7 'r': '0', 'c': 'wav', 'f': '44khz_16bit_stereo', From 217bb9c6b0abdbea405f33ee644f074ac7b3d3eb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:17:41 -0500 Subject: [PATCH 0627/1653] Update TiburonBallena.sh --- .../Applications/NorthernMayaLowlands/TiburonBallena.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index dbd42e66..91c3fdff 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,12 +30,12 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then Espeak.sh off english \ "To be written" else - VoiceRss.sh on spanish \ + VoiceRss.sh off spanish \ "Hola Lupe muy buenos dias" - #Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH_MP3" - Espeak.sh on spanish \ + Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH_MP3" + Espeak.sh off spanish \ "Buenos dias! Estoy listo para platicar sobre el espacio" - #Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" + Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" fi # End of File From ca1fc84ec2c6fd46c8b7b28f9f7d18c4dd468e10 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:19:42 -0500 Subject: [PATCH 0628/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 91c3fdff..c809fe9d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -32,7 +32,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else VoiceRss.sh off spanish \ "Hola Lupe muy buenos dias" - Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH_MP3" + Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH" Espeak.sh off spanish \ "Buenos dias! Estoy listo para platicar sobre el espacio" Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" From 9c932ad819fe0399b14b871332bd70d81c5cf96b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:34:45 -0500 Subject: [PATCH 0629/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index f37e4fdf..01be3b44 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -47,6 +47,10 @@ then $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 fi + + cp $ESPEAK_SPEECH $SPEECH + cp $ESPEAK_SPEECH_MP3 $SPEECH_MP3 + else echo "Invalid number of arguments, see Documentation" exit 1 From 724e33d3ac90f1ddaa74f4c96ff2c9c3bd89ca17 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:35:54 -0500 Subject: [PATCH 0630/1653] Update VoiceRss.sh --- Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh index 823e5c9f..7c0f3bd4 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh @@ -44,6 +44,12 @@ then if [ "$LOCAL_PLAY" = "on" ]; then aplay $VOICERSS_SPEECH fi + + ffmpeg -y -i $VOICERSS_SPEECH $VOICERSS_SPEECH_MP3 + + cp $VOICERSS_SPEECH $SPEECH + cp $VOICERSS_SPEECH_MP3 $SPEECH_MP3 + else echo "Invalid number of arguments, see Documentation" exit 1 From 00c0414e17bfd69c0602823140494b55a8eb19d4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:36:36 -0500 Subject: [PATCH 0631/1653] Update Main.sh --- Hochob/Main.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index fe59c834..e25bb251 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -129,6 +129,9 @@ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SO export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/Speech.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/Speech.mp3 + export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/*.* export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav @@ -157,6 +160,9 @@ export FSWEBCAM_IMAGE_TEXT=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE_TEX export DRAWING_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING export DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES +export SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH +export SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH_MP3 + export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK export ESPEAK_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ALLFILES export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH From b2a7220bd6347fc6d799867c4f9236b00e7ecf33 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:39:18 -0500 Subject: [PATCH 0632/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index c809fe9d..db8d70d9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -27,15 +27,9 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ - "To be written" + Northern.sh english robot "Hi there" else - VoiceRss.sh off spanish \ - "Hola Lupe muy buenos dias" - Stream.sh "Eek'" "1.0" "$VOICERSS_SPEECH" - Espeak.sh off spanish \ - "Buenos dias! Estoy listo para platicar sobre el espacio" - Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" + Northern.sh spanish tt "Hola Lupe muy buenos dias" fi # End of File From 0a37ebbbfaa5b0eeb3b794211566d2e4598334c8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 12:59:29 -0500 Subject: [PATCH 0633/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 4 +++- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index db8d70d9..fa58e08f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -29,7 +29,9 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Northern.sh english robot "Hi there" else - Northern.sh spanish tt "Hola Lupe muy buenos dias" + #Northern.sh english robot "Hi there" + Northern.sh english tt "Hi there" + #Northern.sh spanish robot "Hola Lupe muy buenos dias" fi # End of File diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index 01be3b44..e3eb0c73 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh +. ~/CodeLabs/Hochob/Main.sh export ESPEAK_PID=$$ export ESPEAK_BINARY=espeak @@ -47,7 +47,7 @@ then $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 fi - + cp $ESPEAK_SPEECH $SPEECH cp $ESPEAK_SPEECH_MP3 $SPEECH_MP3 From 58fe9ffd4bf3dbce7d2655d6001ab5f60aabeb4d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:01:36 -0500 Subject: [PATCH 0634/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index fa58e08f..284cfc07 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -29,9 +29,10 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Northern.sh english robot "Hi there" else - #Northern.sh english robot "Hi there" - Northern.sh english tt "Hi there" - #Northern.sh spanish robot "Hola Lupe muy buenos dias" + Northern.sh english robot "Hi Lupe, good morning" + Northern.sh english tt "Hi Lupe, good morning" + Northern.sh spanish robot "Hola Lupe, muy buenos dias" + Northern.sh spanish tt "Hola Lupe, muy buenos dias" fi # End of File From 2cba22a114e0075e7bbd8657bdd7702ed8da8280 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:05:55 -0500 Subject: [PATCH 0635/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 34d1888b..6568357b 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -8,6 +8,7 @@ set -x export STREAM2CHROMECAST_PID=$$ export STREAM2CHROMECAST_BINARY=stream2chromecast.py +export STREAM2CHROMECAST_ARGUMENTS="-transcodebufsize 5242880" LOCAL_DEVICE="$1" LOCAL_VOLUME=0.75 @@ -27,7 +28,7 @@ if [ $# -eq 3 ] then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $LOCAL_FILE + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else echo "Invalid number of arguments, see Documentation" From 8d0b55bc002afbb25c628309de37db7f98ec47e4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:07:30 -0500 Subject: [PATCH 0636/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 6568357b..addf2735 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -28,7 +28,7 @@ if [ $# -eq 3 ] then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS $LOCAL_FILE + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS -transcoder avconv -transcode $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else echo "Invalid number of arguments, see Documentation" From c9baed28a13838cc99e9565675d05f3a1f4f3af8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:08:42 -0500 Subject: [PATCH 0637/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index addf2735..5f5fb046 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -9,6 +9,7 @@ set -x export STREAM2CHROMECAST_PID=$$ export STREAM2CHROMECAST_BINARY=stream2chromecast.py export STREAM2CHROMECAST_ARGUMENTS="-transcodebufsize 5242880" +export STREAM2CHROMECAST_TRANSCODER="-transcoder avconv -transcode" LOCAL_DEVICE="$1" LOCAL_VOLUME=0.75 @@ -28,7 +29,7 @@ if [ $# -eq 3 ] then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS -transcoder avconv -transcode $LOCAL_FILE + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else echo "Invalid number of arguments, see Documentation" From 6d6bb5c5f6426b4afc7f7b87d455acea86003e86 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:10:10 -0500 Subject: [PATCH 0638/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 5f5fb046..3d3df87e 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -29,7 +29,9 @@ if [ $# -eq 3 ] then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ + -transcodeopts '-b:v 1000k -b:a 128k' \ + $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else echo "Invalid number of arguments, see Documentation" From d3b134a32909e6651d6f1d843025721ce0641cd8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:10:40 -0500 Subject: [PATCH 0639/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 3d3df87e..b832f031 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -30,7 +30,7 @@ then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ - -transcodeopts '-b:v 1000k -b:a 128k' \ + -transcodeopts '-b:v 1000k -b:a 64k' \ $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else From 476704599d4e7ae2caa1380562ad85530a41dda4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:12:07 -0500 Subject: [PATCH 0640/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index b832f031..a213a41c 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -30,7 +30,7 @@ then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ - -transcodeopts '-b:v 1000k -b:a 64k' \ + -transcodeopts '-b:v 1000k -b:a 24k' \ $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else From 40d6c46d6086f4c65e1c0ba25612d06fb977a444 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:12:34 -0500 Subject: [PATCH 0641/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Sound/Play/Northern.sh | 49 ++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 Hochob/Services/Sound/Play/Northern.sh diff --git a/Hochob/Services/Sound/Play/Northern.sh b/Hochob/Services/Sound/Play/Northern.sh new file mode 100755 index 00000000..d6c0e9a6 --- /dev/null +++ b/Hochob/Services/Sound/Play/Northern.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export NORTHERN_PID=$$ + +LOCAL_LANGUAGE="$1" +LOCAL_CHARACTER="$2" +LOCAL_TEXT="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off spanish "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off spanish "${LOCAL_TEXT}" +fi + +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" + +exit 0 + +if [ $# -eq 1 ] +then + echo "Tbd" +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 6b856f27cf0bde88f65af1342c41fc0c4e7f417b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:14:41 -0500 Subject: [PATCH 0642/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 284cfc07..55026e03 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -27,10 +27,9 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Northern.sh english robot "Hi there" -else Northern.sh english robot "Hi Lupe, good morning" Northern.sh english tt "Hi Lupe, good morning" +else Northern.sh spanish robot "Hola Lupe, muy buenos dias" Northern.sh spanish tt "Hola Lupe, muy buenos dias" fi From 182fd96db26a3335301932999e1f3b44ac1de1ba Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:29:37 -0500 Subject: [PATCH 0643/1653] Update Signed-off-by: Abraham Arce --- .../Stream2Chromecast/Video2Chromecast.sh | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100755 Hochob/Services/Stream/Stream2Chromecast/Video2Chromecast.sh diff --git a/Hochob/Services/Stream/Stream2Chromecast/Video2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Video2Chromecast.sh new file mode 100755 index 00000000..e3d7fd03 --- /dev/null +++ b/Hochob/Services/Stream/Stream2Chromecast/Video2Chromecast.sh @@ -0,0 +1,41 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +export CAST_PID=$$ +export STREAM2CHROMECAST_BINARY=stream2chromecast.py +export STREAM2CHROMECAST_ARGUMENTS="-transcodebufsize 5242880" +export STREAM2CHROMECAST_TRANSCODER="-transcoder avconv -transcode" + +LOCAL_DEVICE="$1" +LOCAL_VOLUME=0.75 +LOCAL_FILE="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 3 ] +then + killall -9 $STREAM2CHROMECAST_BINARY + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ + -transcodeopts '-b:v 1000k -b:a 24k' \ + $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From c29874b83a3ea783050861b96e674e223486a234 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:33:36 -0500 Subject: [PATCH 0644/1653] Update Video2Chromecast.sh --- .../Stream/Stream2Chromecast/Video2Chromecast.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Video2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Video2Chromecast.sh index e3d7fd03..625df9b4 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Video2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Video2Chromecast.sh @@ -6,10 +6,10 @@ set -x # Variables # ============================================================================= -export CAST_PID=$$ -export STREAM2CHROMECAST_BINARY=stream2chromecast.py -export STREAM2CHROMECAST_ARGUMENTS="-transcodebufsize 5242880" -export STREAM2CHROMECAST_TRANSCODER="-transcoder avconv -transcode" +export VIDEOCHROMECAST_PID=$$ +export VIDEO2CHROMECAST_BINARY=stream2chromecast.py +export VIDEO2CHROMECAST_ARGUMENTS="-transcodebufsize 5242880" +export VIDEO2CHROMECAST_TRANSCODER="-transcoder avconv -transcode" LOCAL_DEVICE="$1" LOCAL_VOLUME=0.75 @@ -28,11 +28,11 @@ LOCAL_FILE="$3" if [ $# -eq 3 ] then killall -9 $STREAM2CHROMECAST_BINARY - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ + $VIDEO2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME + $VIDEO2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $VIDEO2CHROMECAST_ARGUMENTS \ -transcodeopts '-b:v 1000k -b:a 24k' \ - $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop + $VIDEO2CHROMECAST_TRANSCODER $LOCAL_FILE + $VIDEO2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else echo "Invalid number of arguments, see Documentation" exit 1 From fba42cad37ea3c798608f5dedf1c89e82e3ca8f0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 24 Jun 2017 13:35:24 -0500 Subject: [PATCH 0645/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 55026e03..3a31b20e 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -32,6 +32,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else Northern.sh spanish robot "Hola Lupe, muy buenos dias" Northern.sh spanish tt "Hola Lupe, muy buenos dias" + Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/TiburonBallena/LiftoffSpaceXFalcon9CRS10Mission.mp4" fi # End of File From ae00dd83832e74eb528f87c140a24f48544163d7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:13:15 -0500 Subject: [PATCH 0646/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Keypad/Keypad.sh | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 Hochob/Services/Keypad/Keypad.sh diff --git a/Hochob/Services/Keypad/Keypad.sh b/Hochob/Services/Keypad/Keypad.sh new file mode 100755 index 00000000..2d25f427 --- /dev/null +++ b/Hochob/Services/Keypad/Keypad.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export LANGUAGE_PID=$$ + +LOCAL_COMMAND="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ -z "$1" ] +then + cat $HOCHOB_SERVER_CONFIGURATION_LANGUAGE +else + + test -d $HOCHOB_SERVER_MEDIA_SOURCE || mkdir $HOCHOB_SERVER_MEDIA_SOURCE + echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_LANGUAGE +fi + +# End of File From 4d458fa00a03f45a1b4c1ecaf0c4ed018846c67e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:15:45 -0500 Subject: [PATCH 0647/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index e25bb251..45c6c858 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -31,6 +31,7 @@ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS=$HOCHOB_SERVER_SERVICES/Communications/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT=$HOCHOB_SERVER_SERVICES_COMMUNICATIONS/MqttClient/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ +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/ @@ -52,6 +53,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE 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 From 675cfba976341516e78277ad94e8292b06add297 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:18:32 -0500 Subject: [PATCH 0648/1653] Update Keypad.sh --- Hochob/Services/Keypad/Keypad.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Keypad/Keypad.sh b/Hochob/Services/Keypad/Keypad.sh index 2d25f427..e0eadb17 100755 --- a/Hochob/Services/Keypad/Keypad.sh +++ b/Hochob/Services/Keypad/Keypad.sh @@ -8,9 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export LANGUAGE_PID=$$ +export KEYPAD_PID=$$ -LOCAL_COMMAND="$1" +LOCAL_IDENTIFICATION="$1" +LOCAL_BUTTON="$2" # ============================================================================= # Functions @@ -22,13 +23,12 @@ LOCAL_COMMAND="$1" # Main # ============================================================================= -if [ -z "$1" ] +if [ -z "$2" ] then - cat $HOCHOB_SERVER_CONFIGURATION_LANGUAGE + else - - test -d $HOCHOB_SERVER_MEDIA_SOURCE || mkdir $HOCHOB_SERVER_MEDIA_SOURCE - echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_LANGUAGE + echo "Invalid number of arguments, see Documentation" + exit 1 fi # End of File From ee346377c4ffe4450b45c2f0eba1f85ce57fd4f2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:19:21 -0500 Subject: [PATCH 0649/1653] Update Mosquitto.sh --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 6d86f320..1c2bf955 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -36,13 +36,13 @@ do i=`expr $i + 1` done -$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 2 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\"" +$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 0 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\"" exit 0 if [ $# -eq 2 ] then - $MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 2 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE + $MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 0 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE else echo "Invalid number of arguments, see Documentation" exit 1 From 53747498af2f30364c7d8c69623bf9a58bc369e2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:21:11 -0500 Subject: [PATCH 0650/1653] Update Keypad.sh --- Hochob/Services/Keypad/Keypad.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/Keypad.sh b/Hochob/Services/Keypad/Keypad.sh index e0eadb17..11eba3c2 100755 --- a/Hochob/Services/Keypad/Keypad.sh +++ b/Hochob/Services/Keypad/Keypad.sh @@ -25,7 +25,7 @@ LOCAL_BUTTON="$2" if [ -z "$2" ] then - + Mosquitto.sh Hochob/Keypad/$LOCAL_IDENTIFICATION $LOCAL_BUTTON else echo "Invalid number of arguments, see Documentation" exit 1 From 5b456692bd352977525bd5f3903adae3b717b9d8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:27:08 -0500 Subject: [PATCH 0651/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 965226bd..bdf019b4 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -318,6 +318,21 @@ script: movestop: sequence: - service: shell_command.movestop + + # Techie Maya Lands + + keypada: + sequence: + - service: shell_command.keypada + keypadb: + sequence: + - service: shell_command.keypadb + keypadc: + sequence: + - service: shell_command.keypadc + keypadd: + sequence: + - service: shell_command.keypadd shell_command: @@ -367,6 +382,13 @@ shell_command: moveforward: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveforward movebackward: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movebackward movestop: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movestop + + # Techie Maya Lands + + keypada: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual a + keypadb: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual b + keypadc: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual c + keypadd: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual d switch: - platform: command_line @@ -531,4 +553,12 @@ group: - script.moveforward - script.movebackward - script.movestop + + techiemayalandskeypad: + name: Keypad + entities: + - script.keypada + - script.keypadb + - script.keypadc + - script.keypadd From a94e1b90ce30bfdf1cf7ee1eb0db8fd24c942ced Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:28:55 -0500 Subject: [PATCH 0652/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index bdf019b4..739d45ca 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -459,6 +459,12 @@ group: name: The Experience entities: - group.northernmayalowlandsstations + + techiemayalands: + view: yes + name: The Techie + entities: + - group.techiemayalandskeypad language: name: Idioma From 08a9603d3d9116c47bf2242f05b61b479e5fa5d2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:30:27 -0500 Subject: [PATCH 0653/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 739d45ca..55628622 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -560,11 +560,11 @@ group: - script.movebackward - script.movestop - techiemayalandskeypad: - name: Keypad - entities: - - script.keypada - - script.keypadb - - script.keypadc - - script.keypadd + techiemayalandskeypad: + name: Keypad + entities: + - script.keypada + - script.keypadb + - script.keypadc + - script.keypadd From 409d773853ab36c577db0a812e195c7349d66dd5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:36:44 -0500 Subject: [PATCH 0654/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 50 +++++++++++++------ 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 55628622..9ee287e8 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -160,6 +160,24 @@ homeassistant: script.movestop: friendly_name: Move Stop icon: mdi:stop + + # Techie Maya Lands + + script.keypadone: + friendly_name: 1 + icon: mdi:numeric-1-box + + script.keypadtwo: + friendly_name: 2 + icon: mdi:numeric-2-box + + script.keypadthree: + friendly_name: 3 + icon: mdi:numeric-3-box + + script.keypadfour: + friendly_name: 4 + icon: mdi:numeric-4-box # Enables the frontend frontend: @@ -321,18 +339,18 @@ script: # Techie Maya Lands - keypada: + keypadone: sequence: - - service: shell_command.keypada - keypadb: + - service: shell_command.keypadone + keypadtwo: sequence: - - service: shell_command.keypadb - keypadc: + - service: shell_command.keypadtwo + keypadthree: sequence: - - service: shell_command.keypadc - keypadd: + - service: shell_command.keypadthree + keypadfour: sequence: - - service: shell_command.keypadd + - service: shell_command.keypadfour shell_command: @@ -385,10 +403,10 @@ shell_command: # Techie Maya Lands - keypada: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual a - keypadb: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual b - keypadc: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual c - keypadd: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual d + keypadone: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 1 + keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 2 + keypadthree: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 3 + keypadfour: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 4 switch: - platform: command_line @@ -563,8 +581,8 @@ group: techiemayalandskeypad: name: Keypad entities: - - script.keypada - - script.keypadb - - script.keypadc - - script.keypadd + - script.keypadone + - script.keypadtwo + - script.keypadthree + - script.keypadfour From 3320cb1767824346343ed7b073d729b9eb9d94f9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:39:47 -0500 Subject: [PATCH 0655/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 9ee287e8..fef1fac3 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -164,19 +164,19 @@ homeassistant: # Techie Maya Lands script.keypadone: - friendly_name: 1 + friendly_name: Botón Uno icon: mdi:numeric-1-box script.keypadtwo: - friendly_name: 2 + friendly_name: Botón Dos icon: mdi:numeric-2-box script.keypadthree: - friendly_name: 3 + friendly_name: Botón Tres icon: mdi:numeric-3-box script.keypadfour: - friendly_name: 4 + friendly_name: Botón Cuatro icon: mdi:numeric-4-box # Enables the frontend From 307867af89d3bfe2fd9ba51835540b06f88dd4b7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:41:47 -0500 Subject: [PATCH 0656/1653] Update Main.sh --- Hochob/Main.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 45c6c858..fde08385 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -184,7 +184,8 @@ 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_PORT=1883 # ============================================================================= From 4df65176e581efcefd09ba91ac7e79e636ed6697 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:42:53 -0500 Subject: [PATCH 0657/1653] Update Keypad.sh --- Hochob/Services/Keypad/Keypad.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Keypad/Keypad.sh b/Hochob/Services/Keypad/Keypad.sh index 11eba3c2..bf1eef10 100755 --- a/Hochob/Services/Keypad/Keypad.sh +++ b/Hochob/Services/Keypad/Keypad.sh @@ -23,9 +23,9 @@ LOCAL_BUTTON="$2" # Main # ============================================================================= -if [ -z "$2" ] +if [ -z 2 ] then - Mosquitto.sh Hochob/Keypad/$LOCAL_IDENTIFICATION $LOCAL_BUTTON + Mosquitto.sh hochob/keypad/$LOCAL_IDENTIFICATION $LOCAL_BUTTON else echo "Invalid number of arguments, see Documentation" exit 1 From 3a9b8d2bd6619e973190853bbb0688158c9f59ad Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:43:29 -0500 Subject: [PATCH 0658/1653] Update Keypad.sh --- Hochob/Services/Keypad/Keypad.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/Keypad.sh b/Hochob/Services/Keypad/Keypad.sh index bf1eef10..666c4cd7 100755 --- a/Hochob/Services/Keypad/Keypad.sh +++ b/Hochob/Services/Keypad/Keypad.sh @@ -23,7 +23,7 @@ LOCAL_BUTTON="$2" # Main # ============================================================================= -if [ -z 2 ] +if [ $# -eq 2 ] then Mosquitto.sh hochob/keypad/$LOCAL_IDENTIFICATION $LOCAL_BUTTON else From a69846f5eef7bdb0a9bca3b16c876f923cb0512b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:47:22 -0500 Subject: [PATCH 0659/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Survey/Keypad.sh | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 Hochob/Services/Survey/Keypad.sh diff --git a/Hochob/Services/Survey/Keypad.sh b/Hochob/Services/Survey/Keypad.sh new file mode 100755 index 00000000..666c4cd7 --- /dev/null +++ b/Hochob/Services/Survey/Keypad.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export KEYPAD_PID=$$ + +LOCAL_IDENTIFICATION="$1" +LOCAL_BUTTON="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + Mosquitto.sh hochob/keypad/$LOCAL_IDENTIFICATION $LOCAL_BUTTON +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 02b1a902627524070d1059a3268e42265400203a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:50:18 -0500 Subject: [PATCH 0660/1653] Update Keypad.sh --- Hochob/Services/Survey/Keypad.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Survey/Keypad.sh b/Hochob/Services/Survey/Keypad.sh index 666c4cd7..15ac6512 100755 --- a/Hochob/Services/Survey/Keypad.sh +++ b/Hochob/Services/Survey/Keypad.sh @@ -11,7 +11,6 @@ set -x export KEYPAD_PID=$$ LOCAL_IDENTIFICATION="$1" -LOCAL_BUTTON="$2" # ============================================================================= # Functions @@ -23,9 +22,9 @@ LOCAL_BUTTON="$2" # Main # ============================================================================= -if [ $# -eq 2 ] +if [ $# -eq 1 ] then - Mosquitto.sh hochob/keypad/$LOCAL_IDENTIFICATION $LOCAL_BUTTON + echo "Tbd" else echo "Invalid number of arguments, see Documentation" exit 1 From 41408690fcf8dadcec8543cbd7f32b0bb7c18202 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:52:58 -0500 Subject: [PATCH 0661/1653] Create Keypad.py --- Hochob/Services/Survey/Keypad.py | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 Hochob/Services/Survey/Keypad.py diff --git a/Hochob/Services/Survey/Keypad.py b/Hochob/Services/Survey/Keypad.py new file mode 100644 index 00000000..3a37ff1f --- /dev/null +++ b/Hochob/Services/Survey/Keypad.py @@ -0,0 +1,29 @@ +#!/usr/bin/python + +import paho.mqtt.client as paho +import time +from threading import Thread + +def KeypadOptionMessage(mosq, obj, msg): + # print msg.payload == "ON": + print msg.payload + +def KeypadOption(): + mqttclient = paho.Client() + mqttclient.connect("iot.eclipse.org", 1883, 60) + mqttclient.subscribe("hochob/keypad", 0) + mqttclient.on_message = KeypadOptionMessage + while mqttclient.loop() == 0: + pass + +if __name__ == '__main__': + + threadmqttsubscribe = Thread(target=KeypadOption) + threadmqttsubscribe.start() + + print "Hello Edzna @ Light" + + while True: + time.sleep(5) + +# End of File From 894c29b20db925614bf400c7ef7c79f344d3e9b4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:54:36 -0500 Subject: [PATCH 0662/1653] Update Keypad.py --- Hochob/Services/Survey/Keypad.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Survey/Keypad.py b/Hochob/Services/Survey/Keypad.py index 3a37ff1f..b8298eb9 100644 --- a/Hochob/Services/Survey/Keypad.py +++ b/Hochob/Services/Survey/Keypad.py @@ -11,7 +11,7 @@ def KeypadOptionMessage(mosq, obj, msg): def KeypadOption(): mqttclient = paho.Client() mqttclient.connect("iot.eclipse.org", 1883, 60) - mqttclient.subscribe("hochob/keypad", 0) + mqttclient.subscribe("hochob/keypad/virtual", 0) mqttclient.on_message = KeypadOptionMessage while mqttclient.loop() == 0: pass @@ -21,7 +21,7 @@ def KeypadOption(): threadmqttsubscribe = Thread(target=KeypadOption) threadmqttsubscribe.start() - print "Hello Edzna @ Light" + print "Hochob Keypad" while True: time.sleep(5) From ae1323cea85afda65ac1360e33ee6caea334a5bd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 00:58:14 -0500 Subject: [PATCH 0663/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index fef1fac3..8eba7984 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -403,10 +403,10 @@ shell_command: # Techie Maya Lands - keypadone: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 1 - keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 2 - keypadthree: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 3 - keypadfour: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 4 + keypadone: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 1 & + keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 2 & + keypadthree: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 3 & + keypadfour: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 4 & switch: - platform: command_line From eb91d3eeeac9e4e3d8a2013f8a0f0df76376c32e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:13:33 -0500 Subject: [PATCH 0664/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index fde08385..ec6ff905 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -43,6 +43,7 @@ export HOCHOB_SERVER_SERVICES_SOUND_PLAY=$HOCHOB_SERVER_SERVICES_SOUND/Play/ export HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_SERVICES_SOUND/SpeechSynthetizer/ export HOCHOB_SERVER_SERVICES_STREAM=$HOCHOB_SERVER_SERVICES/Stream/ export HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST=$HOCHOB_SERVER_SERVICES_STREAM/Stream2Chromecast/ +export HOCHOB_SERVER_SERVICES_SURVEY=$HOCHOB_SERVER_SERVICES/Survey/ export HOCHOB_SERVER_SERVICES_VIDEO=$HOCHOB_SERVER_SERVICES/Video/ export HOCHOB_SERVER_SERVICES_VISITORS=$HOCHOB_SERVER_SERVICES/Visitors/ @@ -64,6 +65,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_PLAY export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SOUND_SPEECHSYNTHETIZER export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM export PATH=$PATH:$HOCHOB_SERVER_SERVICES_STREAM_STREAM2CHROMECAST +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SURVEY export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VIDEO export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VISITORS From d1875f1d8c28c071b3837a962298dd6b8bd865cc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:23:58 -0500 Subject: [PATCH 0665/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Survey/KeypadOption.py | 30 +++++++++++++++++++ .../Survey/{Keypad.sh => KeypadOption.sh} | 4 +-- .../Survey/{Keypad.py => KeypadThread.py} | 6 ++-- 3 files changed, 35 insertions(+), 5 deletions(-) create mode 100755 Hochob/Services/Survey/KeypadOption.py rename Hochob/Services/Survey/{Keypad.sh => KeypadOption.sh} (91%) rename Hochob/Services/Survey/{Keypad.py => KeypadThread.py} (77%) mode change 100644 => 100755 diff --git a/Hochob/Services/Survey/KeypadOption.py b/Hochob/Services/Survey/KeypadOption.py new file mode 100755 index 00000000..97d0f6cf --- /dev/null +++ b/Hochob/Services/Survey/KeypadOption.py @@ -0,0 +1,30 @@ +#!/usr/bin/python + +import paho.mqtt.client as paho +import time +from threading import Thread + +loop = 1 + +def KeypadOptionMessage(mosq, obj, msg): + global loop + msg.topic = msg.topic.replace("hochob/keypad/", "") + msg.payload = msg.payload.translate(None, '"') + print msg.topic + ":" + msg.payload + loop = 0 + +if __name__ == '__main__': + + mqttclient = paho.Client() + mqttclient.connect("iot.eclipse.org", 1883, 60) + mqttclient.subscribe("hochob/keypad/#", 0) + mqttclient.on_message = KeypadOptionMessage + mqttclient.loop_start() + + while loop == 1: + time.sleep(0.1) + + mqttclient.disconnect() + mqttclient.loop_stop() + +# End of File diff --git a/Hochob/Services/Survey/Keypad.sh b/Hochob/Services/Survey/KeypadOption.sh similarity index 91% rename from Hochob/Services/Survey/Keypad.sh rename to Hochob/Services/Survey/KeypadOption.sh index 15ac6512..2ddaf919 100755 --- a/Hochob/Services/Survey/Keypad.sh +++ b/Hochob/Services/Survey/KeypadOption.sh @@ -22,9 +22,9 @@ LOCAL_IDENTIFICATION="$1" # Main # ============================================================================= -if [ $# -eq 1 ] +if [ $# -eq 0 ] then - echo "Tbd" + answer=`$HOCHOB_SERVER_SERVICES_SURVEY/Keypad.py` else echo "Invalid number of arguments, see Documentation" exit 1 diff --git a/Hochob/Services/Survey/Keypad.py b/Hochob/Services/Survey/KeypadThread.py old mode 100644 new mode 100755 similarity index 77% rename from Hochob/Services/Survey/Keypad.py rename to Hochob/Services/Survey/KeypadThread.py index b8298eb9..11abae8f --- a/Hochob/Services/Survey/Keypad.py +++ b/Hochob/Services/Survey/KeypadThread.py @@ -5,13 +5,13 @@ from threading import Thread def KeypadOptionMessage(mosq, obj, msg): - # print msg.payload == "ON": - print msg.payload + msg.topic = msg.topic.replace("hochob/keypad/", "") + msg.payload = msg.payload.translate(None, '"') def KeypadOption(): mqttclient = paho.Client() mqttclient.connect("iot.eclipse.org", 1883, 60) - mqttclient.subscribe("hochob/keypad/virtual", 0) + mqttclient.subscribe("hochob/keypad/#", 0) mqttclient.on_message = KeypadOptionMessage while mqttclient.loop() == 0: pass From 349ede31a9b7dc53d4936f272b4fbafc8c5e8e87 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:38:16 -0500 Subject: [PATCH 0666/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/TiburonBallena.sh | 13 +++++++++++++ Hochob/Services/Survey/KeypadOption.py | 7 ++++--- Hochob/Services/Survey/KeypadOption.sh | 3 ++- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 3a31b20e..33f6f7d1 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -26,6 +26,19 @@ export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` +Northern.sh spanish robot "Que numero es el segundo de la lista?" +LOCAL_OPTION=`KeypadOption.sh` +echo $LOCAL_OPTION +if [ "$LOCAL_OPTION" = "1" ]; then + Northern.sh spanish robot "Excelente" +else + Northern.sh spanish robot "Suerte para la proxima" +fi + + + +exit 0 + if [ "$LOCAL_LANGUAGE" = "english" ]; then Northern.sh english robot "Hi Lupe, good morning" Northern.sh english tt "Hi Lupe, good morning" diff --git a/Hochob/Services/Survey/KeypadOption.py b/Hochob/Services/Survey/KeypadOption.py index 97d0f6cf..12c81b8a 100755 --- a/Hochob/Services/Survey/KeypadOption.py +++ b/Hochob/Services/Survey/KeypadOption.py @@ -8,16 +8,17 @@ def KeypadOptionMessage(mosq, obj, msg): global loop - msg.topic = msg.topic.replace("hochob/keypad/", "") + # msg.topic = msg.topic.replace("hochob/keypad/", "") + # print msg.topic + ":" + msg.payload msg.payload = msg.payload.translate(None, '"') - print msg.topic + ":" + msg.payload + print msg.payload loop = 0 if __name__ == '__main__': mqttclient = paho.Client() mqttclient.connect("iot.eclipse.org", 1883, 60) - mqttclient.subscribe("hochob/keypad/#", 0) + mqttclient.subscribe("hochob/keypad/virtual", 0) mqttclient.on_message = KeypadOptionMessage mqttclient.loop_start() diff --git a/Hochob/Services/Survey/KeypadOption.sh b/Hochob/Services/Survey/KeypadOption.sh index 2ddaf919..961615cc 100755 --- a/Hochob/Services/Survey/KeypadOption.sh +++ b/Hochob/Services/Survey/KeypadOption.sh @@ -24,7 +24,8 @@ LOCAL_IDENTIFICATION="$1" if [ $# -eq 0 ] then - answer=`$HOCHOB_SERVER_SERVICES_SURVEY/Keypad.py` + answer=`$HOCHOB_SERVER_SERVICES_SURVEY/KeypadOption.py` + echo $answer else echo "Invalid number of arguments, see Documentation" exit 1 From 15b28c19849393dda47ff186b482e5a485506d3c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:44:48 -0500 Subject: [PATCH 0667/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 1c2bf955..97c877d0 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -36,13 +36,13 @@ do i=`expr $i + 1` done -$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 0 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\"" +$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\"" exit 0 if [ $# -eq 2 ] then - $MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 0 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE + $MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m $LOCAL_MESSAGE else echo "Invalid number of arguments, see Documentation" exit 1 From 04d45862515c768f9c5e5c3205c168ea8ac9be12 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:49:20 -0500 Subject: [PATCH 0668/1653] Update KeypadOption.sh --- Hochob/Services/Survey/KeypadOption.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Survey/KeypadOption.sh b/Hochob/Services/Survey/KeypadOption.sh index 961615cc..c7a2f6b0 100755 --- a/Hochob/Services/Survey/KeypadOption.sh +++ b/Hochob/Services/Survey/KeypadOption.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export KEYPAD_PID=$$ +export KEYPADOPTION_PID=$$ LOCAL_IDENTIFICATION="$1" From 893aca228afcca36cb1a5c76ab8e5764f210353d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:53:03 -0500 Subject: [PATCH 0669/1653] Create Survey.sh --- Hochob/Services/Survey/Survey.sh | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Hochob/Services/Survey/Survey.sh diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh new file mode 100644 index 00000000..734643ca --- /dev/null +++ b/Hochob/Services/Survey/Survey.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export SURVEY_PID=$$ + +LOCAL_LANGUAGE="$1" +LOCAL_CHARACTER="$2" +LOCAL_CORRECT="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_OPTION=`KeypadOption.sh` +if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Excelente" +else + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Suerte para la proxima" +fi + +# End of File From dc5f5745e3251be440102a212f0205ecff0ad718 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:56:27 -0500 Subject: [PATCH 0670/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 734643ca..563b260c 100644 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -25,10 +25,27 @@ LOCAL_CORRECT="$3" # ============================================================================= LOCAL_OPTION=`KeypadOption.sh` + if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Excelente" + if [ "$LOCAL_LANGUAGE" = "english" ]; then + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Awesome" + else + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Super" + fi + else - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Suerte para la proxima" + + if [ "$LOCAL_LANGUAGE" = "english" ]; then + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Keep up the great work" + else + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Sigue participando" + fi + fi + + + # End of File From fe574316f2425b0fc1e120a142c8ac15f6e9fddf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:56:47 -0500 Subject: [PATCH 0671/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 563b260c..96743758 100644 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -28,7 +28,6 @@ LOCAL_OPTION=`KeypadOption.sh` if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Excelente" if [ "$LOCAL_LANGUAGE" = "english" ]; then Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Awesome" else From 2efb0a49387a4aedd8c8d9debdf923c73035509c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:57:25 -0500 Subject: [PATCH 0672/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 33f6f7d1..886990cc 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -27,15 +27,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` Northern.sh spanish robot "Que numero es el segundo de la lista?" -LOCAL_OPTION=`KeypadOption.sh` -echo $LOCAL_OPTION -if [ "$LOCAL_OPTION" = "1" ]; then - Northern.sh spanish robot "Excelente" -else - Northern.sh spanish robot "Suerte para la proxima" -fi - - +Survey.sh spanish robot 1 exit 0 From 88eb2961b9a38ed49994bf43bab0b370b341080e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 01:58:45 -0500 Subject: [PATCH 0673/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 886990cc..741abee8 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -26,7 +26,7 @@ export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -Northern.sh spanish robot "Que numero es el segundo de la lista?" +Northern.sh spanish robot "Hola" Survey.sh spanish robot 1 exit 0 From d72d7a89f3e7ce964b7d8aeb3db916cb4c3519a1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:00:11 -0500 Subject: [PATCH 0674/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Survey/Survey.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Survey/Survey.sh diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh old mode 100644 new mode 100755 From e90f98682e03d4e14a4463cf0097b31f54e641d1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:01:23 -0500 Subject: [PATCH 0675/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 96743758..980f3711 100644 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -29,17 +29,21 @@ LOCAL_OPTION=`KeypadOption.sh` if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then if [ "$LOCAL_LANGUAGE" = "english" ]; then - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Awesome" + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + "Awesome" else - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Super" + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + "Super" fi else if [ "$LOCAL_LANGUAGE" = "english" ]; then - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Keep up the great work" + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + "Keep up the great work, the correct answer is ${LOCAL_CORRECT}" else - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER "Sigue participando" + Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + "Sigue participando, la respuesta correcta es ${LOCAL_CORRECT}" fi fi From d9bfbb0827f8e57616c2d551874983732d9454c8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:02:44 -0500 Subject: [PATCH 0676/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Sound/Play/Central.sh | 49 +++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 Hochob/Services/Sound/Play/Central.sh diff --git a/Hochob/Services/Sound/Play/Central.sh b/Hochob/Services/Sound/Play/Central.sh new file mode 100755 index 00000000..d6c0e9a6 --- /dev/null +++ b/Hochob/Services/Sound/Play/Central.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export NORTHERN_PID=$$ + +LOCAL_LANGUAGE="$1" +LOCAL_CHARACTER="$2" +LOCAL_TEXT="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off spanish "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off spanish "${LOCAL_TEXT}" +fi + +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" + +exit 0 + +if [ $# -eq 1 ] +then + echo "Tbd" +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 458b377bf186d41a7aabb34bd530d6f2935a93d7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:06:15 -0500 Subject: [PATCH 0677/1653] Update Signed-off-by: Abraham Arce --- .../{Sound/Play/Central.sh => Stream/Eek.sh} | 0 .../Play/Northern.sh => Stream/Juum.sh} | 0 Hochob/Services/Stream/Triki.sh | 49 +++++++++++++++++++ 3 files changed, 49 insertions(+) rename Hochob/Services/{Sound/Play/Central.sh => Stream/Eek.sh} (100%) rename Hochob/Services/{Sound/Play/Northern.sh => Stream/Juum.sh} (100%) create mode 100755 Hochob/Services/Stream/Triki.sh diff --git a/Hochob/Services/Sound/Play/Central.sh b/Hochob/Services/Stream/Eek.sh similarity index 100% rename from Hochob/Services/Sound/Play/Central.sh rename to Hochob/Services/Stream/Eek.sh diff --git a/Hochob/Services/Sound/Play/Northern.sh b/Hochob/Services/Stream/Juum.sh similarity index 100% rename from Hochob/Services/Sound/Play/Northern.sh rename to Hochob/Services/Stream/Juum.sh diff --git a/Hochob/Services/Stream/Triki.sh b/Hochob/Services/Stream/Triki.sh new file mode 100755 index 00000000..d6c0e9a6 --- /dev/null +++ b/Hochob/Services/Stream/Triki.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export NORTHERN_PID=$$ + +LOCAL_LANGUAGE="$1" +LOCAL_CHARACTER="$2" +LOCAL_TEXT="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off spanish "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off spanish "${LOCAL_TEXT}" +fi + +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" + +exit 0 + +if [ $# -eq 1 ] +then + echo "Tbd" +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 1c9cc29dfb574b9f606ad2b0bd1d102b609d7564 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:08:27 -0500 Subject: [PATCH 0678/1653] Update Eek.sh --- Hochob/Services/Stream/Eek.sh | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Hochob/Services/Stream/Eek.sh b/Hochob/Services/Stream/Eek.sh index d6c0e9a6..5b6f3154 100755 --- a/Hochob/Services/Stream/Eek.sh +++ b/Hochob/Services/Stream/Eek.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export NORTHERN_PID=$$ +export EEK_PID=$$ LOCAL_LANGUAGE="$1" LOCAL_CHARACTER="$2" @@ -36,14 +36,4 @@ fi Stream.sh "Eek'" "1.0" "$SPEECH_MP3" -exit 0 - -if [ $# -eq 1 ] -then - echo "Tbd" -else - echo "Invalid number of arguments, see Documentation" - exit 1 -fi - # End of File From f83325e2683df5a64e0219c698b476fc481a48dc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:08:55 -0500 Subject: [PATCH 0679/1653] Update Juum.sh --- Hochob/Services/Stream/Juum.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Stream/Juum.sh b/Hochob/Services/Stream/Juum.sh index d6c0e9a6..a5f0d810 100755 --- a/Hochob/Services/Stream/Juum.sh +++ b/Hochob/Services/Stream/Juum.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export NORTHERN_PID=$$ +export JUUM_PID=$$ LOCAL_LANGUAGE="$1" LOCAL_CHARACTER="$2" @@ -34,7 +34,7 @@ elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then VoiceRss.sh off spanish "${LOCAL_TEXT}" fi -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +Stream.sh "Juum" "1.0" "$SPEECH_MP3" exit 0 From 1c48942225bb6554cd377be26469ce1721ab609c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:09:00 -0500 Subject: [PATCH 0680/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Stream/Tran.sh | 49 ++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 Hochob/Services/Stream/Tran.sh diff --git a/Hochob/Services/Stream/Tran.sh b/Hochob/Services/Stream/Tran.sh new file mode 100755 index 00000000..d6c0e9a6 --- /dev/null +++ b/Hochob/Services/Stream/Tran.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export NORTHERN_PID=$$ + +LOCAL_LANGUAGE="$1" +LOCAL_CHARACTER="$2" +LOCAL_TEXT="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off spanish "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off spanish "${LOCAL_TEXT}" +fi + +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" + +exit 0 + +if [ $# -eq 1 ] +then + echo "Tbd" +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 5757cd6a999052751f86646354177d8f46c2e189 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:09:20 -0500 Subject: [PATCH 0681/1653] Update Triki.sh --- Hochob/Services/Stream/Triki.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Stream/Triki.sh b/Hochob/Services/Stream/Triki.sh index d6c0e9a6..4239713f 100755 --- a/Hochob/Services/Stream/Triki.sh +++ b/Hochob/Services/Stream/Triki.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export NORTHERN_PID=$$ +export TRIKI_PID=$$ LOCAL_LANGUAGE="$1" LOCAL_CHARACTER="$2" @@ -34,7 +34,7 @@ elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then VoiceRss.sh off spanish "${LOCAL_TEXT}" fi -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +Stream.sh "Triki" "1.0" "$SPEECH_MP3" exit 0 From 90deaf9c717a332f85ed778630d37966adbe2d8d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:10:06 -0500 Subject: [PATCH 0682/1653] Update Triki.sh --- Hochob/Services/Stream/Triki.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Hochob/Services/Stream/Triki.sh b/Hochob/Services/Stream/Triki.sh index 4239713f..b1148178 100755 --- a/Hochob/Services/Stream/Triki.sh +++ b/Hochob/Services/Stream/Triki.sh @@ -36,14 +36,4 @@ fi Stream.sh "Triki" "1.0" "$SPEECH_MP3" -exit 0 - -if [ $# -eq 1 ] -then - echo "Tbd" -else - echo "Invalid number of arguments, see Documentation" - exit 1 -fi - # End of File From a489b2c58f0da1a2378d8dec36d0285e879d9748 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:10:18 -0500 Subject: [PATCH 0683/1653] Update Juum.sh --- Hochob/Services/Stream/Juum.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Hochob/Services/Stream/Juum.sh b/Hochob/Services/Stream/Juum.sh index a5f0d810..410fa041 100755 --- a/Hochob/Services/Stream/Juum.sh +++ b/Hochob/Services/Stream/Juum.sh @@ -36,14 +36,4 @@ fi Stream.sh "Juum" "1.0" "$SPEECH_MP3" -exit 0 - -if [ $# -eq 1 ] -then - echo "Tbd" -else - echo "Invalid number of arguments, see Documentation" - exit 1 -fi - # End of File From 8c6487f07cdc2c61714b57badb41775595db62f6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:12:02 -0500 Subject: [PATCH 0684/1653] Update TiburonBallena.sh --- .../Applications/NorthernMayaLowlands/TiburonBallena.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 741abee8..54402b38 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -32,11 +32,11 @@ Survey.sh spanish robot 1 exit 0 if [ "$LOCAL_LANGUAGE" = "english" ]; then - Northern.sh english robot "Hi Lupe, good morning" - Northern.sh english tt "Hi Lupe, good morning" + Eek.sh english robot "Hi Lupe, good morning" + Eek.sh english tt "Hi Lupe, good morning" else - Northern.sh spanish robot "Hola Lupe, muy buenos dias" - Northern.sh spanish tt "Hola Lupe, muy buenos dias" + Eek.sh spanish robot "Hola Lupe, muy buenos dias" + Eek.sh spanish tt "Hola Lupe, muy buenos dias" Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/TiburonBallena/LiftoffSpaceXFalcon9CRS10Mission.mp4" fi From 2a7cdc0cb5ac9a6c3eea64bf1efa54e594e9655b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:12:50 -0500 Subject: [PATCH 0685/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 54402b38..6d103ee4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -26,7 +26,7 @@ export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -Northern.sh spanish robot "Hola" +Eek.sh spanish robot "Hola" Survey.sh spanish robot 1 exit 0 From 0a71c35578971ad6d5a6ea9555a87e8750eadd98 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:13:36 -0500 Subject: [PATCH 0686/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Stream/StreamAudio.sh | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 Hochob/Services/Stream/StreamAudio.sh diff --git a/Hochob/Services/Stream/StreamAudio.sh b/Hochob/Services/Stream/StreamAudio.sh new file mode 100755 index 00000000..5b6f3154 --- /dev/null +++ b/Hochob/Services/Stream/StreamAudio.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export EEK_PID=$$ + +LOCAL_LANGUAGE="$1" +LOCAL_CHARACTER="$2" +LOCAL_TEXT="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off english "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + Espeak.sh off spanish "${LOCAL_TEXT}" +elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + VoiceRss.sh off spanish "${LOCAL_TEXT}" +fi + +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" + +# End of File From 015301d48d8eb0f5701fbff0184726402e117b18 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:14:48 -0500 Subject: [PATCH 0687/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 980f3711..1c6466ee 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -10,9 +10,10 @@ set -x export SURVEY_PID=$$ -LOCAL_LANGUAGE="$1" -LOCAL_CHARACTER="$2" -LOCAL_CORRECT="$3" +LOCAL_DEVICE="$1" +LOCAL_LANGUAGE="$2" +LOCAL_CHARACTER="$3" +LOCAL_CORRECT="$4" # ============================================================================= # Functions @@ -29,20 +30,20 @@ LOCAL_OPTION=`KeypadOption.sh` if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then if [ "$LOCAL_LANGUAGE" = "english" ]; then - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "Awesome" else - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "Super" fi else if [ "$LOCAL_LANGUAGE" = "english" ]; then - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "Keep up the great work, the correct answer is ${LOCAL_CORRECT}" else - Northern.sh $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "Sigue participando, la respuesta correcta es ${LOCAL_CORRECT}" fi From 7c14f34ee33cec3a2025290389e67b732861f716 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:17:00 -0500 Subject: [PATCH 0688/1653] Update StreamAudio.sh --- Hochob/Services/Stream/StreamAudio.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Stream/StreamAudio.sh b/Hochob/Services/Stream/StreamAudio.sh index 5b6f3154..c559e112 100755 --- a/Hochob/Services/Stream/StreamAudio.sh +++ b/Hochob/Services/Stream/StreamAudio.sh @@ -8,11 +8,12 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export EEK_PID=$$ +export STREAMAUDIO_PID=$$ -LOCAL_LANGUAGE="$1" -LOCAL_CHARACTER="$2" -LOCAL_TEXT="$3" +LOCAL_DEVICE="$2" +LOCAL_LANGUAGE="$2" +LOCAL_CHARACTER="$3" +LOCAL_TEXT="$4" # ============================================================================= # Functions @@ -34,6 +35,6 @@ elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then VoiceRss.sh off spanish "${LOCAL_TEXT}" fi -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 # End of File From c30d25184fc76b8c34d772e0ee0c3e8bb0e78d4d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:18:46 -0500 Subject: [PATCH 0689/1653] Update StreamAudio.sh --- Hochob/Services/Stream/StreamAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/StreamAudio.sh b/Hochob/Services/Stream/StreamAudio.sh index c559e112..b887bacf 100755 --- a/Hochob/Services/Stream/StreamAudio.sh +++ b/Hochob/Services/Stream/StreamAudio.sh @@ -10,7 +10,7 @@ set -x export STREAMAUDIO_PID=$$ -LOCAL_DEVICE="$2" +LOCAL_DEVICE="$1" LOCAL_LANGUAGE="$2" LOCAL_CHARACTER="$3" LOCAL_TEXT="$4" From 8d8ced084a0d66753847f49e2813ad818ccb27ef Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:21:02 -0500 Subject: [PATCH 0690/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 6d103ee4..b3688e49 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -26,8 +26,8 @@ export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -Eek.sh spanish robot "Hola" -Survey.sh spanish robot 1 +StreamAudio.sh "Eek'" spanish robot "Hola" +Survey.sh "Eek'" spanish robot 1 exit 0 From 842a1d7a85253be2ad31f76f4e39b645a14057bd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:23:39 -0500 Subject: [PATCH 0691/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index b3688e49..c56e37e8 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -23,11 +23,12 @@ export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") # Main # ============================================================================= +LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -StreamAudio.sh "Eek'" spanish robot "Hola" -Survey.sh "Eek'" spanish robot 1 +StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" +Survey.sh $LOCAL_DEVICE spanish robot 1 exit 0 From eb26c2de262c2e088da37afeb41a0a70245a939e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:26:23 -0500 Subject: [PATCH 0692/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index c56e37e8..258d997e 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -27,8 +27,16 @@ LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" -Survey.sh $LOCAL_DEVICE spanish robot 1 +# StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" +# Survey.sh $LOCAL_DEVICE spanish robot 1 + +StreamAudio.sh $LOCAL_DEVICE english robot \ + "Which spacecraft took the first photos of Mars?" + "One, Curiosity" + "Two, Spirit" + "Three, Sojourner" + "Four, Mariner 4" +Survey.sh $LOCAL_DEVICE english robot 4 exit 0 From 64f60218acb3583fc9c2d4b343e326779cca406a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:27:38 -0500 Subject: [PATCH 0693/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 258d997e..c43cd074 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -31,11 +31,11 @@ LOCAL_LANGUAGE=`Language.sh` # Survey.sh $LOCAL_DEVICE spanish robot 1 StreamAudio.sh $LOCAL_DEVICE english robot \ - "Which spacecraft took the first photos of Mars?" - "One, Curiosity" - "Two, Spirit" - "Three, Sojourner" - "Four, Mariner 4" + "Which spacecraft took the first photos of Mars?" \ + "One, Curiosity." \ + "Two, Spirit." \ + "Three, Sojourner." \ + "Four, Mariner 4." Survey.sh $LOCAL_DEVICE english robot 4 exit 0 From 128a0801b7f6f454cf5a66000373de6c6c744bd8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:28:24 -0500 Subject: [PATCH 0694/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index c43cd074..c2ae1c92 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -31,11 +31,11 @@ LOCAL_LANGUAGE=`Language.sh` # Survey.sh $LOCAL_DEVICE spanish robot 1 StreamAudio.sh $LOCAL_DEVICE english robot \ - "Which spacecraft took the first photos of Mars?" \ - "One, Curiosity." \ - "Two, Spirit." \ - "Three, Sojourner." \ - "Four, Mariner 4." + "Which spacecraft took the first photos of Mars? \ + One, Curiosity. \ + Two, Spirit. \ + Three, Sojourner. \ + Four, Mariner 4." Survey.sh $LOCAL_DEVICE english robot 4 exit 0 From 161d867a047aae07e155b1204ec8fe0cd9b57b8b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 02:28:51 -0500 Subject: [PATCH 0695/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index c2ae1c92..5dd1b254 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,13 +30,13 @@ LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" # Survey.sh $LOCAL_DEVICE spanish robot 1 -StreamAudio.sh $LOCAL_DEVICE english robot \ +StreamAudio.sh $LOCAL_DEVICE english tt \ "Which spacecraft took the first photos of Mars? \ One, Curiosity. \ Two, Spirit. \ Three, Sojourner. \ Four, Mariner 4." -Survey.sh $LOCAL_DEVICE english robot 4 +Survey.sh $LOCAL_DEVICE english tt 4 exit 0 From cbc3d5e4f8c360f299e16f4be592cfdb47b4f090 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 08:34:06 -0500 Subject: [PATCH 0696/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index e3eb0c73..b9e7d754 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -34,7 +34,7 @@ LOCAL_TEXT="$3" if [ $# -eq 3 ] then if [ "$LOCAL_LANGUAGE" = "english" ]; then - export ESPEAK_LANGUAGE="-ven+m5" + export ESPEAK_LANGUAGE="-v en-us -a 200" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then export ESPEAK_LANGUAGE="-v es-la -a 200" fi From 7bfef6a526b7dae51457b3f4814e5eb056b2360b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 08:34:39 -0500 Subject: [PATCH 0697/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 5dd1b254..c2ae1c92 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,13 +30,13 @@ LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" # Survey.sh $LOCAL_DEVICE spanish robot 1 -StreamAudio.sh $LOCAL_DEVICE english tt \ +StreamAudio.sh $LOCAL_DEVICE english robot \ "Which spacecraft took the first photos of Mars? \ One, Curiosity. \ Two, Spirit. \ Three, Sojourner. \ Four, Mariner 4." -Survey.sh $LOCAL_DEVICE english tt 4 +Survey.sh $LOCAL_DEVICE english robot 4 exit 0 From 30406173912a4f43936fc3291c3b11f6af7fa019 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 08:46:49 -0500 Subject: [PATCH 0698/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 1c6466ee..b27c8bd7 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -15,11 +15,33 @@ LOCAL_LANGUAGE="$2" LOCAL_CHARACTER="$3" LOCAL_CORRECT="$4" +LOCAL_CORRECT_ANSWER[0]="Zara" +LOCAL_CORRECT_ANSWER[1]="Qadir" +LOCAL_CORRECT_ANSWER[2]="Mahnaz" +LOCAL_CORRECT_ANSWER[3]="Ayan" +LOCAL_CORRECT_ANSWER[4]="Daisy" + +LOCAL_WRONG_ANSWER[0]="Zara" +LOCAL_WRONG_ANSWER[1]="Qadir" +LOCAL_WRONG_ANSWER[2]="Mahnaz" +LOCAL_WRONG_ANSWER[3]="Ayan" +LOCAL_WRONG_ANSWER[4]="Daisy" + # ============================================================================= # Functions # ============================================================================= -# None +chooseAnswerCorrect() +{ + rand=$[ $RANDOM % 5 ] + echo ${LOCAL_CORRECT_ANSWER[$rand]} +} + +chooseWrongCorrect() +{ + rand=$[ $RANDOM % 5 ] + echo ${LOCAL_WRONG_ANSWER[$rand]} +} # ============================================================================= # Main From 2f1f093eaa9728f616c57339fc3291e1c3e2d8dd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 08:56:22 -0500 Subject: [PATCH 0699/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 51 ++++++++++++++++++++++++-------- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index b27c8bd7..c6bdc946 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -15,17 +15,29 @@ LOCAL_LANGUAGE="$2" LOCAL_CHARACTER="$3" LOCAL_CORRECT="$4" -LOCAL_CORRECT_ANSWER[0]="Zara" -LOCAL_CORRECT_ANSWER[1]="Qadir" -LOCAL_CORRECT_ANSWER[2]="Mahnaz" -LOCAL_CORRECT_ANSWER[3]="Ayan" -LOCAL_CORRECT_ANSWER[4]="Daisy" - -LOCAL_WRONG_ANSWER[0]="Zara" -LOCAL_WRONG_ANSWER[1]="Qadir" -LOCAL_WRONG_ANSWER[2]="Mahnaz" -LOCAL_WRONG_ANSWER[3]="Ayan" -LOCAL_WRONG_ANSWER[4]="Daisy" +LOCAL_CORRECT_ANSWER_ENGLISH[0]="That’s right." +LOCAL_CORRECT_ANSWER_ENGLISH[1]="That’s spot on." +LOCAL_CORRECT_ANSWER_ENGLISH[2]="You’ve hit the nail on the head. " +LOCAL_CORRECT_ANSWER_ENGLISH[3]="I’m afraid you’re right." +LOCAL_CORRECT_ANSWER_ENGLISH[4]="You are correct." + +LOCAL_WRONG_ANSWER_ENGLISH[0]="I’m afraid that’s not quite right." +LOCAL_WRONG_ANSWER_ENGLISH[1]="I’m afraid you’re mistaken." +LOCAL_WRONG_ANSWER_ENGLISH[2]="In my humble opinion, there is another answer" +LOCAL_WRONG_ANSWER_ENGLISH[3]="Not this time." +LOCAL_WRONG_ANSWER_ENGLISH[4]="No, no, no." + +LOCAL_CORRECT_ANSWER_SPANISH[0]="Zara" +LOCAL_CORRECT_ANSWER_SPANISH[1]="Qadir" +LOCAL_CORRECT_ANSWER_SPANISH[2]="Mahnaz" +LOCAL_CORRECT_ANSWER_SPANISH[3]="Ayan" +LOCAL_CORRECT_ANSWER_SPANISH[4]="Daisy" + +LOCAL_WRONG_ANSWER_SPANISH[0]="Zara" +LOCAL_WRONG_ANSWER_SPANISH[1]="Qadir" +LOCAL_WRONG_ANSWER_SPANISH[2]="Mahnaz" +LOCAL_WRONG_ANSWER_SPANISH[3]="Ayan" +LOCAL_WRONG_ANSWER_SPANISH[4]="Daisy" # ============================================================================= # Functions @@ -33,16 +45,27 @@ LOCAL_WRONG_ANSWER[4]="Daisy" chooseAnswerCorrect() { + LANGUAGE=$1 rand=$[ $RANDOM % 5 ] - echo ${LOCAL_CORRECT_ANSWER[$rand]} + if [ "$LANGUAGE" = "english" ]; then + LOCAL_CORRECT_ANSWER=${LOCAL_CORRECT_ANSWER_ENGLISH[$rand]} + else + LOCAL_CORRECT_ANSWER=${LOCAL_CORRECT_ANSWER_SPANISH[$rand]} + fi } chooseWrongCorrect() { + LANGUAGE=$1 rand=$[ $RANDOM % 5 ] - echo ${LOCAL_WRONG_ANSWER[$rand]} + if [ "$LANGUAGE" = "english" ]; then + LOCAL_CORRECT_ANSWER=${LOCAL_WRONG_ANSWER_ENGLISH[$rand]} + else + LOCAL_CORRECT_ANSWER=${LOCAL_WRONG_ANSWER_SPANISH[$rand]} + fi } + # ============================================================================= # Main # ============================================================================= @@ -51,6 +74,7 @@ LOCAL_OPTION=`KeypadOption.sh` if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then + chooseAnswerCorrect "english" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "Awesome" @@ -61,6 +85,7 @@ if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then else + chooseAnswerCorrect "english" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "Keep up the great work, the correct answer is ${LOCAL_CORRECT}" From 7107f1996b86ebd72a08178d6c1075949ed911f2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 08:58:17 -0500 Subject: [PATCH 0700/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index c6bdc946..f6f25cab 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -x From cd22e1df25e3bd4546107c05f28e915d0ba437d6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 09:01:21 -0500 Subject: [PATCH 0701/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index f6f25cab..08592378 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -59,9 +59,9 @@ chooseWrongCorrect() LANGUAGE=$1 rand=$[ $RANDOM % 5 ] if [ "$LANGUAGE" = "english" ]; then - LOCAL_CORRECT_ANSWER=${LOCAL_WRONG_ANSWER_ENGLISH[$rand]} + LOCAL_WRONG_ANSWER=${LOCAL_WRONG_ANSWER_ENGLISH[$rand]} else - LOCAL_CORRECT_ANSWER=${LOCAL_WRONG_ANSWER_SPANISH[$rand]} + LOCAL_WRONG_ANSWER=${LOCAL_WRONG_ANSWER_SPANISH[$rand]} fi } @@ -77,10 +77,10 @@ if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then chooseAnswerCorrect "english" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ - "Awesome" + "${LOCAL_CORRECT_ANSWER}" else StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ - "Super" + "${LOCAL_CORRECT_ANSWER}" fi else @@ -88,10 +88,10 @@ else chooseAnswerCorrect "english" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ - "Keep up the great work, the correct answer is ${LOCAL_CORRECT}" + "${LOCAL_WRONG_ANSWER}. the correct answer is ${LOCAL_CORRECT}" else StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ - "Sigue participando, la respuesta correcta es ${LOCAL_CORRECT}" + "${LOCAL_WRONG_ANSWER}. La respuesta correcta es ${LOCAL_CORRECT}" fi fi From eceb0d4826b499ba80789e225abde0f30923c8fb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 09:02:49 -0500 Subject: [PATCH 0702/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 08592378..75014d18 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -17,7 +17,7 @@ LOCAL_CORRECT="$4" LOCAL_CORRECT_ANSWER_ENGLISH[0]="That’s right." LOCAL_CORRECT_ANSWER_ENGLISH[1]="That’s spot on." -LOCAL_CORRECT_ANSWER_ENGLISH[2]="You’ve hit the nail on the head. " +LOCAL_CORRECT_ANSWER_ENGLISH[2]="You’ve hit the nail on the head." LOCAL_CORRECT_ANSWER_ENGLISH[3]="I’m afraid you’re right." LOCAL_CORRECT_ANSWER_ENGLISH[4]="You are correct." From d9fc6e731a2748fd3d916af30be8500072035069 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 09:03:49 -0500 Subject: [PATCH 0703/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 75014d18..f3adbcf1 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -85,7 +85,7 @@ if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then else - chooseAnswerCorrect "english" + chooseWrongCorrect "english" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_WRONG_ANSWER}. the correct answer is ${LOCAL_CORRECT}" From a5201d1e25a71074a92e78740348a0a0a893efe8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 09:05:31 -0500 Subject: [PATCH 0704/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index f3adbcf1..95a62383 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -23,8 +23,8 @@ LOCAL_CORRECT_ANSWER_ENGLISH[4]="You are correct." LOCAL_WRONG_ANSWER_ENGLISH[0]="I’m afraid that’s not quite right." LOCAL_WRONG_ANSWER_ENGLISH[1]="I’m afraid you’re mistaken." -LOCAL_WRONG_ANSWER_ENGLISH[2]="In my humble opinion, there is another answer" -LOCAL_WRONG_ANSWER_ENGLISH[3]="Not this time." +LOCAL_WRONG_ANSWER_ENGLISH[2]="In my humble opinion, there is something bad." +LOCAL_WRONG_ANSWER_ENGLISH[3]="Oh oh, not this time." LOCAL_WRONG_ANSWER_ENGLISH[4]="No, no, no." LOCAL_CORRECT_ANSWER_SPANISH[0]="Zara" From 7685ddac9b1402ad187284885aa380c05beccbca Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 09:06:33 -0500 Subject: [PATCH 0705/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index c2ae1c92..5dd1b254 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,13 +30,13 @@ LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" # Survey.sh $LOCAL_DEVICE spanish robot 1 -StreamAudio.sh $LOCAL_DEVICE english robot \ +StreamAudio.sh $LOCAL_DEVICE english tt \ "Which spacecraft took the first photos of Mars? \ One, Curiosity. \ Two, Spirit. \ Three, Sojourner. \ Four, Mariner 4." -Survey.sh $LOCAL_DEVICE english robot 4 +Survey.sh $LOCAL_DEVICE english tt 4 exit 0 From cc8520311c502f03fb89817345ee5fd99cda1eb2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 09:11:56 -0500 Subject: [PATCH 0706/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 5dd1b254..0ab457ef 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,6 +30,14 @@ LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" # Survey.sh $LOCAL_DEVICE spanish robot 1 +StreamAudio.sh $LOCAL_DEVICE english tt \ + " + Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ + Pero donde puedes ver esto y mas? En marte! + " + +exit 0 + StreamAudio.sh $LOCAL_DEVICE english tt \ "Which spacecraft took the first photos of Mars? \ One, Curiosity. \ @@ -38,8 +46,6 @@ StreamAudio.sh $LOCAL_DEVICE english tt \ Four, Mariner 4." Survey.sh $LOCAL_DEVICE english tt 4 -exit 0 - if [ "$LOCAL_LANGUAGE" = "english" ]; then Eek.sh english robot "Hi Lupe, good morning" Eek.sh english tt "Hi Lupe, good morning" From 6723a8024c02b1e4754f032238c68469bd161336 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 09:12:28 -0500 Subject: [PATCH 0707/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 0ab457ef..cb5ce2cb 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,7 +30,7 @@ LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" # Survey.sh $LOCAL_DEVICE spanish robot 1 -StreamAudio.sh $LOCAL_DEVICE english tt \ +StreamAudio.sh $LOCAL_DEVICE spanish tt \ " Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ Pero donde puedes ver esto y mas? En marte! From 964036b3e30ef1096240f1cbffb366aa400837e0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 09:48:57 -0500 Subject: [PATCH 0708/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Memories/Memories.sh | 2 +- .../Video/{Ffmpeg.sh => FfmpegImageVideo.sh} | 0 Hochob/Services/Video/FfmpegStoryScene.sh | 36 +++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) rename Hochob/Services/Video/{Ffmpeg.sh => FfmpegImageVideo.sh} (100%) create mode 100755 Hochob/Services/Video/FfmpegStoryScene.sh diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index a886a36d..feec42f6 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -41,7 +41,7 @@ then cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg if [ "$LOCAL_VIDEO" = "on" ]; then - Ffmpeg.sh $FSWEBCAM_DIRECTORY + FfmpegImageVideo.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME cp $FFMPEG_VIDEO $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 fi diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/FfmpegImageVideo.sh similarity index 100% rename from Hochob/Services/Video/Ffmpeg.sh rename to Hochob/Services/Video/FfmpegImageVideo.sh diff --git a/Hochob/Services/Video/FfmpegStoryScene.sh b/Hochob/Services/Video/FfmpegStoryScene.sh new file mode 100755 index 00000000..bfeb323c --- /dev/null +++ b/Hochob/Services/Video/FfmpegStoryScene.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +#. ~/CodeLabs/Hochob/Main.sh + +export FFMPEG_PID=$$ +export FFMPEG_BINARY=ffmpeg +export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p -acodec copy" + +LOCAL_AUDIO=$1 +LOCAL_DIRECTORY="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From c576a4fab072d8fd389d78cb4743446a16cf1798 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 10:01:09 -0500 Subject: [PATCH 0709/1653] Update MemoriesAudio.sh --- Hochob/Services/Memories/MemoriesAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh index 13703f49..b51ec7fa 100755 --- a/Hochob/Services/Memories/MemoriesAudio.sh +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -31,7 +31,7 @@ mkdir -p $LOCAL_VISITORS_INSTITUTION_NAME if [ $# -eq 1 ] then - + # Substitute with FfmpegAudio.sh? ffmpeg -y -i $FFMPEG_VIDEO -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME From 858040e3bc35ad06e4b917746212f37b60ba8bcb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 10:06:14 -0500 Subject: [PATCH 0710/1653] Update FfmpegStoryScene.sh --- Hochob/Services/Video/FfmpegStoryScene.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Video/FfmpegStoryScene.sh b/Hochob/Services/Video/FfmpegStoryScene.sh index bfeb323c..c29c9a37 100755 --- a/Hochob/Services/Video/FfmpegStoryScene.sh +++ b/Hochob/Services/Video/FfmpegStoryScene.sh @@ -10,10 +10,12 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p -acodec copy" +#export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p -acodec copy" +export FFMPEG_ARGUMENTS="-c:v libx264 -tune stillimage -c:a aac -b:a 192k -pix_fmt yuv420p -shortest" -LOCAL_AUDIO=$1 -LOCAL_DIRECTORY="$2" +LOCAL_IMAGE=$1 +LOCAL_AUDIO=$2 +LOCAL_VIDEO=$3 # ============================================================================= # Functions @@ -27,7 +29,7 @@ LOCAL_DIRECTORY="$2" if [ $# -eq 2 ] then - $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO + $FFMPEG_BINARY -loop 1 -i $LOCAL_IMAGE -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $LOCAL_VIDEO else echo "Invalid number of arguments, see Documentation" exit 1 From 6dd798720a5cb704d5aea5f3e956321bafb22308 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 11:59:16 -0500 Subject: [PATCH 0711/1653] Update Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Mapimi.sh | 2 +- Hochob/Main.sh | 4 ++ Hochob/Services/Memories/Memories.sh | 2 +- Hochob/Services/Memories/MemoriesAudio.sh | 1 + .../SpeechSynthetizer/SpeechSynthetizer.sh | 59 +++++++++++++++++++ .../{FfmpegImageVideo.sh => FfmpegImage.sh} | 3 +- .../{FfmpegAudio.sh => FfmpegImageAudio.sh} | 3 +- 7 files changed, 70 insertions(+), 4 deletions(-) create mode 100755 Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh rename Hochob/Services/Video/{FfmpegImageVideo.sh => FfmpegImage.sh} (94%) rename Hochob/Services/Video/{FfmpegAudio.sh => FfmpegImageAudio.sh} (92%) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 0d01a780..0b1ff185 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -27,7 +27,7 @@ export MAPIMI_DIRECTORY=$(dirname "$MAPIMI_PATH") #Espeak.sh off spanish "Nel Pastel Simona La Mona" #MemoriesAudio.sh "${MAPIMI_NAME}" -#Stream.sh "Eek'" "1.0" "$FFMPEG_VIDEO_AUDIO" +#Stream.sh "Eek'" "1.0" "$FFMPEG_IMAGE_AUDIO" Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & diff --git a/Hochob/Main.sh b/Hochob/Main.sh index ec6ff905..0ffbd052 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -150,6 +150,8 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/*.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideo.mp4 +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegImage.mp4 +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_IMAGE_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegImageAudio.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideoAudio.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ @@ -180,6 +182,8 @@ export VOICERSS_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_V export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO +export FFMPEG_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_IMAGE +export FFMPEG_IMAGE_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_IMAGE_AUDIO export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index feec42f6..bf460263 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -41,7 +41,7 @@ then cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg if [ "$LOCAL_VIDEO" = "on" ]; then - FfmpegImageVideo.sh $FSWEBCAM_DIRECTORY + FfmpegImage.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME cp $FFMPEG_VIDEO $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 fi diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh index b51ec7fa..66b9ccdc 100755 --- a/Hochob/Services/Memories/MemoriesAudio.sh +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -33,6 +33,7 @@ if [ $# -eq 1 ] then # Substitute with FfmpegAudio.sh? ffmpeg -y -i $FFMPEG_VIDEO -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO + cp $FFMPEG_VIDEO_AUDIO $FFMPEG_VIDEO cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME else diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh new file mode 100755 index 00000000..b9e7d754 --- /dev/null +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -0,0 +1,59 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ESPEAK_PID=$$ +export ESPEAK_BINARY=espeak +export ESPEAK_ARGUMENTS="--stdout" +export ESPEAK_PLAY="-w" +export ESPEAK_LANGUAGE="-ven+m5" +export ESPEAK_INPUT="No input has been provided" +export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK +export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH + +LOCAL_PLAY="$1" +LOCAL_LANGUAGE="$2" +LOCAL_TEXT="$3" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 3 ] +then + if [ "$LOCAL_LANGUAGE" = "english" ]; then + export ESPEAK_LANGUAGE="-v en-us -a 200" + elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + export ESPEAK_LANGUAGE="-v es-la -a 200" + fi + + export ESPEAK_INPUT="$LOCAL_TEXT" + + if [ "$LOCAL_PLAY" = "on" ]; then + $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_SPEECH | aplay - + elif [ "$LOCAL_PLAY" = "off" ]; then + $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" + ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 + fi + + cp $ESPEAK_SPEECH $SPEECH + cp $ESPEAK_SPEECH_MP3 $SPEECH_MP3 + +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File diff --git a/Hochob/Services/Video/FfmpegImageVideo.sh b/Hochob/Services/Video/FfmpegImage.sh similarity index 94% rename from Hochob/Services/Video/FfmpegImageVideo.sh rename to Hochob/Services/Video/FfmpegImage.sh index dd73e1fd..45960b30 100755 --- a/Hochob/Services/Video/FfmpegImageVideo.sh +++ b/Hochob/Services/Video/FfmpegImage.sh @@ -26,7 +26,8 @@ LOCAL_DIRECTORY="$1" if [ $# -eq 1 ] then - $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_VIDEO + $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_IMAGE + cp $FFMPEG_IMAGE $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" exit 1 diff --git a/Hochob/Services/Video/FfmpegAudio.sh b/Hochob/Services/Video/FfmpegImageAudio.sh similarity index 92% rename from Hochob/Services/Video/FfmpegAudio.sh rename to Hochob/Services/Video/FfmpegImageAudio.sh index bfeb323c..dc43ea0c 100755 --- a/Hochob/Services/Video/FfmpegAudio.sh +++ b/Hochob/Services/Video/FfmpegImageAudio.sh @@ -27,7 +27,8 @@ LOCAL_DIRECTORY="$2" if [ $# -eq 2 ] then - $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO + $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $FFMPEG_IMAGE_AUDIO + cp $FFMPEG_IMAGE_AUDIO $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" exit 1 From 5f842272ed5e81656f76379228d2a9da10f67819 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:06:35 -0500 Subject: [PATCH 0712/1653] Update SpeechSynthetizer.sh --- .../SpeechSynthetizer/SpeechSynthetizer.sh | 41 +++++-------------- 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh index b9e7d754..3399954c 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -8,18 +8,12 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ESPEAK_PID=$$ -export ESPEAK_BINARY=espeak -export ESPEAK_ARGUMENTS="--stdout" -export ESPEAK_PLAY="-w" -export ESPEAK_LANGUAGE="-ven+m5" -export ESPEAK_INPUT="No input has been provided" -export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK -export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH - -LOCAL_PLAY="$1" -LOCAL_LANGUAGE="$2" -LOCAL_TEXT="$3" +export SPEECHSYNTHETIZER_PID=$$ + +LOCAL_ENGINE="$1" +LOCAL_PLAY="$2" +LOCAL_LANGUAGE="$3" +LOCAL_TEXT="$4" # ============================================================================= # Functions @@ -31,26 +25,13 @@ LOCAL_TEXT="$3" # Main # ============================================================================= -if [ $# -eq 3 ] +if [ $# -eq 4 ] then - if [ "$LOCAL_LANGUAGE" = "english" ]; then - export ESPEAK_LANGUAGE="-v en-us -a 200" - elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - export ESPEAK_LANGUAGE="-v es-la -a 200" - fi - - export ESPEAK_INPUT="$LOCAL_TEXT" - - if [ "$LOCAL_PLAY" = "on" ]; then - $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_SPEECH | aplay - - elif [ "$LOCAL_PLAY" = "off" ]; then - $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" - ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 + if [ "$LOCAL_ENGINE" = "espeak" ]; then + Espeak.sh $LOCAL_PLAY $LOCAL_LANGUAGE $LOCAL_TEXT + elif [ "$LOCAL_LANGUAGE" = "voicerss" ]; then + VoiceRss.sh $LOCAL_PLAY $LOCAL_LANGUAGE $LOCAL_TEXT fi - - cp $ESPEAK_SPEECH $SPEECH - cp $ESPEAK_SPEECH_MP3 $SPEECH_MP3 - else echo "Invalid number of arguments, see Documentation" exit 1 From c781831834ea267a4f06656e22c46ba035356290 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:16:25 -0500 Subject: [PATCH 0713/1653] Update Espeak.sh --- .../Services/Sound/SpeechSynthetizer/Espeak.sh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index b9e7d754..de1186c4 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -17,9 +17,8 @@ export ESPEAK_INPUT="No input has been provided" export ESPEAK_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH -LOCAL_PLAY="$1" -LOCAL_LANGUAGE="$2" -LOCAL_TEXT="$3" +LOCAL_LANGUAGE="$1" +LOCAL_TEXT="$2" # ============================================================================= # Functions @@ -41,13 +40,10 @@ then export ESPEAK_INPUT="$LOCAL_TEXT" - if [ "$LOCAL_PLAY" = "on" ]; then - $ESPEAK_BINARY $ESPEAK_LANGUAGE $ESPEAK_ARGUMENTS "$ESPEAK_INPUT" | tee $ESPEAK_SPEECH | aplay - - elif [ "$LOCAL_PLAY" = "off" ]; then - $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" - ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 - fi - + $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" + + ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 + cp $ESPEAK_SPEECH $SPEECH cp $ESPEAK_SPEECH_MP3 $SPEECH_MP3 From e32817ef8aa5bb89a06635f483812380b15c3c05 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:16:27 -0500 Subject: [PATCH 0714/1653] Update VoiceRss.sh --- Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh index 7c0f3bd4..75ef5a0c 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh @@ -15,9 +15,8 @@ export VOICERSS_PLAY="-w" export VOICERSS_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS export VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH -LOCAL_PLAY="$1" -LOCAL_LANGUAGE="$2" -LOCAL_TEXT="$3" +LOCAL_LANGUAGE="$1" +LOCAL_TEXT="$2" # ============================================================================= # Functions @@ -40,11 +39,7 @@ then export VOICERSS_INPUT="${LOCAL_TEXT}" $VOICERSS_BINARY $VOICERSS_LANGUAGE $VOICERSS_SPEECH "\"$VOICERSS_INPUT\"" - - if [ "$LOCAL_PLAY" = "on" ]; then - aplay $VOICERSS_SPEECH - fi - + ffmpeg -y -i $VOICERSS_SPEECH $VOICERSS_SPEECH_MP3 cp $VOICERSS_SPEECH $SPEECH From ea5f8450174c43c0754fb945ef63088b5b5bbd30 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:17:33 -0500 Subject: [PATCH 0715/1653] Update VoiceRss.sh --- Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh index 75ef5a0c..9d0153f4 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh @@ -28,7 +28,7 @@ LOCAL_TEXT="$2" # Main # ============================================================================= -if [ $# -eq 3 ] +if [ $# -eq 2 ] then if [ "$LOCAL_LANGUAGE" = "english" ]; then export VOICERSS_LANGUAGE="en-us" From 4d4534fd59803771f2d9a19fd85cd2b160a7f8f7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:17:42 -0500 Subject: [PATCH 0716/1653] Update Espeak.sh --- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index de1186c4..439697a5 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -30,7 +30,7 @@ LOCAL_TEXT="$2" # Main # ============================================================================= -if [ $# -eq 3 ] +if [ $# -eq 2 ] then if [ "$LOCAL_LANGUAGE" = "english" ]; then export ESPEAK_LANGUAGE="-v en-us -a 200" From 33cd7ae0351c551b9ece17f0e4201a069dcdf535 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:19:50 -0500 Subject: [PATCH 0717/1653] Update SpeechSynthetizer.sh --- .../SpeechSynthetizer/SpeechSynthetizer.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh index 3399954c..89284b15 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -10,8 +10,8 @@ set -x export SPEECHSYNTHETIZER_PID=$$ -LOCAL_ENGINE="$1" -LOCAL_PLAY="$2" +LOCAL_PLAY="$1" +LOCAL_ENGINE="$2" LOCAL_LANGUAGE="$3" LOCAL_TEXT="$4" @@ -25,13 +25,18 @@ LOCAL_TEXT="$4" # Main # ============================================================================= -if [ $# -eq 4 ] -then +if [ $# -eq 4 ]; then + if [ "$LOCAL_ENGINE" = "espeak" ]; then - Espeak.sh $LOCAL_PLAY $LOCAL_LANGUAGE $LOCAL_TEXT + Espeak.sh $LOCAL_LANGUAGE $LOCAL_TEXT elif [ "$LOCAL_LANGUAGE" = "voicerss" ]; then - VoiceRss.sh $LOCAL_PLAY $LOCAL_LANGUAGE $LOCAL_TEXT + VoiceRss.sh $LOCAL_LANGUAGE $LOCAL_TEXT + fi + + if [ "$LOCAL_PLAY" = "on" ]; then + mpg123 $VOICERSS_SPEECH fi + else echo "Invalid number of arguments, see Documentation" exit 1 From 87d4b621b71a041c384fed8f17f75515e2135499 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:23:07 -0500 Subject: [PATCH 0718/1653] Update Eek.sh --- Hochob/Services/Stream/Eek.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Stream/Eek.sh b/Hochob/Services/Stream/Eek.sh index 5b6f3154..c587ec31 100755 --- a/Hochob/Services/Stream/Eek.sh +++ b/Hochob/Services/Stream/Eek.sh @@ -25,13 +25,13 @@ LOCAL_TEXT="$3" # ============================================================================= if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" fi Stream.sh "Eek'" "1.0" "$SPEECH_MP3" From a9656b0dec2fed905a9fc4884aa4b0be234c8b66 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:24:26 -0500 Subject: [PATCH 0719/1653] Update Juum.sh --- Hochob/Services/Stream/Juum.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Stream/Juum.sh b/Hochob/Services/Stream/Juum.sh index 410fa041..6bf60b97 100755 --- a/Hochob/Services/Stream/Juum.sh +++ b/Hochob/Services/Stream/Juum.sh @@ -25,13 +25,13 @@ LOCAL_TEXT="$3" # ============================================================================= if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" fi Stream.sh "Juum" "1.0" "$SPEECH_MP3" From 542a2e4a63b2d77cfa7011fb6b1f6b3f2af67e37 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:24:51 -0500 Subject: [PATCH 0720/1653] Update Tran.sh --- Hochob/Services/Stream/Tran.sh | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/Hochob/Services/Stream/Tran.sh b/Hochob/Services/Stream/Tran.sh index d6c0e9a6..d64255cf 100755 --- a/Hochob/Services/Stream/Tran.sh +++ b/Hochob/Services/Stream/Tran.sh @@ -25,25 +25,15 @@ LOCAL_TEXT="$3" # ============================================================================= if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" fi -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" - -exit 0 - -if [ $# -eq 1 ] -then - echo "Tbd" -else - echo "Invalid number of arguments, see Documentation" - exit 1 -fi +Stream.sh "Tran" "1.0" "$SPEECH_MP3" # End of File From cf1d08dd5e9c66d247e6c015c72346500f7cb949 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:25:03 -0500 Subject: [PATCH 0721/1653] Update Triki.sh --- Hochob/Services/Stream/Triki.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Stream/Triki.sh b/Hochob/Services/Stream/Triki.sh index b1148178..e40bda23 100755 --- a/Hochob/Services/Stream/Triki.sh +++ b/Hochob/Services/Stream/Triki.sh @@ -25,13 +25,13 @@ LOCAL_TEXT="$3" # ============================================================================= if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" fi Stream.sh "Triki" "1.0" "$SPEECH_MP3" From b4639a16b0bf25da8ea2fcd407320919a0c4694d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:26:10 -0500 Subject: [PATCH 0722/1653] Update StreamAudio.sh --- Hochob/Services/Stream/StreamAudio.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Stream/StreamAudio.sh b/Hochob/Services/Stream/StreamAudio.sh index b887bacf..deb64c13 100755 --- a/Hochob/Services/Stream/StreamAudio.sh +++ b/Hochob/Services/Stream/StreamAudio.sh @@ -26,13 +26,13 @@ LOCAL_TEXT="$4" # ============================================================================= if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - Espeak.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - VoiceRss.sh off spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" fi Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 From bbc8aaa7b9c3c9bff637cbe72e91644599a62e4c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:33:26 -0500 Subject: [PATCH 0723/1653] Update Signed-off-by: Abraham Arce --- .../Applications/CentralMayaLowlands/Acapulco.sh | 4 ++-- .../Applications/CentralMayaLowlands/Huatulco.sh | 4 ++-- .../Applications/CentralMayaLowlands/Mazatlan.sh | 4 ++-- .../CentralMayaLowlands/PuertoVallarta.sh | 4 ++-- .../Applications/CentralMayaLowlands/Veracruz.sh | 4 ++-- .../Applications/NorthernMayaLowlands/Calakmul.sh | 4 ++-- .../NorthernMayaLowlands/LaMichilia.sh | 4 ++-- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 7 ++++--- .../NorthernMayaLowlands/MontesAzules.sh | 4 ++-- .../Applications/NorthernMayaLowlands/SianKaan.sh | 4 ++-- Hochob/Applications/RobotMayaLands/PocChuc.sh | 4 ++-- .../BajaCaliforniaNorte.sh.Backup | 3 ++- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 2 +- .../BajaCaliforniaSurLocal.sh | 2 +- .../SouthernMayaHighlands/Michoacan.sh | 14 +++++++------- .../SouthernMayaHighlands/Zacatecas.sh | 2 +- 16 files changed, 36 insertions(+), 34 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 9a6d3a76..df3aac7f 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -28,12 +28,12 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour." else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ Que disfruten su recorrido." diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index f3825fa6..f3eec08f 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -31,12 +31,12 @@ else fi if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "${LOCAL_INSTITUTION}, you know more about the Mayans, Intel and Intel Guadalajara Design Center, \ now let's get into the next hall where we will find information about our Microproccesors, \ our Fabs and Laboratories. Let's go." else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "${LOCAL_INSTITUTION}, ahora que saben más acerca de los Mayas, \ de Intel y del Centro de Diseño de Intel en Guadalajara, podemos pasar a la siguiente seccion \ en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas \ diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 52c52409..a68e9824 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -33,10 +33,10 @@ fi exit 0 if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "" fi diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index 210ca1c4..dbf2da44 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -31,10 +31,10 @@ else fi if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "" fi diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index f143b585..1f5764fc 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -24,10 +24,10 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "Hi There" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "Hola a todos" fi diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 44c6a8c8..5b9ac685 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -27,10 +27,10 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "To be written" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ Es observarlo, escucharlo y registrar lo que se aprende. \ Te gustaría entender porqué la Tierra gira alrededor del Sol? \ diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 78bbce8f..2ec1a13c 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -26,10 +26,10 @@ export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "To be written" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "Intel no solo se queda en la tierra, es tal el alcance del Microprocesador que puede \ estar en el universo, por ejemplo, ha trabajado con la NASA para crear cohetes y vehiculos \ no tripulados. Veamos el siguiente video." diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 0b1ff185..5d90ffbb 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -24,7 +24,8 @@ export MAPIMI_DIRECTORY=$(dirname "$MAPIMI_PATH") # ============================================================================= #Memories.sh "40" "on" "${MAPIMI_NAME}" -#Espeak.sh off spanish "Nel Pastel Simona La Mona" +#SpeechSynthetizer.sh on espeak english \ +# "Nel Pastel Simona La Mona" #MemoriesAudio.sh "${MAPIMI_NAME}" #Stream.sh "Eek'" "1.0" "$FFMPEG_IMAGE_AUDIO" @@ -35,10 +36,10 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "To be written" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "Me da mucho gusto conocerlos y que hayan venido a Intel. \ Regresen pronto futuras y futuros ingenieros" fi diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 1864f7db..c33ac84b 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -26,10 +26,10 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "Futuras y futuros Matemáticos. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología." fi diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 5f806c71..5cca0ac4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -27,10 +27,10 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "To be written" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "Por escribirse, ${LOCAL_INSTITUTION}" fi diff --git a/Hochob/Applications/RobotMayaLands/PocChuc.sh b/Hochob/Applications/RobotMayaLands/PocChuc.sh index d2fce162..438ad886 100755 --- a/Hochob/Applications/RobotMayaLands/PocChuc.sh +++ b/Hochob/Applications/RobotMayaLands/PocChuc.sh @@ -24,12 +24,12 @@ export POCCHUC_DIRECTORY=$(dirname "$POCCHUC_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Espeak.sh off english \ + SpeechSynthetizer.sh off espeak english \ "Future Engineers! Welcome to this first hall! We called it: The Beginning. \ Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour!" else - Espeak.sh off spanish \ + SpeechSynthetizer.sh off espeak spanish \ "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio de Intel en Guadalajara. \ Que disfruten tu recorrido!" diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup index 073d8aba..2b5bedd3 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup @@ -34,7 +34,8 @@ sleep 19.2 LOCAL_ROBOTAVAILABLE=`RobotAvailable.sh` if [ "$LOCAL_ROBOTAVAILABLE" -eq "0" ]; then - Espeak.sh on spanish "Nel" + SpeechSynthetizer.sh off espeak english \ + "Nel" else Robot.sh lupe/say "Nel" fi diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 163fdcd1..041c6133 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -65,7 +65,7 @@ sleep 75 wait -Espeak.sh off spanish \ +SpeechSynthetizer.sh off espeak spanish \ "Muchas gracias futuras y futuros ingenieros!. A nombre del equipo de Intel, deseamos que hayan tenido una gran visita." diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index 6dd5df7b..5dff1f8e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -45,7 +45,7 @@ sleep 25.5 && Robot.sh lupe/say "Yo funciono con la plataforma Intel Edison" Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & LOCAL_INSTITUTION=`Name.sh` -Espeak.sh off spanish \ +SpeechSynthetizer.sh off espeak spanish \ "Muchas gracias Futuros Ingenieros del ${LOCAL_INSTITUTION}. A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita." diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index f59b38cd..ae5a0f2e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -36,7 +36,7 @@ LOCAL_INSTITUTION=`Name.sh` # las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ # que aquí trabajamos les deseamos la mejor de las experiencias. \ # Muchas gracias por haber venido." -Espeak.sh on spanish \ +SpeechSynthetizer.sh on espeak spanish \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ Es un gusto conocerlas y conocerlos. Ya saben mi nombre, soy Lupe, \ tengo 2 años robot y estudio el primer año de primaria robot. \ @@ -55,7 +55,7 @@ sleep 1 #Robot.sh lupe/message \ # "Ahora tomaremos una foto para el recuerdo. \ # Primero, me iré a mi lugar preferido, denme unos segundos." -Espeak.sh on spanish \ +SpeechSynthetizer.sh on espeak spanish \ "Ahora tomaremos una foto para el recuerdo. \ Primero, me iré a mi lugar preferido, denme unos segundos." @@ -81,7 +81,7 @@ sleep .6 # "Estoy listo! Ahora les toca a ustedes acomodarse. \ # Con mucho cuidado ponganse a ambos lados de mi, \ # viendo hacia la pantalla y sonrían." -Espeak.sh on spanish \ +SpeechSynthetizer.sh on espeak spanish \ "Estoy listo! Ahora les toca a ustedes acomodarse. \ Con mucho cuidado ponganse a ambos lados de mi, \ viendo hacia la pantalla y sonrían." @@ -90,21 +90,21 @@ sleep 15 #Robot.sh lupe/message \ # "Están listos ${LOCAL_INSTITUTION}?" -Espeak.sh on spanish \ +SpeechSynthetizer.sh on espeak spanish \ "Están listas? listos? ${LOCAL_INSTITUTION}?" sleep 5 #Robot.sh lupe/message \ # "Tomemos la foto, a la cuenta de 3." -Espeak.sh on spanish \ +SpeechSynthetizer.sh on espeak spanish \ "Tomemos la foto, a la cuenta de 3." sleep 1 #Robot.sh lupe/message \ # "1, 2 y 3, Sonrian." -Espeak.sh on spanish \ +SpeechSynthetizer.sh on espeak spanish \ "1, 2 y 3, Sonrían." Memories.sh "5" "on" "${MICHOACAN_NAME}" & @@ -115,7 +115,7 @@ Eog.sh "$FSWEBCAM_IMAGE" & #Robot.sh lupe/message \ # "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." -Espeak.sh on spanish \ +SpeechSynthetizer.sh on espeak spanish \ "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." sleep 5 diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index 8a9a7770..c2b43ee2 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -26,7 +26,7 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") LogPid.sh $ZACATECAS_PID $ZACATECAS_NAME Memories.sh "20" "on" "${ZACATECAS_NAME}" -Espeak.sh off spanish \ +SpeechSynthetizer.sh off espeak spanish \ "Me da mucho gusto conocerlos y que hayan venido a Intel. \ Regresen pronto" MemoriesAudio.sh "${ZACATECAS_NAME}" From 355cde409a171d4727180675ec30ee043f4c057c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:52:25 -0500 Subject: [PATCH 0724/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Memories/Memories.sh | 5 +++-- Hochob/Services/Memories/MemoriesAudio.sh | 9 ++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index bf460263..cc2259ea 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -43,9 +43,10 @@ then if [ "$LOCAL_VIDEO" = "on" ]; then FfmpegImage.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME - cp $FFMPEG_VIDEO $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 + cp $FFMPEG_IMAGE $LOCAL_VISITORS_INSTITUTION_NAME + cp $FFMPEG_IMAGE $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 fi - + else echo "Invalid number of arguments, see Documentation" exit 1 diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh index 66b9ccdc..fe8760c1 100755 --- a/Hochob/Services/Memories/MemoriesAudio.sh +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -8,7 +8,7 @@ set -x #. ~/CodeLabs/Hochob/Main.sh -export MEMORIES_PID=$$ +export MEMORIESAUDIO_PID=$$ LOCAL_IDENTIFICATION="$(echo "${1}" | tr -d '[:space:]')" @@ -31,11 +31,10 @@ mkdir -p $LOCAL_VISITORS_INSTITUTION_NAME if [ $# -eq 1 ] then - # Substitute with FfmpegAudio.sh? - ffmpeg -y -i $FFMPEG_VIDEO -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO - cp $FFMPEG_VIDEO_AUDIO $FFMPEG_VIDEO + FfmpegVideoAudio.sh $SPEECH_MP3 cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME - + cp $FFMPEG_VIDEO_AUDIO $LOCAL_VISITORS_INSTITUTION_NAME + cp $FFMPEG_VIDEO_AUDIO $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 else echo "Invalid number of arguments, see Documentation" exit 1 From 45d8f1e863d16ccb07142afe5609c2631784619c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 12:53:02 -0500 Subject: [PATCH 0725/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Video/FfmpegVideoAudio.sh | 36 +++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 Hochob/Services/Video/FfmpegVideoAudio.sh diff --git a/Hochob/Services/Video/FfmpegVideoAudio.sh b/Hochob/Services/Video/FfmpegVideoAudio.sh new file mode 100755 index 00000000..3cf27713 --- /dev/null +++ b/Hochob/Services/Video/FfmpegVideoAudio.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +#. ~/CodeLabs/Hochob/Main.sh + +export FFMPEG_PID=$$ +export FFMPEG_BINARY=ffmpeg +export FFMPEG_ARGUMENTS="-codec copy -shortest" + +LOCAL_AUDIO=$1 + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + $FFMPEG_BINARY -y -i $FFMPEG_IMAGE -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO + cp $FFMPEG_VIDEO_AUDIO $FFMPEG_VIDEO +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From ea3a497ae9e99ec8765a146b74253fafed5b9e6c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:00:06 -0500 Subject: [PATCH 0726/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 2 +- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 2 +- Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh | 2 +- Hochob/Applications/CentralMayaLowlands/Veracruz.sh | 2 +- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 2 +- Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh | 2 +- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 2 +- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 2 +- Hochob/Applications/RobotMayaLands/PocChuc.sh | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index df3aac7f..79023062 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -39,7 +39,7 @@ else Que disfruten su recorrido." fi -Stream.sh "Triki" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Triki" "1.0" "$SPEECH_MP3" LOCAL_LANGUAGE=`Language.sh` diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index f3eec08f..951193fb 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -43,6 +43,6 @@ else y nuestros Laboratorios. Vamos." fi -Stream.sh "Triki" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Triki" "1.0" "$SPEECH_MP3" # End of File diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index a68e9824..078e2db2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -40,6 +40,6 @@ else "" fi -Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Juum" "1.0" "$SPEECH_MP3" # End of File diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index dbf2da44..f753bb00 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -38,6 +38,6 @@ else "" fi -Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Juum" "1.0" "$SPEECH_MP3" # End of File diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index 1f5764fc..f0ac8d53 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -31,7 +31,7 @@ else "Hola a todos" fi -Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Juum" "1.0" "$SPEECH_MP3" # kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 5b9ac685..fb36a46a 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -43,6 +43,6 @@ fi #Los que aplican los descubrimientos de la ciencia para hacer cosas útiles se llaman Ingenieros. -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" # End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 2ec1a13c..06f0848a 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -35,7 +35,7 @@ else no tripulados. Veamos el siguiente video." fi -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" #kill -- -$(ps -o pgid=$LAMICHILIA_PID | grep -o '[0-9]*') diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 5d90ffbb..657be806 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -44,6 +44,6 @@ else Regresen pronto futuras y futuros ingenieros" fi -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" # End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index c33ac84b..576ab70f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -34,7 +34,7 @@ else Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología." fi -Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" if [ "$LOCAL_LANGUAGE" = "english" ]; then echo "Tbd" diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 5cca0ac4..4e32f7f2 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -34,7 +34,7 @@ else "Por escribirse, ${LOCAL_INSTITUTION}" fi -#Stream.sh "Eek'" "1.0" "$ESPEAK_SPEECH_MP3" +#Stream.sh "Eek'" "1.0" "$SPEECH_MP3" Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & diff --git a/Hochob/Applications/RobotMayaLands/PocChuc.sh b/Hochob/Applications/RobotMayaLands/PocChuc.sh index 438ad886..20ec095c 100755 --- a/Hochob/Applications/RobotMayaLands/PocChuc.sh +++ b/Hochob/Applications/RobotMayaLands/PocChuc.sh @@ -35,7 +35,7 @@ else Que disfruten tu recorrido!" fi -Stream.sh "Juum" "1.0" "$ESPEAK_SPEECH_MP3" +Stream.sh "Juum" "1.0" "$SPEECH_MP3" kill -- -$(ps -o pgid=$PCOCHUC_PID | grep -o '[0-9]*') From 075e16357b5c3712594e1ccd63639a2f26c5d93d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:09:36 -0500 Subject: [PATCH 0727/1653] Update SpeechSynthetizer.sh --- Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh index 89284b15..fc4e5c58 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -29,7 +29,7 @@ if [ $# -eq 4 ]; then if [ "$LOCAL_ENGINE" = "espeak" ]; then Espeak.sh $LOCAL_LANGUAGE $LOCAL_TEXT - elif [ "$LOCAL_LANGUAGE" = "voicerss" ]; then + elif [ "$LOCAL_ENGINE" = "voicerss" ]; then VoiceRss.sh $LOCAL_LANGUAGE $LOCAL_TEXT fi From 0f427c74cc9ace6ef755a83ad6b9f0ae8727f3cf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:10:57 -0500 Subject: [PATCH 0728/1653] Update SpeechSynthetizer.sh --- Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh index fc4e5c58..ff7bc9df 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -28,9 +28,9 @@ LOCAL_TEXT="$4" if [ $# -eq 4 ]; then if [ "$LOCAL_ENGINE" = "espeak" ]; then - Espeak.sh $LOCAL_LANGUAGE $LOCAL_TEXT + Espeak.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" elif [ "$LOCAL_ENGINE" = "voicerss" ]; then - VoiceRss.sh $LOCAL_LANGUAGE $LOCAL_TEXT + VoiceRss.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" fi if [ "$LOCAL_PLAY" = "on" ]; then From 7bfe6645f7695fbe81f95716aaf3d66322592455 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:11:48 -0500 Subject: [PATCH 0729/1653] Update SpeechSynthetizer.sh --- Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh index ff7bc9df..acd315eb 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -34,7 +34,7 @@ if [ $# -eq 4 ]; then fi if [ "$LOCAL_PLAY" = "on" ]; then - mpg123 $VOICERSS_SPEECH + mpg123 $SPEECH_MP3 fi else From 87da54f2e4d6e19345d9324f1f60e6fcf8c4998f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:23:44 -0500 Subject: [PATCH 0730/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index cc2259ea..77f08336 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -39,6 +39,7 @@ then LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg + cp $LOCAL_SELECTED_FILE $FSWEBCAM_IMAGE if [ "$LOCAL_VIDEO" = "on" ]; then FfmpegImage.sh $FSWEBCAM_DIRECTORY From 578b324e381c41f866187a7f89005c77b7694847 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:31:51 -0500 Subject: [PATCH 0731/1653] Update Guerrero.sh --- Hochob/Applications/SouthernMayaHighlands/Guerrero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh index 02ebb9ee..635449df 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh @@ -25,6 +25,6 @@ export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") LogPid.sh $GUERRERO_PID $GUERRERO_NAME -Vlc.sh "on" "$CORPORATE_VIDEO/" +#Vlc.sh "on" "$CORPORATE_VIDEO/" # End of File From dbeb13b01e57985ab20a7946674732c353a10eba Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:32:45 -0500 Subject: [PATCH 0732/1653] Update Guerrero.sh --- Hochob/Applications/SouthernMayaHighlands/Guerrero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh index 635449df..02ebb9ee 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh @@ -25,6 +25,6 @@ export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") LogPid.sh $GUERRERO_PID $GUERRERO_NAME -#Vlc.sh "on" "$CORPORATE_VIDEO/" +Vlc.sh "on" "$CORPORATE_VIDEO/" # End of File From 6bca8a359b7b70c3ce390208ece2b33d257a9b84 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:34:05 -0500 Subject: [PATCH 0733/1653] Update Vlc.sh --- Hochob/Services/Video/Vlc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/Vlc.sh index e9e59ccf..fd4ba80e 100755 --- a/Hochob/Services/Video/Vlc.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -24,7 +24,7 @@ LOCAL_FILE="$2" # Main # ============================================================================= -if [ $# -eq 2 ] +if [ $# -eq 1 ] then if [ "$LOCAL_LOOP" = "on" ]; then $VLC_BINARY $VLC_ARGUMENTS $VLC_LOOP $LOCAL_FILE & From ef0a5e7303d62d6d8a8ccc1594b9ea167482bcf4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:34:24 -0500 Subject: [PATCH 0734/1653] Update Vlc.sh --- Hochob/Services/Video/Vlc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/Vlc.sh index fd4ba80e..e9e59ccf 100755 --- a/Hochob/Services/Video/Vlc.sh +++ b/Hochob/Services/Video/Vlc.sh @@ -24,7 +24,7 @@ LOCAL_FILE="$2" # Main # ============================================================================= -if [ $# -eq 1 ] +if [ $# -eq 2 ] then if [ "$LOCAL_LOOP" = "on" ]; then $VLC_BINARY $VLC_ARGUMENTS $VLC_LOOP $LOCAL_FILE & From 52ac198d08bd9d064d5d5df0c302814347e47c50 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:35:48 -0500 Subject: [PATCH 0735/1653] Rename Vlc.sh to VlcAudio.sh --- Hochob/Services/Sound/Play/{Vlc.sh => VlcAudio.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Sound/Play/{Vlc.sh => VlcAudio.sh} (100%) diff --git a/Hochob/Services/Sound/Play/Vlc.sh b/Hochob/Services/Sound/Play/VlcAudio.sh similarity index 100% rename from Hochob/Services/Sound/Play/Vlc.sh rename to Hochob/Services/Sound/Play/VlcAudio.sh From 26ee1eae5ee5c9689a495ec1a7463940e1486da5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:36:23 -0500 Subject: [PATCH 0736/1653] Rename VlcAudio.sh to Vlc.sh --- Hochob/Services/Sound/Play/{VlcAudio.sh => Vlc.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Sound/Play/{VlcAudio.sh => Vlc.sh} (100%) diff --git a/Hochob/Services/Sound/Play/VlcAudio.sh b/Hochob/Services/Sound/Play/Vlc.sh similarity index 100% rename from Hochob/Services/Sound/Play/VlcAudio.sh rename to Hochob/Services/Sound/Play/Vlc.sh From a81f4b4edf31964b99f9173a4b11a9d3a233a3d5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:37:17 -0500 Subject: [PATCH 0737/1653] Rename Vlc.sh to VlcVideo.sh --- Hochob/Services/Video/{Vlc.sh => VlcVideo.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Video/{Vlc.sh => VlcVideo.sh} (100%) diff --git a/Hochob/Services/Video/Vlc.sh b/Hochob/Services/Video/VlcVideo.sh similarity index 100% rename from Hochob/Services/Video/Vlc.sh rename to Hochob/Services/Video/VlcVideo.sh From c609971af538c26fe5d564f00781b8c4e0548f4f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:37:32 -0500 Subject: [PATCH 0738/1653] Update Guerrero.sh --- Hochob/Applications/SouthernMayaHighlands/Guerrero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh index 02ebb9ee..6e41d138 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh @@ -25,6 +25,6 @@ export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") LogPid.sh $GUERRERO_PID $GUERRERO_NAME -Vlc.sh "on" "$CORPORATE_VIDEO/" +VlcVideo.sh "on" "$CORPORATE_VIDEO/" # End of File From c8ad6596d24dbf0448cc34453f8c32237da09871 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:37:43 -0500 Subject: [PATCH 0739/1653] Update QuintanaRoo.sh --- Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh index 9fbb085e..59ae9c57 100755 --- a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh +++ b/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh @@ -25,6 +25,6 @@ export QUINTANAROO_DIRECTORY=$(dirname "$QUINTANAROO_PATH") LogPid.sh $QUINTANAROO_PID $QUINTANAROO_NAME -Vlc.sh "on" "$MEMORIES_VIDEO/*" +VlcVideo.sh "on" "$MEMORIES_VIDEO/*" # End of File From 86ca142d3b55c2f5e4f2840f2872afbc7a41d810 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:46:00 -0500 Subject: [PATCH 0740/1653] Update FfmpegImage.sh --- Hochob/Services/Video/FfmpegImage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegImage.sh b/Hochob/Services/Video/FfmpegImage.sh index 45960b30..7905f4e4 100755 --- a/Hochob/Services/Video/FfmpegImage.sh +++ b/Hochob/Services/Video/FfmpegImage.sh @@ -10,7 +10,8 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" +#export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" +export FFMPEG_ARGUMENTS="-c:v libx264 -tune stillimage -c:a aac -b:a 192k -pix_fmt yuv420p -shortest" LOCAL_DIRECTORY="$1" From bb526627c97fa62501b26ccd77e5f788124a2513 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:56:00 -0500 Subject: [PATCH 0741/1653] Update FfmpegImage.sh --- Hochob/Services/Video/FfmpegImage.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Services/Video/FfmpegImage.sh b/Hochob/Services/Video/FfmpegImage.sh index 7905f4e4..45960b30 100755 --- a/Hochob/Services/Video/FfmpegImage.sh +++ b/Hochob/Services/Video/FfmpegImage.sh @@ -10,8 +10,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -#export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" -export FFMPEG_ARGUMENTS="-c:v libx264 -tune stillimage -c:a aac -b:a 192k -pix_fmt yuv420p -shortest" +export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" LOCAL_DIRECTORY="$1" From c349d15fe4e753b74d2debf4b47ccdcdea0596fe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 13:59:15 -0500 Subject: [PATCH 0742/1653] Update BajaCaliforniaSur.sh --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 041c6133..7bfc04ab 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -27,16 +27,16 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & sleep 37.5 && Robot.sh lupe/cerebro 1 sleep 2 Robot.sh lupe/rightup 1 @@ -48,7 +48,7 @@ sleep .25 Robot.sh lupe/leftfold 1 sleep 2 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/inteledison 1 sleep 3 Robot.sh lupe/rightdown 1 @@ -60,7 +60,7 @@ sleep .25 Robot.sh lupe/leftunfold 1 sleep 2 -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & sleep 75 wait From 873e27d933ade8c30541c8025cae2009c5f60c48 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:00:42 -0500 Subject: [PATCH 0743/1653] Update BajaCaliforniaSurLocal.sh --- .../SouthernMayaHighlands/BajaCaliforniaSurLocal.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index 5dff1f8e..5fc52fa6 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -27,22 +27,22 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & Robot.sh lupe/say "Hola a todos" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/say "Perdon! Lo se!, Es que me emociono!" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/say "Por supuesto" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & sleep 37.5 && Robot.sh lupe/say "En mi caso, mi cerebro esta aqui, en la caja azul!" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/say "Yo funciono con la plataforma Intel Edison" -Vlc.sh "off" "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & +Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & LOCAL_INSTITUTION=`Name.sh` SpeechSynthetizer.sh off espeak spanish \ From e197e5e85281bf8b4ea8e7dbc0c267022dc9f91c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:04:06 -0500 Subject: [PATCH 0744/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 77f08336..f942950c 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh +. ~/CodeLabs/Hochob/Main.sh export MEMORIES_PID=$$ From 4b6ba442cb0738097a5e8ea46b40f20ffe360552 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:06:56 -0500 Subject: [PATCH 0745/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index f942950c..2db1361b 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -13,6 +13,8 @@ export MEMORIES_PID=$$ LOCAL_NUMBER="$1" LOCAL_VIDEO="$2" LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" +echo $LOCAL_IDENTIFICATION +exit 0 LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" From 029d1105f0ddc32f753e3811b295189e7df62a13 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:08:03 -0500 Subject: [PATCH 0746/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 2db1361b..e30d1520 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -13,14 +13,15 @@ export MEMORIES_PID=$$ LOCAL_NUMBER="$1" LOCAL_VIDEO="$2" LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" -echo $LOCAL_IDENTIFICATION -exit 0 LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION +echo $LOCAL_VISITORS_INSTITUTION_NAME +exit 0 + # ============================================================================= # Functions # ============================================================================= From 64d739152134536d86611f99c8c0ea3e0308c8a5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:10:27 -0500 Subject: [PATCH 0747/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index e30d1520..4ec57e27 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -19,9 +19,6 @@ LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION -echo $LOCAL_VISITORS_INSTITUTION_NAME -exit 0 - # ============================================================================= # Functions # ============================================================================= @@ -38,11 +35,17 @@ if [ $# -eq 3 ] then rm -f $FSWEBCAM_ALLFILES Fswebcam.sh $LOCAL_NUMBER - cp -r $FSWEBCAM_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME + cp -r $FSWEBCAM_DIRECTORY $LOCAL_VISITORS_INSTITUTION_NAME LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg cp $LOCAL_SELECTED_FILE $FSWEBCAM_IMAGE + + echo $LOCAL_SELECTED_FILE + echo $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg + echo $FSWEBCAM_IMAGE + + exit 0 if [ "$LOCAL_VIDEO" = "on" ]; then FfmpegImage.sh $FSWEBCAM_DIRECTORY From 621081da17431c04db24deacb5117def0a40d2a3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:12:10 -0500 Subject: [PATCH 0748/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 4ec57e27..e6c0426f 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -41,6 +41,7 @@ then cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg cp $LOCAL_SELECTED_FILE $FSWEBCAM_IMAGE + echo $LOCAL_INSTITUTION_NAME echo $LOCAL_SELECTED_FILE echo $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg echo $FSWEBCAM_IMAGE From 2f98675f9ba3f9aa1188a26c1506e0f174bb8815 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:13:39 -0500 Subject: [PATCH 0749/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 0ffbd052..a7e12ea5 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -28,6 +28,7 @@ export HOCHOB_SERVER=$HOCHOB_ROOT export HOCHOB_SERVER_SERVICES=$HOCHOB_ROOT/Services/ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ +export HOCHOB_SERVER_SERVICES_CALENDAR=$HOCHOB_SERVER_SERVICES/Calendar/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS=$HOCHOB_SERVER_SERVICES/Communications/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT=$HOCHOB_SERVER_SERVICES_COMMUNICATIONS/MqttClient/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ @@ -50,6 +51,7 @@ export HOCHOB_SERVER_SERVICES_VISITORS=$HOCHOB_SERVER_SERVICES/Visitors/ export PATH=$PATH:$HOCHOB_SERVER export PATH=$PATH:$HOCHOB_SERVER_SERVICES export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CALENDAR export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE From d661300ada745ec1a57405a8b7e6e721d7c7bcf0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:15:08 -0500 Subject: [PATCH 0750/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index e6c0426f..8d2cae0f 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -17,6 +17,8 @@ LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" +exit 0 + LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= From 90e537eeb1d42b49e05af2fc1b9850eb06246c45 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:14:28 -0500 Subject: [PATCH 0751/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Calendar/Name.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Calendar/Name.sh diff --git a/Hochob/Services/Calendar/Name.sh b/Hochob/Services/Calendar/Name.sh old mode 100644 new mode 100755 From 5eb4bfbaaf6ad2cfd2a8af414dc3bedcf08b520b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:17:20 -0500 Subject: [PATCH 0752/1653] Update Memories.sh --- Hochob/Services/Memories/Memories.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Hochob/Services/Memories/Memories.sh b/Hochob/Services/Memories/Memories.sh index 8d2cae0f..43c86d64 100755 --- a/Hochob/Services/Memories/Memories.sh +++ b/Hochob/Services/Memories/Memories.sh @@ -17,8 +17,6 @@ LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" -exit 0 - LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= @@ -43,13 +41,6 @@ then cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg cp $LOCAL_SELECTED_FILE $FSWEBCAM_IMAGE - echo $LOCAL_INSTITUTION_NAME - echo $LOCAL_SELECTED_FILE - echo $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg - echo $FSWEBCAM_IMAGE - - exit 0 - if [ "$LOCAL_VIDEO" = "on" ]; then FfmpegImage.sh $FSWEBCAM_DIRECTORY cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME From b04349ee2ba54deeba1fdd84613066a70aadcbf0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:20:02 -0500 Subject: [PATCH 0753/1653] Update MemoriesAudio.sh --- Hochob/Services/Memories/MemoriesAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Memories/MemoriesAudio.sh b/Hochob/Services/Memories/MemoriesAudio.sh index fe8760c1..98fef76e 100755 --- a/Hochob/Services/Memories/MemoriesAudio.sh +++ b/Hochob/Services/Memories/MemoriesAudio.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh +. ~/CodeLabs/Hochob/Main.sh export MEMORIESAUDIO_PID=$$ From 569288513d9ccb0b9cb7eab8f46717645825bbc6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:24:43 -0500 Subject: [PATCH 0754/1653] Update FfmpegVideoAudio.sh --- Hochob/Services/Video/FfmpegVideoAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegVideoAudio.sh b/Hochob/Services/Video/FfmpegVideoAudio.sh index 3cf27713..b7cf84c1 100755 --- a/Hochob/Services/Video/FfmpegVideoAudio.sh +++ b/Hochob/Services/Video/FfmpegVideoAudio.sh @@ -26,7 +26,7 @@ LOCAL_AUDIO=$1 if [ $# -eq 1 ] then - $FFMPEG_BINARY -y -i $FFMPEG_IMAGE -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO + $FFMPEG_BINARY -loop 1 -y -i $FFMPEG_IMAGE -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO cp $FFMPEG_VIDEO_AUDIO $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" From 944646a210bd4e299213af17c272c02a326b3efe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:42:04 -0500 Subject: [PATCH 0755/1653] Update FfmpegVideoAudio.sh --- Hochob/Services/Video/FfmpegVideoAudio.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegVideoAudio.sh b/Hochob/Services/Video/FfmpegVideoAudio.sh index b7cf84c1..a24b3079 100755 --- a/Hochob/Services/Video/FfmpegVideoAudio.sh +++ b/Hochob/Services/Video/FfmpegVideoAudio.sh @@ -11,6 +11,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg export FFMPEG_ARGUMENTS="-codec copy -shortest" +export FFMPEG_ARGUMENTS="-c:v libx264 -tune stillimage -c:a aac -b:a 192k -pix_fmt yuv420p -shortest" LOCAL_AUDIO=$1 @@ -26,7 +27,7 @@ LOCAL_AUDIO=$1 if [ $# -eq 1 ] then - $FFMPEG_BINARY -loop 1 -y -i $FFMPEG_IMAGE -i $ESPEAK_SPEECH_MP3 -codec copy -shortest $FFMPEG_VIDEO_AUDIO + $FFMPEG_BINARY -loop 1 -i $FFMPEG_IMAGE -i $ESPEAK_SPEECH_MP3 $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO cp $FFMPEG_VIDEO_AUDIO $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" From d783f7d0a2a6a0a0b6332a05e74f5d1578d2d5ac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:43:02 -0500 Subject: [PATCH 0756/1653] Update FfmpegVideoAudio.sh --- Hochob/Services/Video/FfmpegVideoAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegVideoAudio.sh b/Hochob/Services/Video/FfmpegVideoAudio.sh index a24b3079..7a7e8c38 100755 --- a/Hochob/Services/Video/FfmpegVideoAudio.sh +++ b/Hochob/Services/Video/FfmpegVideoAudio.sh @@ -27,7 +27,7 @@ LOCAL_AUDIO=$1 if [ $# -eq 1 ] then - $FFMPEG_BINARY -loop 1 -i $FFMPEG_IMAGE -i $ESPEAK_SPEECH_MP3 $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO + $FFMPEG_BINARY -loop 1 -i $FSWEBCAM_ALLFILES -i $ESPEAK_SPEECH_MP3 $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO cp $FFMPEG_VIDEO_AUDIO $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" From f5fc10834331777f5b74a4fa4103767b1bca7af5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:44:02 -0500 Subject: [PATCH 0757/1653] Update FfmpegVideoAudio.sh --- Hochob/Services/Video/FfmpegVideoAudio.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegVideoAudio.sh b/Hochob/Services/Video/FfmpegVideoAudio.sh index 7a7e8c38..9c6eb42d 100755 --- a/Hochob/Services/Video/FfmpegVideoAudio.sh +++ b/Hochob/Services/Video/FfmpegVideoAudio.sh @@ -27,7 +27,7 @@ LOCAL_AUDIO=$1 if [ $# -eq 1 ] then - $FFMPEG_BINARY -loop 1 -i $FSWEBCAM_ALLFILES -i $ESPEAK_SPEECH_MP3 $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO + $FFMPEG_BINARY -loop 1 -y -i $FSWEBCAM_ALLFILES -i $ESPEAK_SPEECH_MP3 $FFMPEG_ARGUMENTS $FFMPEG_VIDEO_AUDIO cp $FFMPEG_VIDEO_AUDIO $FFMPEG_VIDEO else echo "Invalid number of arguments, see Documentation" From b6f11d841c96d44813542c889b87ce8f6c78c3aa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:46:02 -0500 Subject: [PATCH 0758/1653] Update FfmpegStoryScene.sh --- Hochob/Services/Video/FfmpegStoryScene.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegStoryScene.sh b/Hochob/Services/Video/FfmpegStoryScene.sh index c29c9a37..dabc1982 100755 --- a/Hochob/Services/Video/FfmpegStoryScene.sh +++ b/Hochob/Services/Video/FfmpegStoryScene.sh @@ -29,7 +29,7 @@ LOCAL_VIDEO=$3 if [ $# -eq 2 ] then - $FFMPEG_BINARY -loop 1 -i $LOCAL_IMAGE -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $LOCAL_VIDEO + $FFMPEG_BINARY -loop 1 -y -i $LOCAL_IMAGE -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $LOCAL_VIDEO else echo "Invalid number of arguments, see Documentation" exit 1 From 4a15cb1bb8f6647bc6453d34e037c493c21e0bf3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 14:47:38 -0500 Subject: [PATCH 0759/1653] Update FfmpegStoryScene.sh --- Hochob/Services/Video/FfmpegStoryScene.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegStoryScene.sh b/Hochob/Services/Video/FfmpegStoryScene.sh index dabc1982..a03438a5 100755 --- a/Hochob/Services/Video/FfmpegStoryScene.sh +++ b/Hochob/Services/Video/FfmpegStoryScene.sh @@ -27,7 +27,7 @@ LOCAL_VIDEO=$3 # Main # ============================================================================= -if [ $# -eq 2 ] +if [ $# -eq 3 ] then $FFMPEG_BINARY -loop 1 -y -i $LOCAL_IMAGE -i $LOCAL_AUDIO $FFMPEG_ARGUMENTS $LOCAL_VIDEO else From 09e805869a05780b0789c660828f1cf3e7e99931 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 15:16:26 -0500 Subject: [PATCH 0760/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index c2b43ee2..b105cd59 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -25,6 +25,14 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") LogPid.sh $ZACATECAS_PID $ZACATECAS_NAME +Memories.sh "5" "on" "${ZACATECAS_NAME}" & +sleep 2 +ConvertText.sh "$FSWEBCAM_IMAGE" "Bienvenidos" +wait +Eog.sh "$FSWEBCAM_IMAGE" & + +exit 0 + Memories.sh "20" "on" "${ZACATECAS_NAME}" SpeechSynthetizer.sh off espeak spanish \ "Me da mucho gusto conocerlos y que hayan venido a Intel. \ From f1bcbe733221ccfde8163210e4e15541b2d97982 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 21:02:23 -0500 Subject: [PATCH 0761/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index cb5ce2cb..e7bbcea9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -39,11 +39,13 @@ StreamAudio.sh $LOCAL_DEVICE spanish tt \ exit 0 StreamAudio.sh $LOCAL_DEVICE english tt \ - "Which spacecraft took the first photos of Mars? \ - One, Curiosity. \ - Two, Spirit. \ - Three, Sojourner. \ - Four, Mariner 4." + " + Which spacecraft took the first photos of Mars? \ + One, Curiosity. \ + Two, Spirit. \ + Three, Sojourner. \ + Four, Mariner 4. + " Survey.sh $LOCAL_DEVICE english tt 4 if [ "$LOCAL_LANGUAGE" = "english" ]; then From 2f06b5917174378eca8eec5973b0599c154d9129 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 21:06:32 -0500 Subject: [PATCH 0762/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index e7bbcea9..3677541a 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,13 +30,11 @@ LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" # Survey.sh $LOCAL_DEVICE spanish robot 1 -StreamAudio.sh $LOCAL_DEVICE spanish tt \ - " - Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ - Pero donde puedes ver esto y mas? En marte! - " - -exit 0 +#StreamAudio.sh $LOCAL_DEVICE spanish tt \ +# " +# Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ +# Pero donde puedes ver esto y mas? En marte! +# " StreamAudio.sh $LOCAL_DEVICE english tt \ " @@ -48,6 +46,8 @@ StreamAudio.sh $LOCAL_DEVICE english tt \ " Survey.sh $LOCAL_DEVICE english tt 4 +exit 0 + if [ "$LOCAL_LANGUAGE" = "english" ]; then Eek.sh english robot "Hi Lupe, good morning" Eek.sh english tt "Hi Lupe, good morning" From 917adbba8de0c7abfd570992c324ebc97b675851 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 21:19:00 -0500 Subject: [PATCH 0763/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 8eba7984..7610cec6 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -203,6 +203,14 @@ history: # View all events in a logbook logbook: +sensor: + + - platform: systemmonitor + resources: + - type: disk_use_percent + arg: /home/ + - type: memory_free + script: # Southern Maya Highlands @@ -409,6 +417,7 @@ shell_command: keypadfour: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 4 & switch: + - platform: command_line switches: From 6dff308f8169b8fd7dac79248bbe1c61c8110985 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:00:07 -0500 Subject: [PATCH 0764/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Video/Ffmpeg.sh | 36 +++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100755 Hochob/Services/Video/Ffmpeg.sh diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh new file mode 100755 index 00000000..45960b30 --- /dev/null +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +#. ~/CodeLabs/Hochob/Main.sh + +export FFMPEG_PID=$$ +export FFMPEG_BINARY=ffmpeg +export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" + +LOCAL_DIRECTORY="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_IMAGE + cp $FFMPEG_IMAGE $FFMPEG_VIDEO +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 76bb0e1012568de08c8771f6995645a4757ddfb2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:04:53 -0500 Subject: [PATCH 0765/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index a7e12ea5..d8706a8b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -151,6 +151,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH_MP3=$H export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/*.mp4 +export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegCamera.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegVideo.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegImage.mp4 export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_IMAGE_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/FfmpegImageAudio.mp4 @@ -183,6 +184,7 @@ export VOICERSS_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_V export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES +export FFMPEG_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_CAMERA export FFMPEG_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO export FFMPEG_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_IMAGE export FFMPEG_IMAGE_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_IMAGE_AUDIO From 65512c38a2b89c15e88c424967ec67e4ef62d9d0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:05:35 -0500 Subject: [PATCH 0766/1653] Update Ffmpeg.sh --- Hochob/Services/Video/Ffmpeg.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/Ffmpeg.sh index 45960b30..42f1d632 100755 --- a/Hochob/Services/Video/Ffmpeg.sh +++ b/Hochob/Services/Video/Ffmpeg.sh @@ -6,11 +6,12 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh +. ~/CodeLabs/Hochob/Main.sh export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_ARGUMENTS="-y -s 4096x2304 -framerate 10 -vf fps=10 -pix_fmt yuv420p" +export FFMPEG_INPUT=/dev/video0 +export FFMPEG_ARGUMENTS="-codec:v libx264 -qp 0" LOCAL_DIRECTORY="$1" @@ -26,8 +27,7 @@ LOCAL_DIRECTORY="$1" if [ $# -eq 1 ] then - $FFMPEG_BINARY -i "$LOCAL_DIRECTORY/"%04d.jpg $FFMPEG_ARGUMENTS $FFMPEG_IMAGE - cp $FFMPEG_IMAGE $FFMPEG_VIDEO + ffmpeg -i $FFMPEG_INPUT $FFMPEG_CAMERA else echo "Invalid number of arguments, see Documentation" exit 1 From 60a0d7c20cde2946b60a6519488128fa1b795996 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:04:32 -0500 Subject: [PATCH 0767/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Video/{Ffmpeg.sh => FfmpegCamera.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Video/{Ffmpeg.sh => FfmpegCamera.sh} (100%) diff --git a/Hochob/Services/Video/Ffmpeg.sh b/Hochob/Services/Video/FfmpegCamera.sh similarity index 100% rename from Hochob/Services/Video/Ffmpeg.sh rename to Hochob/Services/Video/FfmpegCamera.sh From 9d5e97b32e840cb313bb9f611680cd4c4278e401 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:06:43 -0500 Subject: [PATCH 0768/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 42f1d632..e6044614 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -13,8 +13,6 @@ export FFMPEG_BINARY=ffmpeg export FFMPEG_INPUT=/dev/video0 export FFMPEG_ARGUMENTS="-codec:v libx264 -qp 0" -LOCAL_DIRECTORY="$1" - # ============================================================================= # Functions # ============================================================================= @@ -25,7 +23,7 @@ LOCAL_DIRECTORY="$1" # Main # ============================================================================= -if [ $# -eq 1 ] +if [ $# -eq 0 ] then ffmpeg -i $FFMPEG_INPUT $FFMPEG_CAMERA else From 4a2a7ccea64f15cec385429a2f8ec0b5fe22b836 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:09:36 -0500 Subject: [PATCH 0769/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index e6044614..b5a9af4b 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -11,7 +11,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg export FFMPEG_INPUT=/dev/video0 -export FFMPEG_ARGUMENTS="-codec:v libx264 -qp 0" +export FFMPEG_ARGUMENTS="-segment_time 10 -codec:v libx264 -qp 0" # ============================================================================= # Functions From 3d820bc5b32b2109ea00fd60a2be61a713889d7e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:10:58 -0500 Subject: [PATCH 0770/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index b5a9af4b..d986fbe3 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -11,7 +11,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg export FFMPEG_INPUT=/dev/video0 -export FFMPEG_ARGUMENTS="-segment_time 10 -codec:v libx264 -qp 0" +export FFMPEG_ARGUMENTS="-y -t 00:05:00 -codec:v libx264 -qp 0" # ============================================================================= # Functions From 8b345b076595c8a83e869a6fd2311889ddc5b536 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:12:53 -0500 Subject: [PATCH 0771/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index d986fbe3..1fa4ccab 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -11,7 +11,7 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg export FFMPEG_INPUT=/dev/video0 -export FFMPEG_ARGUMENTS="-y -t 00:05:00 -codec:v libx264 -qp 0" +export FFMPEG_ARGUMENTS="-y -t 00:00:05 -codec:v libx264 -qp 0" # ============================================================================= # Functions From 324d1808f09575e3989af2fbc493ca024e2d7c39 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:13:26 -0500 Subject: [PATCH 0772/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 1fa4ccab..edc4d952 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -25,7 +25,7 @@ export FFMPEG_ARGUMENTS="-y -t 00:00:05 -codec:v libx264 -qp 0" if [ $# -eq 0 ] then - ffmpeg -i $FFMPEG_INPUT $FFMPEG_CAMERA + ffmpeg -i $FFMPEG_INPUT $FFMPEG_ARGUMENTS $FFMPEG_CAMERA else echo "Invalid number of arguments, see Documentation" exit 1 From 0c9a2b86309d88882e4863bd57871610776d4c60 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:14:22 -0500 Subject: [PATCH 0773/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index edc4d952..31803940 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -12,6 +12,7 @@ export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg export FFMPEG_INPUT=/dev/video0 export FFMPEG_ARGUMENTS="-y -t 00:00:05 -codec:v libx264 -qp 0" +export FFMPEG_ARGUMENTS="-y -t 00:00:05" # ============================================================================= # Functions From 8054bbd14161da1f2343c87f258653dc18c4f3bb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:17:42 -0500 Subject: [PATCH 0774/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 31803940..132ac5f2 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -11,8 +11,12 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg export FFMPEG_INPUT=/dev/video0 -export FFMPEG_ARGUMENTS="-y -t 00:00:05 -codec:v libx264 -qp 0" -export FFMPEG_ARGUMENTS="-y -t 00:00:05" +export FFMPEG_ARGUMENTS="-y -codec:v libx264 -qp 0" +export FFMPEG_ARGUMENTS="-y" +export FFMPEG_TIME="-t 00:00:" + +export LOCAL_SECONDS=$1 +export FFMPEG_TIME="${FFMPEG_TIME}${LOCAL_SECONDS}" # ============================================================================= # Functions @@ -26,7 +30,7 @@ export FFMPEG_ARGUMENTS="-y -t 00:00:05" if [ $# -eq 0 ] then - ffmpeg -i $FFMPEG_INPUT $FFMPEG_ARGUMENTS $FFMPEG_CAMERA + ffmpeg -i $FFMPEG_INPUT $FFMPEG_TIME $FFMPEG_ARGUMENTS $FFMPEG_CAMERA else echo "Invalid number of arguments, see Documentation" exit 1 From 2d235bb973e98de6be01aaa494ca6679f6c82d32 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:18:03 -0500 Subject: [PATCH 0775/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 132ac5f2..563ae99e 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -28,7 +28,7 @@ export FFMPEG_TIME="${FFMPEG_TIME}${LOCAL_SECONDS}" # Main # ============================================================================= -if [ $# -eq 0 ] +if [ $# -eq 1 ] then ffmpeg -i $FFMPEG_INPUT $FFMPEG_TIME $FFMPEG_ARGUMENTS $FFMPEG_CAMERA else From b8f8c94bb006fde639de594d951de14f45c643a4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:18:48 -0500 Subject: [PATCH 0776/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index ae5a0f2e..df2cd3ce 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -86,6 +86,8 @@ SpeechSynthetizer.sh on espeak spanish \ Con mucho cuidado ponganse a ambos lados de mi, \ viendo hacia la pantalla y sonrían." +FfmpegCamera.sh 20 + sleep 15 #Robot.sh lupe/message \ From 4642032b79e4a448214488f5f63a6b74e3a90bc9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:23:37 -0500 Subject: [PATCH 0777/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index df2cd3ce..0eca397c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -86,7 +86,7 @@ SpeechSynthetizer.sh on espeak spanish \ Con mucho cuidado ponganse a ambos lados de mi, \ viendo hacia la pantalla y sonrían." -FfmpegCamera.sh 20 +FfmpegCamera.sh 20 & sleep 15 From b00582586f9d5ca9dd0df306f9d623c6dc23d4af Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:29:54 -0500 Subject: [PATCH 0778/1653] Update GiftUsb.sh --- Hochob/Services/Visitors/GiftUsb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Visitors/GiftUsb.sh b/Hochob/Services/Visitors/GiftUsb.sh index 56e37ce7..0f4d4348 100755 --- a/Hochob/Services/Visitors/GiftUsb.sh +++ b/Hochob/Services/Visitors/GiftUsb.sh @@ -6,7 +6,7 @@ set -x # Variables # ============================================================================= -#. ~/CodeLabs/Hochob/Main.sh +. ~/CodeLabs/Hochob/Main.sh export GIFTUSB_PID=$$ From 35cf803a270a28a2a0a0f61833d0e7fffbfc3ca6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:32:51 -0500 Subject: [PATCH 0779/1653] Update Signed-off-by: Abraham Arce --- .../HomeAssistant/configuration.yaml.2.0 | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 7610cec6..cd5238ea 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -203,13 +203,19 @@ history: # View all events in a logbook logbook: +camera: + - platform: ffmpeg + input: /dev/video0 + sensor: - platform: systemmonitor + name: System Monitor resources: + - type: processor_use + - type: memory_free - type: disk_use_percent arg: /home/ - - type: memory_free script: @@ -480,18 +486,20 @@ group: name: The Beginning entities: - group.centralmayalowlandsstations + - group.techiemayalandskeypad northernmayalowlands: view: yes name: The Experience entities: - group.northernmayalowlandsstations + - group.techiemayalandskeypad techiemayalands: view: yes name: The Techie entities: - - group.techiemayalandskeypad + - group.techiemayalandssystemmonitor language: name: Idioma @@ -594,4 +602,12 @@ group: - script.keypadtwo - script.keypadthree - script.keypadfour + + techiemayalandssystemmonitor: + name: System Monitor + entities: + - sensor.cpu_use + - sensor.ram_free + - sensor.disk_use_home + - camera.ffmpeg From 79a1a0d8e1464bc173e3a894ecca2a0bb0da6d18 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:38:12 -0500 Subject: [PATCH 0780/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 563ae99e..deeee5c1 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -30,7 +30,7 @@ export FFMPEG_TIME="${FFMPEG_TIME}${LOCAL_SECONDS}" if [ $# -eq 1 ] then - ffmpeg -i $FFMPEG_INPUT $FFMPEG_TIME $FFMPEG_ARGUMENTS $FFMPEG_CAMERA + ffmpeg -f alsa -i default -i $FFMPEG_INPUT $FFMPEG_TIME $FFMPEG_ARGUMENTS $FFMPEG_CAMERA else echo "Invalid number of arguments, see Documentation" exit 1 From 0d4108fa9ee4961151a37e8ec3141163be68f802 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:39:19 -0500 Subject: [PATCH 0781/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index deeee5c1..9ce2273a 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -30,7 +30,7 @@ export FFMPEG_TIME="${FFMPEG_TIME}${LOCAL_SECONDS}" if [ $# -eq 1 ] then - ffmpeg -f alsa -i default -i $FFMPEG_INPUT $FFMPEG_TIME $FFMPEG_ARGUMENTS $FFMPEG_CAMERA + ffmpeg -f alsa -i hw:2,0 -i $FFMPEG_INPUT $FFMPEG_TIME $FFMPEG_ARGUMENTS $FFMPEG_CAMERA else echo "Invalid number of arguments, see Documentation" exit 1 From 7adb7fd094500af1ddabca76b172b0496059a561 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:51:52 -0500 Subject: [PATCH 0782/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 9ce2273a..1a70a684 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -10,7 +10,10 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg -export FFMPEG_INPUT=/dev/video0 +export FFMPEG_INPUT_DEVICE_CAMERA=/dev/video0 +export FFMPEG_INPUT_CAMERA="-i "$FFMPEG_INPUT_DEVICE_CAMERA +export FFMPEG_INPUT_DEVICE_AUDIO="plughw:CARD=C525,DEV=0" +export FFMPEG_INPUT_AUDIO="-f alsa -i "$FFMPEG_INPUT_DEVICE_AUDIO export FFMPEG_ARGUMENTS="-y -codec:v libx264 -qp 0" export FFMPEG_ARGUMENTS="-y" export FFMPEG_TIME="-t 00:00:" @@ -30,7 +33,7 @@ export FFMPEG_TIME="${FFMPEG_TIME}${LOCAL_SECONDS}" if [ $# -eq 1 ] then - ffmpeg -f alsa -i hw:2,0 -i $FFMPEG_INPUT $FFMPEG_TIME $FFMPEG_ARGUMENTS $FFMPEG_CAMERA + ffmpeg $FFMPEG_INPUT_AUDIO $FFMPEG_INPUT_CAMERA $FFMPEG_TIME $FFMPEG_ARGUMENTS $FFMPEG_CAMERA else echo "Invalid number of arguments, see Documentation" exit 1 From 74f135cc417e1cb686d08420b278d857851e515e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:54:34 -0500 Subject: [PATCH 0783/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 1a70a684..93b85f9f 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -14,8 +14,8 @@ export FFMPEG_INPUT_DEVICE_CAMERA=/dev/video0 export FFMPEG_INPUT_CAMERA="-i "$FFMPEG_INPUT_DEVICE_CAMERA export FFMPEG_INPUT_DEVICE_AUDIO="plughw:CARD=C525,DEV=0" export FFMPEG_INPUT_AUDIO="-f alsa -i "$FFMPEG_INPUT_DEVICE_AUDIO -export FFMPEG_ARGUMENTS="-y -codec:v libx264 -qp 0" -export FFMPEG_ARGUMENTS="-y" +export FFMPEG_CAMERA_ARGUMENTS="-y -codec:v libx264 -qp 0" +export FFMPEG_ARGUMENTS="-y -acodec libmp3lame -ab 96k" export FFMPEG_TIME="-t 00:00:" export LOCAL_SECONDS=$1 From fc6fbeb285e464659bc87ab945d676cf2d8102d9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:56:36 -0500 Subject: [PATCH 0784/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 93b85f9f..7efc6ebf 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -15,7 +15,7 @@ export FFMPEG_INPUT_CAMERA="-i "$FFMPEG_INPUT_DEVICE_CAMERA export FFMPEG_INPUT_DEVICE_AUDIO="plughw:CARD=C525,DEV=0" export FFMPEG_INPUT_AUDIO="-f alsa -i "$FFMPEG_INPUT_DEVICE_AUDIO export FFMPEG_CAMERA_ARGUMENTS="-y -codec:v libx264 -qp 0" -export FFMPEG_ARGUMENTS="-y -acodec libmp3lame -ab 96k" +export FFMPEG_ARGUMENTS="-y -r 30 -f avi -vcodec mpeg4 -vtag xvid -acodec libmp3lame -ab 96k" export FFMPEG_TIME="-t 00:00:" export LOCAL_SECONDS=$1 From 883b437548b683675606f82b41e79c673b995b85 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 22:58:42 -0500 Subject: [PATCH 0785/1653] Update FfmpegCamera.sh --- Hochob/Services/Video/FfmpegCamera.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Video/FfmpegCamera.sh b/Hochob/Services/Video/FfmpegCamera.sh index 7efc6ebf..c1a9be92 100755 --- a/Hochob/Services/Video/FfmpegCamera.sh +++ b/Hochob/Services/Video/FfmpegCamera.sh @@ -11,9 +11,9 @@ set -x export FFMPEG_PID=$$ export FFMPEG_BINARY=ffmpeg export FFMPEG_INPUT_DEVICE_CAMERA=/dev/video0 -export FFMPEG_INPUT_CAMERA="-i "$FFMPEG_INPUT_DEVICE_CAMERA +export FFMPEG_INPUT_CAMERA="-f video4linux2 -s 4096x2304 -i "$FFMPEG_INPUT_DEVICE_CAMERA export FFMPEG_INPUT_DEVICE_AUDIO="plughw:CARD=C525,DEV=0" -export FFMPEG_INPUT_AUDIO="-f alsa -i "$FFMPEG_INPUT_DEVICE_AUDIO +export FFMPEG_INPUT_AUDIO="-f alsa -r 16000 -i "$FFMPEG_INPUT_DEVICE_AUDIO export FFMPEG_CAMERA_ARGUMENTS="-y -codec:v libx264 -qp 0" export FFMPEG_ARGUMENTS="-y -r 30 -f avi -vcodec mpeg4 -vtag xvid -acodec libmp3lame -ab 96k" export FFMPEG_TIME="-t 00:00:" From abd3b757ce25539ddebbb4c87602631e17a88168 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:03:13 -0500 Subject: [PATCH 0786/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Visitors/{GiftUsb.sh => Usb.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Visitors/{GiftUsb.sh => Usb.sh} (100%) diff --git a/Hochob/Services/Visitors/GiftUsb.sh b/Hochob/Services/Visitors/Usb.sh similarity index 100% rename from Hochob/Services/Visitors/GiftUsb.sh rename to Hochob/Services/Visitors/Usb.sh From 65f5f8b37edd466c7c4fa59073449c08c4cf94fe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:06:28 -0500 Subject: [PATCH 0787/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index cd5238ea..0c50f6b9 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -179,6 +179,10 @@ homeassistant: friendly_name: Botón Cuatro icon: mdi:numeric-4-box + script.visitorsusb: + friendly_name: Visitantes USB + icon: mdi:usb + # Enables the frontend frontend: @@ -366,6 +370,10 @@ script: sequence: - service: shell_command.keypadfour + visitorsusb: + sequence: + - service: shell_command.visitorsusb + shell_command: # Southern Maya Highlands @@ -421,6 +429,7 @@ shell_command: keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 2 & keypadthree: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 3 & keypadfour: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 4 & + visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & switch: @@ -500,6 +509,7 @@ group: name: The Techie entities: - group.techiemayalandssystemmonitor + - group.techiemayalandspoc language: name: Idioma @@ -610,4 +620,10 @@ group: - sensor.ram_free - sensor.disk_use_home - camera.ffmpeg - + + techiemayalandspoc: + name: Proof of Concept + entities: + - script.visitorsusb + + From 4547375055c598df295773fa44729410bfc3215d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:12:10 -0500 Subject: [PATCH 0788/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0c50f6b9..babbea7a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -221,6 +221,10 @@ sensor: - type: disk_use_percent arg: /home/ +device_tracker: + - platform: nmap_tracker + hosts: 192.168.1.1/24 + script: # Southern Maya Highlands From 2787def3bb5f262fe6273c31ca50d699039dfb94 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:15:20 -0500 Subject: [PATCH 0789/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index babbea7a..be3ae8b3 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -223,7 +223,7 @@ sensor: device_tracker: - platform: nmap_tracker - hosts: 192.168.1.1/24 + hosts: 192.168.1.80 script: From 9551825b8e67872be4faa8c392a1b273972b797d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:17:32 -0500 Subject: [PATCH 0790/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index be3ae8b3..f5c8c028 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -629,5 +629,6 @@ group: name: Proof of Concept entities: - script.visitorsusb + - group.all_devices From 47ab5f22c65bc86eb0c78c2c0e22bf3f1bb33fc9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:18:07 -0500 Subject: [PATCH 0791/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f5c8c028..9783ed4a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -514,6 +514,7 @@ group: entities: - group.techiemayalandssystemmonitor - group.techiemayalandspoc + - group.all_devices language: name: Idioma @@ -629,6 +630,3 @@ group: name: Proof of Concept entities: - script.visitorsusb - - group.all_devices - - From 2432d76b54397ff3b196cad0d3a90379bac14971 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:19:56 -0500 Subject: [PATCH 0792/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 9783ed4a..696c1a90 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -514,7 +514,6 @@ group: entities: - group.techiemayalandssystemmonitor - group.techiemayalandspoc - - group.all_devices language: name: Idioma @@ -630,3 +629,5 @@ group: name: Proof of Concept entities: - script.visitorsusb + - device_tracker.001788464752 + - zone.home From 898d703cf5a70845fdd5f8738a822bf40ee8497a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:21:28 -0500 Subject: [PATCH 0793/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 696c1a90..b39e7979 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -222,8 +222,9 @@ sensor: arg: /home/ device_tracker: - - platform: nmap_tracker - hosts: 192.168.1.80 + - platform: ping + hosts: + hostone: 192.168.1.80 script: @@ -629,5 +630,3 @@ group: name: Proof of Concept entities: - script.visitorsusb - - device_tracker.001788464752 - - zone.home From d460ce9b1576c597220aad673cbc914d41b90795 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:22:08 -0500 Subject: [PATCH 0794/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b39e7979..7d15ef26 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -630,3 +630,4 @@ group: name: Proof of Concept entities: - script.visitorsusb + - device_tracker.hostone From 79468c56959e7dece08effbe236bccaaa4ff803a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:25:34 -0500 Subject: [PATCH 0795/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 7d15ef26..efdc8ac3 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -224,7 +224,8 @@ sensor: device_tracker: - platform: ping hosts: - hostone: 192.168.1.80 + eclipse: iot.eclipse.org + hochob: 10.215.56.158 script: @@ -515,6 +516,7 @@ group: entities: - group.techiemayalandssystemmonitor - group.techiemayalandspoc + - group.techiemayalandsinfrastructure language: name: Idioma @@ -630,4 +632,9 @@ group: name: Proof of Concept entities: - script.visitorsusb - - device_tracker.hostone + + techiemayalandsinfrastructure: + name: Infrastructure + entities: + - device_tracker.eclipse + - device_tracker.hochob From ace3f2bc7c566bfdc3338aec8b7985044caabedd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 25 Jun 2017 23:28:42 -0500 Subject: [PATCH 0796/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index efdc8ac3..824e8ac3 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -183,6 +183,15 @@ homeassistant: friendly_name: Visitantes USB icon: mdi:usb + device_tracker.eclipse: + friendly_name: IoT Eclipse Org + icon: mdi:server + + device_tracker.hochob: + friendly_name: Hochob Server + icon: mdi:server-network + + # Enables the frontend frontend: From d51d0e9a4dd1d9c6ef97b0afbb58f75d2092afae Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 26 Jun 2017 15:57:46 -0500 Subject: [PATCH 0797/1653] Delete BajaCaliforniaNorte.sh.Backup --- .../BajaCaliforniaNorte.sh.Backup | 58 ------------------- 1 file changed, 58 deletions(-) delete mode 100755 Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup deleted file mode 100755 index 2b5bedd3..00000000 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh.Backup +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -. ~/CodeLabs/Hochob/Main.sh - -export BAJACALIFORNIANORTE_PID=$$ -export BAJACALIFORNIANORTE_NAME="BajaCaliforniaNorte" -export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") -export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -LogPid.sh $BAJACALIFORNIANORTE_PID $BAJACALIFORNIANORTE_NAME - -Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & - -Eog.sh "$VISITORSCENTER_IMAGE/*" & -sleep 5 -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & -sleep 19.2 - -LOCAL_ROBOTAVAILABLE=`RobotAvailable.sh` -if [ "$LOCAL_ROBOTAVAILABLE" -eq "0" ]; then - SpeechSynthetizer.sh off espeak english \ - "Nel" -else - Robot.sh lupe/say "Nel" -fi - -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/headleft 1 -sleep .6 -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/headleft 1 -sleep .6 -Robot.sh lupe/headright 1 -sleep .6 -Robot.sh lupe/resetall 1 -sleep 5 - -kill -- -$(ps -o pgid=$BAJACALIFORNIANORTE_PID | grep -o '[0-9]*') - -# End of File From aba53d62c7a667ba43eeb51827b2b89a9732aa47 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 26 Jun 2017 15:58:40 -0500 Subject: [PATCH 0798/1653] Delete Mexico.sh --- .../SouthernMayaHighlands/Mexico.sh | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100755 Hochob/Applications/SouthernMayaHighlands/Mexico.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh b/Hochob/Applications/SouthernMayaHighlands/Mexico.sh deleted file mode 100755 index 0d7b4039..00000000 --- a/Hochob/Applications/SouthernMayaHighlands/Mexico.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -. ~/CodeLabs/Hochob/Main.sh - -export MEXICO_PID=$$ -export MEXICO_NAME="Mexico" -export MEXICO_PATH=$(readlink -f "$0") -export MEXICO_DIRECTORY=$(dirname "$MEXICO_PATH") - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -LogPid.sh $MEXICO_PID $MEXICO_NAME - -Fswebcam.sh 360 -# find dirname -type f | shuf -n 5 - -# End of File From 9dee005a6b05355f47a0fdff553938d8b7525454 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 26 Jun 2017 16:30:03 -0500 Subject: [PATCH 0799/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 77 ++++++++++++++----- 1 file changed, 56 insertions(+), 21 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 824e8ac3..84d60ed8 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -65,6 +65,12 @@ homeassistant: switch.quintanaroo: friendly_name: Video Showcase icon: mdi:camera + + # Southern Maya Highlands : Sandbox + + script.zacatecas: + friendly_name: Sandbox + icon: mdi:test-tube # Central Maya Lowlands @@ -84,6 +90,12 @@ homeassistant: friendly_name: 5. Labs y Fabs icon: mdi:audiobook + # Central Maya Lowlands + + script.veracruz: + friendly_name: Sandbox + icon: mdi:test-tube + # Northern Maya Lowlands script.montesazules: @@ -260,6 +272,10 @@ script: sequence: - service: shell_command.michoacan + zacatecas: + sequence: + - service: shell_command.zacatecas + # Central Maya Lowlands acapulco: @@ -282,6 +298,10 @@ script: sequence: - service: shell_command.puertovallarta + veracruz: + sequence: + - service: shell_command.veracruz + # Northern Maya Lowlands ojodeliebre: @@ -398,6 +418,7 @@ shell_command: bajacaliforniasur: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh & campeche: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Campeche.sh & michoacan: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & + zacatecas: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh & # Central Maya Lowlands @@ -406,6 +427,7 @@ shell_command: huatulco: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Huatulco.sh & mazatlan: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh & puertovallarta: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh & + veracruz: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Veracruz.sh & # Northern Maya Lowlands @@ -487,13 +509,14 @@ group: view: yes name: The Home entities: - - group.language - - group.introduction - - group.robot - - group.tour - - group.corporate - - group.visitorscenter - - group.memories + - group.southernmayahighlandslanguage + - group.southernmayahighlandsintroduction + - group.southernmayahighlandsrobot + - group.southernmayahighlandstour + - group.southernmayahighlandscorporate + - group.southernmayahighlandsvisitorscenter + - group.southernmayahighlandsmemories + - group.southernmayahighlandssandbox robotmayalands: view: yes @@ -511,6 +534,7 @@ group: entities: - group.centralmayalowlandsstations - group.techiemayalandskeypad + - group.centralmayalowlandssandbox northernmayalowlands: view: yes @@ -524,20 +548,20 @@ group: name: The Techie entities: - group.techiemayalandssystemmonitor - - group.techiemayalandspoc - group.techiemayalandsinfrastructure + - group.techiemayalandssandbox - language: + southernmayahighlandslanguage: name: Idioma entities: - switch.language - introduction: + southernmayahighlandsintroduction: name: 1 Introduccion entities: - script.aguascalientes - robot: + southernmayahighlandsrobot: name: 2 Robot entities: - script.bajacalifornianorte @@ -545,28 +569,33 @@ group: - script.michoacan - script.campeche - tour: + southernmayahighlandstour: name: 3 Tour entities: - script.campeche - corporate: + southernmayahighlandscorporate: name: Corporate entities: - switch.guanajuato - switch.guerrero - visitorscenter: + southernmayahighlandsvisitorscenter: name: Visitors Center entities: - switch.hidalgo - memories: + southernmayahighlandsmemories: name: Memories entities: - switch.queretaro - switch.quintanaroo + southernmayahighlandssandbox: + name: Sandbox + entities: + - script.zacatecas + centralmayalowlandsstations: name: Stations entities: @@ -575,7 +604,12 @@ group: - script.huatulco - script.mazatlan - script.puertovallarta - + + centralmayalowlandssandbox: + name: Sandbox + entities: + - script.veracruz + northernmayalowlandsstations: name: Stations entities: @@ -636,14 +670,15 @@ group: - sensor.ram_free - sensor.disk_use_home - camera.ffmpeg - - techiemayalandspoc: - name: Proof of Concept - entities: - - script.visitorsusb techiemayalandsinfrastructure: name: Infrastructure entities: - device_tracker.eclipse - device_tracker.hochob + + techiemayalandssandbox: + name: Sandbox + entities: + - script.visitorsusb + From 31c1c9df8c52c5c5645fe8d1864a332b4efb1667 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 26 Jun 2017 16:41:07 -0500 Subject: [PATCH 0800/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 44 ++++++++++++++++++- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 84d60ed8..0e811df0 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -118,6 +118,18 @@ homeassistant: friendly_name: 5. Hasta Pronto icon: mdi:audiobook + script.siankaan: + friendly_name: El Baile del Robot + icon: mdi:test-tube + + script.calakmul: + friendly_name: La Ciencia + icon: mdi:test-tube + + script.tiburonballena: + friendly_name: Planeta Marte + icon: mdi:test-tube + # Robot Maya Techlands script.resetall: @@ -323,7 +335,19 @@ script: mapimi: sequence: - service: shell_command.mapimi - + + siankaan: + sequence: + - service: shell_command.siankaan + + calakmul: + sequence: + - service: shell_command.calakmul + + tiburonballena: + sequence: + - service: shell_command.tiburonballena + # Robot Maya Techlands resetall: @@ -436,6 +460,9 @@ shell_command: lamichilia: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & elcielo: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & + siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Siankaan.sh & + calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & + tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Tiburonballena.sh & # Robot Maya Techlands @@ -542,7 +569,9 @@ group: entities: - group.northernmayalowlandsstations - group.techiemayalandskeypad - + - group.northernmayalowlandsstories + - group.northernmayalowlandsrobot + techiemayalands: view: yes name: The Techie @@ -619,6 +648,17 @@ group: - script.elcielo - script.mapimi + northernmayalowlandsrobot: + name: Robot + entities: + - script.siankaan + + northernmayalowlandsstories: + name: Stories + entities: + - script.calakmul + - script.tiburonballena + robotmayalandsreset: name: Reset entities: From 3d7f76be520737f317ebfd91533f02feae238e3b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 26 Jun 2017 16:42:52 -0500 Subject: [PATCH 0801/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0e811df0..2263aa56 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -460,9 +460,9 @@ shell_command: lamichilia: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & elcielo: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & - siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Siankaan.sh & + siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh & calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & - tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Tiburonballena.sh & + tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh & # Robot Maya Techlands From d269e8e6ea341d4e6a9e1ded852e63e78b8aa6ae Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 26 Jun 2017 20:15:49 -0500 Subject: [PATCH 0802/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 3677541a..0bcdc249 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -36,6 +36,18 @@ LOCAL_LANGUAGE=`Language.sh` # Pero donde puedes ver esto y mas? En marte! # " +StreamAudio.sh $LOCAL_DEVICE spanish tt \ + " + Cual fue la primer mision que tomo las primeras fotos de Marte? \ + Uno, Curiosity. \ + Dos, Spirit. \ + Tres, Sojourner. \ + Cuatro, Mariner 4. + " +Survey.sh $LOCAL_DEVICE spanish tt 4 + +exit 0 + StreamAudio.sh $LOCAL_DEVICE english tt \ " Which spacecraft took the first photos of Mars? \ @@ -46,8 +58,6 @@ StreamAudio.sh $LOCAL_DEVICE english tt \ " Survey.sh $LOCAL_DEVICE english tt 4 -exit 0 - if [ "$LOCAL_LANGUAGE" = "english" ]; then Eek.sh english robot "Hi Lupe, good morning" Eek.sh english tt "Hi Lupe, good morning" From 81b5d10d784fd4472ff2e73709cacb4c2a54e4cd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 27 Jun 2017 07:35:45 -0500 Subject: [PATCH 0803/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index a213a41c..2ac6a718 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -27,7 +27,8 @@ LOCAL_FILE="$3" if [ $# -eq 3 ] then - killall -9 $STREAM2CHROMECAST_BINARY + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop + killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ -transcodeopts '-b:v 1000k -b:a 24k' \ From 92cc7c5ded209c66db1a236ccc59956afb417580 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 27 Jun 2017 07:56:13 -0500 Subject: [PATCH 0804/1653] Update --- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 4 ++-- Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh | 6 +++--- Hochob/Services/Stream/StreamAudio.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index 439697a5..d2dc6a8a 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -41,9 +41,9 @@ then export ESPEAK_INPUT="$LOCAL_TEXT" $ESPEAK_BINARY $ESPEAK_PLAY $ESPEAK_SPEECH $ESPEAK_LANGUAGE "$ESPEAK_INPUT" - + ffmpeg -y -i $ESPEAK_SPEECH $ESPEAK_SPEECH_MP3 - + cp $ESPEAK_SPEECH $SPEECH cp $ESPEAK_SPEECH_MP3 $SPEECH_MP3 diff --git a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh index 9d0153f4..bc162ab1 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/VoiceRss.sh @@ -39,12 +39,12 @@ then export VOICERSS_INPUT="${LOCAL_TEXT}" $VOICERSS_BINARY $VOICERSS_LANGUAGE $VOICERSS_SPEECH "\"$VOICERSS_INPUT\"" - + ffmpeg -y -i $VOICERSS_SPEECH $VOICERSS_SPEECH_MP3 - + cp $VOICERSS_SPEECH $SPEECH cp $VOICERSS_SPEECH_MP3 $SPEECH_MP3 - + else echo "Invalid number of arguments, see Documentation" exit 1 diff --git a/Hochob/Services/Stream/StreamAudio.sh b/Hochob/Services/Stream/StreamAudio.sh index deb64c13..16342093 100755 --- a/Hochob/Services/Stream/StreamAudio.sh +++ b/Hochob/Services/Stream/StreamAudio.sh @@ -26,13 +26,13 @@ LOCAL_TEXT="$4" # ============================================================================= if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak english "\"${LOCAL_TEXT}\"" elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss english "\"${LOCAL_TEXT}\"" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off espeak spanish "$\"{LOCAL_TEXT}\"" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" + SpeechSynthetizer.sh off voicerss spanish "\"${LOCAL_TEXT}\"" fi Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 From c8fce69f586edd72cfa8fc6b77b219d8a3143291 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 27 Jun 2017 07:57:54 -0500 Subject: [PATCH 0805/1653] Update --- Hochob/Services/Survey/Survey.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 95a62383..581cf9bb 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -74,7 +74,7 @@ LOCAL_OPTION=`KeypadOption.sh` if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then - chooseAnswerCorrect "english" + chooseAnswerCorrect $LOCAL_LANGUAGE if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_CORRECT_ANSWER}" @@ -85,7 +85,7 @@ if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then else - chooseWrongCorrect "english" + chooseWrongCorrect "$LOCAL_LANGUAGE" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_WRONG_ANSWER}. the correct answer is ${LOCAL_CORRECT}" From df519c8e7007c583a5b91b269c67050a8f451bb6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 27 Jun 2017 07:58:50 -0500 Subject: [PATCH 0806/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 0bcdc249..6dab73e4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -36,7 +36,7 @@ LOCAL_LANGUAGE=`Language.sh` # Pero donde puedes ver esto y mas? En marte! # " -StreamAudio.sh $LOCAL_DEVICE spanish tt \ +StreamAudio.sh $LOCAL_DEVICE spanish robot \ " Cual fue la primer mision que tomo las primeras fotos de Marte? \ Uno, Curiosity. \ From 7c2fdc83e1c096c4b140b956fdcf8d1116fd978a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 28 Jun 2017 08:46:14 -0500 Subject: [PATCH 0807/1653] Update Keypad.sh --- Hochob/Services/Keypad/Keypad.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/Keypad.sh b/Hochob/Services/Keypad/Keypad.sh index 666c4cd7..ee4c601a 100755 --- a/Hochob/Services/Keypad/Keypad.sh +++ b/Hochob/Services/Keypad/Keypad.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export KEYPAD_PID=$$ +export KEYPAD_MQTT_TOPIC=hochob/keypad/ LOCAL_IDENTIFICATION="$1" LOCAL_BUTTON="$2" @@ -25,7 +26,7 @@ LOCAL_BUTTON="$2" if [ $# -eq 2 ] then - Mosquitto.sh hochob/keypad/$LOCAL_IDENTIFICATION $LOCAL_BUTTON + Mosquitto.sh $KEYPAD_MQTT_TOPIC$LOCAL_IDENTIFICATION $LOCAL_BUTTON else echo "Invalid number of arguments, see Documentation" exit 1 From f492554a03bac3db896ef0d3ccdbcdab81d6e71e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 30 Jun 2017 17:05:32 -0500 Subject: [PATCH 0808/1653] Update Main.sh --- Hochob/Main.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index d8706a8b..ba6f7eb9 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -194,8 +194,7 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport -#MQTT_SERVER_ADDRESS=10.215.56.158 -MQTT_SERVER_ADDRESS=iot.eclipse.org +MQTT_SERVER_ADDRESS=10.215.56.158 MQTT_SERVER_PORT=1883 # ============================================================================= From 7868cdbf04bf28f61b76184f41d3871cdd852cd2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 30 Jun 2017 17:17:50 -0500 Subject: [PATCH 0809/1653] Update --- .../SouthernMayaHighlands/BajaCaliforniaSur.sh | 12 ++++++------ .../BajaCaliforniaSurLocal.sh | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 7bfc04ab..f646b1e0 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -27,16 +27,16 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & (Robot.sh lupe/inicial 1) && sleep 1.25 -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & sleep 37.5 && Robot.sh lupe/cerebro 1 sleep 2 Robot.sh lupe/rightup 1 @@ -48,7 +48,7 @@ sleep .25 Robot.sh lupe/leftfold 1 sleep 2 -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/inteledison 1 sleep 3 Robot.sh lupe/rightdown 1 @@ -60,7 +60,7 @@ sleep .25 Robot.sh lupe/leftunfold 1 sleep 2 -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & sleep 75 wait diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index 5fc52fa6..454cedec 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -27,22 +27,22 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & Robot.sh lupe/say "Hola a todos" -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & sleep 6.35 && Robot.sh lupe/say "Perdon! Lo se!, Es que me emociono!" -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & sleep 2.7 && Robot.sh lupe/say "Por supuesto" -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & -sleep 37.5 && Robot.sh lupe/say "En mi caso, mi cerebro esta aqui, en la caja azul!" +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & +sleep 37.5 && Robot.sh lupe/say "En mi caso, mi cerebro esta aqui, en la caja azul!" -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & sleep 25.5 && Robot.sh lupe/say "Yo funciono con la plataforma Intel Edison" -Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & +VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & LOCAL_INSTITUTION=`Name.sh` SpeechSynthetizer.sh off espeak spanish \ From 12a294ece72097610397215a8fc435d8bb4b8589 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 05:43:11 -0500 Subject: [PATCH 0810/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 2263aa56..0f52851d 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -240,9 +240,9 @@ history: # View all events in a logbook logbook: -camera: - - platform: ffmpeg - input: /dev/video0 +#camera: +# - platform: ffmpeg +# input: /dev/video0 sensor: @@ -709,7 +709,7 @@ group: - sensor.cpu_use - sensor.ram_free - sensor.disk_use_home - - camera.ffmpeg + #- camera.ffmpeg techiemayalandsinfrastructure: name: Infrastructure From 3b4eaca387aeb7a45f611c2a8a4889f0b980543d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 05:50:55 -0500 Subject: [PATCH 0811/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/TechieMayaLands/Toyota.sh | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100755 Hochob/Applications/TechieMayaLands/Toyota.sh diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh new file mode 100755 index 00000000..b105cd59 --- /dev/null +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ZACATECAS_PID=$$ +export ZACATECAS_NAME="Zacatecas" +export ZACATECAS_PATH=$(readlink -f "$0") +export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $ZACATECAS_PID $ZACATECAS_NAME + +Memories.sh "5" "on" "${ZACATECAS_NAME}" & +sleep 2 +ConvertText.sh "$FSWEBCAM_IMAGE" "Bienvenidos" +wait +Eog.sh "$FSWEBCAM_IMAGE" & + +exit 0 + +Memories.sh "20" "on" "${ZACATECAS_NAME}" +SpeechSynthetizer.sh off espeak spanish \ + "Me da mucho gusto conocerlos y que hayan venido a Intel. \ + Regresen pronto" +MemoriesAudio.sh "${ZACATECAS_NAME}" + +sync + +# End of File From 0c0eb8e31c829bfa797bc7d256b07ba527df8d05 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:01:47 -0500 Subject: [PATCH 0812/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0f52851d..891a0930 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -186,7 +186,11 @@ homeassistant: icon: mdi:stop # Techie Maya Lands - + + script.toyota: + friendly_name: System Health + icon: mdi:approval + script.keypadone: friendly_name: Botón Uno icon: mdi:numeric-1-box @@ -416,6 +420,9 @@ script: # Techie Maya Lands + toyota: + sequence: + - service: shell_command.toyota keypadone: sequence: - service: shell_command.keypadone @@ -489,6 +496,8 @@ shell_command: # Techie Maya Lands + toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & + keypadone: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 1 & keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 2 & keypadthree: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 3 & @@ -576,6 +585,7 @@ group: view: yes name: The Techie entities: + - group.techiemayalandssystemhealth - group.techiemayalandssystemmonitor - group.techiemayalandsinfrastructure - group.techiemayalandssandbox @@ -694,7 +704,12 @@ group: - script.moveforward - script.movebackward - script.movestop - + + techiemayalandssystemhealth: + name: System Health + entities: + - script.toyota + techiemayalandskeypad: name: Keypad entities: From c44002a8f551325acd65381da9780f700c07bcc6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:03:22 -0500 Subject: [PATCH 0813/1653] Update Toyota.sh --- Hochob/Applications/TechieMayaLands/Toyota.sh | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index b105cd59..31e516c2 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ZACATECAS_PID=$$ -export ZACATECAS_NAME="Zacatecas" -export ZACATECAS_PATH=$(readlink -f "$0") -export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") +export TOYOTA_PID=$$ +export TOYOTA_NAME="Zacatecas" +export TOYOTA_PATH=$(readlink -f "$0") +export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") # ============================================================================= # Functions @@ -23,22 +23,24 @@ export ZACATECAS_DIRECTORY=$(dirname "$ZACATECAS_PATH") # Main # ============================================================================= -LogPid.sh $ZACATECAS_PID $ZACATECAS_NAME +LogPid.sh $TOYOTA_PID $TOYOTA_NAME + +SpeechSynthetizer.sh on espeak spanish \ + "Hola Mundo" + +Stream.sh "Triki" "1.0" "$SPEECH_MP3" +Stream.sh "Tran" "1.0" "$SPEECH_MP3" +Stream.sh "Juum" "1.0" "$SPEECH_MP3" +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" Memories.sh "5" "on" "${ZACATECAS_NAME}" & sleep 2 -ConvertText.sh "$FSWEBCAM_IMAGE" "Bienvenidos" +ConvertText.sh "$FSWEBCAM_IMAGE" "System Health" wait Eog.sh "$FSWEBCAM_IMAGE" & -exit 0 - -Memories.sh "20" "on" "${ZACATECAS_NAME}" -SpeechSynthetizer.sh off espeak spanish \ - "Me da mucho gusto conocerlos y que hayan venido a Intel. \ - Regresen pronto" -MemoriesAudio.sh "${ZACATECAS_NAME}" - sync +KillApp.sh "eog" + # End of File From c9410d9c5b664468917d7d113a064fbbeefadcdc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:08:47 -0500 Subject: [PATCH 0814/1653] Update Toyota.sh --- Hochob/Applications/TechieMayaLands/Toyota.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index 31e516c2..2c200f51 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -26,7 +26,7 @@ export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") LogPid.sh $TOYOTA_PID $TOYOTA_NAME SpeechSynthetizer.sh on espeak spanish \ - "Hola Mundo" + "Hola Mundo Uno Dos Tres Probando" Stream.sh "Triki" "1.0" "$SPEECH_MP3" Stream.sh "Tran" "1.0" "$SPEECH_MP3" @@ -38,8 +38,7 @@ sleep 2 ConvertText.sh "$FSWEBCAM_IMAGE" "System Health" wait Eog.sh "$FSWEBCAM_IMAGE" & - -sync +sleep 2 KillApp.sh "eog" From 7228c330f66616fe80dd6e7f2a8b8a166d5904c4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:09:17 -0500 Subject: [PATCH 0815/1653] Update Toyota.sh --- Hochob/Applications/TechieMayaLands/Toyota.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index 2c200f51..e23fb7f4 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -26,7 +26,7 @@ export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") LogPid.sh $TOYOTA_PID $TOYOTA_NAME SpeechSynthetizer.sh on espeak spanish \ - "Hola Mundo Uno Dos Tres Probando" + "Hola Mundo! Uno, Dos, Tres, Probando!" Stream.sh "Triki" "1.0" "$SPEECH_MP3" Stream.sh "Tran" "1.0" "$SPEECH_MP3" From 278c866682e76441ed0c56c8eb0f5d48d560c18d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:10:17 -0500 Subject: [PATCH 0816/1653] Update Toyota.sh --- Hochob/Applications/TechieMayaLands/Toyota.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index e23fb7f4..ef1c2aeb 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -29,9 +29,13 @@ SpeechSynthetizer.sh on espeak spanish \ "Hola Mundo! Uno, Dos, Tres, Probando!" Stream.sh "Triki" "1.0" "$SPEECH_MP3" +echo $? Stream.sh "Tran" "1.0" "$SPEECH_MP3" +echo $? Stream.sh "Juum" "1.0" "$SPEECH_MP3" +echo $? Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +echo $? Memories.sh "5" "on" "${ZACATECAS_NAME}" & sleep 2 From 0651a553655fff908cfdf88680ed2c927ec73edf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:17:46 -0500 Subject: [PATCH 0817/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/RobotMayaLands/{PocChuc.sh => Coji.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/RobotMayaLands/{PocChuc.sh => Coji.sh} (100%) diff --git a/Hochob/Applications/RobotMayaLands/PocChuc.sh b/Hochob/Applications/RobotMayaLands/Coji.sh similarity index 100% rename from Hochob/Applications/RobotMayaLands/PocChuc.sh rename to Hochob/Applications/RobotMayaLands/Coji.sh From fddf9c0a764085e95dd047620ba40cc6518074aa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:23:20 -0500 Subject: [PATCH 0818/1653] Update Toyota.sh --- Hochob/Applications/TechieMayaLands/Toyota.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index ef1c2aeb..b7421a0e 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -30,6 +30,13 @@ SpeechSynthetizer.sh on espeak spanish \ Stream.sh "Triki" "1.0" "$SPEECH_MP3" echo $? + +Robot.sh lupe/inicial 1 +Robot.sh lupe/emocion 1 +Robot.sh lupe/porsupuesto 1 +Robot.sh lupe/cerebro 1 +Robot.sh lupe/inteledison 1 + Stream.sh "Tran" "1.0" "$SPEECH_MP3" echo $? Stream.sh "Juum" "1.0" "$SPEECH_MP3" From 39fc857b7a3a92f3e6ef7fb6b4d02cad8edcd99d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:24:06 -0500 Subject: [PATCH 0819/1653] Update Coji.sh --- Hochob/Applications/RobotMayaLands/Coji.sh | 24 ++++++++-------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Coji.sh b/Hochob/Applications/RobotMayaLands/Coji.sh index 20ec095c..08e1e803 100755 --- a/Hochob/Applications/RobotMayaLands/Coji.sh +++ b/Hochob/Applications/RobotMayaLands/Coji.sh @@ -8,9 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export POCCHUC_PID=$$ -export POCCHUC_PATH=$(readlink -f "$0") -export POCCHUC_DIRECTORY=$(dirname "$POCCHUC_PATH") +export COJI_PID=$$ +export COJI_PATH=$(readlink -f "$0") +export COJI_DIRECTORY=$(dirname "$COJI_PATH") # ============================================================================= # Functions @@ -22,21 +22,15 @@ export POCCHUC_DIRECTORY=$(dirname "$POCCHUC_PATH") # Main # ============================================================================= +Robot.sh lupe/inicial 1 + LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ - "Future Engineers! Welcome to this first hall! We called it: The Beginning. \ - Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ - Enjoy your tour!" + Robot.sh lupe/say \ + "Hello World! One, Two, Three!" else - SpeechSynthetizer.sh off espeak spanish \ - "Futuros Ingenieros! Bienvenidos a esta primer sala, le llamamos: El Inicio. \ - Aqui recordaras a los Mayas, la historia de Intel y de este Centro de Disenio de Intel en Guadalajara. \ - Que disfruten tu recorrido!" + Robot.sh lupe/decir \ + "Hola Mundo! Uno, Dos, Tres!" fi -Stream.sh "Juum" "1.0" "$SPEECH_MP3" - -kill -- -$(ps -o pgid=$PCOCHUC_PID | grep -o '[0-9]*') - # End of File From 0f2dde62d898a0d86ef89d5d2aa17ab2182b5575 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:28:36 -0500 Subject: [PATCH 0820/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 891a0930..0bbe21a1 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -135,6 +135,9 @@ homeassistant: script.resetall: friendly_name: Reset icon: mdi:lock-reset + script.coji: + friendly_name: Speak + icon: mdi:speaker script.headright: friendly_name: Head Right @@ -358,6 +361,10 @@ script: sequence: - service: shell_command.resetall + coji: + sequence: + - service: shell_command.coji + headright: sequence: - service: shell_command.headright @@ -474,6 +481,7 @@ shell_command: # Robot Maya Techlands resetall: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 + coji: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Coji.sh & headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 headright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 @@ -570,16 +578,16 @@ group: entities: - group.centralmayalowlandsstations - group.techiemayalandskeypad - - group.centralmayalowlandssandbox + #- group.centralmayalowlandssandbox northernmayalowlands: view: yes name: The Experience entities: - group.northernmayalowlandsstations - - group.techiemayalandskeypad - group.northernmayalowlandsstories - group.northernmayalowlandsrobot + - group.techiemayalandskeypad techiemayalands: view: yes @@ -673,6 +681,7 @@ group: name: Reset entities: - script.resetall + - script.coji robotmayalandshead: name: Head From a7ad49d68c64cc4d9426e932b991dcd4a3e40a4e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 7 Jul 2017 06:33:52 -0500 Subject: [PATCH 0821/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0bbe21a1..a3b1a285 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -560,7 +560,7 @@ group: - group.southernmayahighlandscorporate - group.southernmayahighlandsvisitorscenter - group.southernmayahighlandsmemories - - group.southernmayahighlandssandbox + #- group.southernmayahighlandssandbox robotmayalands: view: yes From 7870a4d81fff6ce45ad8e8ade9a829112ce5a4d9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:24:58 +0000 Subject: [PATCH 0822/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Calendar/Google.py | 1 - .../Calendar/{democalendar.py => GoogleCalendar.py} | 8 ++++---- Hochob/Services/Calendar/Name.sh | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100755 Hochob/Services/Calendar/Google.py rename Hochob/Services/Calendar/{democalendar.py => GoogleCalendar.py} (92%) mode change 100644 => 100755 diff --git a/Hochob/Services/Calendar/Google.py b/Hochob/Services/Calendar/Google.py deleted file mode 100755 index d3f5a12f..00000000 --- a/Hochob/Services/Calendar/Google.py +++ /dev/null @@ -1 +0,0 @@ - diff --git a/Hochob/Services/Calendar/democalendar.py b/Hochob/Services/Calendar/GoogleCalendar.py old mode 100644 new mode 100755 similarity index 92% rename from Hochob/Services/Calendar/democalendar.py rename to Hochob/Services/Calendar/GoogleCalendar.py index 54878b81..59039371 --- a/Hochob/Services/Calendar/democalendar.py +++ b/Hochob/Services/Calendar/GoogleCalendar.py @@ -74,10 +74,10 @@ def main(): for event in events: start = event['start'].get('dateTime', event['start'].get('date')) print(start, event['summary']) - titulo=" Bienvenidos \n"+event['summary'] - instruccion="convert -pointsize 90 -fill white -draw \'text 50,100 \" "+str(titulo)+" \" \' intel.jpg intel2.jpg" - os.system(instruccion) - os.system("feh --fullscreen intel2.jpg") + #titulo=" Bienvenidos \n"+event['summary'] + #instruccion="convert -pointsize 90 -fill white -draw \'text 50,100 \" "+str(titulo)+" \" \' intel.jpg intel2.jpg" + #os.system(instruccion) + #os.system("feh --fullscreen intel2.jpg") if __name__ == '__main__': diff --git a/Hochob/Services/Calendar/Name.sh b/Hochob/Services/Calendar/Name.sh index f3c636ed..efed633c 100755 --- a/Hochob/Services/Calendar/Name.sh +++ b/Hochob/Services/Calendar/Name.sh @@ -20,6 +20,7 @@ export NAME_PID=$$ # Main # ============================================================================= -echo "Instituto Triki Tran" +#echo "Instituto Triki Tran" +python GoogleCalendar.py # End of File From 44f28f931d8ed6e9cf0a72ecadc576b2d38b77ed Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:34:56 +0000 Subject: [PATCH 0823/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Calendar/GoogleCalendar.py | 2 +- Hochob/Services/Calendar/Name.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Calendar/GoogleCalendar.py b/Hochob/Services/Calendar/GoogleCalendar.py index 59039371..4a93bd34 100755 --- a/Hochob/Services/Calendar/GoogleCalendar.py +++ b/Hochob/Services/Calendar/GoogleCalendar.py @@ -73,7 +73,7 @@ def main(): """ print('No upcoming events found.')""" for event in events: start = event['start'].get('dateTime', event['start'].get('date')) - print(start, event['summary']) + print(event['summary']) #titulo=" Bienvenidos \n"+event['summary'] #instruccion="convert -pointsize 90 -fill white -draw \'text 50,100 \" "+str(titulo)+" \" \' intel.jpg intel2.jpg" #os.system(instruccion) diff --git a/Hochob/Services/Calendar/Name.sh b/Hochob/Services/Calendar/Name.sh index efed633c..2dede228 100755 --- a/Hochob/Services/Calendar/Name.sh +++ b/Hochob/Services/Calendar/Name.sh @@ -21,6 +21,6 @@ export NAME_PID=$$ # ============================================================================= #echo "Instituto Triki Tran" -python GoogleCalendar.py +python $HOCHOB_SERVER_SERVICES_CALENDAR/GoogleCalendar.py # End of File From 0a4dd23da9c4c466259e2d8263a2962a32d71c37 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:37:31 +0000 Subject: [PATCH 0824/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Events/Host.sh | 55 ++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100755 Hochob/Services/Events/Host.sh diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh new file mode 100755 index 00000000..43c86d64 --- /dev/null +++ b/Hochob/Services/Events/Host.sh @@ -0,0 +1,55 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MEMORIES_PID=$$ + +LOCAL_NUMBER="$1" +LOCAL_VIDEO="$2" +LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" + +LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" + +LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +mkdir -p $LOCAL_VISITORS_INSTITUTION_NAME + +if [ $# -eq 3 ] +then + rm -f $FSWEBCAM_ALLFILES + Fswebcam.sh $LOCAL_NUMBER + cp -r $FSWEBCAM_DIRECTORY $LOCAL_VISITORS_INSTITUTION_NAME + + LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` + cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg + cp $LOCAL_SELECTED_FILE $FSWEBCAM_IMAGE + + if [ "$LOCAL_VIDEO" = "on" ]; then + FfmpegImage.sh $FSWEBCAM_DIRECTORY + cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME + cp $FFMPEG_IMAGE $LOCAL_VISITORS_INSTITUTION_NAME + cp $FFMPEG_IMAGE $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 + fi + +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi +# End of File From e4f4cd9b5c060d0a2619274128fb6cd5d7fb001c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 11:40:18 -0500 Subject: [PATCH 0825/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 43c86d64..99960502 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -8,16 +8,9 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export MEMORIES_PID=$$ - -LOCAL_NUMBER="$1" -LOCAL_VIDEO="$2" -LOCAL_IDENTIFICATION="$(echo "${3}" | tr -d '[:space:]')" +export HOST_PID=$$ LOCAL_INSTITUTION_NAME=`Name.sh` -LOCAL_INSTITUTION_NAME="$(echo "${LOCAL_INSTITUTION_NAME}" | tr -d '[:space:]')" - -LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_IDENTIFICATION # ============================================================================= # Functions @@ -29,25 +22,9 @@ LOCAL_VISITORS_INSTITUTION_NAME=$VISITORS_SOURCE/$LOCAL_INSTITUTION_NAME/$LOCAL_ # Main # ============================================================================= -mkdir -p $LOCAL_VISITORS_INSTITUTION_NAME - -if [ $# -eq 3 ] +if [ $# -eq 0 ] then - rm -f $FSWEBCAM_ALLFILES - Fswebcam.sh $LOCAL_NUMBER - cp -r $FSWEBCAM_DIRECTORY $LOCAL_VISITORS_INSTITUTION_NAME - - LOCAL_SELECTED_FILE=`find $FSWEBCAM_DIRECTORY -type f | shuf -n 1` - cp $LOCAL_SELECTED_FILE $MEMORIES_CAMERA/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.jpg - cp $LOCAL_SELECTED_FILE $FSWEBCAM_IMAGE - - if [ "$LOCAL_VIDEO" = "on" ]; then - FfmpegImage.sh $FSWEBCAM_DIRECTORY - cp -r $FFMPEG_ALLFILES $LOCAL_VISITORS_INSTITUTION_NAME - cp $FFMPEG_IMAGE $LOCAL_VISITORS_INSTITUTION_NAME - cp $FFMPEG_IMAGE $MEMORIES_VIDEO/$LOCAL_INSTITUTION_NAME$LOCAL_IDENTIFICATION.mp4 - fi - + echo else echo "Invalid number of arguments, see Documentation" exit 1 From 049ca7adb40ea4949da8a9928cd6003507f8a342 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 19:31:41 +0000 Subject: [PATCH 0826/1653] Update Signed-off-by: Abraham Arce --- .../HomeAssistant/configuration.yaml.2.0 | 100 ++++++++++++++++-- 1 file changed, 90 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index a3b1a285..a528f549 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -251,8 +251,28 @@ logbook: # - platform: ffmpeg # input: /dev/video0 +google: + client_id: !secret google_calendar_client_id + client_secret: !secret google_calendar_client_secret + +input_slider: + + server_volume: + name: Server Volume + initial: 50 + min: 0 + max: 100 + step: 5 + icon: mdi:volume-medium + sensor: + - platform: command_line + name: Server Volume Read + command: amixer sget Master | grep -Eo '\[(\w+)\%\]' | grep -Eo '\w+' + unit_of_measurement: "%" + value_template: '{{ value | int }}' + - platform: systemmonitor name: System Monitor resources: @@ -261,6 +281,18 @@ sensor: - type: disk_use_percent arg: /home/ + - platform: template + sensors: + calendarmessage: + friendly_name: Who is coming? + value_template: '{{ states.calendar.hochobvcgmailcom.attributes.message }}' + + - platform: template + sensors: + calendarstarttime: + friendly_name: When? + value_template: '{{ states.calendar.hochobvcgmailcom.attributes.start_time }}' + device_tracker: - platform: ping hosts: @@ -449,6 +481,8 @@ script: shell_command: + server_volume_set: amixer sset Master '{{ volume_level }}%' + # Southern Maya Highlands aguascalientes: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & @@ -511,7 +545,7 @@ shell_command: keypadthree: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 3 & keypadfour: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 4 & visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & - + switch: - platform: command_line @@ -547,12 +581,35 @@ switch: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" +automation: + + # Server Volume Automation + - alias: Server Volume Change + trigger: + - platform: state + entity_id: input_slider.server_volume + action: + - service: shell_command.server_volume_set + data_template: + volume_level: "{{ states.input_slider.server_volume.state }}" + + - alias: Server Volume Change Read + trigger: + - platform: state + entity_id: sensor.server_volume_read + action: + - service: input_slider.select_value + data_template: + entity_id: input_slider.server_volume + value: "{{ states.sensor.server_volume_read.state | int }}" + group: default_view: view: yes name: The Home entities: + - group.southernmayahighlandscalendar - group.southernmayahighlandslanguage - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot @@ -593,11 +650,19 @@ group: view: yes name: The Techie entities: + - group.techiemayalandssystemcalendar + - group.techiemayalandssystemaudio - group.techiemayalandssystemhealth - group.techiemayalandssystemmonitor - group.techiemayalandsinfrastructure - group.techiemayalandssandbox + southernmayahighlandscalendar: + name: Next Visit + entities: + - sensor.calendarmessage + - sensor.calendarstarttime + southernmayahighlandslanguage: name: Idioma entities: @@ -714,19 +779,26 @@ group: - script.movebackward - script.movestop + techiemayalandssystemcalendar: + name: System Calendar + entities: + - sensor.calendarmessage + - sensor.calendarstarttime + + techiemayalandssystemaudio: + name: System Audio + entities: + - input_slider.server_volume + - sensor.server_volume_read + - shell_command.server_volume_set + - automation.server_volume_change + - automation.server_volume_change_read + techiemayalandssystemhealth: name: System Health entities: - script.toyota - techiemayalandskeypad: - name: Keypad - entities: - - script.keypadone - - script.keypadtwo - - script.keypadthree - - script.keypadfour - techiemayalandssystemmonitor: name: System Monitor entities: @@ -741,8 +813,16 @@ group: - device_tracker.eclipse - device_tracker.hochob + techiemayalandskeypad: + name: Keypad + entities: + - script.keypadone + - script.keypadtwo + - script.keypadthree + - script.keypadfour + techiemayalandssandbox: name: Sandbox entities: - script.visitorsusb - + - calendar.hochobvcgmailcom From 7373db67a2c6248868ff40bdcdcd38ef3077f014 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 20:28:59 +0000 Subject: [PATCH 0827/1653] Update Signed-off-by: Abraham Arce --- .../Applications/TechieMayaLands/WindRiver.sh | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100755 Hochob/Applications/TechieMayaLands/WindRiver.sh diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh new file mode 100755 index 00000000..b7421a0e --- /dev/null +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -0,0 +1,56 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export TOYOTA_PID=$$ +export TOYOTA_NAME="Zacatecas" +export TOYOTA_PATH=$(readlink -f "$0") +export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $TOYOTA_PID $TOYOTA_NAME + +SpeechSynthetizer.sh on espeak spanish \ + "Hola Mundo! Uno, Dos, Tres, Probando!" + +Stream.sh "Triki" "1.0" "$SPEECH_MP3" +echo $? + +Robot.sh lupe/inicial 1 +Robot.sh lupe/emocion 1 +Robot.sh lupe/porsupuesto 1 +Robot.sh lupe/cerebro 1 +Robot.sh lupe/inteledison 1 + +Stream.sh "Tran" "1.0" "$SPEECH_MP3" +echo $? +Stream.sh "Juum" "1.0" "$SPEECH_MP3" +echo $? +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +echo $? + +Memories.sh "5" "on" "${ZACATECAS_NAME}" & +sleep 2 +ConvertText.sh "$FSWEBCAM_IMAGE" "System Health" +wait +Eog.sh "$FSWEBCAM_IMAGE" & +sleep 2 + +KillApp.sh "eog" + +# End of File From 291c25f1c3de96eb65d0aef7e219d05ba7477a67 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 15:30:33 -0500 Subject: [PATCH 0828/1653] Update WindRiver.sh --- .../Applications/TechieMayaLands/WindRiver.sh | 36 +++---------------- 1 file changed, 5 insertions(+), 31 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index b7421a0e..9848e940 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export TOYOTA_PID=$$ -export TOYOTA_NAME="Zacatecas" -export TOYOTA_PATH=$(readlink -f "$0") -export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") +export WINDRIVER_PID=$$ +export WINDRIVER_NAME="WindRiver" +export WINDRIVER_PATH=$(readlink -f "$0") +export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") # ============================================================================= # Functions @@ -23,34 +23,8 @@ export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") # Main # ============================================================================= -LogPid.sh $TOYOTA_PID $TOYOTA_NAME - -SpeechSynthetizer.sh on espeak spanish \ - "Hola Mundo! Uno, Dos, Tres, Probando!" - -Stream.sh "Triki" "1.0" "$SPEECH_MP3" -echo $? +LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME Robot.sh lupe/inicial 1 -Robot.sh lupe/emocion 1 -Robot.sh lupe/porsupuesto 1 -Robot.sh lupe/cerebro 1 -Robot.sh lupe/inteledison 1 - -Stream.sh "Tran" "1.0" "$SPEECH_MP3" -echo $? -Stream.sh "Juum" "1.0" "$SPEECH_MP3" -echo $? -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" -echo $? - -Memories.sh "5" "on" "${ZACATECAS_NAME}" & -sleep 2 -ConvertText.sh "$FSWEBCAM_IMAGE" "System Health" -wait -Eog.sh "$FSWEBCAM_IMAGE" & -sleep 2 - -KillApp.sh "eog" # End of File From 8be6083f37322536095ce5f93c0c89f9f6600c23 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 20:43:12 +0000 Subject: [PATCH 0829/1653] Update Signed-off-by: Abraham Arce --- .../HomeAssistant/configuration.yaml.2.0 | 83 ++++++++++++------- 1 file changed, 54 insertions(+), 29 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index a528f549..760071c7 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -190,6 +190,14 @@ homeassistant: # Techie Maya Lands + input_slider.qualcomm: + friendly_name: Server Volume Set % + icon: mdi:approval + + sensor.qualcomm: + friendly_name: Server Volume % + icon: mdi:approval + script.toyota: friendly_name: System Health icon: mdi:approval @@ -257,7 +265,7 @@ google: input_slider: - server_volume: + qualcomm: name: Server Volume initial: 50 min: 0 @@ -268,7 +276,7 @@ input_slider: sensor: - platform: command_line - name: Server Volume Read + name: Qualcomm command: amixer sget Master | grep -Eo '\[(\w+)\%\]' | grep -Eo '\w+' unit_of_measurement: "%" value_template: '{{ value | int }}' @@ -283,13 +291,13 @@ sensor: - platform: template sensors: - calendarmessage: + appleimac: friendly_name: Who is coming? value_template: '{{ states.calendar.hochobvcgmailcom.attributes.message }}' - platform: template sensors: - calendarstarttime: + appleipod: friendly_name: When? value_template: '{{ states.calendar.hochobvcgmailcom.attributes.start_time }}' @@ -481,8 +489,6 @@ script: shell_command: - server_volume_set: amixer sset Master '{{ volume_level }}%' - # Southern Maya Highlands aguascalientes: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & @@ -538,7 +544,9 @@ shell_command: # Techie Maya Lands + qualcomm: amixer sset Master '{{ volume_level }}%' toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & + windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & keypadone: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 1 & keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 2 & @@ -583,25 +591,36 @@ switch: automation: - # Server Volume Automation - - alias: Server Volume Change + - alias: Services Sound PulseAudio Change + initial_state: 'on' trigger: - platform: state - entity_id: input_slider.server_volume + entity_id: input_slider.qualcomm action: - - service: shell_command.server_volume_set + - service: shell_command.qualcomm data_template: - volume_level: "{{ states.input_slider.server_volume.state }}" + volume_level: "{{ states.input_slider.qualcomm.state }}" - - alias: Server Volume Change Read + - alias: Services Sound PulseAudio Read + initial_state: 'on' trigger: - platform: state - entity_id: sensor.server_volume_read + entity_id: sensor.qualcomm action: - service: input_slider.select_value data_template: - entity_id: input_slider.server_volume - value: "{{ states.sensor.server_volume_read.state | int }}" + entity_id: input_slider.qualcomm + value: "{{ states.sensor.qualcomm.state | int }}" + + - alias: Services Event Host + initial_state: 'off' + trigger: + platform: time + #minutes: '/5' + #seconds: 00 + seconds: '/5' + action: + - service: shell_command.windriver group: @@ -609,7 +628,7 @@ group: view: yes name: The Home entities: - - group.southernmayahighlandscalendar + - group.southernmayahighlandsapple - group.southernmayahighlandslanguage - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot @@ -650,18 +669,19 @@ group: view: yes name: The Techie entities: - - group.techiemayalandssystemcalendar + - group.techiemayalandssystemapple - group.techiemayalandssystemaudio - group.techiemayalandssystemhealth - group.techiemayalandssystemmonitor + - group.techiemayalandssystemevent - group.techiemayalandsinfrastructure - group.techiemayalandssandbox - southernmayahighlandscalendar: + southernmayahighlandsapple: name: Next Visit entities: - - sensor.calendarmessage - - sensor.calendarstarttime + - sensor.appleimac + - sensor.appleipod southernmayahighlandslanguage: name: Idioma @@ -779,20 +799,21 @@ group: - script.movebackward - script.movestop - techiemayalandssystemcalendar: + techiemayalandssystemapple: name: System Calendar entities: - - sensor.calendarmessage - - sensor.calendarstarttime + - sensor.appleimac + - sensor.appleipod + - calendar.hochobvcgmailcom techiemayalandssystemaudio: name: System Audio entities: - - input_slider.server_volume - - sensor.server_volume_read - - shell_command.server_volume_set - - automation.server_volume_change - - automation.server_volume_change_read + - input_slider.qualcomm + - sensor.qualcomm + - shell_command.qualcomm + - automation.services_sound_pulseaudio_change + - automation.services_sound_pulseaudio_read techiemayalandssystemhealth: name: System Health @@ -807,6 +828,11 @@ group: - sensor.disk_use_home #- camera.ffmpeg + techiemayalandssystemevent: + name: System Event + entities: + - automation.services_event_host + techiemayalandsinfrastructure: name: Infrastructure entities: @@ -825,4 +851,3 @@ group: name: Sandbox entities: - script.visitorsusb - - calendar.hochobvcgmailcom From aac78619f173805d843f8cdb344947702cccbcf7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 15:46:16 -0500 Subject: [PATCH 0830/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 9848e940..ee2b05ce 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -25,6 +25,10 @@ export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME -Robot.sh lupe/inicial 1 + + +Robot.sh lupe/armfold 1 +sleep 2 +Robot.sh lupe/armunfold 1 # End of File From 9c1482920ace6be1b74be0ffdbafeb15c30aa3de Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 15:56:49 -0500 Subject: [PATCH 0831/1653] Update WindRiver.sh --- .../Applications/TechieMayaLands/WindRiver.sh | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index ee2b05ce..3f0c2321 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -13,11 +13,32 @@ export WINDRIVER_NAME="WindRiver" export WINDRIVER_PATH=$(readlink -f "$0") export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") +LOCAL_GREETING_ENGLISH[0]="Hi There." +LOCAL_GREETING_ENGLISH[1]="Good morning." +LOCAL_GREETING_ENGLISH[2]="Hi Friend." +LOCAL_GREETING_ENGLISH[3]="Hey." +LOCAL_GREETING_ENGLISH[4]="Hello There." + +LOCAL_GREETING_SPANISH[0]="Hola." +LOCAL_GREETING_SPANISH[0]="Buenos dias." +LOCAL_GREETING_SPANISH[0]="Hola Cacerola." +LOCAL_GREETING_SPANISH[0]="Que onda." +LOCAL_GREETING_SPANISH[0]="Espera." + # ============================================================================= # Functions # ============================================================================= -# None +chooseGreeting() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 5 ] + if [ "$LANGUAGE" = "english" ]; then + LOCAL_GREETING=${LOCAL_GREETING_ENGLISH[$rand]} + else + LOCAL_GREETING=${LOCAL_GREETING_SPANISH[$rand]} + fi +} # ============================================================================= # Main @@ -25,7 +46,9 @@ export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME +LOCAL_MESSAGE=$LOCAL_GREETING +Robot.sh lupe/message $LOCAL_MESSAGE Robot.sh lupe/armfold 1 sleep 2 From bc9d2058a07b074ead04092c29fafcfd63cfbd60 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:00:37 -0500 Subject: [PATCH 0832/1653] Update WindRiver.sh --- .../Applications/TechieMayaLands/WindRiver.sh | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 3f0c2321..3bdbe61f 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -13,6 +13,9 @@ export WINDRIVER_NAME="WindRiver" export WINDRIVER_PATH=$(readlink -f "$0") export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") +LOCAL_LANGUAGE[0]="english" +LOCAL_LANGUAGE[1]="spanish" + LOCAL_GREETING_ENGLISH[0]="Hi There." LOCAL_GREETING_ENGLISH[1]="Good morning." LOCAL_GREETING_ENGLISH[2]="Hi Friend." @@ -20,15 +23,21 @@ LOCAL_GREETING_ENGLISH[3]="Hey." LOCAL_GREETING_ENGLISH[4]="Hello There." LOCAL_GREETING_SPANISH[0]="Hola." -LOCAL_GREETING_SPANISH[0]="Buenos dias." -LOCAL_GREETING_SPANISH[0]="Hola Cacerola." -LOCAL_GREETING_SPANISH[0]="Que onda." -LOCAL_GREETING_SPANISH[0]="Espera." +LOCAL_GREETING_SPANISH[1]="Buenos dias." +LOCAL_GREETING_SPANISH[2]="Hola Cacerola." +LOCAL_GREETING_SPANISH[3]="Que onda." +LOCAL_GREETING_SPANISH[4]="Espera." # ============================================================================= # Functions # ============================================================================= +chooseLanguage() +{ + rand=$[ $RANDOM % 2 ] + LOCAL_LANGUAGE=${LOCAL_LANGUAGE[$rand]} +} + chooseGreeting() { LANGUAGE=$1 @@ -46,6 +55,9 @@ chooseGreeting() LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME +chooseLanguage +chooseGreeting + LOCAL_MESSAGE=$LOCAL_GREETING Robot.sh lupe/message $LOCAL_MESSAGE From 5b5ef08df512aae6768a91f1b9c86552cf188e41 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:02:18 -0500 Subject: [PATCH 0833/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 3bdbe61f..7171dc9c 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -x From f380253052d40e288115d8c7ed924f2412e7a411 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:03:19 -0500 Subject: [PATCH 0834/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 7171dc9c..5654499a 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -60,7 +60,7 @@ chooseGreeting LOCAL_MESSAGE=$LOCAL_GREETING -Robot.sh lupe/message $LOCAL_MESSAGE +Robot.sh lupe/say $LOCAL_MESSAGE Robot.sh lupe/armfold 1 sleep 2 From 9658205fd0f0918e6fbd96b5d0f197708180596d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:04:23 -0500 Subject: [PATCH 0835/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 5654499a..b59f07b7 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -56,7 +56,7 @@ chooseGreeting() LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage -chooseGreeting +chooseGreeting $LOCAL_LANGUAGE LOCAL_MESSAGE=$LOCAL_GREETING From 077f5d6301c3ffa730c318c711a448db9db991f0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:05:39 -0500 Subject: [PATCH 0836/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index b59f07b7..d79517c0 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -61,6 +61,8 @@ chooseGreeting $LOCAL_LANGUAGE LOCAL_MESSAGE=$LOCAL_GREETING Robot.sh lupe/say $LOCAL_MESSAGE +Robot.sh lupe/decir \ + "Hola Mundo! Uno, Dos, Tres!" Robot.sh lupe/armfold 1 sleep 2 From 754fb4d6d6cc46e3b711cb798daa7b67e229cac0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:06:21 -0500 Subject: [PATCH 0837/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index d79517c0..d3a59d9e 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -60,7 +60,8 @@ chooseGreeting $LOCAL_LANGUAGE LOCAL_MESSAGE=$LOCAL_GREETING -Robot.sh lupe/say $LOCAL_MESSAGE +Robot.sh lupe/decir \ + $LOCAL_MESSAGE Robot.sh lupe/decir \ "Hola Mundo! Uno, Dos, Tres!" From 54bf65388fe9f5ab41e0edff4771edd58bc3f398 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:10:22 -0500 Subject: [PATCH 0838/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 45 ++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 99960502..98731ae0 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -10,23 +10,52 @@ set -x export HOST_PID=$$ +LOCAL_LANGUAGE="$1" + LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_GREETING_ENGLISH[0]="Hi There." +LOCAL_GREETING_ENGLISH[1]="Good morning." +LOCAL_GREETING_ENGLISH[2]="Hi Friend." +LOCAL_GREETING_ENGLISH[3]="Hey." +LOCAL_GREETING_ENGLISH[4]="Hello There." + +LOCAL_GREETING_SPANISH[0]="Hola." +LOCAL_GREETING_SPANISH[1]="Buenos dias." +LOCAL_GREETING_SPANISH[2]="Hola Cacerola." +LOCAL_GREETING_SPANISH[3]="Que onda." +LOCAL_GREETING_SPANISH[4]="Espera." + # ============================================================================= # Functions # ============================================================================= -# None +chooseGreeting() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 5 ] + if [ "$LANGUAGE" = "english" ]; then + LOCAL_GREETING=${LOCAL_GREETING_ENGLISH[$rand]} + else + LOCAL_GREETING=${LOCAL_GREETING_SPANISH[$rand]} + fi +} # ============================================================================= # Main # ============================================================================= -if [ $# -eq 0 ] -then - echo -else - echo "Invalid number of arguments, see Documentation" - exit 1 -fi +chooseGreeting $LOCAL_LANGUAGE + +LOCAL_MESSAGE=${LOCAL_GREETING} + +Robot.sh lupe/decir \ + ${LOCAL_MESSAGE} +Robot.sh lupe/decir \ + "Hola Mundo! Uno, Dos, Tres!" + +Robot.sh lupe/armfold 1 +sleep 2 +Robot.sh lupe/armunfold 1 + # End of File From 7c04810d0aa37977a66b13fdfdc4678a7705b6e1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:11:08 -0500 Subject: [PATCH 0839/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index ba6f7eb9..8148d6fa 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -31,6 +31,7 @@ export HOCHOB_SERVER_SERVICES_CAMERA=$HOCHOB_SERVER_SERVICES/Camera/ export HOCHOB_SERVER_SERVICES_CALENDAR=$HOCHOB_SERVER_SERVICES/Calendar/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS=$HOCHOB_SERVER_SERVICES/Communications/ export HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT=$HOCHOB_SERVER_SERVICES_COMMUNICATIONS/MqttClient/ +export HOCHOB_SERVER_SERVICES_EVENTS=$HOCHOB_SERVER_SERVICES/Events/ export HOCHOB_SERVER_SERVICES_IMAGE=$HOCHOB_SERVER_SERVICES/Image/ export HOCHOB_SERVER_SERVICES_KEYPAD=$HOCHOB_SERVER_SERVICES/Keypad/ export HOCHOB_SERVER_SERVICES_KILL=$HOCHOB_SERVER_SERVICES/Kill/ @@ -54,6 +55,7 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CAMERA export PATH=$PATH:$HOCHOB_SERVER_SERVICES_CALENDAR export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_COMMUNICATIONS_MQTTCLIENT +export PATH=$PATH:$HOCHOB_SERVER_SERVICES_EVENTS export PATH=$PATH:$HOCHOB_SERVER_SERVICES_IMAGE export PATH=$PATH:$HOCHOB_SERVER_SERVICES_KILL export PATH=$PATH:$HOCHOB_SERVER_SERVICES_KEYPAD From b7f8a3e346c6a369624605dbd3ffed81fcb736ae Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:13:15 -0500 Subject: [PATCH 0840/1653] Update WindRiver.sh --- .../Applications/TechieMayaLands/WindRiver.sh | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index d3a59d9e..783a8b8b 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -16,18 +16,6 @@ export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="spanish" -LOCAL_GREETING_ENGLISH[0]="Hi There." -LOCAL_GREETING_ENGLISH[1]="Good morning." -LOCAL_GREETING_ENGLISH[2]="Hi Friend." -LOCAL_GREETING_ENGLISH[3]="Hey." -LOCAL_GREETING_ENGLISH[4]="Hello There." - -LOCAL_GREETING_SPANISH[0]="Hola." -LOCAL_GREETING_SPANISH[1]="Buenos dias." -LOCAL_GREETING_SPANISH[2]="Hola Cacerola." -LOCAL_GREETING_SPANISH[3]="Que onda." -LOCAL_GREETING_SPANISH[4]="Espera." - # ============================================================================= # Functions # ============================================================================= @@ -38,17 +26,6 @@ chooseLanguage() LOCAL_LANGUAGE=${LOCAL_LANGUAGE[$rand]} } -chooseGreeting() -{ - LANGUAGE=$1 - rand=$[ $RANDOM % 5 ] - if [ "$LANGUAGE" = "english" ]; then - LOCAL_GREETING=${LOCAL_GREETING_ENGLISH[$rand]} - else - LOCAL_GREETING=${LOCAL_GREETING_SPANISH[$rand]} - fi -} - # ============================================================================= # Main # ============================================================================= @@ -56,17 +33,6 @@ chooseGreeting() LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage -chooseGreeting $LOCAL_LANGUAGE - -LOCAL_MESSAGE=$LOCAL_GREETING - -Robot.sh lupe/decir \ - $LOCAL_MESSAGE -Robot.sh lupe/decir \ - "Hola Mundo! Uno, Dos, Tres!" - -Robot.sh lupe/armfold 1 -sleep 2 -Robot.sh lupe/armunfold 1 +Host.sh $LOCAL_LANGUAGE # End of File From 9d9e1d05f5143260b4fb9fd2fde01c21f9623e0b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:15:27 -0500 Subject: [PATCH 0841/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 98731ae0..80bede19 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -50,7 +50,7 @@ chooseGreeting $LOCAL_LANGUAGE LOCAL_MESSAGE=${LOCAL_GREETING} Robot.sh lupe/decir \ - ${LOCAL_MESSAGE} + ${LOCAL_GREETING} Robot.sh lupe/decir \ "Hola Mundo! Uno, Dos, Tres!" From 5a309a8d11ab6fb452aff837cb40e35f44a0c959 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:16:06 -0500 Subject: [PATCH 0842/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 80bede19..f0164cef 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -x From 9cf0d74f84b1b21eea031e4a98c923e923ca9f65 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 21:21:10 +0000 Subject: [PATCH 0843/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Events/Host.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index f0164cef..8a9107c1 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -46,11 +46,13 @@ chooseGreeting() # ============================================================================= chooseGreeting $LOCAL_LANGUAGE +echo $LOCAL_GREETING -LOCAL_MESSAGE=${LOCAL_GREETING} +#LOCAL_MESSAGE=${LOCAL_GREETING} Robot.sh lupe/decir \ - ${LOCAL_GREETING} + "${LOCAL_GREETING}" +exit 0 Robot.sh lupe/decir \ "Hola Mundo! Uno, Dos, Tres!" From c13d6a2b11e48ba35f2a3956d7cb4cdc2273e1f7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:22:15 -0500 Subject: [PATCH 0844/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 8a9107c1..ce17e5cf 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -48,13 +48,10 @@ chooseGreeting() chooseGreeting $LOCAL_LANGUAGE echo $LOCAL_GREETING -#LOCAL_MESSAGE=${LOCAL_GREETING} +LOCAL_MESSAGE="${LOCAL_GREETING}" Robot.sh lupe/decir \ - "${LOCAL_GREETING}" -exit 0 -Robot.sh lupe/decir \ - "Hola Mundo! Uno, Dos, Tres!" + "${LOCAL_MESSAGE}" Robot.sh lupe/armfold 1 sleep 2 From aa0d21d4cd2066b98682c16408c4a446b5663ac5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:28:06 -0500 Subject: [PATCH 0845/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index ce17e5cf..954cc6ba 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -11,20 +11,19 @@ set -x export HOST_PID=$$ LOCAL_LANGUAGE="$1" +LOCAL_INSTITUTION_NAME="$2" -LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_GREETING_ENGLISH[0]="Hi There" +LOCAL_GREETING_ENGLISH[1]="Good morning" +LOCAL_GREETING_ENGLISH[2]="Hurray" +LOCAL_GREETING_ENGLISH[3]="Hey" +LOCAL_GREETING_ENGLISH[4]="Hello There" -LOCAL_GREETING_ENGLISH[0]="Hi There." -LOCAL_GREETING_ENGLISH[1]="Good morning." -LOCAL_GREETING_ENGLISH[2]="Hi Friend." -LOCAL_GREETING_ENGLISH[3]="Hey." -LOCAL_GREETING_ENGLISH[4]="Hello There." - -LOCAL_GREETING_SPANISH[0]="Hola." -LOCAL_GREETING_SPANISH[1]="Buenos dias." -LOCAL_GREETING_SPANISH[2]="Hola Cacerola." -LOCAL_GREETING_SPANISH[3]="Que onda." -LOCAL_GREETING_SPANISH[4]="Espera." +LOCAL_GREETING_SPANISH[0]="Hola" +LOCAL_GREETING_SPANISH[1]="Buenos dias" +LOCAL_GREETING_SPANISH[2]="Hola Cacerola" +LOCAL_GREETING_SPANISH[3]="Que onda" +LOCAL_GREETING_SPANISH[4]="Espera" # ============================================================================= # Functions @@ -48,7 +47,7 @@ chooseGreeting() chooseGreeting $LOCAL_LANGUAGE echo $LOCAL_GREETING -LOCAL_MESSAGE="${LOCAL_GREETING}" +LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}" Robot.sh lupe/decir \ "${LOCAL_MESSAGE}" From fbcf6bc082222de58cc3d1e7666b42923d6c44cb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:28:32 -0500 Subject: [PATCH 0846/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 783a8b8b..55731949 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -13,6 +13,8 @@ export WINDRIVER_NAME="WindRiver" export WINDRIVER_PATH=$(readlink -f "$0") export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") +LOCAL_INSTITUTION_NAME=`Name.sh` + LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="spanish" @@ -33,6 +35,6 @@ chooseLanguage() LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage -Host.sh $LOCAL_LANGUAGE +Host.sh $LOCAL_LANGUAGE $LOCAL_INSTITUTION_NAME # End of File From 3e376b59eb167d9a3b151e6a0c8a74008449b3b4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 21:39:18 +0000 Subject: [PATCH 0847/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 2 +- Hochob/Services/Calendar/GoogleCalendar.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 55731949..dd840ec6 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -35,6 +35,6 @@ chooseLanguage() LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage -Host.sh $LOCAL_LANGUAGE $LOCAL_INSTITUTION_NAME +Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" # End of File diff --git a/Hochob/Services/Calendar/GoogleCalendar.py b/Hochob/Services/Calendar/GoogleCalendar.py index 4a93bd34..2372f0f6 100755 --- a/Hochob/Services/Calendar/GoogleCalendar.py +++ b/Hochob/Services/Calendar/GoogleCalendar.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- from __future__ import print_function import httplib2 @@ -73,7 +75,8 @@ def main(): """ print('No upcoming events found.')""" for event in events: start = event['start'].get('dateTime', event['start'].get('date')) - print(event['summary']) + name = event['summary'].encode('utf-8') + print(name) #titulo=" Bienvenidos \n"+event['summary'] #instruccion="convert -pointsize 90 -fill white -draw \'text 50,100 \" "+str(titulo)+" \" \' intel.jpg intel2.jpg" #os.system(instruccion) From 573be0abff0145f07bcea6ce0dac18629d403341 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:49:54 -0500 Subject: [PATCH 0848/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 53 +++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 954cc6ba..2b01f4f9 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -12,18 +12,33 @@ export HOST_PID=$$ LOCAL_LANGUAGE="$1" LOCAL_INSTITUTION_NAME="$2" +LOCAL_EVENT_NAME="$3" -LOCAL_GREETING_ENGLISH[0]="Hi There" -LOCAL_GREETING_ENGLISH[1]="Good morning" -LOCAL_GREETING_ENGLISH[2]="Hurray" -LOCAL_GREETING_ENGLISH[3]="Hey" -LOCAL_GREETING_ENGLISH[4]="Hello There" +LOCAL_GREETING_ENGLISH[0]="Hi There," +LOCAL_GREETING_ENGLISH[1]="Good morning," +LOCAL_GREETING_ENGLISH[2]="Hurray," +LOCAL_GREETING_ENGLISH[3]="Hey," +LOCAL_GREETING_ENGLISH[4]="Hello There," +LOCAL_GREETING_ENGLISH[5]="One minute please, " -LOCAL_GREETING_SPANISH[0]="Hola" -LOCAL_GREETING_SPANISH[1]="Buenos dias" -LOCAL_GREETING_SPANISH[2]="Hola Cacerola" -LOCAL_GREETING_SPANISH[3]="Que onda" -LOCAL_GREETING_SPANISH[4]="Espera" +LOCAL_GREETING_SPANISH[0]="Hola," +LOCAL_GREETING_SPANISH[1]="Buenos dias," +LOCAL_GREETING_SPANISH[2]="Hola Cacerola," +LOCAL_GREETING_SPANISH[3]="Que onda," +LOCAL_GREETING_SPANISH[4]="Espera," +LOCAL_GREETING_SPANISH[5]="Un minuto por favor," + +LOCAL_REMINDER_ENGLISH[0]="Remember we have today our" +LOCAL_REMINDER_ENGLISH[1]="Do not forget about" +LOCAL_REMINDER_ENGLISH[2]="Today is the day!," +LOCAL_REMINDER_ENGLISH[3]="It if finally here!," +LOCAL_REMINDER_ENGLISH[4]="The big day has just arrived!," + +LOCAL_REMINDER_SPANISH[0]="No olvides nuestro evento," +LOCAL_REMINDER_SPANISH[1]="Recuerda hoy es dia de" +LOCAL_REMINDER_SPANISH[2]="Hoy es el gran dia!," +LOCAL_REMINDER_SPANISH[3]="Finalmente con nosotros!," +LOCAL_REMINDER_SPANISH[4]="No se diga mas, el gran evento," # ============================================================================= # Functions @@ -32,7 +47,7 @@ LOCAL_GREETING_SPANISH[4]="Espera" chooseGreeting() { LANGUAGE=$1 - rand=$[ $RANDOM % 5 ] + rand=$[ $RANDOM % 6 ] if [ "$LANGUAGE" = "english" ]; then LOCAL_GREETING=${LOCAL_GREETING_ENGLISH[$rand]} else @@ -40,14 +55,26 @@ chooseGreeting() fi } +chooseReminder() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 5 ] + if [ "$LANGUAGE" = "english" ]; then + LOCAL_REMINDER=${LOCAL_REMINDER_ENGLISH[$rand]} + else + LOCAL_REMINDER=${LOCAL_REMINDER_SPANISH[$rand]} + fi +} + # ============================================================================= # Main # ============================================================================= chooseGreeting $LOCAL_LANGUAGE -echo $LOCAL_GREETING +chooseReminder $LOCAL_LANGUAGE -LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}" +LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ + ${LOCAL_GREETING} ${LOCAL_EVENT_NAME}" Robot.sh lupe/decir \ "${LOCAL_MESSAGE}" From 7cfa81704da685c6310045569e07c8373919e3ad Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:50:37 -0500 Subject: [PATCH 0849/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index dd840ec6..c60655f8 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -14,6 +14,7 @@ export WINDRIVER_PATH=$(readlink -f "$0") export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_EVENT_NAME="Innovation Week 2017" LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="spanish" @@ -35,6 +36,6 @@ chooseLanguage() LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage -Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" +Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME}" # End of File From dbe3ebfc7bb343128f1a6f336c1131b7a8530248 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:51:15 -0500 Subject: [PATCH 0850/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 2b01f4f9..e8f1a641 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -74,7 +74,7 @@ chooseGreeting $LOCAL_LANGUAGE chooseReminder $LOCAL_LANGUAGE LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ - ${LOCAL_GREETING} ${LOCAL_EVENT_NAME}" + ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}" Robot.sh lupe/decir \ "${LOCAL_MESSAGE}" From ad76aaff809358ba4dfb3eecebfe6ef9e6feb075 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 16:56:30 -0500 Subject: [PATCH 0851/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index e8f1a641..ff0bcc86 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -76,11 +76,10 @@ chooseReminder $LOCAL_LANGUAGE LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}" -Robot.sh lupe/decir \ - "${LOCAL_MESSAGE}" - -Robot.sh lupe/armfold 1 -sleep 2 -Robot.sh lupe/armunfold 1 +if [ "$LANGUAGE" = "english" ]; then + Robot.sh lupe/say "${LOCAL_MESSAGE}" +else + Robot.sh lupe/decir "${LOCAL_MESSAGE}" +fi # End of File From 5ace606580a18996618f64dff21076ea2e89318d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:06:27 -0500 Subject: [PATCH 0852/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 42 ++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index ff0bcc86..263afb7b 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -17,28 +17,36 @@ LOCAL_EVENT_NAME="$3" LOCAL_GREETING_ENGLISH[0]="Hi There," LOCAL_GREETING_ENGLISH[1]="Good morning," LOCAL_GREETING_ENGLISH[2]="Hurray," -LOCAL_GREETING_ENGLISH[3]="Hey," -LOCAL_GREETING_ENGLISH[4]="Hello There," -LOCAL_GREETING_ENGLISH[5]="One minute please, " +LOCAL_GREETING_ENGLISH[3]="Wait," +LOCAL_GREETING_ENGLISH[4]="Hey," +LOCAL_GREETING_ENGLISH[5]="Hello There," +LOCAL_GREETING_ENGLISH[6]="One minute please, " +LOCAL_GREETING_ENGLISH[7]="What's up, " -LOCAL_GREETING_SPANISH[0]="Hola," +LOCAL_GREETING_SPANISH[0]="Hola Hola," LOCAL_GREETING_SPANISH[1]="Buenos dias," LOCAL_GREETING_SPANISH[2]="Hola Cacerola," -LOCAL_GREETING_SPANISH[3]="Que onda," -LOCAL_GREETING_SPANISH[4]="Espera," -LOCAL_GREETING_SPANISH[5]="Un minuto por favor," +LOCAL_GREETING_SPANISH[3]="Espera," +LOCAL_GREETING_SPANISH[4]="Hey," +LOCAL_GREETING_SPANISH[5]="Hola hola," +LOCAL_GREETING_SPANISH[6]="Un minuto por favor," +LOCAL_GREETING_SPANISH[7]="Que onda," LOCAL_REMINDER_ENGLISH[0]="Remember we have today our" LOCAL_REMINDER_ENGLISH[1]="Do not forget about" -LOCAL_REMINDER_ENGLISH[2]="Today is the day!," -LOCAL_REMINDER_ENGLISH[3]="It if finally here!," -LOCAL_REMINDER_ENGLISH[4]="The big day has just arrived!," - -LOCAL_REMINDER_SPANISH[0]="No olvides nuestro evento," -LOCAL_REMINDER_SPANISH[1]="Recuerda hoy es dia de" +LOCAL_REMINDER_ENGLISH[2]="Today is the big day!," +LOCAL_REMINDER_ENGLISH[3]="It is finally here!," +LOCAL_REMINDER_ENGLISH[4]="Finally with us!," +LOCAL_REMINDER_ENGLISH[5]="The big day has just arrived!," +LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, the great event," + +LOCAL_REMINDER_SPANISH[0]="Recuerda hoy tenemos nuestro evento," +LOCAL_REMINDER_SPANISH[1]="No olvides acerca de" LOCAL_REMINDER_SPANISH[2]="Hoy es el gran dia!," -LOCAL_REMINDER_SPANISH[3]="Finalmente con nosotros!," -LOCAL_REMINDER_SPANISH[4]="No se diga mas, el gran evento," +LOCAL_REMINDER_SPANISH[3]="Finalmente aqui!," +LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros!," +LOCAL_REMINDER_SPANISH[5]="El gran dia ha llegado!," +LOCAL_REMINDER_SPANISH[6]="No se diga mas, el gran evento," # ============================================================================= # Functions @@ -47,7 +55,7 @@ LOCAL_REMINDER_SPANISH[4]="No se diga mas, el gran evento," chooseGreeting() { LANGUAGE=$1 - rand=$[ $RANDOM % 6 ] + rand=$[ $RANDOM % 7 ] if [ "$LANGUAGE" = "english" ]; then LOCAL_GREETING=${LOCAL_GREETING_ENGLISH[$rand]} else @@ -58,7 +66,7 @@ chooseGreeting() chooseReminder() { LANGUAGE=$1 - rand=$[ $RANDOM % 5 ] + rand=$[ $RANDOM % 6 ] if [ "$LANGUAGE" = "english" ]; then LOCAL_REMINDER=${LOCAL_REMINDER_ENGLISH[$rand]} else From df11ee282ddd99069581326ba27a77a20104e6e9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:11:57 -0500 Subject: [PATCH 0853/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 263afb7b..02cf9fe5 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -48,6 +48,10 @@ LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros!," LOCAL_REMINDER_SPANISH[5]="El gran dia ha llegado!," LOCAL_REMINDER_SPANISH[6]="No se diga mas, el gran evento," +LOCAL_CLOSURE_ENGLISH="Check you email for more information." +LOCAL_CLOSURE_SPANSIH="Verifica tu correo electronico para mas informacion." + + # ============================================================================= # Functions # ============================================================================= @@ -74,15 +78,27 @@ chooseReminder() fi } +chooseClosure() +{ + LANGUAGE=$1 + if [ "$LANGUAGE" = "english" ]; then + LOCAL_CLOSURE=${LOCAL_CLOSURE_ENGLISH} + else + LOCAL_CLOSURE=${LOCAL_CLOSURE_SPANISH} + fi +} + # ============================================================================= # Main # ============================================================================= chooseGreeting $LOCAL_LANGUAGE chooseReminder $LOCAL_LANGUAGE +chooseClosure $LOCAL_LANGUAGE LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ - ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}" + ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}. \ + ${LOCAL_CLOSURE}" if [ "$LANGUAGE" = "english" ]; then Robot.sh lupe/say "${LOCAL_MESSAGE}" From 3b72fc46a47e8964a836ea6f00e8f14f9d1bef70 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:13:56 -0500 Subject: [PATCH 0854/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 02cf9fe5..fd3587d3 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -49,8 +49,7 @@ LOCAL_REMINDER_SPANISH[5]="El gran dia ha llegado!," LOCAL_REMINDER_SPANISH[6]="No se diga mas, el gran evento," LOCAL_CLOSURE_ENGLISH="Check you email for more information." -LOCAL_CLOSURE_SPANSIH="Verifica tu correo electronico para mas informacion." - +LOCAL_CLOSURE_SPANISH="Verifica tu correo electronico para mas informacion." # ============================================================================= # Functions @@ -81,6 +80,8 @@ chooseReminder() chooseClosure() { LANGUAGE=$1 + rand=$[ $RANDOM % 2 ] + echo $rand if [ "$LANGUAGE" = "english" ]; then LOCAL_CLOSURE=${LOCAL_CLOSURE_ENGLISH} else @@ -96,6 +97,8 @@ chooseGreeting $LOCAL_LANGUAGE chooseReminder $LOCAL_LANGUAGE chooseClosure $LOCAL_LANGUAGE +exit 0 + LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}. \ ${LOCAL_CLOSURE}" From b119373246e80cedcf33290b9f27031d2c00c267 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:15:15 -0500 Subject: [PATCH 0855/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index fd3587d3..47487b6d 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -80,12 +80,14 @@ chooseReminder() chooseClosure() { LANGUAGE=$1 - rand=$[ $RANDOM % 2 ] + rand=$[ $RANDOM % 3 ] echo $rand - if [ "$LANGUAGE" = "english" ]; then - LOCAL_CLOSURE=${LOCAL_CLOSURE_ENGLISH} - else - LOCAL_CLOSURE=${LOCAL_CLOSURE_SPANISH} + if [ "$rand" = "1" ]; then + if [ "$LANGUAGE" = "english" ]; then + LOCAL_CLOSURE=${LOCAL_CLOSURE_ENGLISH} + else + LOCAL_CLOSURE=${LOCAL_CLOSURE_SPANISH} + fi fi } From 623f3412876db76fc19e9768640beddd115b6d13 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:16:05 -0500 Subject: [PATCH 0856/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 47487b6d..f2e3923e 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -99,8 +99,6 @@ chooseGreeting $LOCAL_LANGUAGE chooseReminder $LOCAL_LANGUAGE chooseClosure $LOCAL_LANGUAGE -exit 0 - LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}. \ ${LOCAL_CLOSURE}" From 1df4c616c7e67506148a7b2f88cd1accc39d6764 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:19:23 -0500 Subject: [PATCH 0857/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index f2e3923e..5173afcd 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -42,14 +42,14 @@ LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, the great event," LOCAL_REMINDER_SPANISH[0]="Recuerda hoy tenemos nuestro evento," LOCAL_REMINDER_SPANISH[1]="No olvides acerca de" -LOCAL_REMINDER_SPANISH[2]="Hoy es el gran dia!," -LOCAL_REMINDER_SPANISH[3]="Finalmente aqui!," +LOCAL_REMINDER_SPANISH[2]="Hoy es el gran día!," +LOCAL_REMINDER_SPANISH[3]="Finalmente aquí!," LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros!," -LOCAL_REMINDER_SPANISH[5]="El gran dia ha llegado!," +LOCAL_REMINDER_SPANISH[5]="El gran día ha llegado!," LOCAL_REMINDER_SPANISH[6]="No se diga mas, el gran evento," LOCAL_CLOSURE_ENGLISH="Check you email for more information." -LOCAL_CLOSURE_SPANISH="Verifica tu correo electronico para mas informacion." +LOCAL_CLOSURE_SPANISH="Verifica tu correo electrónico para mas información." # ============================================================================= # Functions From ff30119d37eb60460dd2dc6325ec67129643fd07 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 22:25:49 +0000 Subject: [PATCH 0858/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/TechieMayaLands/Apple.sh | 56 ++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100755 Hochob/Applications/TechieMayaLands/Apple.sh diff --git a/Hochob/Applications/TechieMayaLands/Apple.sh b/Hochob/Applications/TechieMayaLands/Apple.sh new file mode 100755 index 00000000..b7421a0e --- /dev/null +++ b/Hochob/Applications/TechieMayaLands/Apple.sh @@ -0,0 +1,56 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export TOYOTA_PID=$$ +export TOYOTA_NAME="Zacatecas" +export TOYOTA_PATH=$(readlink -f "$0") +export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $TOYOTA_PID $TOYOTA_NAME + +SpeechSynthetizer.sh on espeak spanish \ + "Hola Mundo! Uno, Dos, Tres, Probando!" + +Stream.sh "Triki" "1.0" "$SPEECH_MP3" +echo $? + +Robot.sh lupe/inicial 1 +Robot.sh lupe/emocion 1 +Robot.sh lupe/porsupuesto 1 +Robot.sh lupe/cerebro 1 +Robot.sh lupe/inteledison 1 + +Stream.sh "Tran" "1.0" "$SPEECH_MP3" +echo $? +Stream.sh "Juum" "1.0" "$SPEECH_MP3" +echo $? +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +echo $? + +Memories.sh "5" "on" "${ZACATECAS_NAME}" & +sleep 2 +ConvertText.sh "$FSWEBCAM_IMAGE" "System Health" +wait +Eog.sh "$FSWEBCAM_IMAGE" & +sleep 2 + +KillApp.sh "eog" + +# End of File From 43e51eda0e5ca89c087a4c28f02c0f39884ffd50 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:32:09 -0500 Subject: [PATCH 0859/1653] Update Apple.sh --- Hochob/Applications/TechieMayaLands/Apple.sh | 58 +++++++++----------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/Apple.sh b/Hochob/Applications/TechieMayaLands/Apple.sh index b7421a0e..1c4a5bfb 100755 --- a/Hochob/Applications/TechieMayaLands/Apple.sh +++ b/Hochob/Applications/TechieMayaLands/Apple.sh @@ -8,49 +8,45 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export TOYOTA_PID=$$ -export TOYOTA_NAME="Zacatecas" -export TOYOTA_PATH=$(readlink -f "$0") -export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") +export APPLE_PID=$$ +export APPLE_NAME="Zacatecas" +export APPLE_PATH=$(readlink -f "$0") +export APPLE_DIRECTORY=$(dirname "$APPLE_PATH") + +LOCAL_INSTITUTION_NAME=`Name.sh` + +LOCAL_LANGUAGE[0]="english" +LOCAL_LANGUAGE[1]="spanish" # ============================================================================= # Functions # ============================================================================= -# None +chooseLanguage() +{ + rand=$[ $RANDOM % 2 ] + LOCAL_LANGUAGE=${LOCAL_LANGUAGE[$rand]} +} # ============================================================================= # Main # ============================================================================= -LogPid.sh $TOYOTA_PID $TOYOTA_NAME - -SpeechSynthetizer.sh on espeak spanish \ - "Hola Mundo! Uno, Dos, Tres, Probando!" - -Stream.sh "Triki" "1.0" "$SPEECH_MP3" -echo $? - -Robot.sh lupe/inicial 1 -Robot.sh lupe/emocion 1 -Robot.sh lupe/porsupuesto 1 -Robot.sh lupe/cerebro 1 -Robot.sh lupe/inteledison 1 +LogPid.sh $APPLE_PID $APPLE_NAME -Stream.sh "Tran" "1.0" "$SPEECH_MP3" -echo $? -Stream.sh "Juum" "1.0" "$SPEECH_MP3" -echo $? -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" -echo $? +chooseLanguage -Memories.sh "5" "on" "${ZACATECAS_NAME}" & -sleep 2 -ConvertText.sh "$FSWEBCAM_IMAGE" "System Health" -wait -Eog.sh "$FSWEBCAM_IMAGE" & -sleep 2 +if [ "$LANGUAGE" = "english" ]; then + SpeechSynthetizer.sh on voicerss english \ + "Next Visit, ${LOCAL_INSTITUTION_NAME}" +else + SpeechSynthetizer.sh on voicerss spanish \ + "Proxima Visita, ${LOCAL_INSTITUTION_NAME}" +fi -KillApp.sh "eog" +#Stream.sh "Triki" "1.0" "$SPEECH_MP3" +#Stream.sh "Tran" "1.0" "$SPEECH_MP3" +#Stream.sh "Juum" "1.0" "$SPEECH_MP3" +#Stream.sh "Eek'" "1.0" "$SPEECH_MP3" # End of File From b5a14d795034b14af68fb1b272000ed06b0f804c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:40:24 -0500 Subject: [PATCH 0860/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 760071c7..6ea8257f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -544,6 +544,7 @@ shell_command: # Techie Maya Lands + apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & qualcomm: amixer sset Master '{{ volume_level }}%' toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & @@ -616,12 +617,19 @@ automation: initial_state: 'off' trigger: platform: time - #minutes: '/5' - #seconds: 00 - seconds: '/5' + seconds: '/30' action: - service: shell_command.windriver + - alias: Services Calendar Name + initial_state: 'off' + trigger: + platform: time + minutes: '/30' + seconds: 00 + action: + - service: shell_command.apple + group: default_view: @@ -805,6 +813,7 @@ group: - sensor.appleimac - sensor.appleipod - calendar.hochobvcgmailcom + - automation.services_calendar_name techiemayalandssystemaudio: name: System Audio From 938a752c2e475d33d759f14a868b3e9866ac42bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:50:13 -0500 Subject: [PATCH 0861/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 6ea8257f..5deb775f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -275,6 +275,11 @@ input_slider: sensor: + - platform: command_line + name: Bosch + command: fortune + scan_interval: 600 + - platform: command_line name: Qualcomm command: amixer sget Master | grep -Eo '\[(\w+)\%\]' | grep -Eo '\w+' @@ -282,7 +287,7 @@ sensor: value_template: '{{ value | int }}' - platform: systemmonitor - name: System Monitor + name: Toyota resources: - type: processor_use - type: memory_free @@ -860,3 +865,4 @@ group: name: Sandbox entities: - script.visitorsusb + - sensor.bosch From 8e84d77a3baaa18ed3a5b04231abe98fa3591bbc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:53:11 -0500 Subject: [PATCH 0862/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 5deb775f..f504383e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -190,6 +190,10 @@ homeassistant: # Techie Maya Lands + sensor.bosch: + friendly_name: Cita + icon: mdi:approval + input_slider.qualcomm: friendly_name: Server Volume Set % icon: mdi:approval From 74659ffc32d3ca5bbfdaa226ba6150b5363410a8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 17:56:08 -0500 Subject: [PATCH 0863/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f504383e..debf3967 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -282,7 +282,7 @@ sensor: - platform: command_line name: Bosch command: fortune - scan_interval: 600 + scan_interval: 300 - platform: command_line name: Qualcomm From f45a17734dabb573a0324bae6f779a18bb5635e1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 23:04:42 +0000 Subject: [PATCH 0864/1653] Update Signed-off-by: Abraham Arce --- .../SouthernMayaHighlands/Jalisco.sh | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 Hochob/Applications/SouthernMayaHighlands/Jalisco.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh b/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh new file mode 100755 index 00000000..c1ec452f --- /dev/null +++ b/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export HIDALGO_PID=$$ +export HIDALGO_NAME="Hidalgo" +export HIDALGO_PATH=$(readlink -f "$0") +export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $HIDALGO_PID $HIDALGO_NAME + +Eog.sh "$VISITORSCENTER_IMAGE/*" & + +# End of File From 6d8875d5e0d45957d23d5f64f3e989eae0f563ce Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:06:53 -0500 Subject: [PATCH 0865/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index debf3967..954f1d0e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -51,6 +51,12 @@ homeassistant: friendly_name: Video Showcase icon: mdi:camera + # Southern Maya Highlands : Intel Guadalajara + + switch.jalisco: + friendly_name: Image Showcase + icon: mdi:camera + # Southern Maya Highlands : Visitors Center switch.hidalgo: @@ -584,6 +590,12 @@ switch: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" + # Southern Maya Highlands: Intel Guadalajara + + jalisco: + command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + # Southern Maya Highlands: Visitors Center hidalgo: @@ -729,6 +741,11 @@ group: - switch.guanajuato - switch.guerrero + southernmayahighlandsintelguadalajara: + name: Intel Guadalajara + entities: + - switch.jalisco + southernmayahighlandsvisitorscenter: name: Visitors Center entities: From ef8ef2dcdc04a4f2d63de09140574607884369f4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:08:15 -0500 Subject: [PATCH 0866/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 954f1d0e..120ca3e8 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -663,6 +663,7 @@ group: - group.southernmayahighlandsrobot - group.southernmayahighlandstour - group.southernmayahighlandscorporate + - group.southernmayahighlandsintelguadalajara - group.southernmayahighlandsvisitorscenter - group.southernmayahighlandsmemories #- group.southernmayahighlandssandbox From 5e34bceafe492d8ff028e32f579f960de9737588 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:18:00 -0500 Subject: [PATCH 0867/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 120ca3e8..cc151d7a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -46,32 +46,38 @@ homeassistant: switch.guanajuato: friendly_name: Image Showcase - icon: mdi:camera + icon: mdi:folder-multiple-image switch.guerrero: friendly_name: Video Showcase - icon: mdi:camera + icon: mdi:file-video # Southern Maya Highlands : Intel Guadalajara switch.jalisco: friendly_name: Image Showcase - icon: mdi:camera + icon: mdi:folder-multiple-image # Southern Maya Highlands : Visitors Center switch.hidalgo: friendly_name: Image Showcase - icon: mdi:camera + icon: mdi:folder-multiple-image # Southern Maya Highlands : Memories switch.queretaro: friendly_name: Image Showcase - icon: mdi:camera + icon: mdi:folder-multiple-image switch.quintanaroo: friendly_name: Video Showcase + icon: mdi:file-video + + # Southern Maya Highlands : Camera + + switch.yucatan: + friendly_name: Camera Preview icon: mdi:camera - + # Southern Maya Highlands : Sandbox script.zacatecas: @@ -611,6 +617,12 @@ switch: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" + # Southern Maya Highlands: Camera + + yucatan: + command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0 &" + command_off: "pkill -9 vlc" + automation: - alias: Services Sound PulseAudio Change @@ -666,6 +678,7 @@ group: - group.southernmayahighlandsintelguadalajara - group.southernmayahighlandsvisitorscenter - group.southernmayahighlandsmemories + - gropu.southernmayahighlandscamera #- group.southernmayahighlandssandbox robotmayalands: @@ -758,6 +771,11 @@ group: - switch.queretaro - switch.quintanaroo + southernmayahighlandscamera: + name: Camera + entities: + - switch.yucatan + southernmayahighlandssandbox: name: Sandbox entities: From ce2c8ab9271d069554693b5b34f4d4c553a741d0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:18:43 -0500 Subject: [PATCH 0868/1653] Update Jalisco.sh --- Hochob/Applications/SouthernMayaHighlands/Jalisco.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh b/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh index c1ec452f..63ca4271 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HIDALGO_PID=$$ -export HIDALGO_NAME="Hidalgo" -export HIDALGO_PATH=$(readlink -f "$0") -export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") +export JALISCO_PID=$$ +export JALISCO_NAME="Hidalgo" +export JALISCO_PATH=$(readlink -f "$0") +export JALISCO_DIRECTORY=$(dirname "$HIDALGO_PATH") # ============================================================================= # Functions @@ -23,7 +23,7 @@ export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") # Main # ============================================================================= -LogPid.sh $HIDALGO_PID $HIDALGO_NAME +LogPid.sh $JALISCO_PID $JALISCO_NAME Eog.sh "$VISITORSCENTER_IMAGE/*" & From 7b13fa73afd8205eaf0aa9a5b42c068ad90088f9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:20:56 -0500 Subject: [PATCH 0869/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index cc151d7a..7c448c75 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -203,7 +203,7 @@ homeassistant: # Techie Maya Lands sensor.bosch: - friendly_name: Cita + friendly_name: Quote icon: mdi:approval input_slider.qualcomm: @@ -678,7 +678,7 @@ group: - group.southernmayahighlandsintelguadalajara - group.southernmayahighlandsvisitorscenter - group.southernmayahighlandsmemories - - gropu.southernmayahighlandscamera + - group.southernmayahighlandscamera #- group.southernmayahighlandssandbox robotmayalands: From c7cc682f9c4a07318ef35553e972ec8ee69456bb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:22:24 -0500 Subject: [PATCH 0870/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 7c448c75..55410627 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -750,29 +750,29 @@ group: - script.campeche southernmayahighlandscorporate: - name: Corporate + name: Media Corporate entities: - switch.guanajuato - switch.guerrero southernmayahighlandsintelguadalajara: - name: Intel Guadalajara + name: Media Intel Guadalajara entities: - switch.jalisco southernmayahighlandsvisitorscenter: - name: Visitors Center + name: Media Visitors Center entities: - switch.hidalgo southernmayahighlandsmemories: - name: Memories + name: Media Memories entities: - switch.queretaro - switch.quintanaroo southernmayahighlandscamera: - name: Camera + name: Media Camera entities: - switch.yucatan From 1f3f450e49f692f64c8d3b1d0cfb9cb68e5debda Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:25:21 -0500 Subject: [PATCH 0871/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 55410627..f2f17703 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -674,11 +674,6 @@ group: - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot - group.southernmayahighlandstour - - group.southernmayahighlandscorporate - - group.southernmayahighlandsintelguadalajara - - group.southernmayahighlandsvisitorscenter - - group.southernmayahighlandsmemories - - group.southernmayahighlandscamera #- group.southernmayahighlandssandbox robotmayalands: @@ -720,6 +715,16 @@ group: - group.techiemayalandsinfrastructure - group.techiemayalandssandbox + mediamayalands: + view: yes + name: The Media + entities: + - group.southernmayahighlandscorporate + - group.southernmayahighlandsintelguadalajara + - group.southernmayahighlandsvisitorscenter + - group.southernmayahighlandsmemories + - group.southernmayahighlandscamera + southernmayahighlandsapple: name: Next Visit entities: From 6faf295925f80dc8558213af2e5c04341bebe89c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:29:43 -0500 Subject: [PATCH 0872/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f2f17703..3f619ab3 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -707,9 +707,9 @@ group: view: yes name: The Techie entities: + - group.techiemayalandssystemhealth - group.techiemayalandssystemapple - group.techiemayalandssystemaudio - - group.techiemayalandssystemhealth - group.techiemayalandssystemmonitor - group.techiemayalandssystemevent - group.techiemayalandsinfrastructure From 74024cc7e0e13874059a3ad8a613ceb3f7bb8311 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:30:50 -0500 Subject: [PATCH 0873/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 3f619ab3..e54003ef 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -857,6 +857,11 @@ group: - script.movebackward - script.movestop + techiemayalandssystemhealth: + name: System Health + entities: + - script.toyota + techiemayalandssystemapple: name: System Calendar entities: @@ -874,11 +879,6 @@ group: - automation.services_sound_pulseaudio_change - automation.services_sound_pulseaudio_read - techiemayalandssystemhealth: - name: System Health - entities: - - script.toyota - techiemayalandssystemmonitor: name: System Monitor entities: From 6008c48ba4dfe9486dcd9a2f1799c179ed4044f0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:33:08 -0500 Subject: [PATCH 0874/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 5173afcd..4f60e477 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -48,7 +48,7 @@ LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros!," LOCAL_REMINDER_SPANISH[5]="El gran día ha llegado!," LOCAL_REMINDER_SPANISH[6]="No se diga mas, el gran evento," -LOCAL_CLOSURE_ENGLISH="Check you email for more information." +LOCAL_CLOSURE_ENGLISH="Check your email for more information." LOCAL_CLOSURE_SPANISH="Verifica tu correo electrónico para mas información." # ============================================================================= From 38244832f162b418466ae89f4905150ed95c073b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:35:19 -0500 Subject: [PATCH 0875/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index c60655f8..3fa19687 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -14,7 +14,8 @@ export WINDRIVER_PATH=$(readlink -f "$0") export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") LOCAL_INSTITUTION_NAME=`Name.sh` -LOCAL_EVENT_NAME="Innovation Week 2017" +LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" +LOCAL_EVENT_NAME_SPANISH="Semana de Innovacion 2017" LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="spanish" @@ -36,6 +37,11 @@ chooseLanguage() LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage -Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME}" + +if [ "$LANGUAGE" = "english" ]; then + Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" +else + Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" +fi # End of File From 570f549b5f5b47442aae35e46ab4cff403a7574a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:37:20 -0500 Subject: [PATCH 0876/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 3fa19687..a90e30bb 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -38,7 +38,7 @@ LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage -if [ "$LANGUAGE" = "english" ]; then +if [ "$LOCAL_LANGUAGE" = "english" ]; then Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" else Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" From 067e3f6dd041fe0ade9c669c2a81704ea86cd375 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:38:29 -0500 Subject: [PATCH 0877/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index a90e30bb..19da30c5 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -15,7 +15,7 @@ export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" -LOCAL_EVENT_NAME_SPANISH="Semana de Innovacion 2017" +LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="spanish" From bd135c7fe0843c07c72ba2a758e9f69c8550d255 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:41:07 -0500 Subject: [PATCH 0878/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index e54003ef..d3c8d067 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -755,29 +755,29 @@ group: - script.campeche southernmayahighlandscorporate: - name: Media Corporate + name: Corporate entities: - switch.guanajuato - switch.guerrero southernmayahighlandsintelguadalajara: - name: Media Intel Guadalajara + name: Intel Guadalajara entities: - switch.jalisco southernmayahighlandsvisitorscenter: - name: Media Visitors Center + name: Visitors Center entities: - switch.hidalgo southernmayahighlandsmemories: - name: Media Memories + name: Memories entities: - switch.queretaro - switch.quintanaroo southernmayahighlandscamera: - name: Media Camera + name: Camera entities: - switch.yucatan From 0447044701fbea732a39190c91a0a8a00b1555ca Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:44:42 -0500 Subject: [PATCH 0879/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d3c8d067..4b6e20c2 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -208,11 +208,11 @@ homeassistant: input_slider.qualcomm: friendly_name: Server Volume Set % - icon: mdi:approval + icon: mdi:volume-high sensor.qualcomm: friendly_name: Server Volume % - icon: mdi:approval + icon: mdi:volume-high script.toyota: friendly_name: System Health From 7cb5dc71029abf165db97f5c230ff28eb825dc65 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 23:49:29 +0000 Subject: [PATCH 0880/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/RobotMayaLands/Sphero.sh | 47 ++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100755 Hochob/Applications/RobotMayaLands/Sphero.sh diff --git a/Hochob/Applications/RobotMayaLands/Sphero.sh b/Hochob/Applications/RobotMayaLands/Sphero.sh new file mode 100755 index 00000000..19da30c5 --- /dev/null +++ b/Hochob/Applications/RobotMayaLands/Sphero.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export WINDRIVER_PID=$$ +export WINDRIVER_NAME="WindRiver" +export WINDRIVER_PATH=$(readlink -f "$0") +export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") + +LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" +LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" + +LOCAL_LANGUAGE[0]="english" +LOCAL_LANGUAGE[1]="spanish" + +# ============================================================================= +# Functions +# ============================================================================= + +chooseLanguage() +{ + rand=$[ $RANDOM % 2 ] + LOCAL_LANGUAGE=${LOCAL_LANGUAGE[$rand]} +} + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME + +chooseLanguage + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" +else + Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" +fi + +# End of File From f98a7626bbfbca3e010eb0fd300af4c23ff41f0d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:51:45 -0500 Subject: [PATCH 0881/1653] Update Sphero.sh --- Hochob/Applications/RobotMayaLands/Sphero.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Sphero.sh b/Hochob/Applications/RobotMayaLands/Sphero.sh index 19da30c5..3c219270 100755 --- a/Hochob/Applications/RobotMayaLands/Sphero.sh +++ b/Hochob/Applications/RobotMayaLands/Sphero.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export WINDRIVER_PID=$$ -export WINDRIVER_NAME="WindRiver" -export WINDRIVER_PATH=$(readlink -f "$0") -export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") +export SPHERO_PID=$$ +export SPHERO_NAME="WindRiver" +export SPHERO_PATH=$(readlink -f "$0") +export SPHERO_DIRECTORY=$(dirname "$SPHERO_PATH") LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" @@ -34,7 +34,7 @@ chooseLanguage() # Main # ============================================================================= -LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME +LogPid.sh $SPHERO_PID $SPHERO_NAME chooseLanguage From 5869c3c82e829afc33316d1eafd4a6c526b552ed Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 18:59:18 -0500 Subject: [PATCH 0882/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 56 +++++++++++++------ 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 4b6e20c2..af50f06d 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -142,7 +142,7 @@ homeassistant: friendly_name: Planeta Marte icon: mdi:test-tube - # Robot Maya Techlands + # Robot Maya Lands script.resetall: friendly_name: Reset @@ -416,7 +416,7 @@ script: sequence: - service: shell_command.tiburonballena - # Robot Maya Techlands + # Robot Maya Lands resetall: sequence: @@ -539,10 +539,11 @@ shell_command: calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh & - # Robot Maya Techlands + # Robot Maya Lands resetall: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 coji: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Coji.sh & + sphero: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Sphero.sh & headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 headright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 @@ -625,6 +626,27 @@ switch: automation: + # Robot Maya Lands + + - alias: Services Event Host Robot + initial_state: 'off' + trigger: + platform: time + seconds: '/30' + action: + - service: shell_command.sphero + + # Techie Maya Lands + + - alias: Services Calendar Name + initial_state: 'off' + trigger: + platform: time + minutes: '/30' + seconds: 00 + action: + - service: shell_command.apple + - alias: Services Sound PulseAudio Change initial_state: 'on' trigger: @@ -646,7 +668,7 @@ automation: entity_id: input_slider.qualcomm value: "{{ states.sensor.qualcomm.state | int }}" - - alias: Services Event Host + - alias: Services Event Host Server initial_state: 'off' trigger: platform: time @@ -654,15 +676,6 @@ automation: action: - service: shell_command.windriver - - alias: Services Calendar Name - initial_state: 'off' - trigger: - platform: time - minutes: '/30' - seconds: 00 - action: - - service: shell_command.apple - group: default_view: @@ -820,10 +833,14 @@ group: - script.calakmul - script.tiburonballena - robotmayalandsreset: - name: Reset + robotmayalandsevent: + name: Event + entities: + - automation.services_event_host_robot + + robotmayalandslanguage: + name: Language entities: - - script.resetall - script.coji robotmayalandshead: @@ -857,6 +874,11 @@ group: - script.movebackward - script.movestop + robotmayalandsreset: + name: Reset + entities: + - script.resetall + techiemayalandssystemhealth: name: System Health entities: @@ -890,7 +912,7 @@ group: techiemayalandssystemevent: name: System Event entities: - - automation.services_event_host + - automation.services_event_host_server techiemayalandsinfrastructure: name: Infrastructure From 4a92fe80a52eefa032cab1ad01cafcd4f3acae30 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 19:02:26 -0500 Subject: [PATCH 0883/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index af50f06d..66cc5838 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -693,11 +693,13 @@ group: view: yes name: The Robot entities: - - group.robotmayalandsreset + - group.robotmayalandslanguage + - group.robotmayalandsevent - group.robotmayalandshead - group.robotmayalandsarmright - group.robotmayalandsarmleft - group.robotmayalandslegs + - group.robotmayalandsreset centralmayalowlands: view: yes @@ -833,16 +835,16 @@ group: - script.calakmul - script.tiburonballena - robotmayalandsevent: - name: Event - entities: - - automation.services_event_host_robot - robotmayalandslanguage: name: Language entities: - script.coji + robotmayalandsevent: + name: Event + entities: + - automation.services_event_host_robot + robotmayalandshead: name: Head entities: From d03e1ad91be476ee22bf7d4997833d57ad9dc242 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 19:07:12 -0500 Subject: [PATCH 0884/1653] Update Sphero.sh --- Hochob/Applications/RobotMayaLands/Sphero.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Sphero.sh b/Hochob/Applications/RobotMayaLands/Sphero.sh index 3c219270..1cf65003 100755 --- a/Hochob/Applications/RobotMayaLands/Sphero.sh +++ b/Hochob/Applications/RobotMayaLands/Sphero.sh @@ -39,9 +39,9 @@ LogPid.sh $SPHERO_PID $SPHERO_NAME chooseLanguage if [ "$LOCAL_LANGUAGE" = "english" ]; then - Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" + Host.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" else - Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" + Host.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" fi # End of File From f5a1bda634884c7fb631f08214126f7d7b0dd960 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 19:07:43 -0500 Subject: [PATCH 0885/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index 19da30c5..c939ccff 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -39,9 +39,9 @@ LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage if [ "$LOCAL_LANGUAGE" = "english" ]; then - Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" + Host.sh server $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" else - Host.sh $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" + Host.sh server $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" fi # End of File From 5dfaafa05ca96154f812a3371a3619e87d9cd5e3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 19:12:06 -0500 Subject: [PATCH 0886/1653] Update Host.sh --- Hochob/Services/Events/Host.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 4f60e477..01a070e4 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -10,9 +10,10 @@ set -x export HOST_PID=$$ -LOCAL_LANGUAGE="$1" -LOCAL_INSTITUTION_NAME="$2" -LOCAL_EVENT_NAME="$3" +LOCAL_HOST="$1" +LOCAL_LANGUAGE="$2" +LOCAL_INSTITUTION_NAME="$3" +LOCAL_EVENT_NAME="$4" LOCAL_GREETING_ENGLISH[0]="Hi There," LOCAL_GREETING_ENGLISH[1]="Good morning," @@ -103,10 +104,15 @@ LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}. \ ${LOCAL_CLOSURE}" -if [ "$LANGUAGE" = "english" ]; then - Robot.sh lupe/say "${LOCAL_MESSAGE}" +if [ "$LOCAL_HOST" = "server" ]; then + SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" else - Robot.sh lupe/decir "${LOCAL_MESSAGE}" + if [ "$LANGUAGE" = "english" ]; then + Robot.sh lupe/say "${LOCAL_MESSAGE}" + else + Robot.sh lupe/decir "${LOCAL_MESSAGE}" + fi fi + # End of File From fbe0fa154e51d4ebe0ab6f22623a8222010156d6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 19:41:47 -0500 Subject: [PATCH 0887/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 66cc5838..b550e5be 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -202,6 +202,14 @@ homeassistant: # Techie Maya Lands + script.toyota: + friendly_name: Check Infrastructure + icon: mdi:approval + + script.kodak: + friendly_name: Reboot + icon: mdi:restart + sensor.bosch: friendly_name: Quote icon: mdi:approval @@ -214,10 +222,6 @@ homeassistant: friendly_name: Server Volume % icon: mdi:volume-high - script.toyota: - friendly_name: System Health - icon: mdi:approval - script.keypadone: friendly_name: Botón Uno icon: mdi:numeric-1-box @@ -303,7 +307,7 @@ sensor: value_template: '{{ value | int }}' - platform: systemmonitor - name: Toyota + name: SpaceX resources: - type: processor_use - type: memory_free @@ -491,6 +495,9 @@ script: toyota: sequence: - service: shell_command.toyota + kodak: + sequence: + - service: shell_command.kodak keypadone: sequence: - service: shell_command.keypadone @@ -569,6 +576,7 @@ shell_command: apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & qualcomm: amixer sset Master '{{ volume_level }}%' toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & + kodak: ssh root@127.0.0.1 sudo reboot windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & keypadone: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 1 & @@ -885,6 +893,7 @@ group: name: System Health entities: - script.toyota + - script.kodak techiemayalandssystemapple: name: System Calendar From 8551eded3a660434b3cf9e47bd2e49b637516dbe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 19:53:09 -0500 Subject: [PATCH 0888/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b550e5be..f59635c7 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -202,7 +202,11 @@ homeassistant: # Techie Maya Lands - script.toyota: + sensor.bosch: + friendly_name: Quote + icon: mdi:approval + + script.toyota: friendly_name: Check Infrastructure icon: mdi:approval @@ -210,10 +214,6 @@ homeassistant: friendly_name: Reboot icon: mdi:restart - sensor.bosch: - friendly_name: Quote - icon: mdi:approval - input_slider.qualcomm: friendly_name: Server Volume Set % icon: mdi:volume-high @@ -573,10 +573,10 @@ shell_command: # Techie Maya Lands - apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & - qualcomm: amixer sset Master '{{ volume_level }}%' toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & kodak: ssh root@127.0.0.1 sudo reboot + apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & + qualcomm: amixer sset Master '{{ volume_level }}%' windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & keypadone: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 1 & @@ -892,6 +892,7 @@ group: techiemayalandssystemhealth: name: System Health entities: + - sensor.bosch - script.toyota - script.kodak @@ -943,4 +944,3 @@ group: name: Sandbox entities: - script.visitorsusb - - sensor.bosch From 9b7de9d5e4ce7fe63b81a2ee614d0abcb15d90a7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 19:56:08 -0500 Subject: [PATCH 0889/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f59635c7..f2ac50b2 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -206,7 +206,7 @@ homeassistant: friendly_name: Quote icon: mdi:approval - script.toyota: + script.toyota: friendly_name: Check Infrastructure icon: mdi:approval From e47bbefa17190beea6b1ba3d14a5dbe1cd79621b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 20:01:45 -0500 Subject: [PATCH 0890/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f2ac50b2..45a4d388 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -690,6 +690,7 @@ group: view: yes name: The Home entities: + - group.techiemayalandssystemhealth - group.southernmayahighlandsapple - group.southernmayahighlandslanguage - group.southernmayahighlandsintroduction @@ -736,6 +737,7 @@ group: - group.techiemayalandssystemmonitor - group.techiemayalandssystemevent - group.techiemayalandsinfrastructure + - group.techiemayalandsquote - group.techiemayalandssandbox mediamayalands: @@ -892,7 +894,6 @@ group: techiemayalandssystemhealth: name: System Health entities: - - sensor.bosch - script.toyota - script.kodak @@ -940,6 +941,11 @@ group: - script.keypadthree - script.keypadfour + techiemayalandsquote: + name: Quote + entities: + - sensor.bosch + techiemayalandssandbox: name: Sandbox entities: From f8ba143d83a2ff8170e01e492a1e35bb5ea74051 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 20:04:18 -0500 Subject: [PATCH 0891/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 45a4d388..2ffcdf92 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -732,7 +732,7 @@ group: name: The Techie entities: - group.techiemayalandssystemhealth - - group.techiemayalandssystemapple + - group.techiemayalandssystemcalendar - group.techiemayalandssystemaudio - group.techiemayalandssystemmonitor - group.techiemayalandssystemevent @@ -897,7 +897,7 @@ group: - script.toyota - script.kodak - techiemayalandssystemapple: + techiemayalandssystemcalendar: name: System Calendar entities: - sensor.appleimac From b5701dcedf629cfed369c21daca452ffe04d81b3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 20:15:07 -0500 Subject: [PATCH 0892/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 2ffcdf92..030da163 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -203,7 +203,7 @@ homeassistant: # Techie Maya Lands sensor.bosch: - friendly_name: Quote + friendly_name: System Quote icon: mdi:approval script.toyota: @@ -691,7 +691,7 @@ group: name: The Home entities: - group.techiemayalandssystemhealth - - group.southernmayahighlandsapple + - group.southernmayahighlandscalendar - group.southernmayahighlandslanguage - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot @@ -736,8 +736,8 @@ group: - group.techiemayalandssystemaudio - group.techiemayalandssystemmonitor - group.techiemayalandssystemevent - - group.techiemayalandsinfrastructure - - group.techiemayalandsquote + - group.techiemayalandssystemquote + - group.techiemayalandsserverinfrastructure - group.techiemayalandssandbox mediamayalands: @@ -750,7 +750,7 @@ group: - group.southernmayahighlandsmemories - group.southernmayahighlandscamera - southernmayahighlandsapple: + southernmayahighlandscalendar: name: Next Visit entities: - sensor.appleimac @@ -927,8 +927,13 @@ group: entities: - automation.services_event_host_server - techiemayalandsinfrastructure: - name: Infrastructure + techiemayalandssystemquote: + name: System Quote + entities: + - sensor.bosch + + techiemayalandsserverinfrastructure: + name: Server Infrastructure entities: - device_tracker.eclipse - device_tracker.hochob @@ -941,11 +946,6 @@ group: - script.keypadthree - script.keypadfour - techiemayalandsquote: - name: Quote - entities: - - sensor.bosch - techiemayalandssandbox: name: Sandbox entities: From 99e56ef5b2631d7f4bdbb437d937593ee4ca6d2e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 8 Jul 2017 20:22:13 -0500 Subject: [PATCH 0893/1653] Update Coji.sh --- Hochob/Applications/RobotMayaLands/Coji.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Applications/RobotMayaLands/Coji.sh b/Hochob/Applications/RobotMayaLands/Coji.sh index 08e1e803..0706aca7 100755 --- a/Hochob/Applications/RobotMayaLands/Coji.sh +++ b/Hochob/Applications/RobotMayaLands/Coji.sh @@ -23,6 +23,11 @@ export COJI_DIRECTORY=$(dirname "$COJI_PATH") # ============================================================================= Robot.sh lupe/inicial 1 +sleep 2 +Robot.sh lupe/say "Hello World! One, Two, Three!" +sleep 2 +Robot.sh lupe/decir "Hola Mundo! Uno, Dos, Tres!" +sleep 2 LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then From c29c3e5bbd1644c255ce429f045c450f3e7b5ecd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:03:54 -0500 Subject: [PATCH 0894/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 030da163..ba183e38 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -742,6 +742,7 @@ group: mediamayalands: view: yes + icon: mdi:filmstrip name: The Media entities: - group.southernmayahighlandscorporate From c2137e933a5087873f6139727758e151b861f8e3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:13:50 -0500 Subject: [PATCH 0895/1653] Update Survey.sh --- Hochob/Services/Survey/Survey.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/Survey.sh index 581cf9bb..7e915e85 100755 --- a/Hochob/Services/Survey/Survey.sh +++ b/Hochob/Services/Survey/Survey.sh @@ -96,7 +96,4 @@ else fi - - - # End of File From a7839114d67f95babe61a05a97e11278c635cd55 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:16:50 -0500 Subject: [PATCH 0896/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 6dab73e4..b24265d4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -44,7 +44,7 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ Tres, Sojourner. \ Cuatro, Mariner 4. " -Survey.sh $LOCAL_DEVICE spanish tt 4 +SurveyOption.sh $LOCAL_DEVICE spanish tt 4 exit 0 @@ -56,7 +56,7 @@ StreamAudio.sh $LOCAL_DEVICE english tt \ Three, Sojourner. \ Four, Mariner 4. " -Survey.sh $LOCAL_DEVICE english tt 4 +SurveyOption.sh $LOCAL_DEVICE english tt 4 if [ "$LOCAL_LANGUAGE" = "english" ]; then Eek.sh english robot "Hi Lupe, good morning" From ef4e2bd645c7f8fd34678347eee41a447dd6fc44 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:17:11 -0500 Subject: [PATCH 0897/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index b24265d4..1b317d87 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -28,7 +28,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" -# Survey.sh $LOCAL_DEVICE spanish robot 1 +# SurveyOption.sh $LOCAL_DEVICE spanish robot 1 #StreamAudio.sh $LOCAL_DEVICE spanish tt \ # " From 9e27ef303c3939c9489d4109e26c669956408d5a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:18:47 -0500 Subject: [PATCH 0898/1653] Rename Survey.sh to SurveyOption.sh --- Hochob/Services/Survey/{Survey.sh => SurveyOption.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Survey/{Survey.sh => SurveyOption.sh} (100%) diff --git a/Hochob/Services/Survey/Survey.sh b/Hochob/Services/Survey/SurveyOption.sh similarity index 100% rename from Hochob/Services/Survey/Survey.sh rename to Hochob/Services/Survey/SurveyOption.sh From 35484967545bdbf780caef814ec87eb125ebb3af Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:17:31 -0500 Subject: [PATCH 0899/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/{Survey => Keypad}/KeypadOption.py | 0 Hochob/Services/{Survey => Keypad}/KeypadOption.sh | 0 Hochob/Services/{Survey => Keypad}/KeypadThread.py | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/{Survey => Keypad}/KeypadOption.py (100%) rename Hochob/Services/{Survey => Keypad}/KeypadOption.sh (100%) rename Hochob/Services/{Survey => Keypad}/KeypadThread.py (100%) diff --git a/Hochob/Services/Survey/KeypadOption.py b/Hochob/Services/Keypad/KeypadOption.py similarity index 100% rename from Hochob/Services/Survey/KeypadOption.py rename to Hochob/Services/Keypad/KeypadOption.py diff --git a/Hochob/Services/Survey/KeypadOption.sh b/Hochob/Services/Keypad/KeypadOption.sh similarity index 100% rename from Hochob/Services/Survey/KeypadOption.sh rename to Hochob/Services/Keypad/KeypadOption.sh diff --git a/Hochob/Services/Survey/KeypadThread.py b/Hochob/Services/Keypad/KeypadThread.py similarity index 100% rename from Hochob/Services/Survey/KeypadThread.py rename to Hochob/Services/Keypad/KeypadThread.py From 33a77adb7b83ab3a2d77958ba461ce54e16efba4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:23:13 -0500 Subject: [PATCH 0900/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 1b317d87..35ec826d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -28,7 +28,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" -# SurveyOption.sh $LOCAL_DEVICE spanish robot 1 +# SurveyMultipleOption.sh $LOCAL_DEVICE spanish robot 1 #StreamAudio.sh $LOCAL_DEVICE spanish tt \ # " @@ -36,6 +36,14 @@ LOCAL_LANGUAGE=`Language.sh` # Pero donde puedes ver esto y mas? En marte! # " +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Los mayas fueron quienes inventaron el numero 0? \ + " +SurveyMultipleOption.sh $LOCAL_DEVICE spanish tt yes + +exit 0 + StreamAudio.sh $LOCAL_DEVICE spanish robot \ " Cual fue la primer mision que tomo las primeras fotos de Marte? \ @@ -44,7 +52,7 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ Tres, Sojourner. \ Cuatro, Mariner 4. " -SurveyOption.sh $LOCAL_DEVICE spanish tt 4 +SurveyMultipleOption.sh $LOCAL_DEVICE spanish tt 4 exit 0 From 5bd0a6624313ae6b52a386507bdfd970042e06f2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:23:41 -0500 Subject: [PATCH 0901/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 35ec826d..59f1f3c8 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -40,7 +40,7 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ " Los mayas fueron quienes inventaron el numero 0? \ " -SurveyMultipleOption.sh $LOCAL_DEVICE spanish tt yes +SurveyYesNo.sh $LOCAL_DEVICE spanish tt yes exit 0 @@ -64,7 +64,7 @@ StreamAudio.sh $LOCAL_DEVICE english tt \ Three, Sojourner. \ Four, Mariner 4. " -SurveyOption.sh $LOCAL_DEVICE english tt 4 +SurveyMultipleOption.sh $LOCAL_DEVICE english tt 4 if [ "$LOCAL_LANGUAGE" = "english" ]; then Eek.sh english robot "Hi Lupe, good morning" From 233156e1826a818134ce44f6bf58aaaa72d2600f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:22:11 -0500 Subject: [PATCH 0902/1653] Update Signed-off-by: Abraham Arce --- .../Services/Survey/{SurveyOption.sh => SurveyMultipleChoice.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Survey/{SurveyOption.sh => SurveyMultipleChoice.sh} (100%) diff --git a/Hochob/Services/Survey/SurveyOption.sh b/Hochob/Services/Survey/SurveyMultipleChoice.sh similarity index 100% rename from Hochob/Services/Survey/SurveyOption.sh rename to Hochob/Services/Survey/SurveyMultipleChoice.sh From fdcaf189cb2cd15be39b3f7490ca4da615b94a9b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:30:23 -0500 Subject: [PATCH 0903/1653] Update Signed-off-by: Abraham Arce --- ...ypadOption.py => HandlerMultipleOption.py} | 0 ...ypadOption.sh => HandlerMultipleOption.sh} | 0 ...read.py => HandlerMultipleOptionThread.py} | 0 .../{Keypad.sh => KeypadMultipleOption.sh} | 0 Hochob/Services/Keypad/KeypadYesNo.sh | 35 +++++++++++++++++++ 5 files changed, 35 insertions(+) rename Hochob/Services/Keypad/{KeypadOption.py => HandlerMultipleOption.py} (100%) rename Hochob/Services/Keypad/{KeypadOption.sh => HandlerMultipleOption.sh} (100%) rename Hochob/Services/Keypad/{KeypadThread.py => HandlerMultipleOptionThread.py} (100%) rename Hochob/Services/Keypad/{Keypad.sh => KeypadMultipleOption.sh} (100%) create mode 100755 Hochob/Services/Keypad/KeypadYesNo.sh diff --git a/Hochob/Services/Keypad/KeypadOption.py b/Hochob/Services/Keypad/HandlerMultipleOption.py similarity index 100% rename from Hochob/Services/Keypad/KeypadOption.py rename to Hochob/Services/Keypad/HandlerMultipleOption.py diff --git a/Hochob/Services/Keypad/KeypadOption.sh b/Hochob/Services/Keypad/HandlerMultipleOption.sh similarity index 100% rename from Hochob/Services/Keypad/KeypadOption.sh rename to Hochob/Services/Keypad/HandlerMultipleOption.sh diff --git a/Hochob/Services/Keypad/KeypadThread.py b/Hochob/Services/Keypad/HandlerMultipleOptionThread.py similarity index 100% rename from Hochob/Services/Keypad/KeypadThread.py rename to Hochob/Services/Keypad/HandlerMultipleOptionThread.py diff --git a/Hochob/Services/Keypad/Keypad.sh b/Hochob/Services/Keypad/KeypadMultipleOption.sh similarity index 100% rename from Hochob/Services/Keypad/Keypad.sh rename to Hochob/Services/Keypad/KeypadMultipleOption.sh diff --git a/Hochob/Services/Keypad/KeypadYesNo.sh b/Hochob/Services/Keypad/KeypadYesNo.sh new file mode 100755 index 00000000..ee4c601a --- /dev/null +++ b/Hochob/Services/Keypad/KeypadYesNo.sh @@ -0,0 +1,35 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export KEYPAD_PID=$$ +export KEYPAD_MQTT_TOPIC=hochob/keypad/ + +LOCAL_IDENTIFICATION="$1" +LOCAL_BUTTON="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + Mosquitto.sh $KEYPAD_MQTT_TOPIC$LOCAL_IDENTIFICATION $LOCAL_BUTTON +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 09481a26be3535c6d3f8ef378cac56142ea19a16 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:33:31 -0500 Subject: [PATCH 0904/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 59f1f3c8..19cf3060 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -28,7 +28,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` # StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" -# SurveyMultipleOption.sh $LOCAL_DEVICE spanish robot 1 +# SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 #StreamAudio.sh $LOCAL_DEVICE spanish tt \ # " @@ -52,7 +52,7 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ Tres, Sojourner. \ Cuatro, Mariner 4. " -SurveyMultipleOption.sh $LOCAL_DEVICE spanish tt 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish tt 4 exit 0 @@ -64,7 +64,7 @@ StreamAudio.sh $LOCAL_DEVICE english tt \ Three, Sojourner. \ Four, Mariner 4. " -SurveyMultipleOption.sh $LOCAL_DEVICE english tt 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE english tt 4 if [ "$LOCAL_LANGUAGE" = "english" ]; then Eek.sh english robot "Hi Lupe, good morning" From df1a5927a8664c4bc5c463fd00ca39f488c992fe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:42:23 -0500 Subject: [PATCH 0905/1653] Rename HandlerMultipleOption.py to HandlerMultipleChoice.py --- .../Keypad/{HandlerMultipleOption.py => HandlerMultipleChoice.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Keypad/{HandlerMultipleOption.py => HandlerMultipleChoice.py} (100%) diff --git a/Hochob/Services/Keypad/HandlerMultipleOption.py b/Hochob/Services/Keypad/HandlerMultipleChoice.py similarity index 100% rename from Hochob/Services/Keypad/HandlerMultipleOption.py rename to Hochob/Services/Keypad/HandlerMultipleChoice.py From 8bb93fb76bcbac45249942a5d5ac8fc169539496 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:42:39 -0500 Subject: [PATCH 0906/1653] Rename HandlerMultipleOption.sh to HandlerMultipleChoice.sh --- .../Keypad/{HandlerMultipleOption.sh => HandlerMultipleChoice.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Keypad/{HandlerMultipleOption.sh => HandlerMultipleChoice.sh} (100%) diff --git a/Hochob/Services/Keypad/HandlerMultipleOption.sh b/Hochob/Services/Keypad/HandlerMultipleChoice.sh similarity index 100% rename from Hochob/Services/Keypad/HandlerMultipleOption.sh rename to Hochob/Services/Keypad/HandlerMultipleChoice.sh From f01f1ace3d941f0d2c0ae6d1719c6517ecb5d7c9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:42:52 -0500 Subject: [PATCH 0907/1653] Rename HandlerMultipleOptionThread.py to HandlerMultipleChoiceThread.py --- ...dlerMultipleOptionThread.py => HandlerMultipleChoiceThread.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Keypad/{HandlerMultipleOptionThread.py => HandlerMultipleChoiceThread.py} (100%) diff --git a/Hochob/Services/Keypad/HandlerMultipleOptionThread.py b/Hochob/Services/Keypad/HandlerMultipleChoiceThread.py similarity index 100% rename from Hochob/Services/Keypad/HandlerMultipleOptionThread.py rename to Hochob/Services/Keypad/HandlerMultipleChoiceThread.py From b006681d9577dc91c090d04fa1579649c5bd9b1e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:43:12 -0500 Subject: [PATCH 0908/1653] Rename KeypadMultipleOption.sh to KeypadMultipleChoice.sh --- .../Keypad/{KeypadMultipleOption.sh => KeypadMultipleChoice.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Keypad/{KeypadMultipleOption.sh => KeypadMultipleChoice.sh} (100%) diff --git a/Hochob/Services/Keypad/KeypadMultipleOption.sh b/Hochob/Services/Keypad/KeypadMultipleChoice.sh similarity index 100% rename from Hochob/Services/Keypad/KeypadMultipleOption.sh rename to Hochob/Services/Keypad/KeypadMultipleChoice.sh From cfed6d115ca722ec8a865ff18729edda598ef21d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:43:44 -0500 Subject: [PATCH 0909/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index ba183e38..634d1778 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -238,6 +238,14 @@ homeassistant: friendly_name: Botón Cuatro icon: mdi:numeric-4-box + script.keypadyes: + friendly_name: Botón Sí + icon: mdi:check-circle + + script.keypadno: + friendly_name: Botón No + icon: mdi:check-circle-outline + script.visitorsusb: friendly_name: Visitantes USB icon: mdi:usb @@ -510,6 +518,12 @@ script: keypadfour: sequence: - service: shell_command.keypadfour + keypadyes: + sequence: + - service: shell_command.keypadyes + keypadno: + sequence: + - service: shell_command.keypadno visitorsusb: sequence: @@ -579,10 +593,12 @@ shell_command: qualcomm: amixer sset Master '{{ volume_level }}%' windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & - keypadone: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 1 & - keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 2 & - keypadthree: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 3 & - keypadfour: ~/CodeLabs/Hochob/Services/Keypad/Keypad.sh virtual 4 & + keypadone: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 1 & + keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 2 & + keypadthree: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 3 & + keypadfour: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 4 & + keypadyes: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual yes & + keypadno: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual no & visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & switch: @@ -940,7 +956,7 @@ group: - device_tracker.hochob techiemayalandskeypad: - name: Keypad + name: Keypad Multiple Choice entities: - script.keypadone - script.keypadtwo From 276d507cea09833789fd673662a5baf62d491358 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:45:55 -0500 Subject: [PATCH 0910/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 634d1778..776b86f4 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -731,7 +731,8 @@ group: name: The Beginning entities: - group.centralmayalowlandsstations - - group.techiemayalandskeypad + - group.techiemayalandskeypadmultiplechoice + - group.techiemayalandskeypadyesno #- group.centralmayalowlandssandbox northernmayalowlands: @@ -741,7 +742,8 @@ group: - group.northernmayalowlandsstations - group.northernmayalowlandsstories - group.northernmayalowlandsrobot - - group.techiemayalandskeypad + - group.techiemayalandskeypadmultiplechoice + - group.techiemayalandskeypadyesno techiemayalands: view: yes @@ -955,7 +957,7 @@ group: - device_tracker.eclipse - device_tracker.hochob - techiemayalandskeypad: + techiemayalandskeypadmultiplechoice: name: Keypad Multiple Choice entities: - script.keypadone @@ -963,6 +965,12 @@ group: - script.keypadthree - script.keypadfour + techiemayalandskeypadyesno: + name: Keypad Yes No + entities: + - script.keypadyes + - script.keypadno + techiemayalandssandbox: name: Sandbox entities: From 93c67954ee941414e011ba524da7edffd746875c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:48:13 -0500 Subject: [PATCH 0911/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 776b86f4..6bf3a69c 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -244,7 +244,7 @@ homeassistant: script.keypadno: friendly_name: Botón No - icon: mdi:check-circle-outline + icon: mdi:checkbox-blank-circle script.visitorsusb: friendly_name: Visitantes USB From eb4290d451d6237f124abb57b4e49f14b1870f70 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:49:29 -0500 Subject: [PATCH 0912/1653] Update KeypadYesNo.sh --- Hochob/Services/Keypad/KeypadYesNo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Keypad/KeypadYesNo.sh b/Hochob/Services/Keypad/KeypadYesNo.sh index ee4c601a..9bdac96b 100755 --- a/Hochob/Services/Keypad/KeypadYesNo.sh +++ b/Hochob/Services/Keypad/KeypadYesNo.sh @@ -12,7 +12,7 @@ export KEYPAD_PID=$$ export KEYPAD_MQTT_TOPIC=hochob/keypad/ LOCAL_IDENTIFICATION="$1" -LOCAL_BUTTON="$2" +LOCAL_ANSWER="$2" # ============================================================================= # Functions @@ -26,7 +26,7 @@ LOCAL_BUTTON="$2" if [ $# -eq 2 ] then - Mosquitto.sh $KEYPAD_MQTT_TOPIC$LOCAL_IDENTIFICATION $LOCAL_BUTTON + Mosquitto.sh $KEYPAD_MQTT_TOPIC$LOCAL_IDENTIFICATION $LOCAL_ANSWER else echo "Invalid number of arguments, see Documentation" exit 1 From 29073ec7cccdfbf6248075a71f9c6747a4542231 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:50:16 -0500 Subject: [PATCH 0913/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Survey/SurveyYesNo.sh | 99 +++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100755 Hochob/Services/Survey/SurveyYesNo.sh diff --git a/Hochob/Services/Survey/SurveyYesNo.sh b/Hochob/Services/Survey/SurveyYesNo.sh new file mode 100755 index 00000000..7e915e85 --- /dev/null +++ b/Hochob/Services/Survey/SurveyYesNo.sh @@ -0,0 +1,99 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export SURVEY_PID=$$ + +LOCAL_DEVICE="$1" +LOCAL_LANGUAGE="$2" +LOCAL_CHARACTER="$3" +LOCAL_CORRECT="$4" + +LOCAL_CORRECT_ANSWER_ENGLISH[0]="That’s right." +LOCAL_CORRECT_ANSWER_ENGLISH[1]="That’s spot on." +LOCAL_CORRECT_ANSWER_ENGLISH[2]="You’ve hit the nail on the head." +LOCAL_CORRECT_ANSWER_ENGLISH[3]="I’m afraid you’re right." +LOCAL_CORRECT_ANSWER_ENGLISH[4]="You are correct." + +LOCAL_WRONG_ANSWER_ENGLISH[0]="I’m afraid that’s not quite right." +LOCAL_WRONG_ANSWER_ENGLISH[1]="I’m afraid you’re mistaken." +LOCAL_WRONG_ANSWER_ENGLISH[2]="In my humble opinion, there is something bad." +LOCAL_WRONG_ANSWER_ENGLISH[3]="Oh oh, not this time." +LOCAL_WRONG_ANSWER_ENGLISH[4]="No, no, no." + +LOCAL_CORRECT_ANSWER_SPANISH[0]="Zara" +LOCAL_CORRECT_ANSWER_SPANISH[1]="Qadir" +LOCAL_CORRECT_ANSWER_SPANISH[2]="Mahnaz" +LOCAL_CORRECT_ANSWER_SPANISH[3]="Ayan" +LOCAL_CORRECT_ANSWER_SPANISH[4]="Daisy" + +LOCAL_WRONG_ANSWER_SPANISH[0]="Zara" +LOCAL_WRONG_ANSWER_SPANISH[1]="Qadir" +LOCAL_WRONG_ANSWER_SPANISH[2]="Mahnaz" +LOCAL_WRONG_ANSWER_SPANISH[3]="Ayan" +LOCAL_WRONG_ANSWER_SPANISH[4]="Daisy" + +# ============================================================================= +# Functions +# ============================================================================= + +chooseAnswerCorrect() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 5 ] + if [ "$LANGUAGE" = "english" ]; then + LOCAL_CORRECT_ANSWER=${LOCAL_CORRECT_ANSWER_ENGLISH[$rand]} + else + LOCAL_CORRECT_ANSWER=${LOCAL_CORRECT_ANSWER_SPANISH[$rand]} + fi +} + +chooseWrongCorrect() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 5 ] + if [ "$LANGUAGE" = "english" ]; then + LOCAL_WRONG_ANSWER=${LOCAL_WRONG_ANSWER_ENGLISH[$rand]} + else + LOCAL_WRONG_ANSWER=${LOCAL_WRONG_ANSWER_SPANISH[$rand]} + fi +} + + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_OPTION=`KeypadOption.sh` + +if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then + + chooseAnswerCorrect $LOCAL_LANGUAGE + if [ "$LOCAL_LANGUAGE" = "english" ]; then + StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + "${LOCAL_CORRECT_ANSWER}" + else + StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + "${LOCAL_CORRECT_ANSWER}" + fi + +else + + chooseWrongCorrect "$LOCAL_LANGUAGE" + if [ "$LOCAL_LANGUAGE" = "english" ]; then + StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + "${LOCAL_WRONG_ANSWER}. the correct answer is ${LOCAL_CORRECT}" + else + StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + "${LOCAL_WRONG_ANSWER}. La respuesta correcta es ${LOCAL_CORRECT}" + fi + +fi + +# End of File From c7ca6ca5c17dd67d9a9ea4e5cf7b6f2300cb0b43 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:54:58 -0500 Subject: [PATCH 0914/1653] Update SurveyYesNo.sh --- Hochob/Services/Survey/SurveyYesNo.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Hochob/Services/Survey/SurveyYesNo.sh b/Hochob/Services/Survey/SurveyYesNo.sh index 7e915e85..94531e93 100755 --- a/Hochob/Services/Survey/SurveyYesNo.sh +++ b/Hochob/Services/Survey/SurveyYesNo.sh @@ -27,17 +27,17 @@ LOCAL_WRONG_ANSWER_ENGLISH[2]="In my humble opinion, there is something bad." LOCAL_WRONG_ANSWER_ENGLISH[3]="Oh oh, not this time." LOCAL_WRONG_ANSWER_ENGLISH[4]="No, no, no." -LOCAL_CORRECT_ANSWER_SPANISH[0]="Zara" -LOCAL_CORRECT_ANSWER_SPANISH[1]="Qadir" -LOCAL_CORRECT_ANSWER_SPANISH[2]="Mahnaz" -LOCAL_CORRECT_ANSWER_SPANISH[3]="Ayan" -LOCAL_CORRECT_ANSWER_SPANISH[4]="Daisy" - -LOCAL_WRONG_ANSWER_SPANISH[0]="Zara" -LOCAL_WRONG_ANSWER_SPANISH[1]="Qadir" -LOCAL_WRONG_ANSWER_SPANISH[2]="Mahnaz" -LOCAL_WRONG_ANSWER_SPANISH[3]="Ayan" -LOCAL_WRONG_ANSWER_SPANISH[4]="Daisy" +LOCAL_CORRECT_ANSWER_SPANISH[0]="Es correcto" +LOCAL_CORRECT_ANSWER_SPANISH[1]="Si claro" +LOCAL_CORRECT_ANSWER_SPANISH[2]="Es justo la respuesta" +LOCAL_CORRECT_ANSWER_SPANISH[3]="Creo que estas en lo correcto" +LOCAL_CORRECT_ANSWER_SPANISH[4]="Totalmente de acuerdo" + +LOCAL_WRONG_ANSWER_SPANISH[0]="Me temo que no es del todo correcto" +LOCAL_WRONG_ANSWER_SPANISH[1]="Me temo que estas equivocado" +LOCAL_WRONG_ANSWER_SPANISH[2]="En mi humilde opinion, hay algo mal" +LOCAL_WRONG_ANSWER_SPANISH[3]="Oh oh, no por esta ocasión" +LOCAL_WRONG_ANSWER_SPANISH[4]="No, no, no" # ============================================================================= # Functions From da301455d98ab86ad58c8e0013166de0d016266b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:56:06 -0500 Subject: [PATCH 0915/1653] Update SurveyMultipleChoice.sh --- .../Services/Survey/SurveyMultipleChoice.sh | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Hochob/Services/Survey/SurveyMultipleChoice.sh b/Hochob/Services/Survey/SurveyMultipleChoice.sh index 7e915e85..6d53cc84 100755 --- a/Hochob/Services/Survey/SurveyMultipleChoice.sh +++ b/Hochob/Services/Survey/SurveyMultipleChoice.sh @@ -27,17 +27,17 @@ LOCAL_WRONG_ANSWER_ENGLISH[2]="In my humble opinion, there is something bad." LOCAL_WRONG_ANSWER_ENGLISH[3]="Oh oh, not this time." LOCAL_WRONG_ANSWER_ENGLISH[4]="No, no, no." -LOCAL_CORRECT_ANSWER_SPANISH[0]="Zara" -LOCAL_CORRECT_ANSWER_SPANISH[1]="Qadir" -LOCAL_CORRECT_ANSWER_SPANISH[2]="Mahnaz" -LOCAL_CORRECT_ANSWER_SPANISH[3]="Ayan" -LOCAL_CORRECT_ANSWER_SPANISH[4]="Daisy" - -LOCAL_WRONG_ANSWER_SPANISH[0]="Zara" -LOCAL_WRONG_ANSWER_SPANISH[1]="Qadir" -LOCAL_WRONG_ANSWER_SPANISH[2]="Mahnaz" -LOCAL_WRONG_ANSWER_SPANISH[3]="Ayan" -LOCAL_WRONG_ANSWER_SPANISH[4]="Daisy" +LOCAL_CORRECT_ANSWER_SPANISH[0]="Es correcto" +LOCAL_CORRECT_ANSWER_SPANISH[1]="Sí, claro" +LOCAL_CORRECT_ANSWER_SPANISH[2]="Es justo la respuesta" +LOCAL_CORRECT_ANSWER_SPANISH[3]="Creo que estás en lo correcto" +LOCAL_CORRECT_ANSWER_SPANISH[4]="Totalmente de acuerdo" + +LOCAL_WRONG_ANSWER_SPANISH[0]="Me temo que no es del todo correcto" +LOCAL_WRONG_ANSWER_SPANISH[1]="Me temo que estás equivocado" +LOCAL_WRONG_ANSWER_SPANISH[2]="En mi humilde opinión, hay algo mal" +LOCAL_WRONG_ANSWER_SPANISH[3]="Oh oh, no por esta ocasión" +LOCAL_WRONG_ANSWER_SPANISH[4]="No, no, no" # ============================================================================= # Functions From 6593b7ab89f1f42ce8ffd86c5af59ec2ef6b8c87 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:57:46 -0500 Subject: [PATCH 0916/1653] Update SurveyYesNo.sh --- Hochob/Services/Survey/SurveyYesNo.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Survey/SurveyYesNo.sh b/Hochob/Services/Survey/SurveyYesNo.sh index 94531e93..05564cd1 100755 --- a/Hochob/Services/Survey/SurveyYesNo.sh +++ b/Hochob/Services/Survey/SurveyYesNo.sh @@ -28,14 +28,14 @@ LOCAL_WRONG_ANSWER_ENGLISH[3]="Oh oh, not this time." LOCAL_WRONG_ANSWER_ENGLISH[4]="No, no, no." LOCAL_CORRECT_ANSWER_SPANISH[0]="Es correcto" -LOCAL_CORRECT_ANSWER_SPANISH[1]="Si claro" +LOCAL_CORRECT_ANSWER_SPANISH[1]="Sí, claro" LOCAL_CORRECT_ANSWER_SPANISH[2]="Es justo la respuesta" -LOCAL_CORRECT_ANSWER_SPANISH[3]="Creo que estas en lo correcto" +LOCAL_CORRECT_ANSWER_SPANISH[3]="Creo que estás en lo correcto" LOCAL_CORRECT_ANSWER_SPANISH[4]="Totalmente de acuerdo" LOCAL_WRONG_ANSWER_SPANISH[0]="Me temo que no es del todo correcto" -LOCAL_WRONG_ANSWER_SPANISH[1]="Me temo que estas equivocado" -LOCAL_WRONG_ANSWER_SPANISH[2]="En mi humilde opinion, hay algo mal" +LOCAL_WRONG_ANSWER_SPANISH[1]="Me temo que estás equivocado" +LOCAL_WRONG_ANSWER_SPANISH[2]="En mi humilde opinión, hay algo mal" LOCAL_WRONG_ANSWER_SPANISH[3]="Oh oh, no por esta ocasión" LOCAL_WRONG_ANSWER_SPANISH[4]="No, no, no" @@ -70,7 +70,7 @@ chooseWrongCorrect() # Main # ============================================================================= -LOCAL_OPTION=`KeypadOption.sh` +LOCAL_OPTION=`HandlerYesNo.sh` if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then From 89d37d26d75f7202792da2cba96eed8ae70e035e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:58:01 -0500 Subject: [PATCH 0917/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Keypad/HandlerYesNo.py | 31 +++++++++++++++++++++++ Hochob/Services/Keypad/HandlerYesNo.sh | 34 ++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100755 Hochob/Services/Keypad/HandlerYesNo.py create mode 100755 Hochob/Services/Keypad/HandlerYesNo.sh diff --git a/Hochob/Services/Keypad/HandlerYesNo.py b/Hochob/Services/Keypad/HandlerYesNo.py new file mode 100755 index 00000000..12c81b8a --- /dev/null +++ b/Hochob/Services/Keypad/HandlerYesNo.py @@ -0,0 +1,31 @@ +#!/usr/bin/python + +import paho.mqtt.client as paho +import time +from threading import Thread + +loop = 1 + +def KeypadOptionMessage(mosq, obj, msg): + global loop + # msg.topic = msg.topic.replace("hochob/keypad/", "") + # print msg.topic + ":" + msg.payload + msg.payload = msg.payload.translate(None, '"') + print msg.payload + loop = 0 + +if __name__ == '__main__': + + mqttclient = paho.Client() + mqttclient.connect("iot.eclipse.org", 1883, 60) + mqttclient.subscribe("hochob/keypad/virtual", 0) + mqttclient.on_message = KeypadOptionMessage + mqttclient.loop_start() + + while loop == 1: + time.sleep(0.1) + + mqttclient.disconnect() + mqttclient.loop_stop() + +# End of File diff --git a/Hochob/Services/Keypad/HandlerYesNo.sh b/Hochob/Services/Keypad/HandlerYesNo.sh new file mode 100755 index 00000000..c7a2f6b0 --- /dev/null +++ b/Hochob/Services/Keypad/HandlerYesNo.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export KEYPADOPTION_PID=$$ + +LOCAL_IDENTIFICATION="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 0 ] +then + answer=`$HOCHOB_SERVER_SERVICES_SURVEY/KeypadOption.py` + echo $answer +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 9f459ff841db2e8aeca8cf03074b69bbc62fe739 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 21:58:40 -0500 Subject: [PATCH 0918/1653] Update SurveyMultipleChoice.sh --- Hochob/Services/Survey/SurveyMultipleChoice.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Survey/SurveyMultipleChoice.sh b/Hochob/Services/Survey/SurveyMultipleChoice.sh index 6d53cc84..eae091b3 100755 --- a/Hochob/Services/Survey/SurveyMultipleChoice.sh +++ b/Hochob/Services/Survey/SurveyMultipleChoice.sh @@ -70,9 +70,9 @@ chooseWrongCorrect() # Main # ============================================================================= -LOCAL_OPTION=`KeypadOption.sh` +LOCAL_CHOICE=`HandlerMultipleChoice.sh` -if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then +if [ "$LOCAL_CHOICE" = "$LOCAL_CORRECT" ]; then chooseAnswerCorrect $LOCAL_LANGUAGE if [ "$LOCAL_LANGUAGE" = "english" ]; then From d5a3d58f6988130a69964ae7b2343ec23fe469ec Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:01:00 -0500 Subject: [PATCH 0919/1653] Update HandlerYesNo.sh --- Hochob/Services/Keypad/HandlerYesNo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/HandlerYesNo.sh b/Hochob/Services/Keypad/HandlerYesNo.sh index c7a2f6b0..7719b327 100755 --- a/Hochob/Services/Keypad/HandlerYesNo.sh +++ b/Hochob/Services/Keypad/HandlerYesNo.sh @@ -24,7 +24,7 @@ LOCAL_IDENTIFICATION="$1" if [ $# -eq 0 ] then - answer=`$HOCHOB_SERVER_SERVICES_SURVEY/KeypadOption.py` + answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerYesNo.py` echo $answer else echo "Invalid number of arguments, see Documentation" From 717e73e3d0962c488c695d096efdcc4396e26a77 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:01:55 -0500 Subject: [PATCH 0920/1653] Update HandlerMultipleChoice.sh --- Hochob/Services/Keypad/HandlerMultipleChoice.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/HandlerMultipleChoice.sh b/Hochob/Services/Keypad/HandlerMultipleChoice.sh index c7a2f6b0..48cdbeb4 100755 --- a/Hochob/Services/Keypad/HandlerMultipleChoice.sh +++ b/Hochob/Services/Keypad/HandlerMultipleChoice.sh @@ -24,7 +24,7 @@ LOCAL_IDENTIFICATION="$1" if [ $# -eq 0 ] then - answer=`$HOCHOB_SERVER_SERVICES_SURVEY/KeypadOption.py` + answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerMultipleChoice.py` echo $answer else echo "Invalid number of arguments, see Documentation" From 79a988a64a0909b66decec361d042e3db46070a1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:02:22 -0500 Subject: [PATCH 0921/1653] Update HandlerMultipleChoice.sh --- Hochob/Services/Keypad/HandlerMultipleChoice.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/HandlerMultipleChoice.sh b/Hochob/Services/Keypad/HandlerMultipleChoice.sh index 48cdbeb4..6c898036 100755 --- a/Hochob/Services/Keypad/HandlerMultipleChoice.sh +++ b/Hochob/Services/Keypad/HandlerMultipleChoice.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export KEYPADOPTION_PID=$$ +export HANDLERMULTIPLECHOICE_PID=$$ LOCAL_IDENTIFICATION="$1" From 44ed0d422732cde270f271d2dcdcfb99804e9e30 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:02:49 -0500 Subject: [PATCH 0922/1653] Update HandlerYesNo.sh --- Hochob/Services/Keypad/HandlerYesNo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/HandlerYesNo.sh b/Hochob/Services/Keypad/HandlerYesNo.sh index 7719b327..4455958f 100755 --- a/Hochob/Services/Keypad/HandlerYesNo.sh +++ b/Hochob/Services/Keypad/HandlerYesNo.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export KEYPADOPTION_PID=$$ +export HANDLERYESNO_PID=$$ LOCAL_IDENTIFICATION="$1" From ad0fa8dc1fad8191c4b4d02a6f63d0de5efe27c7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:05:08 -0500 Subject: [PATCH 0923/1653] Update TiburonBallena.sh --- .../Applications/NorthernMayaLowlands/TiburonBallena.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 19cf3060..a915d111 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -36,10 +36,10 @@ LOCAL_LANGUAGE=`Language.sh` # Pero donde puedes ver esto y mas? En marte! # " -StreamAudio.sh $LOCAL_DEVICE spanish robot \ - " - Los mayas fueron quienes inventaron el numero 0? \ - " +#StreamAudio.sh $LOCAL_DEVICE spanish robot \ +# " +# Los mayas fueron quienes inventaron el numero 0? \ +# " SurveyYesNo.sh $LOCAL_DEVICE spanish tt yes exit 0 From d69711a53697d6ff3d37c8c53a279945fa963988 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:07:36 -0500 Subject: [PATCH 0924/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 6bf3a69c..7e1fbaa1 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -731,8 +731,8 @@ group: name: The Beginning entities: - group.centralmayalowlandsstations - - group.techiemayalandskeypadmultiplechoice - group.techiemayalandskeypadyesno + - group.techiemayalandskeypadmultiplechoice #- group.centralmayalowlandssandbox northernmayalowlands: @@ -742,8 +742,8 @@ group: - group.northernmayalowlandsstations - group.northernmayalowlandsstories - group.northernmayalowlandsrobot - - group.techiemayalandskeypadmultiplechoice - group.techiemayalandskeypadyesno + - group.techiemayalandskeypadmultiplechoice techiemayalands: view: yes From 1deea11b1d1bbf990a7e0fc3f63137a1f768544e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:10:17 -0500 Subject: [PATCH 0925/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 7e1fbaa1..9afc7308 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -222,6 +222,14 @@ homeassistant: friendly_name: Server Volume % icon: mdi:volume-high + script.keypadyes: + friendly_name: Botón Sí + icon: mdi:check-circle + + script.keypadno: + friendly_name: Botón No + icon: mdi:checkbox-blank-circle + script.keypadone: friendly_name: Botón Uno icon: mdi:numeric-1-box @@ -238,14 +246,6 @@ homeassistant: friendly_name: Botón Cuatro icon: mdi:numeric-4-box - script.keypadyes: - friendly_name: Botón Sí - icon: mdi:check-circle - - script.keypadno: - friendly_name: Botón No - icon: mdi:checkbox-blank-circle - script.visitorsusb: friendly_name: Visitantes USB icon: mdi:usb @@ -506,6 +506,12 @@ script: kodak: sequence: - service: shell_command.kodak + keypadyes: + sequence: + - service: shell_command.keypadyes + keypadno: + sequence: + - service: shell_command.keypadno keypadone: sequence: - service: shell_command.keypadone @@ -518,12 +524,6 @@ script: keypadfour: sequence: - service: shell_command.keypadfour - keypadyes: - sequence: - - service: shell_command.keypadyes - keypadno: - sequence: - - service: shell_command.keypadno visitorsusb: sequence: @@ -593,12 +593,12 @@ shell_command: qualcomm: amixer sset Master '{{ volume_level }}%' windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & + keypadyes: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual yes & + keypadno: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual no & keypadone: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 1 & keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 2 & keypadthree: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 3 & keypadfour: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 4 & - keypadyes: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual yes & - keypadno: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual no & visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & switch: @@ -957,6 +957,12 @@ group: - device_tracker.eclipse - device_tracker.hochob + techiemayalandskeypadyesno: + name: Keypad Yes No + entities: + - script.keypadyes + - script.keypadno + techiemayalandskeypadmultiplechoice: name: Keypad Multiple Choice entities: @@ -965,12 +971,6 @@ group: - script.keypadthree - script.keypadfour - techiemayalandskeypadyesno: - name: Keypad Yes No - entities: - - script.keypadyes - - script.keypadno - techiemayalandssandbox: name: Sandbox entities: From c0029093b039b2a92844ac1f737a9f999e17b30d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:15:33 -0500 Subject: [PATCH 0926/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index a915d111..12d08aac 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -27,26 +27,21 @@ LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -# StreamAudio.sh $LOCAL_DEVICE spanish robot "Hola" -# SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 - -#StreamAudio.sh $LOCAL_DEVICE spanish tt \ -# " -# Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ -# Pero donde puedes ver esto y mas? En marte! -# " - -#StreamAudio.sh $LOCAL_DEVICE spanish robot \ -# " -# Los mayas fueron quienes inventaron el numero 0? \ -# " -SurveyYesNo.sh $LOCAL_DEVICE spanish tt yes +StreamAudio.sh $LOCAL_DEVICE spanish tt \ + " + Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ + Pero donde puedes ver esto y mas? En marte! Veamos si puedes responder un par de preguntas? + " -exit 0 +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + A Marte se le conoce también como el planeta rojo? que opinas?\ + " +SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - Cual fue la primer mision que tomo las primeras fotos de Marte? \ + Cual fue la primer misión que tomó por primera vez fotos de Marte? \ Uno, Curiosity. \ Dos, Spirit. \ Tres, Sojourner. \ From fb4ed7ee7d49802a5c94b8a8584729a988a32db0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:21:06 -0500 Subject: [PATCH 0927/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 12d08aac..67803057 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -35,7 +35,7 @@ StreamAudio.sh $LOCAL_DEVICE spanish tt \ StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - A Marte se le conoce también como el planeta rojo? que opinas?\ + A Marte se le conoce también como el planeta rojo? que opinas, sí o no?\ " SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes From efae42f294b59350f5e2d1ea899c32ba95857d23 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 9 Jul 2017 22:22:08 -0500 Subject: [PATCH 0928/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 67803057..7f03deaa 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,7 +30,7 @@ LOCAL_LANGUAGE=`Language.sh` StreamAudio.sh $LOCAL_DEVICE spanish tt \ " Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ - Pero donde puedes ver esto y mas? En marte! Veamos si puedes responder un par de preguntas? + Pero donde puedes ver esto y mas? En el planeta marte! Veamos si puedes responder un par de preguntas. " StreamAudio.sh $LOCAL_DEVICE spanish robot \ From d81633fe430b256e665ba35348eb63289d0867e8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 20:00:41 -0500 Subject: [PATCH 0929/1653] Update --- .../NorthernMayaLowlands/TiburonBallena.sh | 4 ++-- Hochob/Services/Events/Host.sh | 14 +++++++------- Hochob/Services/Keypad/HandlerMultipleChoice.py | 2 +- Hochob/Services/Keypad/HandlerMultipleChoice.sh | 2 +- Hochob/Services/Keypad/HandlerYesNo.py | 4 ++-- Hochob/Services/Keypad/HandlerYesNo.sh | 2 +- Hochob/Services/Stream/StreamAudio.sh | 8 ++++---- Hochob/Services/Survey/SurveyMultipleChoice.sh | 2 +- Hochob/Services/Survey/SurveyYesNo.sh | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 7f03deaa..ee4d5a85 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -27,7 +27,7 @@ LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -StreamAudio.sh $LOCAL_DEVICE spanish tt \ +StreamAudio.sh $LOCAL_DEVICE spanish robot \ " Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ 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 \ Tres, Sojourner. \ Cuatro, Mariner 4. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish tt 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 exit 0 diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/Host.sh index 01a070e4..5018305d 100755 --- a/Hochob/Services/Events/Host.sh +++ b/Hochob/Services/Events/Host.sh @@ -35,18 +35,18 @@ LOCAL_GREETING_SPANISH[7]="Que onda," LOCAL_REMINDER_ENGLISH[0]="Remember we have today our" LOCAL_REMINDER_ENGLISH[1]="Do not forget about" -LOCAL_REMINDER_ENGLISH[2]="Today is the big day!," +LOCAL_REMINDER_ENGLISH[2]="Today is the big day," LOCAL_REMINDER_ENGLISH[3]="It is finally here!," -LOCAL_REMINDER_ENGLISH[4]="Finally with us!," -LOCAL_REMINDER_ENGLISH[5]="The big day has just arrived!," +LOCAL_REMINDER_ENGLISH[4]="Finally with us," +LOCAL_REMINDER_ENGLISH[5]="The big day has just arrived," LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, the great event," LOCAL_REMINDER_SPANISH[0]="Recuerda hoy tenemos nuestro evento," LOCAL_REMINDER_SPANISH[1]="No olvides acerca de" -LOCAL_REMINDER_SPANISH[2]="Hoy es el gran día!," -LOCAL_REMINDER_SPANISH[3]="Finalmente aquí!," -LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros!," -LOCAL_REMINDER_SPANISH[5]="El gran día ha llegado!," +LOCAL_REMINDER_SPANISH[2]="Hoy es el gran día," +LOCAL_REMINDER_SPANISH[3]="Finalmente aquí," +LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros," +LOCAL_REMINDER_SPANISH[5]="El gran día ha llegado," LOCAL_REMINDER_SPANISH[6]="No se diga mas, el gran evento," LOCAL_CLOSURE_ENGLISH="Check your email for more information." diff --git a/Hochob/Services/Keypad/HandlerMultipleChoice.py b/Hochob/Services/Keypad/HandlerMultipleChoice.py index 12c81b8a..a9e5a292 100755 --- a/Hochob/Services/Keypad/HandlerMultipleChoice.py +++ b/Hochob/Services/Keypad/HandlerMultipleChoice.py @@ -17,7 +17,7 @@ def KeypadOptionMessage(mosq, obj, msg): if __name__ == '__main__': mqttclient = paho.Client() - mqttclient.connect("iot.eclipse.org", 1883, 60) + mqttclient.connect("10.215.56.158", 1883, 60) mqttclient.subscribe("hochob/keypad/virtual", 0) mqttclient.on_message = KeypadOptionMessage mqttclient.loop_start() diff --git a/Hochob/Services/Keypad/HandlerMultipleChoice.sh b/Hochob/Services/Keypad/HandlerMultipleChoice.sh index 6c898036..fa45042a 100755 --- a/Hochob/Services/Keypad/HandlerMultipleChoice.sh +++ b/Hochob/Services/Keypad/HandlerMultipleChoice.sh @@ -22,7 +22,7 @@ LOCAL_IDENTIFICATION="$1" # Main # ============================================================================= -if [ $# -eq 0 ] +if [ $# -eq 1 ] then answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerMultipleChoice.py` echo $answer diff --git a/Hochob/Services/Keypad/HandlerYesNo.py b/Hochob/Services/Keypad/HandlerYesNo.py index 12c81b8a..9fd6698b 100755 --- a/Hochob/Services/Keypad/HandlerYesNo.py +++ b/Hochob/Services/Keypad/HandlerYesNo.py @@ -9,7 +9,7 @@ def KeypadOptionMessage(mosq, obj, msg): global loop # msg.topic = msg.topic.replace("hochob/keypad/", "") - # print msg.topic + ":" + msg.payload + #print msg.topic + ":" + msg.payload msg.payload = msg.payload.translate(None, '"') print msg.payload loop = 0 @@ -17,7 +17,7 @@ def KeypadOptionMessage(mosq, obj, msg): if __name__ == '__main__': mqttclient = paho.Client() - mqttclient.connect("iot.eclipse.org", 1883, 60) + mqttclient.connect("10.215.56.158", 1883, 60) mqttclient.subscribe("hochob/keypad/virtual", 0) mqttclient.on_message = KeypadOptionMessage mqttclient.loop_start() diff --git a/Hochob/Services/Keypad/HandlerYesNo.sh b/Hochob/Services/Keypad/HandlerYesNo.sh index 4455958f..9aa972fc 100755 --- a/Hochob/Services/Keypad/HandlerYesNo.sh +++ b/Hochob/Services/Keypad/HandlerYesNo.sh @@ -22,7 +22,7 @@ LOCAL_IDENTIFICATION="$1" # Main # ============================================================================= -if [ $# -eq 0 ] +if [ $# -eq 1 ] then answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerYesNo.py` echo $answer diff --git a/Hochob/Services/Stream/StreamAudio.sh b/Hochob/Services/Stream/StreamAudio.sh index 16342093..deb64c13 100755 --- a/Hochob/Services/Stream/StreamAudio.sh +++ b/Hochob/Services/Stream/StreamAudio.sh @@ -26,13 +26,13 @@ LOCAL_TEXT="$4" # ============================================================================= if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak english "\"${LOCAL_TEXT}\"" + SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss english "\"${LOCAL_TEXT}\"" + SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak spanish "$\"{LOCAL_TEXT}\"" + SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss spanish "\"${LOCAL_TEXT}\"" + SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" fi Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 diff --git a/Hochob/Services/Survey/SurveyMultipleChoice.sh b/Hochob/Services/Survey/SurveyMultipleChoice.sh index eae091b3..2cf787d2 100755 --- a/Hochob/Services/Survey/SurveyMultipleChoice.sh +++ b/Hochob/Services/Survey/SurveyMultipleChoice.sh @@ -70,7 +70,7 @@ chooseWrongCorrect() # Main # ============================================================================= -LOCAL_CHOICE=`HandlerMultipleChoice.sh` +LOCAL_CHOICE=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerMultipleChoice.sh virtual` if [ "$LOCAL_CHOICE" = "$LOCAL_CORRECT" ]; then diff --git a/Hochob/Services/Survey/SurveyYesNo.sh b/Hochob/Services/Survey/SurveyYesNo.sh index 05564cd1..80bf0060 100755 --- a/Hochob/Services/Survey/SurveyYesNo.sh +++ b/Hochob/Services/Survey/SurveyYesNo.sh @@ -70,7 +70,7 @@ chooseWrongCorrect() # Main # ============================================================================= -LOCAL_OPTION=`HandlerYesNo.sh` +LOCAL_OPTION=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerYesNo.sh virtual` if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then From 9ce647a862c99f0ea6b64258d8153309a4fd0595 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 20:23:07 -0500 Subject: [PATCH 0930/1653] Create Ixtapa.sh --- .../CentralMayaLowlands/Ixtapa.sh | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 Hochob/Applications/CentralMayaLowlands/Ixtapa.sh diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh new file mode 100644 index 00000000..a2aba3b2 --- /dev/null +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -0,0 +1,95 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export IXTAPA_PID=$$ +export IXTAPA_NAME="Mapimi Application" +export IXTAPA_PATH=$(readlink -f "$0") +export IXTAPA_DIRECTORY=$(dirname "$IXTAPA_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_DEVICE="Juum" +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Que aportaron los Mayas a la tecnologia? \ + Uno, Las piramides. \ + Dos, El cero. \ + Tres, El calendario. \ + Cuatro, El chocolate. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Quienes son los fundadores de Intel? \ + " +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Uno, Robert Noyce, Gordon Moore. \ + Dos, Steve Allen. \ + Tres, Elon Musk. \ + Cuatro, Larry Page and Sergey Brin. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Cuantos ingenieros eran cuando empeze Intel Guadalajara? + Uno, 60. \ + Dos, 34. \ + Tres, 1200. \ + Cuatro, 15. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + El microprocesador es el cerebro de la computadora? + " +SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Las fabricas de Intel son 200 veces mas limpias que un quirofano?? + " +SurveyYesNo.sh $LOCAL_DEVICE spanish robot no + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Podemos encontrar el microprocesador en? + Uno, Accesorios para las personas. \ + Dos, En la tierra. \ + Tres, En el espacio. \ + Cuatro, En todos los anteriores. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + En el sistema binario, el cero significa? + Uno, Encendido. \ + Dos, Apagado. \ + Tres, Nada. \ + Cuatro, Todo. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 + +# End of File From 50ad737425caf0540a97f141a8a2a3c393317a8e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 20:28:01 -0500 Subject: [PATCH 0931/1653] Update Ixtapa.sh --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index a2aba3b2..34f05741 100644 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -29,8 +29,8 @@ LOCAL_LANGUAGE=`Language.sh` StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - Que aportaron los Mayas a la tecnologia? \ - Uno, Las piramides. \ + Que aportaron los Mayas a la tecnología? \ + Uno, Las pirámides. \ Dos, El cero. \ Tres, El calendario. \ Cuatro, El chocolate. \ @@ -39,9 +39,9 @@ SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - Quienes son los fundadores de Intel? \ + Quiénes son los fundadores de Intel? \ " -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamAudio.sh $LOCAL_DEVICE english robot \ " Uno, Robert Noyce, Gordon Moore. \ Dos, Steve Allen. \ @@ -52,7 +52,7 @@ SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - Cuantos ingenieros eran cuando empeze Intel Guadalajara? + Cuántos ingenieros erán cuando empezo Intel Guadalajara? Uno, 60. \ Dos, 34. \ Tres, 1200. \ @@ -68,7 +68,7 @@ SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - Las fabricas de Intel son 200 veces mas limpias que un quirofano?? + Las fábricas de Intel son 200 veces mas limpias que un quirófano?? " SurveyYesNo.sh $LOCAL_DEVICE spanish robot no From 17505ae1a6218fda19facdea91ebff83427d2ce3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 20:36:00 -0500 Subject: [PATCH 0932/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 9afc7308..65a28b90 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -84,7 +84,7 @@ homeassistant: friendly_name: Sandbox icon: mdi:test-tube - # Central Maya Lowlands + # Central Maya Lowlands, Stations script.acapulco: friendly_name: 1. Antes del inicio @@ -102,7 +102,13 @@ homeassistant: friendly_name: 5. Labs y Fabs icon: mdi:audiobook - # Central Maya Lowlands + # Central Maya Lowlands, Stations + + script.ixtapa: + friendly_name: Preguntas + icon: mdi:audiobook + + # Central Maya Lowlands, Sandbox script.veracruz: friendly_name: Sandbox @@ -368,7 +374,7 @@ script: sequence: - service: shell_command.zacatecas - # Central Maya Lowlands + # Central Maya Lowlands, Stations acapulco: sequence: @@ -390,6 +396,14 @@ script: sequence: - service: shell_command.puertovallarta + # Central Maya Lowlands, Questions + + ixtapa: + sequence: + - service: shell_command.ixtapa + + # Central Maya Lowlands, Sandbox + veracruz: sequence: - service: shell_command.veracruz @@ -540,13 +554,19 @@ shell_command: michoacan: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & zacatecas: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh & - # Central Maya Lowlands + # Central Maya Lowlands, Stations acapulco: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Acapulco.sh & cancun: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Cancun.sh & huatulco: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Huatulco.sh & mazatlan: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh & puertovallarta: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh & + + # Central Maya Lowlands, Questions + puertovallarta: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh & + + # Central Maya Lowlands, Sandbox + veracruz: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Veracruz.sh & # Northern Maya Lowlands @@ -731,6 +751,7 @@ group: name: The Beginning entities: - group.centralmayalowlandsstations + - group.centralmayalowlandsquestions - group.techiemayalandskeypadyesno - group.techiemayalandskeypadmultiplechoice #- group.centralmayalowlandssandbox @@ -839,6 +860,11 @@ group: - script.mazatlan - script.puertovallarta + centralmayalowlandsquestions: + name: Questions + entities: + - script.ixtapa + centralmayalowlandssandbox: name: Sandbox entities: From ff1cd8593e4b56737ca0ed5d943b9fbb0e28e2cf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 20:38:39 -0500 Subject: [PATCH 0933/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 65a28b90..a232286d 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -563,7 +563,7 @@ shell_command: puertovallarta: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh & # Central Maya Lowlands, Questions - puertovallarta: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh & + ixtapa: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh & # Central Maya Lowlands, Sandbox From 449012659f119eca4c74ae7ba5a87bf6340070d5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 20:41:15 -0500 Subject: [PATCH 0934/1653] ~Update --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/CentralMayaLowlands/Ixtapa.sh diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh old mode 100644 new mode 100755 From feecbd0e20845ff752c57dec0d1e6d0cd518dd39 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 20:50:43 -0500 Subject: [PATCH 0935/1653] Update Ixtapa.sh --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index 34f05741..7f9a5248 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -52,7 +52,7 @@ SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - Cuántos ingenieros erán cuando empezo Intel Guadalajara? + Cuántos ingenieros erán cuando empezó Intel Guadalajara? Uno, 60. \ Dos, 34. \ Tres, 1200. \ @@ -62,13 +62,13 @@ SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - El microprocesador es el cerebro de la computadora? + El microprocesador es el cerebro de la computadora? Sí o no? " SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - Las fábricas de Intel son 200 veces mas limpias que un quirófano?? + Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? " SurveyYesNo.sh $LOCAL_DEVICE spanish robot no @@ -90,6 +90,6 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ Tres, Nada. \ Cuatro, Todo. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 # End of File From 0ec8c6397b22b014efe282ef01cb40fd68e53e3c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 21:06:46 -0500 Subject: [PATCH 0936/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index a232286d..205411cd 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -316,7 +316,7 @@ sensor: - platform: command_line name: Qualcomm - command: amixer sget Master | grep -Eo '\[(\w+)\%\]' | grep -Eo '\w+' + command: amixer -D pulse sget Master | grep Left | grep -Eo '\[(\w+)\%\]' | grep -Eo '\w+' unit_of_measurement: "%" value_template: '{{ value | int }}' @@ -610,7 +610,7 @@ shell_command: toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & kodak: ssh root@127.0.0.1 sudo reboot apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & - qualcomm: amixer sset Master '{{ volume_level }}%' + qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & keypadyes: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual yes & From 5079048c63023f6861269d196c4d5f898022cfbb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 21:14:14 -0500 Subject: [PATCH 0937/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 0eca397c..183a8933 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -50,6 +50,7 @@ SpeechSynthetizer.sh on espeak spanish \ que aquí trabajamos les deseamos la mejor de las experiencias. \ Muchas gracias por haber venido." +wait sleep 1 #Robot.sh lupe/message \ From 2db51bcaf094c674b23369f21f293705e0b624f8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 21:25:27 -0500 Subject: [PATCH 0938/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 183a8933..0eca397c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -50,7 +50,6 @@ SpeechSynthetizer.sh on espeak spanish \ que aquí trabajamos les deseamos la mejor de las experiencias. \ Muchas gracias por haber venido." -wait sleep 1 #Robot.sh lupe/message \ From 2c5df1460ee345edace39f4802dcf0a3dbe7e138 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 21:30:24 -0500 Subject: [PATCH 0939/1653] Update Mapimi.sh --- .../NorthernMayaLowlands/Mapimi.sh | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 657be806..8d9806c6 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -23,25 +23,21 @@ export MAPIMI_DIRECTORY=$(dirname "$MAPIMI_PATH") # Main # ============================================================================= -#Memories.sh "40" "on" "${MAPIMI_NAME}" -#SpeechSynthetizer.sh on espeak english \ -# "Nel Pastel Simona La Mona" -#MemoriesAudio.sh "${MAPIMI_NAME}" - -#Stream.sh "Eek'" "1.0" "$FFMPEG_IMAGE_AUDIO" - -Eog.sh $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM & - LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then SpeechSynthetizer.sh off espeak english \ - "To be written" + " + It was a great pleasure to meet you and have you here at Intel Guadalajara. \ + Come back soon future Engineers. + " else SpeechSynthetizer.sh off espeak spanish \ - "Me da mucho gusto conocerlos y que hayan venido a Intel. \ - Regresen pronto futuras y futuros ingenieros" + " + Me da mucho gusto conocerlos y que hayan venido a Intel Guadalajara. \ + Regresen pronto futuras y futuros Ingenieros + " fi Stream.sh "Eek'" "1.0" "$SPEECH_MP3" From 1f93a9fc3a64ba1e175a8b4c831190b7ed3687c1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 10 Jul 2017 21:36:00 -0500 Subject: [PATCH 0940/1653] Update --- Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh index acd315eb..08be9265 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -34,7 +34,7 @@ if [ $# -eq 4 ]; then fi if [ "$LOCAL_PLAY" = "on" ]; then - mpg123 $SPEECH_MP3 + Aplay.sh $SPEECH fi else From 523997bb127aaa53d7c29e2f6353a502abe77e3f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 12 Jul 2017 12:53:48 -0500 Subject: [PATCH 0941/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 205411cd..9c84b653 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -752,8 +752,6 @@ group: entities: - group.centralmayalowlandsstations - group.centralmayalowlandsquestions - - group.techiemayalandskeypadyesno - - group.techiemayalandskeypadmultiplechoice #- group.centralmayalowlandssandbox northernmayalowlands: @@ -763,8 +761,6 @@ group: - group.northernmayalowlandsstations - group.northernmayalowlandsstories - group.northernmayalowlandsrobot - - group.techiemayalandskeypadyesno - - group.techiemayalandskeypadmultiplechoice techiemayalands: view: yes @@ -779,6 +775,14 @@ group: - group.techiemayalandsserverinfrastructure - group.techiemayalandssandbox + consolemayalands: + view: yes + icon: mdi:keyboard + name: The Console + entities: + - group.consolemayalandskeypadyesno + - group.consolemayalandskeypadmultiplechoice + mediamayalands: view: yes icon: mdi:filmstrip @@ -977,19 +981,19 @@ group: entities: - sensor.bosch - techiemayalandsserverinfrastructure: + mayalandsserverinfrastructure: name: Server Infrastructure entities: - device_tracker.eclipse - device_tracker.hochob - techiemayalandskeypadyesno: + consolemayalandskeypadyesno: name: Keypad Yes No entities: - script.keypadyes - script.keypadno - techiemayalandskeypadmultiplechoice: + consolemayalandskeypadmultiplechoice: name: Keypad Multiple Choice entities: - script.keypadone From 45327f692978eada52f434aca75d84fa8424c79a Mon Sep 17 00:00:00 2001 From: Alfredo Reyes Date: Wed, 12 Jul 2017 10:58:54 -0700 Subject: [PATCH 0942/1653] Update --- Hochob/Services/Drawing/dibujos/guardar.php | 9 + Hochob/Services/Drawing/index.html | 114 +++++++++++ .../Services/Drawing/recursos/PaintLayout.jpg | Bin 0 -> 112084 bytes .../Services/Drawing/recursos/PaintLayout.psd | Bin 0 -> 267488 bytes Hochob/Services/Drawing/recursos/eraser.png | Bin 0 -> 6218 bytes Hochob/Services/Drawing/recursos/pantone.png | Bin 0 -> 2234 bytes Hochob/Services/Drawing/recursos/save (1).png | Bin 0 -> 3653 bytes Hochob/Services/Drawing/recursos/save.png | Bin 0 -> 3165 bytes Hochob/Services/Drawing/recursos/saveok.png | Bin 0 -> 3424 bytes Hochob/Services/Drawing/recursos/size.png | Bin 0 -> 23698 bytes Hochob/Services/Drawing/sketch.js | 183 ++++++++++++++++++ 11 files changed, 306 insertions(+) create mode 100644 Hochob/Services/Drawing/dibujos/guardar.php create mode 100644 Hochob/Services/Drawing/index.html create mode 100644 Hochob/Services/Drawing/recursos/PaintLayout.jpg create mode 100644 Hochob/Services/Drawing/recursos/PaintLayout.psd create mode 100644 Hochob/Services/Drawing/recursos/eraser.png create mode 100644 Hochob/Services/Drawing/recursos/pantone.png create mode 100644 Hochob/Services/Drawing/recursos/save (1).png create mode 100644 Hochob/Services/Drawing/recursos/save.png create mode 100644 Hochob/Services/Drawing/recursos/saveok.png create mode 100644 Hochob/Services/Drawing/recursos/size.png create mode 100644 Hochob/Services/Drawing/sketch.js diff --git a/Hochob/Services/Drawing/dibujos/guardar.php b/Hochob/Services/Drawing/dibujos/guardar.php new file mode 100644 index 00000000..dc93aa77 --- /dev/null +++ b/Hochob/Services/Drawing/dibujos/guardar.php @@ -0,0 +1,9 @@ + \ No newline at end of file diff --git a/Hochob/Services/Drawing/index.html b/Hochob/Services/Drawing/index.html new file mode 100644 index 00000000..ba5632ae --- /dev/null +++ b/Hochob/Services/Drawing/index.html @@ -0,0 +1,114 @@ + + + + + Intel + + + + + + + + +
+
+

Visitor Center

+
+ +
+
+ + +
+
+ + + + + + + +
+ + + + + diff --git a/Hochob/Services/Drawing/recursos/PaintLayout.jpg b/Hochob/Services/Drawing/recursos/PaintLayout.jpg new file mode 100644 index 0000000000000000000000000000000000000000..63a93cbe53d6a533bd59943d911aba1958d2dd22 GIT binary patch literal 112084 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

@17I|uwS_9%PdC$IXu&Y5$O=^G1YJFeq~ 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�Kdu$sm8uwlI8uXBo+L06g4dIZA!^_dJ%_VtC^Klr($1* z`NDVnVXH1EkJ7DP@|tIa0_X`NhRyipB%_K;I_#GK;_C+(t&{xxUh%Q_fhdOdL{?Jc zLiUNnmqsSv{o#taPrmi7rvK!=yM2f4#nF2kWw~i@=tcJBM$$67+t5GUYud-Y{4wd( zS$eevYe`#h<8ooOxSC(J@(S+N-33+5oYXVCN|u)g7-lY(U(r*3Nz_jZ3qLnyu%8#< z9;nx0FjjCk?dV4e-gc9zku#Zb548Pnr-Zk~x8=9kDk-|x4}H3$Un`j~`YZco`S{e( z1okWYu;R16#r&eB)uO@5dCt!BEN0dcMQH2>WMha4;J&Ve`ns&wZ}PEzANq<-7GMS1 z*Ry>+JNoFMSA^=NU#EG9JOciYI3EBmOdetG^=LEW55LkII~+i-R6}L-#t!?h!bT!g!&}`823dkIwwLoiu)&i}C0nY9)7e=inP`0RVP~V`wL4AYz z26aN}gwzSC6H+InPDq`QIw5sJ>V(t@sS{Esq)tekkUAlCLh6Ln38@oOC!|hDosc>q zbwcWd)Cs8*QYWNNNS%;6A$3CPgwzSC6H+InPDq`QIw5sJ>V(t@sS{Esq)tekPyr{T z+~FR-yG74th^{M|4Vn#-0Xh@tOrSG?RspSoyH`QA%=F?8Uz4^=w`s+)c(i zT$4-k`nf>8&ZOrHDt(gA&r6-vUYPzKCl0KN^&TL-DV-^;9;u4A-w@aB^HDD2=y&tF|U=g zSLC%4wIEU>*x+HR!I{L8%>xW%2_HNjt!CD_@)@1CXpAmD9}O{(!ftIP#Nc6y!okdv z)rCayX~Pjw4-By?&y&v;WS^1Fjy-esiVh1)DeUvD1Q$F^VK|-IZ*?MJ49$oZHtRsR z=**MS(y>dHT`0uDek4p#!NU}W0-JYsMDsG_q=VGb>oljD|OB-%ct zO)$a3)JDW8n;o?M_{{HUZL`jsKOVG`S8m#zwmdna?M2!I5j;$7ATUW*tA({n_#E_z zwhNEjhqagfK3{)j-7^tw57H)h;9+V5sz|bSpqyiXPqemK*Qd4{X%jT?Ftq^-ELq!- zHpT)+v^(**{o!$6FU;*8w+m?#EbuV30SPQw%}5)QtD?2dx<0i#LE9WY^?7(VJiq}< z)@G!QaljF6Cmy%d*SMW2%u9+$0}5EOHX&(@Ig6Gy>-v)plZc0zalimewnik4F~AXN z5sy01�eMWYmBFmaIl3jiGnZ(q>&mI$s|((IDZ$n8l*5CCg^510FzHwG1LKF>8L~fnJ;5}e zPuv#X5&d?VkSeC~Da)?J?9YJmE7@*#q9ci>HIYptn{t!;AqId@}&V1(;5utLnX74W{2t=Pi&F(#G_=USt+j%&~% zyzk{R(F*szqXw{V&{kw&oaC~dDa@+&)yxWUC9}fOWiCA%Fu?USdeOV=k$1H%6O#M? ze&G5V{^u1h3g1TFajD;H1J~Cued_pEy|xkyV;$(bf$Li_JwATQxYv9r{{vnfxV|^1 z2jfRgo$#8+R%T&@fdqi-YnU#<8^#?%(}{5n^akMi8Xoq=kD4-RpT`Ds-WnX}9l-Ui zobG{ljN2#K48VORlc;x!?!xu0_>l`qrh9Ca7N(O_S@#9n{B@GcUl0G)bvIUmsIk&7 z#n&+1i6Vlu-hvAfuZX@NE80wU)+XY4Y%y9niwAXJLK#5S;P<|d%Oz;uwMEz_ZsWIZ z(T7m)q;G_8%?}(PHQ|WIRs&MR4r8Q*Hd8y>CLk$~+1SdN-AGD4`LrpOU$U1}rfJbk zAwf*wXFsOKmDvZsw{p52C)sbU10CY{u{!Oh4z``>v>MyER-*Gxs_8fU@_j_7@tL{8 zd~rUXH19Ij=?mUl|6?l%O+N0mH9%pJyV|gY1}66!9_c`Ne9db$!T891+>=til3lgj z-BoUAbu@%w4ovMe{-6!1pYU66!=T9m#+SmUru^*th97d@o3p|*+!zKx_8NX@h5#lV z^jq)1@X6v01(5uWFB>Ls5B_-7umczzuD9XgW)#l}$=U+(kaaAM=iet9rf}mQRU)22 zv3e_i(gXobPWM_{At17*4+j*O!c1~cWG1&L6WCB$y~ZCjLWJW_NVayELuAJjjxaQZ zoBGg1_cV6gM6*&s4iVH_^QaN!@u7%2hm&qlUkI}6F#c|2_?;iu28uL|KJBgulc7B zDHiOI@w~<#S3{taz~e*+lyqRa0v$DZ!cXVS@juSbN&N3|3eC|W6M9XLR>jMcxi|gR zPKcEBslt&4r?8X1?0%3Lr%sfs+XCoo-{_QhbN2xMri+8Mf|AAlaBkXZkV5>h1Zo!Zt8^l#Ruaa_|nwL58OX~ zsza$tVg}FW-EtGnO-Q5{5=mN|-C<7n_DSc3u@^sn;>#2N^zI|$m5X!GaNeq~l|wqG zob*}!kWSM7?TV9q;4FY|TPHpx%jfP_I>>uR^X@D|pE#s40I4Jm@u(1wK!_FN5<~KF z1w$M(n0G-bs+&`OYY1Wt$V|A;+7%}^Y1(qr!{oeTT^Va<9MCGzM6e{oZlK3&$ zI4uw>cl@X4V$2gNebW8n*fIBwn>yu7_fHfQtD>PHdH<^zndeEb6PUNZjDI>NRE1VV zL+A0%EQ;qQPq+@8&!QJXk4!*=gzujFx*?uj69D+G2a0mXcaM)mRIsIN{+0nPLw4Q!>AQFAPJi#ZHPnQki3alSxoMU0?8YFFck9!B^bwGEJG<6^ z3VwD2VRz3|#g9vcvU6?!kNEf}W!bp(xzoX}C7yzT49wg;Gpz<@4-lo93!(T?iz;P# zeJGx37>Qu|0`8vuYF#|L9Oejrdsfm#0Pbe|=-aDYBca|0ZTHNyhIsaOK7j280JiJ4 zcdZQ-`~>Ov=(SB&?B3u6H+InPDq`QIw5sJ z>V(t@sS{Esq)tekkUAlCLh6Ln38@oOC!|hDosc>qbwcWd)Cs8*QYWNNNS%;6A$3CP zgwzSC6H+InPDq`QIw5sJ>V(t@sS{Esq)tekkUAlCLh6M7&rV1|x>3Ikie@7{i6Ocs I|2ebqe?MW9djJ3c literal 0 HcmV?d00001 diff --git a/Hochob/Services/Drawing/recursos/eraser.png b/Hochob/Services/Drawing/recursos/eraser.png new file mode 100644 index 0000000000000000000000000000000000000000..a07be0c3d2cb10ed3846661af5b465097785cf18 GIT binary patch literal 6218 zcmeHLX;f3mwyqO`MCP=#M5d%cg>Ds4ltBmq85~=%vBd!anHv<4LFVKrDzq}#IJHUx zN+a5+ASj@K2{JV}-~fUp2IpQGQ*zy=?_Ve?J`{EH{}B*W*0p_}%EL;H5@ z9~rvZb`lOQiE!8*;S%B(5p^KU7eqxx8U7L+6z+W>)YmX1%>T+KD-8hD8#de9?u_mj z?PA>On%v*OO%w*U3tBF8@u*d!mp5UW23kG3^G;1s`_nwsj4 zqtlsV4dnEqGbggbKh4qIo4d(9E{(iO9H{Mg0004i0DujY4kK0t0EIm~02J8#?^FNG z{DtKTa$L~%F!wOuu<&BT_A>{!xo<1gA6q(`(bagRF{p89pxq}S%rz__Y)`Sd#q*%k z0FdrflQ*|6qt>@Erht{KWXS zWrb=!0+qHIi{l$J6cVf;d4rB<(OJ#2`(?F7jaKJZ^0_ck+pI+w^^ML22vo$USc!B` zRRn~F3N9{HIUgZV;RlDggk_{taUj`B6r>+qe^#z!*#i~_CNW}snfT*hIs@d zoO3O=$E()zNLjN!0z8EdP!3CQ8m=$ORY%~mvyE_Y$?HAvaJf^M1RI!h1`!3oSfmSA zUkWf5N$1(=*nB-1n@^!(^CX5nBs3N!Lqbm>5fZWldN@3)j$mULo`_%$;TUwd5sx`c zCtwcAM2e*Ue8m>Lp86{;~7QJ@-6p)FLy z5+p)3UjXTZP;CW?+JAM3a?MCsg#Qlz4;``uGEgCOjwxiTU<&KWn8FmAsyR-p*i(2E zCHCgXvQ_XYAZZneLGi?!hgJ(@5Ixpag?ci9gebcki)>hgP{A>-9L^DyAwj4yPV2E0 zN?9O=XTz?xYCutLxaaIaHErsus zJ~c=ieg->5RixbX_1`?JpMT$rkeUE17Xdu z@u>96Aw7f@15o+bfAcbsK;8t~)xAi=AeR#APhHhv5W$N@W2BWQ=@_K#kl9`}FRbTU z6;N*Q6c!!yPJ2M5!5c~MttZRi9o9>`ZQ`XChS_ZlHuX_E0(-1m`+s?A@EM!kW6_+m zLx4Fp38P%{eq&IFjsDX4W__EIX5JF$(s&hL9&9m#dV7CwC4em!u;;l&4~M?Or2YP8 zD>;*QGEMSe{+NnGRk6U8?`{LCeweHB+hl8As?K+?!hy=j3P2fv4k+btR~*2Cv^``c z6q=#+G)yZcrvR=39KBnap=AX3i7rSUeArmZB5A-n=4F!oE+Y6Hpe zcB7^G@_-!zy{SGKbUBoGcrC1rIq^E{Tdhf(V8sGWzEQ>Ya2I+T;?Ui#+x_(w^I)w6 zgWUHKWsi4DNR%xzWFa>U%X~`z;!_`!ldkU3eiX@(mMUGaxC9gdaLq=z%lPE!}BK18$ zGMx-hTD$~p4`Zvu&@#F(wk}KzLWHpeV`5MOywsRtVkC5$U+8{Q!eYbdSPQV&Fgmxd zbhp0JwS1)uECK;OybO-^CXCa5A?j#q7Smyihe)S$a7usah_($jRV$CqYFkN+-`CNg0z45f-POzK5B!& z`1E%Hs{x9n_Y+uK{6w4b#pHEcd?2sQ6} zT&Ww0%tmz5z}rv#vZNUT=@Hk%WW5n}%*<~xc3r`Wl<{7fUTt+lmh(ndsOTQUWOk=q zVM~o;^f*$~?4V$Lk7!)U{LpqI;bvmnFBL?cc<}K^HBQkNugD*pHY;whjQztp=0Y4v z(HwL~+{G#G$193|q-)&YXc?Qjm#<`8E2D(Ax!nME-y(J8H6B${`r4JI`% zo&mZ!=4Jdtt(Qya`!C-g)99;~W0e>>qgRtrudYtUv-j^RFI8EcZu4fi7w!)@E=L9< z`!j(|I_mZ4t`oJwfLbPF61OVQV-2f@2%;VsBMUT;I=U;f^~&5fhA_L)H8Y_Yi@v1A8^=6p>^E7FUpvncyd-1s5xb$}mE92H!0O%xQ{i1tz`V zef_8w{Jcr%g zu*|F8>ya~qx6J}Vt8r@KLf2HoriRVW=wjr`d8oYF5+axM~Ov$9WbLqMPcJoL_N65(?TvWC&<3o)tz@ z0M1R^W}e?vG30P@U?mzxph(X^e%9>~5$^`QlOT`Y#N|ZB^+xR<2ZIfjB1Ml)kUugM9L_)=HC=T>)* z(7zBvFDS#aCHk3#0buu720fn%h_xzIo)&mmoNhRhjTi=EGBuK9J%w=xC;!eXDPI*w zW^!nQ7w7WJ)omkB5TzE2lNLY=(cEOG|F~P$NT<`RSs?Reb&#ltXc&f3Y)_Jd26K5+ zADSw6bgi!Ay}csZl`taEl$#tYQxn}vY)iO8G>pYegOlJl$}D#o|6~0?NM|}#*0!qD zT8T@}7bkoI^sRk&)7-@~4UUS3U&`3P8zwEwajIE6L2*~x;%MzBsz4XMuOl(Xkk%CyON(tKC*l{KoB^doE;$QbKkaO=(80 z5DNSXBGh(DntD%J9kS32M;(hlHUyFbY=q5I;s*fg& z8*Cm5x{&3QW8eWnIUm`yfzk1$l?@+S&}#> zg!FxrCT1`p;QI+^MJ=0le1fssysT%I)i7SXeLPJ~&{^@^+JYI~n3?<6&NP#AI4s#r zcguXEnx0ZKvD;w&!x;fq6h>M)mw&P=3fD;QV@$+Og*0|GIykyuQFIH;N}Td&ytzlz z2EVDWi)3;BYX*N*S?BdpH6{K~K~O%)2@^Gu&KP;po7&+qH5X$V)HB-eYAE`vpiqoe z31`e8gVD~6odj7N@u0UJCvuRRo_gy;HM^o2l?Oy{E=pKPn%*?4bZAE8R>50=K3nF$ zjTbjp!d>CG6H81cZL}wroh72RHB?N|!DL4v|I^`JOmBNx6n;-k$B8Bn?k8t+jt)3g z%$yZZc3h0(M+X&>c1T=z_Z602r8Sq#*w2();P-wMwsnhg`ZG)vZ(<2sI5z6h`G#l2 zPj8{$Ofp*;doADN?szA_vX!SPo+<;6x=WZ`ewaW-w4g?tDkN3;NZp!=MnQS;nHurg z9^4K0mXdTA>a3;S4{#GYKjMb$2_G6B=2q@2?-Msxi8y~;5DDAjCI-bVdKWb$x+YS^ z)l3KRuD+Av7unwB2m8$w9|~$1ErldW#wOCl)g?m(Cp1NNWU=}~!QGDca{yjIKod zxu?oHRs6tCENEE#oXo5^K#en|eo|k4%&+<7&rvDN$k5qU$Bm3HW07;~$(XMc8UZd3 z{2@qkA6_n9VT;SJ)~Zq<(YRSx7Vz9g^oblz3-<3%$i3(_sl+4r7~BE zf1a)##zG4HvoLa`vfF)Hkhh32t8}8=W-YxI4gc59R6c&yyqHY$q=W!VB$4- z5!49~EO;~o5iG`11?YqqDhRgMd)vUAMh-RQy{wid zjX5hbacWuGvd~)DOG%IvA0UW;iuvN9qU@55f9j+CvES$X&OP_s@A;l{&;5MPuXw*r zrkGh60D!5l&xSw%kkCW|v=Lk$Uw5d2ixFv^F9D54H@5l<;nq08XA23!>-9gvwSC2p z&^eRr9ZC+0-$|xK?27~x3dJQlE{60|L_(xX{JvdRx>wBt0Kvq6NAT9^bV~J*uuTr7 zU9K1t==oTLVmTBDfJX+TKrAza2t=~6BZG!Ui|7Nu05cfPtx^bp(kyI;y6Hb{AU7bP z(I}8WX>F53q)5`iZ)qEgHRy(BahtUB#1gV+^&t zmN5e|uxQ#wFO#e!Gcvjbu=4a>r?qzVJ^3QkPW)GCf1?9rbihAWgcY0pE zX?R`BujcS;IE^r*hTFsut6`$L24Q_?6|Aj^t85WT1tO_f+9~eRjFqYg-qCaFx4xpX zzDG~{IrRf=`Ua}{+SOGob$6XcUNI;s9-^Pr#sz4b(sb2?+cJx}@O2}|fqp^2XfhgY zjIsLi>pAlsofa%~b8}zm;pyqMVKbf(5*kK~h~6EuXHRTgJcW{U{PdYKm$K+re`hfM z$os3Xu=IZAAT zm5=y`vG#}MaUsEFyF^owsi~Z_HE3hPwK@2!MjTMBt6^<#^=e~F`H8fnnuyuk|3_$%8^Fon4yx2~kEQgWr=wqyB zwI(}b_Q4XUmZ+H7Rt~7O2*{N{sA!*yS*CZd$GkXCy8z4DPQcyEwzUtNlJa`d*Zo{} znSZ96X4|c2Uh3uDN?e&2hN0QMH?FnxnoEuAUKbaMwlyWVU}V)QkT9aUwc-+jv88!% zXs>p-P-c#$GZV`aD!lRONy!fdX^!?S_rpnfAS&bs!DzG>f2poub8CJ%#p8sgYxhc| zL#(_vUO~L4wdhj~t{cwWQq|KhFly>Pqa{;r9x|e~ApjLv0OVSL z1_)a)X`+oZ_q0=PBLmye$1EZx@2zC=jf8h*ncXPjT?(2g_Onuq4`Li^Q}*6a5ohYM zH8wzcEo5n0iCGqM+_Krv+pe8CCwR&7~NB&t(V-aU(0g|H|pB}aCb;2a1&flukW*n3T3 ix<)MS)AQMZo<535r?zKd=3<`%`1yMKZ75i`o%S!M2fJ$k literal 0 HcmV?d00001 diff --git a/Hochob/Services/Drawing/recursos/save (1).png b/Hochob/Services/Drawing/recursos/save (1).png new file mode 100644 index 0000000000000000000000000000000000000000..16b4b6ceb3fd31ff403a8c72d11dea50a634f02f GIT binary patch literal 3653 zcmdT{SzJ?B9zIEfG3_8NsUj+Y)=G4!kb(?r5EqKbCITX0B&e(bf+R5zK_Z~lQJ`wI zKxA<$4O<9Qk~m?D){QFL7!nqP)E0<|fEF(jiZJK)sq-)oqrS{T{^#8D{g?0ipYyx- zX<}e&^aa;Vi0MJc>v78CB7B_4g~-m9RSxN0L)S^%Y)n@fIZ;ry&Zs>{I&M*iIBP@oCPbX(H~~( zdOTnoolZ%UhQ%@=S!@v zc3Ac0Hy__O4aqa9!GF+~oAO!J2Gg5)iL7(9ub-XFvHCD)eFt)5r^L#Uohx;X{o>;C z-t9izPh&oNxapUdBb1{h0tZ&~M60{UUOFCQpA z=V<zBpo_kV*Cq*r35kr z4Aug^$iV{HVUa?ecQ#XoYf|C{x~hc6nZN$b`*l;Hvsl{M6wU2ZPFbWgEzDQQ2uwH-N z@|}?Ln8*)Oh;957E){j|M7iy;`5JN?;GhgM*k#Zf*rn*4a~Yj;1kieEH=!bXV^EQm zKcXT7xTuP&U8u;tv~@61uj@`ll9SO1N3*`*Rc)`Pl;>1|iX}5@M~Tq(^3#5eSoakihpbN=U%3^AsddRMv|U@LG%ZrQ}N=$T%ebkAMgs z>YCJnI!P;0LApytXr{;r2=E%N!W=K7H$Yf>+Z5*LDLet&Q9=G7fDb&QR+K>3;m=Xk zuZ!(4i;W9*SU@cyW5oLwy)k@`&I|lSGU%x_LS;s=(8xFzEKWs{Y1rxMb{z&=|*c3sq~~;Q@(ek37_=Ox1jm1_T?RJ@&A}A zGSbAk(njYZA}g#jTNnCyH^=hX(+T;71> z#e`o3nLo@ll_`E2Y?NbC3GeiT|5<)g=)#oZj7(CtFRqDn`0`!d3l(wiMr>*eOE2NX z(89x%E+XOOk<)Y0ny^=WVTsxL4RuQ}&MF(-HAyRS%D6P#Onn=<#A`{ZDpa3Sv9#q= zm^wF^2aOvz`!HK0l}l!n(-GYj+1Q53X{4ZohA^MSNQ7NXYR)i05wy5RoIs7fP!=ka zmU&L$=$#I_gCg>SkxoRXB5DPo&frPw;obD}803L0BHuAgMxuOoMprE&_c&mxYFwLb zVR&p<6Unn1S5c!o@7j#y6;C8m`DFyp(7qEQd|rys1v(C@d7j!MB}9HrO}PrKki^tu zUiyKWngS&^GO(!kXI=w>gSQ37f(+rCXEiT8;$f+-?!O6}z>X(jU8xpA!xDNO1C zeirg%?$t88@S-&`oSSMba&nO7#)zA!iSwVFvC6K(Co(5Q<+IGqXFdVsIgTcjDjAcDq@p2lp7}CC7HP7aO!f)$zGteK5TjHlUscUstAIpHazl zL=OG=N6or?P6BOrchy=+dt20Fako+&QNHAU>K~u+tgBu!1;fY8*V}2SKYb^z;mSNPV`RYCAL1k}qsWsvLnkd4)hd19 z(RqK{_vRo{FTNHL7(cQO`MdG(Z&xth%vyb9IhZ!(J2pp{#2*^>i8>lUv)5{CBf8`E zV|RsehBt^$h7EN5$Q@9$Tc#!4Dle|v1W%OQeI~=%5C*ojlU!?Ule4f7$cWQIBRtsj z192YnhI?6Kd-6a?D7A;DxYd<8JALl=2co4gke6OydH(6pYeD+N>0|o~rI7Giz?hMe zDAm&owAX1pz1z0kI7CpC*hxt}x2E)r)h(l}+ycv)_11nsm092Rh`04Ub@J@Gd2bzA zNS&LRD_4;fEwE#=tF0^`R=DuyGx12SHIhtxxK9-?3AlLgoPzg(Ot9TQ^O zgPh8ri14}zWJo21FkLgj3D-R2-CDm)-6@%FdVFKi^R@59=BJTu;dV845)ZboKr*4MArjqvXd)6CR&btZRPCcov-S~C^grP`dMSd#v09i}707!GtciLJ(lQw8rhg%CpDcX6nrO2V1dPczVVXYPt-SfVV=LzH zl{Ve$-q9ER&+ogpyd3gAK*rl|uRc1WWfH0m;lm39%XfJwV-me-8{WM=Jy~W7*v3 lv>3qUa%~e*7_5WQsWG<9v^c?}`zq)Je7pj-*Keig{2OuxK6(HE literal 0 HcmV?d00001 diff --git a/Hochob/Services/Drawing/recursos/save.png b/Hochob/Services/Drawing/recursos/save.png new file mode 100644 index 0000000000000000000000000000000000000000..63ec3809486f00d4046a2275ba8bb3c0eea3c3f2 GIT binary patch literal 3165 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 literal 0 HcmV?d00001 diff --git a/Hochob/Services/Drawing/recursos/saveok.png b/Hochob/Services/Drawing/recursos/saveok.png new file mode 100644 index 0000000000000000000000000000000000000000..84e27e91415948ca8595349037581db3ffe23d4a GIT binary patch literal 3424 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 literal 0 HcmV?d00001 diff --git a/Hochob/Services/Drawing/recursos/size.png b/Hochob/Services/Drawing/recursos/size.png new file mode 100644 index 0000000000000000000000000000000000000000..ec0a66a7a98c6e377effbcb2b19a9af42380cc1c GIT binary patch literal 23698 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 1) { + $.error('Sketch.js can only be called on one element at a time.'); + } + sketch = this.data('sketch'); + if (typeof key === 'string' && sketch) { + if (sketch[key]) { + if (typeof sketch[key] === 'function') { + return sketch[key].apply(sketch, args); + } else if (args.length === 0) { + return sketch[key]; + } else if (args.length === 1) { + return sketch[key] = args[0]; + } + } else { + return $.error('Sketch.js did not recognize the given command.'); + } + } else if (sketch) { + return sketch; + } else { + this.data('sketch', new Sketch(this.get(0), key)); + return this; + } + }; + Sketch = (function() { + function Sketch(el, opts) { + this.el = el; + this.canvas = $(el); + this.context = el.getContext('2d'); + this.options = $.extend({ + toolLinks: true, + defaultTool: 'marker', + defaultColor: '#000000', + defaultSize: 5 + }, opts); + this.painting = false; + this.color = this.options.defaultColor; + this.size = this.options.defaultSize; + this.tool = this.options.defaultTool; + this.actions = []; + this.action = []; + this.canvas.bind('click mousedown mouseup mousemove mouseleave mouseout touchstart touchmove touchend touchcancel', this.onEvent); + if (this.options.toolLinks) { + $('body').delegate("a[href=\"#" + (this.canvas.attr('id')) + "\"]", 'click', function(e) { + var $canvas, $this, key, sketch, _i, _len, _ref; + $this = $(this); + $canvas = $($this.attr('href')); + sketch = $canvas.data('sketch'); + _ref = ['color', 'size', 'tool']; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + key = _ref[_i]; + if ($this.attr("data-" + key)) { + sketch.set(key, $(this).attr("data-" + key)); + } + } + if ($(this).attr('data-download')) { + sketch.download($(this).attr('data-download')); + } + return false; + }); + } + } + Sketch.prototype.download = function(format) { + var mime; + format || (format = "png"); + if (format === "jpg") { + format = "jpeg"; + } + mime = "image/" + format; + return window.open(this.el.toDataURL(mime)); + }; + Sketch.prototype.set = function(key, value) { + this[key] = value; + return this.canvas.trigger("sketch.change" + key, value); + }; + Sketch.prototype.startPainting = function() { + this.painting = true; + return this.action = { + tool: this.tool, + color: this.color, + size: parseFloat(this.size), + events: [] + }; + }; + Sketch.prototype.stopPainting = function() { + if (this.action) { + this.actions.push(this.action); + } + this.painting = false; + this.action = null; + return this.redraw(); + }; + Sketch.prototype.onEvent = function(e) { + if (e.originalEvent && e.originalEvent.targetTouches) { + if (e.originalEvent.targetTouches[0] !== undefined && e.originalEvent.targetTouches[0].pageX!==undefined){ + e.pageX = e.originalEvent.targetTouches[0].pageX; +} +if (e.originalEvent.targetTouches[0] !== undefined &&e.originalEvent.targetTouches[0].pageY){ + e.pageY = e.originalEvent.targetTouches[0].pageY; +} + } + $.sketch.tools[$(this).data('sketch').tool].onEvent.call($(this).data('sketch'), e); + e.preventDefault(); + return false; + }; + Sketch.prototype.redraw = function() { + var sketch; + this.el.width = this.canvas.width(); + this.context = this.el.getContext('2d'); + sketch = this; + $.each(this.actions, function() { + if (this.tool) { + return $.sketch.tools[this.tool].draw.call(sketch, this); + } + }); + if (this.painting && this.action) { + return $.sketch.tools[this.action.tool].draw.call(sketch, this.action); + } + }; + return Sketch; + })(); + $.sketch = { + tools: {} + }; + $.sketch.tools.marker = { + onEvent: function(e) { + switch (e.type) { + case 'mousedown': + case 'touchstart': + this.startPainting(); + break; + case 'mouseup': + case 'mouseout': + case 'mouseleave': + case 'touchend': + case 'touchcancel': + this.stopPainting(); + } + if (this.painting) { + this.action.events.push({ + x: e.pageX - this.canvas.offset().left, + y: e.pageY - this.canvas.offset().top, + event: e.type + }); + return this.redraw(); + } + }, + draw: function(action) { + var event, previous, _i, _len, _ref; + this.context.lineJoin = "round"; + this.context.lineCap = "round"; + this.context.beginPath(); + this.context.moveTo(action.events[0].x, action.events[0].y); + _ref = action.events; + for (_i = 0, _len = _ref.length; _i < _len; _i++) { + event = _ref[_i]; + this.context.lineTo(event.x, event.y); + previous = event; + } + this.context.strokeStyle = action.color; + this.context.lineWidth = action.size; + return this.context.stroke(); + } + }; + return $.sketch.tools.eraser = { + onEvent: function(e) { + return $.sketch.tools.marker.onEvent.call(this, e); + }, + draw: function(action) { + var oldcomposite; + oldcomposite = this.context.globalCompositeOperation; + this.context.globalCompositeOperation = "copy"; + action.color = "rgba(0,0,0,0)"; + $.sketch.tools.marker.draw.call(this, action); + return this.context.globalCompositeOperation = oldcomposite; + } + }; +})(jQuery); \ No newline at end of file From 30991c1ee3718e45e77a615a3581ec55cbefbcff Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 12 Jul 2017 12:59:24 -0500 Subject: [PATCH 0943/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 9c84b653..88c65846 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -228,6 +228,20 @@ homeassistant: friendly_name: Server Volume % icon: mdi:volume-high + script.visitorsusb: + friendly_name: Visitantes USB + icon: mdi:usb + + device_tracker.eclipse: + friendly_name: IoT Eclipse Org + icon: mdi:server + + device_tracker.hochob: + friendly_name: Hochob Server + icon: mdi:server-network + + # Console Maya Lands + script.keypadyes: friendly_name: Botón Sí icon: mdi:check-circle @@ -252,19 +266,6 @@ homeassistant: friendly_name: Botón Cuatro icon: mdi:numeric-4-box - script.visitorsusb: - friendly_name: Visitantes USB - icon: mdi:usb - - device_tracker.eclipse: - friendly_name: IoT Eclipse Org - icon: mdi:server - - device_tracker.hochob: - friendly_name: Hochob Server - icon: mdi:server-network - - # Enables the frontend frontend: @@ -520,6 +521,13 @@ script: kodak: sequence: - service: shell_command.kodak + + visitorsusb: + sequence: + - service: shell_command.visitorsusb + + # Console Maya Lands + keypadyes: sequence: - service: shell_command.keypadyes @@ -539,10 +547,6 @@ script: sequence: - service: shell_command.keypadfour - visitorsusb: - sequence: - - service: shell_command.visitorsusb - shell_command: # Southern Maya Highlands @@ -612,14 +616,16 @@ shell_command: apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & - + visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & + + # Console Maya Lands + keypadyes: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual yes & keypadno: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual no & keypadone: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 1 & keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 2 & keypadthree: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 3 & keypadfour: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 4 & - visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & switch: From e85c0dd5a4d53a6327661e0ec263874aa314e6f3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 12 Jul 2017 13:48:21 -0700 Subject: [PATCH 0944/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 2ac6a718..44dd8813 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -31,7 +31,7 @@ then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ - -transcodeopts '-b:v 1000k -b:a 24k' \ + -transcodeopts '-b:v 500k -b:a 16k' \ $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else From 8f84aea8e4cec80ecd8a19e527f414bda42b2e56 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 12 Jul 2017 13:53:32 -0700 Subject: [PATCH 0945/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 44dd8813..4fbb3395 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -10,6 +10,7 @@ export STREAM2CHROMECAST_PID=$$ export STREAM2CHROMECAST_BINARY=stream2chromecast.py export STREAM2CHROMECAST_ARGUMENTS="-transcodebufsize 5242880" export STREAM2CHROMECAST_TRANSCODER="-transcoder avconv -transcode" +export STREAM2CHROMECAST_TRANSCODER="-transcode" LOCAL_DEVICE="$1" LOCAL_VOLUME=0.75 From a758ee0880513a6089f5a41a5b32b477851e719d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 13 Jul 2017 11:13:00 -0500 Subject: [PATCH 0946/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 88c65846..7695f0fa 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -730,16 +730,21 @@ group: default_view: view: yes - name: The Home + name: The Captain entities: - group.techiemayalandssystemhealth - group.southernmayahighlandscalendar - group.southernmayahighlandslanguage + #- group.southernmayahighlandssandbox + + southernmayalands: + view: yes + name: The Show + entities: - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot - group.southernmayahighlandstour - #- group.southernmayahighlandssandbox - + robotmayalands: view: yes name: The Robot @@ -783,7 +788,7 @@ group: consolemayalands: view: yes - icon: mdi:keyboard + #icon: mdi:keyboard name: The Console entities: - group.consolemayalandskeypadyesno @@ -791,7 +796,7 @@ group: mediamayalands: view: yes - icon: mdi:filmstrip + #icon: mdi:filmstrip name: The Media entities: - group.southernmayahighlandscorporate From eedbd15f66f8729a61575473c961177acd288e1f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 13 Jul 2017 11:17:58 -0500 Subject: [PATCH 0947/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 7695f0fa..1ee43c23 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -733,9 +733,8 @@ group: name: The Captain entities: - group.techiemayalandssystemhealth - - group.southernmayahighlandscalendar - - group.southernmayahighlandslanguage - #- group.southernmayahighlandssandbox + - group.captainmayalandscalendar + - group.captainmayalandslanguage southernmayalands: view: yes @@ -744,6 +743,7 @@ group: - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot - group.southernmayahighlandstour + #- group.southernmayahighlandssandbox robotmayalands: view: yes @@ -805,13 +805,13 @@ group: - group.southernmayahighlandsmemories - group.southernmayahighlandscamera - southernmayahighlandscalendar: - name: Next Visit + captainmayalandscalendar: + name: Próxima Visita entities: - sensor.appleimac - sensor.appleipod - southernmayahighlandslanguage: + captainmayalandslanguage: name: Idioma entities: - switch.language From 6a5afe5a2583f63d145f326a36ac70060d47b687 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 13 Jul 2017 11:33:21 -0500 Subject: [PATCH 0948/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 112 ++++++++++-------- 1 file changed, 64 insertions(+), 48 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 1ee43c23..7f150908 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -15,10 +15,12 @@ homeassistant: # Language switch.language: - friendly_name: Idioma English / Espanol + friendly_name: Idioma English / Español icon: mdi:audiobook - # Southern Maya Highlands : 1 Introduccion + # Southern Maya Highlands + + # Southern Maya Highlands : 1 Introducción script.aguascalientes: friendly_name: 1.1 Bienvenidos Intel, Protocolo de Seguridad @@ -42,42 +44,6 @@ homeassistant: friendly_name: 3.1 Bienvenidos Recorrido icon: mdi:audiobook - # Southern Maya Highlands : Corporate : - - switch.guanajuato: - friendly_name: Image Showcase - icon: mdi:folder-multiple-image - switch.guerrero: - friendly_name: Video Showcase - icon: mdi:file-video - - # Southern Maya Highlands : Intel Guadalajara - - switch.jalisco: - friendly_name: Image Showcase - icon: mdi:folder-multiple-image - - # Southern Maya Highlands : Visitors Center - - switch.hidalgo: - friendly_name: Image Showcase - icon: mdi:folder-multiple-image - - # Southern Maya Highlands : Memories - - switch.queretaro: - friendly_name: Image Showcase - icon: mdi:folder-multiple-image - switch.quintanaroo: - friendly_name: Video Showcase - icon: mdi:file-video - - # Southern Maya Highlands : Camera - - switch.yucatan: - friendly_name: Camera Preview - icon: mdi:camera - # Southern Maya Highlands : Sandbox script.zacatecas: @@ -208,30 +174,32 @@ homeassistant: # Techie Maya Lands - sensor.bosch: - friendly_name: System Quote - icon: mdi:approval + # Techie Maya Lands : System Health script.toyota: - friendly_name: Check Infrastructure + friendly_name: Verificar Infraestructura icon: mdi:approval script.kodak: - friendly_name: Reboot + friendly_name: Reiniciar Servidor icon: mdi:restart + + # Techie Maya Lands : System Audio input_slider.qualcomm: - friendly_name: Server Volume Set % + friendly_name: Servidor Ajustar Volumén % icon: mdi:volume-high sensor.qualcomm: - friendly_name: Server Volume % + friendly_name: Servidor Nivel de Volumén % icon: mdi:volume-high script.visitorsusb: friendly_name: Visitantes USB icon: mdi:usb + # Techie Maya Lands : System Infrastructure + device_tracker.eclipse: friendly_name: IoT Eclipse Org icon: mdi:server @@ -240,8 +208,16 @@ homeassistant: friendly_name: Hochob Server icon: mdi:server-network + # Techie Maya Lands : System Quote + + sensor.bosch: + friendly_name: System Quote + icon: mdi:approval + # Console Maya Lands + # Console Maya Lands : Keypad Yes No + script.keypadyes: friendly_name: Botón Sí icon: mdi:check-circle @@ -250,6 +226,8 @@ homeassistant: friendly_name: Botón No icon: mdi:checkbox-blank-circle + # Console Maya Lands : Keypad Multiple Choice + script.keypadone: friendly_name: Botón Uno icon: mdi:numeric-1-box @@ -266,6 +244,45 @@ homeassistant: friendly_name: Botón Cuatro icon: mdi:numeric-4-box + # Media Maya Lands + + # Media Maya Lands : Corporate + + switch.guanajuato: + friendly_name: Imágenes Corporativas + icon: mdi:folder-multiple-image + switch.guerrero: + friendly_name: Videos Corporativos + icon: mdi:file-video + + # Media Maya Lands : Intel Guadalajara + + switch.jalisco: + friendly_name: Imágenes Intel Guadalajara + icon: mdi:folder-multiple-image + + # Media Maya Lands : Visitors Center + + switch.hidalgo: + friendly_name: Imágenes Centro de Visitantes + icon: mdi:folder-multiple-image + + # Media Maya Lands : Memories + + switch.queretaro: + friendly_name: Imágenes de Visitas + icon: mdi:folder-multiple-image + switch.quintanaroo: + friendly_name: Videos de Visitas + icon: mdi:file-video + + # Media Maya Lands : Camera + + switch.yucatan: + friendly_name: Vista Previa Cámara + icon: mdi:camera + + # Enables the frontend frontend: @@ -599,7 +616,7 @@ shell_command: rightunfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightunfold leftup: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftup - lefttdown: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftdown + leftdown: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftdown leftfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftfold leftunfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftunfold @@ -777,7 +794,6 @@ group: view: yes name: The Techie entities: - - group.techiemayalandssystemhealth - group.techiemayalandssystemcalendar - group.techiemayalandssystemaudio - group.techiemayalandssystemmonitor @@ -952,7 +968,7 @@ group: - script.resetall techiemayalandssystemhealth: - name: System Health + name: Verificación del Sistema entities: - script.toyota - script.kodak From b2ec07270d0ab2783a57beab88e0eb5120dcb0e5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 13 Jul 2017 11:53:47 -0500 Subject: [PATCH 0949/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 34 ++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 7f150908..8e83b9dc 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -267,6 +267,12 @@ homeassistant: friendly_name: Imágenes Centro de Visitantes icon: mdi:folder-multiple-image + # Media Maya Lands : Drawing + + switch.puebla: + friendly_name: Imágenes de Dibujos + icon: mdi:folder-multiple-image + # Media Maya Lands : Memories switch.queretaro: @@ -655,7 +661,7 @@ switch: command_on: "~/CodeLabs/Hochob/Services/Language/Language.sh spanish &" command_off: "~/CodeLabs/Hochob/Services/Language/Language.sh english &" - # Southern Maya Highlands: Corporate + # Media Maya Lands: Corporate guanajuato: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh &" @@ -664,19 +670,25 @@ switch: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" - # Southern Maya Highlands: Intel Guadalajara + # Media Maya Lands: Intel Guadalajara jalisco: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" - # Southern Maya Highlands: Visitors Center + # Media Maya Lands: Visitors Center hidalgo: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" - # Southern Maya Highlands: Memories + # Media Maya Lands: Drawing + + puebla: + command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Puebla.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + + # Media Maya Lands: Memories queretaro: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh &" @@ -685,7 +697,7 @@ switch: command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" - # Southern Maya Highlands: Camera + # Media Maya Lands: Camera yucatan: command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0 &" @@ -818,6 +830,7 @@ group: - group.southernmayahighlandscorporate - group.southernmayahighlandsintelguadalajara - group.southernmayahighlandsvisitorscenter + - group.southernmayahighlandsdrawing - group.southernmayahighlandsmemories - group.southernmayahighlandscamera @@ -862,18 +875,23 @@ group: - switch.jalisco southernmayahighlandsvisitorscenter: - name: Visitors Center + name: Centro de Visitantes entities: - switch.hidalgo + southernmayahighlandsdrawing: + name: Dibujos + entities: + - switch.puebla + southernmayahighlandsmemories: - name: Memories + name: Visitas entities: - switch.queretaro - switch.quintanaroo southernmayahighlandscamera: - name: Camera + name: Cámara entities: - switch.yucatan From 8c3565557b2128431894fc8bd4aa851fe774d732 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 13 Jul 2017 11:58:07 -0500 Subject: [PATCH 0950/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 8e83b9dc..3ad1c0eb 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -901,7 +901,7 @@ group: - script.zacatecas centralmayalowlandsstations: - name: Stations + name: Estaciones entities: - script.acapulco - script.cancun @@ -910,7 +910,7 @@ group: - script.puertovallarta centralmayalowlandsquestions: - name: Questions + name: Conocimiento entities: - script.ixtapa @@ -920,7 +920,7 @@ group: - script.veracruz northernmayalowlandsstations: - name: Stations + name: Estaciones entities: - script.montesazules - script.ojodeliebre @@ -934,29 +934,29 @@ group: - script.siankaan northernmayalowlandsstories: - name: Stories + name: Historias entities: - script.calakmul - script.tiburonballena robotmayalandslanguage: - name: Language + name: Idioma entities: - script.coji robotmayalandsevent: - name: Event + name: Evento entities: - automation.services_event_host_robot robotmayalandshead: - name: Head + name: Cabeza entities: - script.headright - script.headleft robotmayalandsarmright: - name: Arm Right + name: Brazo Derecho entities: - script.rightup - script.rightdown @@ -964,7 +964,7 @@ group: - script.rightunfold robotmayalandsarmleft: - name: Arm Left + name: Brazo Izquierdo entities: - script.leftup - script.lefttdown @@ -972,7 +972,7 @@ group: - script.leftunfold robotmayalandslegs: - name: Legs + name: Piernas entities: - script.moveright - script.moveleft @@ -981,7 +981,7 @@ group: - script.movestop robotmayalandsreset: - name: Reset + name: Reiniciar entities: - script.resetall @@ -992,7 +992,7 @@ group: - script.kodak techiemayalandssystemcalendar: - name: System Calendar + name: Calendario de Visitas entities: - sensor.appleimac - sensor.appleipod @@ -1000,7 +1000,7 @@ group: - automation.services_calendar_name techiemayalandssystemaudio: - name: System Audio + name: Audio del Servidor entities: - input_slider.qualcomm - sensor.qualcomm @@ -1009,7 +1009,7 @@ group: - automation.services_sound_pulseaudio_read techiemayalandssystemmonitor: - name: System Monitor + name: Monitor del Servidor entities: - sensor.cpu_use - sensor.ram_free @@ -1017,29 +1017,29 @@ group: #- camera.ffmpeg techiemayalandssystemevent: - name: System Event + name: Evento entities: - automation.services_event_host_server techiemayalandssystemquote: - name: System Quote + name: Citas del Servidor entities: - sensor.bosch mayalandsserverinfrastructure: - name: Server Infrastructure + name: Disponibilidad de Servidores entities: - device_tracker.eclipse - device_tracker.hochob consolemayalandskeypadyesno: - name: Keypad Yes No + name: Teclado Sí No entities: - script.keypadyes - script.keypadno consolemayalandskeypadmultiplechoice: - name: Keypad Multiple Choice + name: Teclado Opción Multiple entities: - script.keypadone - script.keypadtwo From 68150d15549ebe9848a2fe90b71822ff9c97e844 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 13 Jul 2017 12:00:37 -0500 Subject: [PATCH 0951/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 3ad1c0eb..10ff1994 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -187,11 +187,11 @@ homeassistant: # Techie Maya Lands : System Audio input_slider.qualcomm: - friendly_name: Servidor Ajustar Volumén % + friendly_name: Ajustar Volumén % icon: mdi:volume-high sensor.qualcomm: - friendly_name: Servidor Nivel de Volumén % + friendly_name: Nivel de Volumén % icon: mdi:volume-high script.visitorsusb: @@ -211,7 +211,7 @@ homeassistant: # Techie Maya Lands : System Quote sensor.bosch: - friendly_name: System Quote + friendly_name: Hoy digo... icon: mdi:approval # Console Maya Lands From ffb6da768246a27a7f6d80d90f6ff0c0c41f16eb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 13 Jul 2017 12:03:38 -0500 Subject: [PATCH 0952/1653] Create Puebla.sh --- .../SouthernMayaHighlands/Puebla.sh | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 Hochob/Applications/SouthernMayaHighlands/Puebla.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Puebla.sh b/Hochob/Applications/SouthernMayaHighlands/Puebla.sh new file mode 100644 index 00000000..60e81631 --- /dev/null +++ b/Hochob/Applications/SouthernMayaHighlands/Puebla.sh @@ -0,0 +1,30 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export PUEBLA_PID=$$ +export PUEBLA_NAME="Queretaro" +export PUEBLA_PATH=$(readlink -f "$0") +export PUEBLA_DIRECTORY=$(dirname "$PUEBLA_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $PUEBLA_PID $PUEBLA_NAME + +Eog.sh "/var/www/html/Drawing/dibujos/*" & + +# End of File From 7654aee6a9ed65e9bed477c97781a12a1d38c817 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 18 Jul 2017 15:31:44 -0500 Subject: [PATCH 0953/1653] Update BajaCaliforniaSurLocal.sh --- .../SouthernMayaHighlands/BajaCaliforniaSurLocal.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index 454cedec..298bc27d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -28,19 +28,19 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & -Robot.sh lupe/say "Hola a todos" +SpeechSynthetizer.sh on espeak spanish "Hola a todos" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & -sleep 6.35 && Robot.sh lupe/say "Perdon! Lo se!, Es que me emociono!" +sleep 6.35 && SpeechSynthetizer.sh on espeak spanish "Perdon! Lo se!, Es que me emociono!" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & -sleep 2.7 && Robot.sh lupe/say "Por supuesto" +sleep 2.7 && SpeechSynthetizer.sh on espeak spanish "Por supuesto" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & -sleep 37.5 && Robot.sh lupe/say "En mi caso, mi cerebro esta aqui, en la caja azul!" +sleep 37.5 && SpeechSynthetizer.sh on espeak spanish "En mi caso, mi cerebro esta aqui, en la caja azul!" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & -sleep 25.5 && Robot.sh lupe/say "Yo funciono con la plataforma Intel Edison" +sleep 25.5 && SpeechSynthetizer.sh on espeak spanish "Yo funciono con la plataforma Intel Edison" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & From 9ce5a195b9955eeb1c06fe8a8cf9a7428c914e26 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 18 Jul 2017 15:32:31 -0500 Subject: [PATCH 0954/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 10ff1994..ea19d6ac 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -576,7 +576,7 @@ shell_command: aguascalientes: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & bajacalifornianorte: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh & - bajacaliforniasur: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh & + bajacaliforniasur: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh & campeche: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Campeche.sh & michoacan: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & zacatecas: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh & From ecc4f0cdbee99b91249a055843d1a1622cb8d07b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 18 Jul 2017 15:38:35 -0500 Subject: [PATCH 0955/1653] Update BajaCaliforniaSurLocal.sh --- .../SouthernMayaHighlands/BajaCaliforniaSurLocal.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index 298bc27d..f80abc80 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -31,16 +31,16 @@ VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & SpeechSynthetizer.sh on espeak spanish "Hola a todos" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & -sleep 6.35 && SpeechSynthetizer.sh on espeak spanish "Perdon! Lo se!, Es que me emociono!" +sleep 6.45 && SpeechSynthetizer.sh on espeak spanish "Perdon! Lo se!, Es que me emociono!" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & -sleep 2.7 && SpeechSynthetizer.sh on espeak spanish "Por supuesto" +sleep 2.8 && SpeechSynthetizer.sh on espeak spanish "Por supuesto" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & -sleep 37.5 && SpeechSynthetizer.sh on espeak spanish "En mi caso, mi cerebro esta aqui, en la caja azul!" +sleep 37.6 && SpeechSynthetizer.sh on espeak spanish "En mi caso, mi cerebro esta aqui, en la caja azul!" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & -sleep 25.5 && SpeechSynthetizer.sh on espeak spanish "Yo funciono con la plataforma Intel Edison" +sleep 25.6 && SpeechSynthetizer.sh on espeak spanish "Yo funciono con la plataforma Intel Edison" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & From 2861b65c30376b590a62dc83b80ab02d75b17b05 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 18 Jul 2017 15:42:26 -0500 Subject: [PATCH 0956/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 55a17cbd..7896dea9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -25,7 +25,7 @@ export CAMPECHE_DIRECTORY=$(dirname "$CAMPECHE_PATH") LogPid.sh $CAMPECHE_PID $CAMPECHE_NAME -Eog.sh $FSWEBCAM_IMAGE_TEXT & +Eog.sh "$FSWEBCAM_IMAGE" & sleep 1 Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" & From 9a9d1dec3afc8438b484266e344fc6aa3250c82f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 18 Jul 2017 16:00:56 -0500 Subject: [PATCH 0957/1653] Update Ixtapa.sh --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index 7f9a5248..965e5e31 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -29,7 +29,7 @@ LOCAL_LANGUAGE=`Language.sh` StreamAudio.sh $LOCAL_DEVICE spanish robot \ " - Que aportaron los Mayas a la tecnología? \ + Puedes decirme que aportaron los Mayas a la tecnología? \ Uno, Las pirámides. \ Dos, El cero. \ Tres, El calendario. \ From 72ff1e53f3869c1fa1ba1a9dc0c8eeb255168952 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 19:52:54 -0500 Subject: [PATCH 0958/1653] Create Yucatan.sh --- Hochob/Applications/SouthernMayaHighlands/Yucatan.sh | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Hochob/Applications/SouthernMayaHighlands/Yucatan.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Yucatan.sh b/Hochob/Applications/SouthernMayaHighlands/Yucatan.sh new file mode 100644 index 00000000..e6d5d083 --- /dev/null +++ b/Hochob/Applications/SouthernMayaHighlands/Yucatan.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +# Implementation under HomeAssistant default configuration file: configuration.yaml + +# command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0 &" +# command_off: "pkill -9 vlc" + +# End of File From 2f4abfdc3970da26fb01f06e755ef06fe30e84c9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 19:53:53 -0500 Subject: [PATCH 0959/1653] Update Zacatecas.sh --- Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh index b105cd59..4ad17acc 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh @@ -36,7 +36,7 @@ exit 0 Memories.sh "20" "on" "${ZACATECAS_NAME}" SpeechSynthetizer.sh off espeak spanish \ "Me da mucho gusto conocerlos y que hayan venido a Intel. \ - Regresen pronto" + Saludos!" MemoriesAudio.sh "${ZACATECAS_NAME}" sync From d68cfbffdeaebf3febe55f7a9ad70bb18a135406 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 20:26:15 -0500 Subject: [PATCH 0960/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index ea19d6ac..6666e37e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -333,11 +333,6 @@ input_slider: sensor: - - platform: command_line - name: Bosch - command: fortune - scan_interval: 300 - - platform: command_line name: Qualcomm command: amixer -D pulse sget Master | grep Left | grep -Eo '\[(\w+)\%\]' | grep -Eo '\w+' @@ -352,6 +347,11 @@ sensor: - type: disk_use_percent arg: /home/ + - platform: command_line + name: Bosch + command: fortune + scan_interval: 300 + - platform: template sensors: appleimac: From ddf6fc21f6a565e38e8d371693d444c3b6eb4a8d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 20:38:15 -0500 Subject: [PATCH 0961/1653] Update Sphero.sh --- Hochob/Applications/RobotMayaLands/Sphero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/RobotMayaLands/Sphero.sh b/Hochob/Applications/RobotMayaLands/Sphero.sh index 1cf65003..1f329904 100755 --- a/Hochob/Applications/RobotMayaLands/Sphero.sh +++ b/Hochob/Applications/RobotMayaLands/Sphero.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export SPHERO_PID=$$ -export SPHERO_NAME="WindRiver" +export SPHERO_NAME="Sphero" export SPHERO_PATH=$(readlink -f "$0") export SPHERO_DIRECTORY=$(dirname "$SPHERO_PATH") From a78d2920aa6d3af5a1462e39eab718c06a273c07 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 20:42:39 -0500 Subject: [PATCH 0962/1653] Rename Host.sh to HostInternal.sh --- Hochob/Services/Events/{Host.sh => HostInternal.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Events/{Host.sh => HostInternal.sh} (100%) diff --git a/Hochob/Services/Events/Host.sh b/Hochob/Services/Events/HostInternal.sh similarity index 100% rename from Hochob/Services/Events/Host.sh rename to Hochob/Services/Events/HostInternal.sh From 63cd3e3a12c3279b220e0c3f436f5eba5963d166 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 20:43:25 -0500 Subject: [PATCH 0963/1653] Update Sphero.sh --- Hochob/Applications/RobotMayaLands/Sphero.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Sphero.sh b/Hochob/Applications/RobotMayaLands/Sphero.sh index 1f329904..c4f5bc70 100755 --- a/Hochob/Applications/RobotMayaLands/Sphero.sh +++ b/Hochob/Applications/RobotMayaLands/Sphero.sh @@ -39,9 +39,9 @@ LogPid.sh $SPHERO_PID $SPHERO_NAME chooseLanguage if [ "$LOCAL_LANGUAGE" = "english" ]; then - Host.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" + HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" else - Host.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" + HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" fi # End of File From 2f19711599dbe9d99adc595741d1358ebd30c12d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 20:43:52 -0500 Subject: [PATCH 0964/1653] Update WindRiver.sh --- Hochob/Applications/TechieMayaLands/WindRiver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/TechieMayaLands/WindRiver.sh index c939ccff..6c7258fa 100755 --- a/Hochob/Applications/TechieMayaLands/WindRiver.sh +++ b/Hochob/Applications/TechieMayaLands/WindRiver.sh @@ -39,9 +39,9 @@ LogPid.sh $WINDRIVER_PID $WINDRIVER_NAME chooseLanguage if [ "$LOCAL_LANGUAGE" = "english" ]; then - Host.sh server $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" + HostInternal.sh server $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" else - Host.sh server $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" + HostInternal.sh server $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" fi # End of File From 2006c0e408b973361a1e9d9a557bd66b5f4404e9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 20:48:32 -0500 Subject: [PATCH 0965/1653] Create HostExternal.sh --- Hochob/Services/Events/HostExternal.sh | 118 +++++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 Hochob/Services/Events/HostExternal.sh diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh new file mode 100644 index 00000000..ac4f1d8d --- /dev/null +++ b/Hochob/Services/Events/HostExternal.sh @@ -0,0 +1,118 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export HOST_PID=$$ + +LOCAL_HOST="$1" +LOCAL_LANGUAGE="$2" +LOCAL_INSTITUTION_NAME="$3" +LOCAL_EVENT_NAME="$4" + +LOCAL_GREETING_ENGLISH[0]="Hi There," +LOCAL_GREETING_ENGLISH[1]="Good morning," +LOCAL_GREETING_ENGLISH[2]="Hurray," +LOCAL_GREETING_ENGLISH[3]="Wait," +LOCAL_GREETING_ENGLISH[4]="Hey," +LOCAL_GREETING_ENGLISH[5]="Hello There," +LOCAL_GREETING_ENGLISH[6]="One minute please, " +LOCAL_GREETING_ENGLISH[7]="What's up, " + +LOCAL_GREETING_SPANISH[0]="Hola Hola," +LOCAL_GREETING_SPANISH[1]="Buenos dias," +LOCAL_GREETING_SPANISH[2]="Hola Cacerola," +LOCAL_GREETING_SPANISH[3]="Espera," +LOCAL_GREETING_SPANISH[4]="Hey," +LOCAL_GREETING_SPANISH[5]="Hola hola," +LOCAL_GREETING_SPANISH[6]="Un minuto por favor," +LOCAL_GREETING_SPANISH[7]="Que onda," + +LOCAL_REMINDER_ENGLISH[0]="Welcome to our" +LOCAL_REMINDER_ENGLISH[1]="Great you did not forget about" +LOCAL_REMINDER_ENGLISH[2]="Today is the big day," +LOCAL_REMINDER_ENGLISH[3]="It is finally here!," +LOCAL_REMINDER_ENGLISH[4]="Finally with us," +LOCAL_REMINDER_ENGLISH[5]="The big day has just arrived," +LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, the great event," + +LOCAL_REMINDER_SPANISH[0]="Bienvenido a nuestro evento," +LOCAL_REMINDER_SPANISH[1]="Excelente que estas aqui, " +LOCAL_REMINDER_SPANISH[2]="Hoy es el gran día," +LOCAL_REMINDER_SPANISH[3]="Finalmente aquí," +LOCAL_REMINDER_SPANISH[4]="Finalmente con nosotros," +LOCAL_REMINDER_SPANISH[5]="El gran día ha llegado," +LOCAL_REMINDER_SPANISH[6]="No se diga mas, el gran evento," + +LOCAL_CLOSURE_ENGLISH="Enjoy the show." +LOCAL_CLOSURE_SPANISH="Que disfrutes el evento." + +# ============================================================================= +# Functions +# ============================================================================= + +chooseGreeting() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 7 ] + if [ "$LANGUAGE" = "english" ]; then + LOCAL_GREETING=${LOCAL_GREETING_ENGLISH[$rand]} + else + LOCAL_GREETING=${LOCAL_GREETING_SPANISH[$rand]} + fi +} + +chooseReminder() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 6 ] + if [ "$LANGUAGE" = "english" ]; then + LOCAL_REMINDER=${LOCAL_REMINDER_ENGLISH[$rand]} + else + LOCAL_REMINDER=${LOCAL_REMINDER_SPANISH[$rand]} + fi +} + +chooseClosure() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 3 ] + echo $rand + if [ "$rand" = "1" ]; then + if [ "$LANGUAGE" = "english" ]; then + LOCAL_CLOSURE=${LOCAL_CLOSURE_ENGLISH} + else + LOCAL_CLOSURE=${LOCAL_CLOSURE_SPANISH} + fi + fi +} + +# ============================================================================= +# Main +# ============================================================================= + +chooseGreeting $LOCAL_LANGUAGE +chooseReminder $LOCAL_LANGUAGE +chooseClosure $LOCAL_LANGUAGE + +LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ + ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}. \ + ${LOCAL_CLOSURE}" + +if [ "$LOCAL_HOST" = "server" ]; then + SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" +else + if [ "$LANGUAGE" = "english" ]; then + Robot.sh lupe/say "${LOCAL_MESSAGE}" + else + Robot.sh lupe/decir "${LOCAL_MESSAGE}" + fi +fi + + +# End of File From b01f728a7a30b392b6ef36fa60ea8712df153225 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 20:57:32 -0500 Subject: [PATCH 0966/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 6666e37e..3adaf7d7 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -612,6 +612,7 @@ shell_command: resetall: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 coji: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Coji.sh & sphero: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Sphero.sh & + meccanoid: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Meccanoid.sh & headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 headright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 @@ -707,7 +708,7 @@ automation: # Robot Maya Lands - - alias: Services Event Host Robot + - alias: Services Internal Event Host Robot initial_state: 'off' trigger: platform: time @@ -715,6 +716,14 @@ automation: action: - service: shell_command.sphero + - alias: Services External Event Host Robot + initial_state: 'off' + trigger: + platform: time + seconds: '/30' + action: + - service: shell_command.meccanoid + # Techie Maya Lands - alias: Services Calendar Name @@ -747,7 +756,7 @@ automation: entity_id: input_slider.qualcomm value: "{{ states.sensor.qualcomm.state | int }}" - - alias: Services Event Host Server + - alias: Services Internal Event Host Server initial_state: 'off' trigger: platform: time @@ -947,7 +956,8 @@ group: robotmayalandsevent: name: Evento entities: - - automation.services_event_host_robot + - automation.services_internal_event_host_robot + - automation.services_external_event_host_robot robotmayalandshead: name: Cabeza @@ -1019,7 +1029,7 @@ group: techiemayalandssystemevent: name: Evento entities: - - automation.services_event_host_server + - automation.services_internal_event_host_server techiemayalandssystemquote: name: Citas del Servidor From 440e84ba2756d4f179d10966ba4f4f881b0c1d7a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 20:59:51 -0500 Subject: [PATCH 0967/1653] Create Meccanoid.sh --- .../Applications/RobotMayaLands/Meccanoid.sh | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Hochob/Applications/RobotMayaLands/Meccanoid.sh diff --git a/Hochob/Applications/RobotMayaLands/Meccanoid.sh b/Hochob/Applications/RobotMayaLands/Meccanoid.sh new file mode 100644 index 00000000..91a4fd0b --- /dev/null +++ b/Hochob/Applications/RobotMayaLands/Meccanoid.sh @@ -0,0 +1,47 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MECCANOID_PID=$$ +export MECCANOID_NAME="Meccanoid" +export MECCANOID_PATH=$(readlink -f "$0") +export MECCANOID_DIRECTORY=$(dirname "$SPHERO_PATH") + +LOCAL_INSTITUTION_NAME="Mexico" +LOCAL_EVENT_NAME_ENGLISH="Intel Experience Day 2017" +LOCAL_EVENT_NAME_SPANISH="Intel 2017" + +LOCAL_LANGUAGE[0]="english" +LOCAL_LANGUAGE[1]="spanish" + +# ============================================================================= +# Functions +# ============================================================================= + +chooseLanguage() +{ + rand=$[ $RANDOM % 2 ] + LOCAL_LANGUAGE=${LOCAL_LANGUAGE[$rand]} +} + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $MECCANOID_PID $SPHERO_NAME + +chooseLanguage + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" +else + HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" +fi + +# End of File From 9754d6e872ff46895b9c813b26be93b32e1b394e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 21:16:19 -0500 Subject: [PATCH 0968/1653] Update Ixtapa.sh --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index 965e5e31..24f75033 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export IXTAPA_PID=$$ -export IXTAPA_NAME="Mapimi Application" +export IXTAPA_NAME="Ixtapa" export IXTAPA_PATH=$(readlink -f "$0") export IXTAPA_DIRECTORY=$(dirname "$IXTAPA_PATH") From 9111cb850c7e94a5da7fb72dc092b9f595fe6e8f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 21:19:25 -0500 Subject: [PATCH 0969/1653] Create Makeblock.sh --- .../Applications/RobotMayaLands/Makeblock.sh | 95 +++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 Hochob/Applications/RobotMayaLands/Makeblock.sh diff --git a/Hochob/Applications/RobotMayaLands/Makeblock.sh b/Hochob/Applications/RobotMayaLands/Makeblock.sh new file mode 100644 index 00000000..c218ad20 --- /dev/null +++ b/Hochob/Applications/RobotMayaLands/Makeblock.sh @@ -0,0 +1,95 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MAKEBLOCK_PID=$$ +export MAKEBLOCK_NAME="Makeblock" +export MAKEBLOCK_PATH=$(readlink -f "$0") +export MAKEBLOCK_DIRECTORY=$(dirname "$IXTAPA_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_DEVICE="Amikoo" +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Puedes decirme que aportaron los Mayas a la tecnología? \ + Uno, Las pirámides. \ + Dos, El cero. \ + Tres, El calendario. \ + Cuatro, El chocolate. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Quiénes son los fundadores de Intel? \ + " +StreamAudio.sh $LOCAL_DEVICE english robot \ + " + Uno, Robert Noyce, Gordon Moore. \ + Dos, Steve Allen. \ + Tres, Elon Musk. \ + Cuatro, Larry Page and Sergey Brin. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Cuántos ingenieros erán cuando empezó Intel Guadalajara? + Uno, 60. \ + Dos, 34. \ + Tres, 1200. \ + Cuatro, 15. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + El microprocesador es el cerebro de la computadora? Sí o no? + " +SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? + " +SurveyYesNo.sh $LOCAL_DEVICE spanish robot no + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + Podemos encontrar el microprocesador en? + Uno, Accesorios para las personas. \ + Dos, En la tierra. \ + Tres, En el espacio. \ + Cuatro, En todos los anteriores. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 + +StreamAudio.sh $LOCAL_DEVICE spanish robot \ + " + En el sistema binario, el cero significa? + Uno, Encendido. \ + Dos, Apagado. \ + Tres, Nada. \ + Cuatro, Todo. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 + +# End of File From fd677d1b5d3da21babb65cf9fee762801f961ab2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 21:19:33 -0500 Subject: [PATCH 0970/1653] Update StreamAudio.sh --- Hochob/Services/Stream/StreamAudio.sh | 28 +++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Stream/StreamAudio.sh b/Hochob/Services/Stream/StreamAudio.sh index deb64c13..ee7b38d3 100755 --- a/Hochob/Services/Stream/StreamAudio.sh +++ b/Hochob/Services/Stream/StreamAudio.sh @@ -25,16 +25,24 @@ LOCAL_TEXT="$4" # Main # ============================================================================= -if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" +if [ "$LOCAL_DEVICE" = "Amikoo" ] && [ "$LOCAL_LANGUAGE" = "english" ]; then + Robot.sh lupe/say \ + "${LOCAL_TEXT}" +elif [ "$LOCAL_DEVICE" = "Amikoo" ] && [ "$LOCAL_LANGUAGE" = "spanish" ]; then + Robot.sh lupe/decir \ + "${LOCAL_TEXT}" +else + if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" + elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" + elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then + SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" + elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then + SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" + fi + + Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 fi -Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 - # End of File From 363849214aa52f0ecafc6906e21880992f8a8119 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 21:32:10 -0500 Subject: [PATCH 0971/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 3adaf7d7..2ec98a7b 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -122,7 +122,10 @@ homeassistant: script.coji: friendly_name: Speak icon: mdi:speaker - + script.makeblock: + friendly_name: Preguntas + icon: mdi:audiobook + script.headright: friendly_name: Head Right icon: mdi:arrow-right-thick @@ -476,6 +479,10 @@ script: sequence: - service: shell_command.coji + makeblock: + sequence: + - service: shell_command.makeblock + headright: sequence: - service: shell_command.headright @@ -613,7 +620,8 @@ shell_command: coji: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Coji.sh & sphero: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Sphero.sh & meccanoid: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Meccanoid.sh & - + makeblock: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Makeblock.sh & + headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 headright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 @@ -789,6 +797,7 @@ group: entities: - group.robotmayalandslanguage - group.robotmayalandsevent + - group.robotmayalandsquestions - group.robotmayalandshead - group.robotmayalandsarmright - group.robotmayalandsarmleft @@ -959,6 +968,11 @@ group: - automation.services_internal_event_host_robot - automation.services_external_event_host_robot + robotmayalandsquestions: + name: Conocimiento + entities: + - script.makeblock + robotmayalandshead: name: Cabeza entities: From 7829d59bf90dcb2d674635b9ee3fed409605ff7a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 21:54:09 -0500 Subject: [PATCH 0972/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 2ec98a7b..b6e0694b 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -648,6 +648,7 @@ shell_command: apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & + google: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Google.sh & visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & # Console Maya Lands @@ -772,6 +773,15 @@ automation: action: - service: shell_command.windriver + - alias: Services Season + initial_state: 'off' + trigger: + platform: time + minutes: '/5' + seconds: 00 + action: + - service: shell_command.google + group: default_view: @@ -828,6 +838,7 @@ group: - group.techiemayalandssystemaudio - group.techiemayalandssystemmonitor - group.techiemayalandssystemevent + - group.techiemayalandssystemseason - group.techiemayalandssystemquote - group.techiemayalandsserverinfrastructure - group.techiemayalandssandbox @@ -1045,6 +1056,11 @@ group: entities: - automation.services_internal_event_host_server + techiemayalandssystemseason: + name: Temporada + entities: + - automation.services_season + techiemayalandssystemquote: name: Citas del Servidor entities: From ffe39258d3a6e4d58f78ea11d9f772ad5f1a33e5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 21:59:55 -0500 Subject: [PATCH 0973/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b6e0694b..669878be 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -777,7 +777,7 @@ automation: initial_state: 'off' trigger: platform: time - minutes: '/5' + minutes: '/15' seconds: 00 action: - service: shell_command.google From 228ac4e6a880a9d597a87ce2153a3e05c611769e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 22:05:57 -0500 Subject: [PATCH 0974/1653] Create Google.sh --- Hochob/Applications/TechieMayaLands/Google.sh | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 Hochob/Applications/TechieMayaLands/Google.sh diff --git a/Hochob/Applications/TechieMayaLands/Google.sh b/Hochob/Applications/TechieMayaLands/Google.sh new file mode 100644 index 00000000..25d63828 --- /dev/null +++ b/Hochob/Applications/TechieMayaLands/Google.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export GOOGLE_PID=$$ +export GOOGLE_NAME="Zacatecas" +export GOOGLE_PATH=$(readlink -f "$0") +export GOOGLE_DIRECTORY=$(dirname "$GOOGLE_PATH") + +LOCAL_DEVICE[0]="Triki" +LOCAL_DEVICE[1]="Tran" +LOCAL_DEVICE[2]="Juum" +LOCAL_DEVICE[3]="Eek'" + +# ============================================================================= +# Functions +# ============================================================================= + +chooseDevice() +{ + rand=$[ $RANDOM % 4 ] + LOCAL_DEVICE=${LOCAL_DEVICE[$rand]} +} + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $GOOGLE_PID $GOOGLE_NAME + +if [ "$LANGUAGE" = "english" ]; then + SpeechSynthetizer.sh on espeak english \ + "Happy Halloween" +else + SpeechSynthetizer.sh on espeak spanish \ + "Feliz dia de muertos" +fi + +Stream.sh $LOCAL_DEVICE "1.0" "$SPEECH_MP3" + +# See implement WindRiver.sh logic, maybe Season service? +# Choose Random Audio from Directory + +# End of File From 4345045ee2a2a56c93a5a4278c6542e81003ed1d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 22:10:49 -0500 Subject: [PATCH 0975/1653] Update Main.sh --- Hochob/Main.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 8148d6fa..0079f679 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -136,6 +136,9 @@ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_SOURCE_IMAG export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING/*.jpg export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ + +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/Season/ + export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/Speech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/Speech.mp3 @@ -171,6 +174,8 @@ export FSWEBCAM_IMAGE_TEXT=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE_TEX export DRAWING_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING export DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES +export SEASON=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON + export SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH export SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH_MP3 From a84461cce0d75dd6d1bc74a1d9c96e916b3ee4c8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 22:50:27 -0500 Subject: [PATCH 0976/1653] Update Google.sh --- Hochob/Applications/TechieMayaLands/Google.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Applications/TechieMayaLands/Google.sh b/Hochob/Applications/TechieMayaLands/Google.sh index 25d63828..aa6457e9 100644 --- a/Hochob/Applications/TechieMayaLands/Google.sh +++ b/Hochob/Applications/TechieMayaLands/Google.sh @@ -13,6 +13,8 @@ export GOOGLE_NAME="Zacatecas" export GOOGLE_PATH=$(readlink -f "$0") export GOOGLE_DIRECTORY=$(dirname "$GOOGLE_PATH") +LOCAL_SEASON="Halloween" + LOCAL_DEVICE[0]="Triki" LOCAL_DEVICE[1]="Tran" LOCAL_DEVICE[2]="Juum" @@ -42,6 +44,8 @@ else "Feliz dia de muertos" fi +LOCAL_SOUND=`find $SEASON/$LOCAL_SEASON/ -type f | shuf -n 1` +Stream.sh $LOCAL_DEVICE "1.0" "$LOCAL_SOUND" Stream.sh $LOCAL_DEVICE "1.0" "$SPEECH_MP3" # See implement WindRiver.sh logic, maybe Season service? From dcd90ed6cdbdd8f43c6d9680349b8a56e7f568d5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 18 Oct 2017 03:58:46 +0000 Subject: [PATCH 0977/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/RobotMayaLands/Makeblock.sh | 0 Hochob/Applications/RobotMayaLands/Meccanoid.sh | 0 Hochob/Applications/SouthernMayaHighlands/Yucatan.sh | 0 Hochob/Applications/TechieMayaLands/Google.sh | 0 Hochob/Services/Events/HostExternal.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/RobotMayaLands/Makeblock.sh mode change 100644 => 100755 Hochob/Applications/RobotMayaLands/Meccanoid.sh mode change 100644 => 100755 Hochob/Applications/SouthernMayaHighlands/Yucatan.sh mode change 100644 => 100755 Hochob/Applications/TechieMayaLands/Google.sh mode change 100644 => 100755 Hochob/Services/Events/HostExternal.sh diff --git a/Hochob/Applications/RobotMayaLands/Makeblock.sh b/Hochob/Applications/RobotMayaLands/Makeblock.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/RobotMayaLands/Meccanoid.sh b/Hochob/Applications/RobotMayaLands/Meccanoid.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/SouthernMayaHighlands/Yucatan.sh b/Hochob/Applications/SouthernMayaHighlands/Yucatan.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/TechieMayaLands/Google.sh b/Hochob/Applications/TechieMayaLands/Google.sh old mode 100644 new mode 100755 diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh old mode 100644 new mode 100755 From 44d3084885b453cc38e15dbcd1a5cfd38a3ee937 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 17 Oct 2017 23:03:07 -0500 Subject: [PATCH 0978/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 669878be..c924a148 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -893,7 +893,7 @@ group: - script.campeche southernmayahighlandscorporate: - name: Corporate + name: Corporativo entities: - switch.guanajuato - switch.guerrero From 269e4878d685d3a3374a02589d8053cda7823501 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 18 Oct 2017 07:47:18 -0500 Subject: [PATCH 0979/1653] Update --- .../SouthernMayaHighlands/Puebla.sh | 2 +- .../Stream/Stream2Chromecast/README.md | 18 ++++---- .../Stream/Stream2Chromecast/cc_message.py | 44 +++++++++---------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Puebla.sh b/Hochob/Applications/SouthernMayaHighlands/Puebla.sh index 60e81631..bf912d60 100644 --- a/Hochob/Applications/SouthernMayaHighlands/Puebla.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Puebla.sh @@ -25,6 +25,6 @@ export PUEBLA_DIRECTORY=$(dirname "$PUEBLA_PATH") LogPid.sh $PUEBLA_PID $PUEBLA_NAME -Eog.sh "/var/www/html/Drawing/dibujos/*" & +Eog.sh "/var/www/html/Drawing/dibujos/*.png" & # End of File diff --git a/Hochob/Services/Stream/Stream2Chromecast/README.md b/Hochob/Services/Stream/Stream2Chromecast/README.md index fd123ac1..27e8ae04 100644 --- a/Hochob/Services/Stream/Stream2Chromecast/README.md +++ b/Hochob/Services/Stream/Stream2Chromecast/README.md @@ -53,7 +53,7 @@ To play a supported file from a URL. stream2chromecast.py -playurl http://www.example.com/my_media.mp4 -###Control playback +### Control playback - pause playback (currently only works when not transcoding) @@ -68,7 +68,7 @@ To play a supported file from a URL. stream2chromecast.py -stop -###Volume control +### Volume control - set volume (takes a value between 0.0 and 1.0) @@ -85,14 +85,14 @@ To play a supported file from a URL. -###Status +### Status - get Chromecast status stream2chromecast.py -status -###Specifying a device when there are multiple Chromecasts on the network +### Specifying a device when there are multiple Chromecasts on the network To specify a device by name or IP address, use the -devicename parameter. e.g. @@ -109,7 +109,7 @@ e.g. stream2chromecast.py -devicelist -###Specify which transcoder to use +### Specify which transcoder to use If both ffmpeg and avconv are installed, ffmpeg will be used by default. - To specify avconv to be used and transcode a playback, use the -transcoder option @@ -117,7 +117,7 @@ If both ffmpeg and avconv are installed, ffmpeg will be used by default. stream2chromecast.py -transcoder avconv -transcode -###Supply custom transcoder parameters +### Supply custom transcoder parameters It is possible to pass in specific parameters to ffmpeg or avconv using the -transcodeopts parameter with the options surrounded by quotes. These options are applied to the transcoder output. @@ -132,7 +132,7 @@ It is also possible to pass in parameters to the transcoder to be applied to the stream2chromecast.py -transcodeinputopts '-ss 00:15:00' -transcode -###Specify a port to use for streaming media. +### Specify a port to use for streaming media. By default, a random unused port will be selected to serve the media from. In a firewalled environment, it can be useful to be able to specify the port to open - To specify port 8765 to serve media from @@ -140,7 +140,7 @@ By default, a random unused port will be selected to serve the media from. In a stream2chromecast.py -port 8765 -###Subtitles +### Subtitles Only the WebVTT format is currently supported and not when transcoding. - to cast the subtitles on /path/to/subtitles.vtt @@ -163,7 +163,7 @@ To specify the subtitles language. The language format is defined by RFC 5646. ( -###Specify a buffer-size for the transcoder process +### Specify a buffer-size for the transcoder process By default, the transcoder process returns its data to be sent to the device without buffering. Buffering the data can help in situations where the network connection is slow. - To specify a buffer size of 5 megabytes diff --git a/Hochob/Services/Stream/Stream2Chromecast/cc_message.py b/Hochob/Services/Stream/Stream2Chromecast/cc_message.py index 3aa589e3..5324861d 100644 --- a/Hochob/Services/Stream/Stream2Chromecast/cc_message.py +++ b/Hochob/Services/Stream/Stream2Chromecast/cc_message.py @@ -143,35 +143,35 @@ def extract_int_field(data): return field_id, int_value, remainder - + +def extract_varint(data): + # extract varint + # LSB first + value = 0 + ptr = 0 + mul = 1 + while True: + byte = unpack("B", data[ptr])[0] + value += mul * (byte & 127) + ptr += 1 + if not byte & 128: + break + mul *= 128 + + remainder = data[ptr:] + return value, remainder + def extract_string_field(data): """ extracts a protocol buffers length-delimited field from a received message """ field_id = extract_field_id(data[0]) + data = data[1:] # extract varint length - length = 0 - ptr = 1 - byte = unpack("B", data[ptr])[0] - - while byte & 128: - length += byte & 127 - length = length << 7 - - ptr += 1 - byte = unpack("B", data[ptr])[0] - - length += byte - - ptr += 1 - string_end_ptr = ptr + length - string = data[ptr:string_end_ptr] - - remainder = "" - if len(data) > string_end_ptr: - remainder = data[string_end_ptr:] - + length, data = extract_varint(data) + string = data[:length] + remainder = data[length:] return field_id, string, remainder From 9b124d49c7707afafc1daddc69bffc38858834ab Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 18 Oct 2017 08:04:09 -0500 Subject: [PATCH 0980/1653] Update --- Hochob/Applications/TechieMayaLands/Google.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/Google.sh b/Hochob/Applications/TechieMayaLands/Google.sh index aa6457e9..7bab3c59 100755 --- a/Hochob/Applications/TechieMayaLands/Google.sh +++ b/Hochob/Applications/TechieMayaLands/Google.sh @@ -37,16 +37,16 @@ chooseDevice() LogPid.sh $GOOGLE_PID $GOOGLE_NAME if [ "$LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh on espeak english \ + SpeechSynthetizer.sh off espeak english \ "Happy Halloween" else - SpeechSynthetizer.sh on espeak spanish \ + SpeechSynthetizer.sh off espeak spanish \ "Feliz dia de muertos" fi LOCAL_SOUND=`find $SEASON/$LOCAL_SEASON/ -type f | shuf -n 1` -Stream.sh $LOCAL_DEVICE "1.0" "$LOCAL_SOUND" -Stream.sh $LOCAL_DEVICE "1.0" "$SPEECH_MP3" +Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" +#Stream.sh "$LOCAL_DEVICE" "1.0" "$SPEECH_MP3" # See implement WindRiver.sh logic, maybe Season service? # Choose Random Audio from Directory From 5733090d0fa442d6d460da5b71118130c8977325 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 18 Oct 2017 08:36:06 -0500 Subject: [PATCH 0981/1653] Update --- Hochob/Applications/TechieMayaLands/Google.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/Google.sh b/Hochob/Applications/TechieMayaLands/Google.sh index 7bab3c59..18e03a74 100755 --- a/Hochob/Applications/TechieMayaLands/Google.sh +++ b/Hochob/Applications/TechieMayaLands/Google.sh @@ -15,10 +15,10 @@ export GOOGLE_DIRECTORY=$(dirname "$GOOGLE_PATH") LOCAL_SEASON="Halloween" -LOCAL_DEVICE[0]="Triki" -LOCAL_DEVICE[1]="Tran" -LOCAL_DEVICE[2]="Juum" -LOCAL_DEVICE[3]="Eek'" +LOCAL_DEVICE[0]="Tran" +LOCAL_DEVICE[1]="Juum" +LOCAL_DEVICE[2]="Eek'" +#LOCAL_DEVICE[3]="Triki" # ============================================================================= # Functions From 74580d02477d3cbd2a984d14a2a5019494206815 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 18 Oct 2017 16:57:49 -0500 Subject: [PATCH 0982/1653] Update --- Hochob/Applications/TechieMayaLands/Google.sh | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/Google.sh b/Hochob/Applications/TechieMayaLands/Google.sh index 18e03a74..36a12a22 100755 --- a/Hochob/Applications/TechieMayaLands/Google.sh +++ b/Hochob/Applications/TechieMayaLands/Google.sh @@ -14,21 +14,13 @@ export GOOGLE_PATH=$(readlink -f "$0") export GOOGLE_DIRECTORY=$(dirname "$GOOGLE_PATH") LOCAL_SEASON="Halloween" - -LOCAL_DEVICE[0]="Tran" -LOCAL_DEVICE[1]="Juum" -LOCAL_DEVICE[2]="Eek'" -#LOCAL_DEVICE[3]="Triki" +LOCAL_DEVICE="Triki" # ============================================================================= # Functions # ============================================================================= -chooseDevice() -{ - rand=$[ $RANDOM % 4 ] - LOCAL_DEVICE=${LOCAL_DEVICE[$rand]} -} +# None # ============================================================================= # Main @@ -37,18 +29,14 @@ chooseDevice() LogPid.sh $GOOGLE_PID $GOOGLE_NAME if [ "$LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ - "Happy Halloween" + Robot.sh lupe/say "Happy Halloween" else - SpeechSynthetizer.sh off espeak spanish \ - "Feliz dia de muertos" + Robot.sh lupe/decir "Feliz dia de muertos" fi LOCAL_SOUND=`find $SEASON/$LOCAL_SEASON/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" -#Stream.sh "$LOCAL_DEVICE" "1.0" "$SPEECH_MP3" # See implement WindRiver.sh logic, maybe Season service? -# Choose Random Audio from Directory # End of File From 657be5c820db7a8abdab2c587bd9e3b54902562e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 20 Oct 2017 19:05:29 -0500 Subject: [PATCH 0983/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index c924a148..fac32548 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -786,7 +786,7 @@ group: default_view: view: yes - name: The Captain + name: Sensei entities: - group.techiemayalandssystemhealth - group.captainmayalandscalendar @@ -794,7 +794,7 @@ group: southernmayalands: view: yes - name: The Show + name: Home entities: - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot @@ -803,7 +803,7 @@ group: robotmayalands: view: yes - name: The Robot + name: Robotics entities: - group.robotmayalandslanguage - group.robotmayalandsevent @@ -816,7 +816,7 @@ group: centralmayalowlands: view: yes - name: The Beginning + name: Beginning entities: - group.centralmayalowlandsstations - group.centralmayalowlandsquestions @@ -824,7 +824,7 @@ group: northernmayalowlands: view: yes - name: The Experience + name: Experience entities: - group.northernmayalowlandsstations - group.northernmayalowlandsstories @@ -832,7 +832,7 @@ group: techiemayalands: view: yes - name: The Techie + name: Techies entities: - group.techiemayalandssystemcalendar - group.techiemayalandssystemaudio @@ -846,7 +846,7 @@ group: consolemayalands: view: yes #icon: mdi:keyboard - name: The Console + name: Interaction entities: - group.consolemayalandskeypadyesno - group.consolemayalandskeypadmultiplechoice @@ -854,7 +854,7 @@ group: mediamayalands: view: yes #icon: mdi:filmstrip - name: The Media + name: Memories entities: - group.southernmayahighlandscorporate - group.southernmayahighlandsintelguadalajara From 9f9727be385fb7220b17d9cf9972a5ebe715bc60 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 20 Oct 2017 22:58:30 -0500 Subject: [PATCH 0984/1653] Update Signed-off-by: Abraham Arce --- .../Guanajuato.sh => MediaMayaLands/Aak.sh} | 0 .../Guerrero.sh => MediaMayaLands/Aayin.sh} | 0 .../{SouthernMayaHighlands/Hidalgo.sh => MediaMayaLands/Am.sh} | 0 .../Jalisco.sh => MediaMayaLands/Chakmool.sh} | 0 .../{SouthernMayaHighlands/Puebla.sh => MediaMayaLands/Chiich.sh} | 0 .../{SouthernMayaHighlands/Queretaro.sh => MediaMayaLands/Cho.sh} | 0 .../QuintanaRoo.sh => MediaMayaLands/Chuwen.sh} | 0 .../{SouthernMayaHighlands/Yucatan.sh => MediaMayaLands/Kaab.sh} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/{SouthernMayaHighlands/Guanajuato.sh => MediaMayaLands/Aak.sh} (100%) rename Hochob/Applications/{SouthernMayaHighlands/Guerrero.sh => MediaMayaLands/Aayin.sh} (100%) rename Hochob/Applications/{SouthernMayaHighlands/Hidalgo.sh => MediaMayaLands/Am.sh} (100%) rename Hochob/Applications/{SouthernMayaHighlands/Jalisco.sh => MediaMayaLands/Chakmool.sh} (100%) rename Hochob/Applications/{SouthernMayaHighlands/Puebla.sh => MediaMayaLands/Chiich.sh} (100%) rename Hochob/Applications/{SouthernMayaHighlands/Queretaro.sh => MediaMayaLands/Cho.sh} (100%) rename Hochob/Applications/{SouthernMayaHighlands/QuintanaRoo.sh => MediaMayaLands/Chuwen.sh} (100%) rename Hochob/Applications/{SouthernMayaHighlands/Yucatan.sh => MediaMayaLands/Kaab.sh} (100%) diff --git a/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh b/Hochob/Applications/MediaMayaLands/Aak.sh similarity index 100% rename from Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh rename to Hochob/Applications/MediaMayaLands/Aak.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh b/Hochob/Applications/MediaMayaLands/Aayin.sh similarity index 100% rename from Hochob/Applications/SouthernMayaHighlands/Guerrero.sh rename to Hochob/Applications/MediaMayaLands/Aayin.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh b/Hochob/Applications/MediaMayaLands/Am.sh similarity index 100% rename from Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh rename to Hochob/Applications/MediaMayaLands/Am.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh b/Hochob/Applications/MediaMayaLands/Chakmool.sh similarity index 100% rename from Hochob/Applications/SouthernMayaHighlands/Jalisco.sh rename to Hochob/Applications/MediaMayaLands/Chakmool.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Puebla.sh b/Hochob/Applications/MediaMayaLands/Chiich.sh similarity index 100% rename from Hochob/Applications/SouthernMayaHighlands/Puebla.sh rename to Hochob/Applications/MediaMayaLands/Chiich.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh b/Hochob/Applications/MediaMayaLands/Cho.sh similarity index 100% rename from Hochob/Applications/SouthernMayaHighlands/Queretaro.sh rename to Hochob/Applications/MediaMayaLands/Cho.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh b/Hochob/Applications/MediaMayaLands/Chuwen.sh similarity index 100% rename from Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh rename to Hochob/Applications/MediaMayaLands/Chuwen.sh diff --git a/Hochob/Applications/SouthernMayaHighlands/Yucatan.sh b/Hochob/Applications/MediaMayaLands/Kaab.sh similarity index 100% rename from Hochob/Applications/SouthernMayaHighlands/Yucatan.sh rename to Hochob/Applications/MediaMayaLands/Kaab.sh From 32e4bf33404101844e31d379b0c0dac1c520ef50 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 20 Oct 2017 23:03:22 -0500 Subject: [PATCH 0985/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index fac32548..5afb07c6 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -251,22 +251,22 @@ homeassistant: # Media Maya Lands : Corporate - switch.guanajuato: + switch.aak: friendly_name: Imágenes Corporativas icon: mdi:folder-multiple-image - switch.guerrero: + switch.aayin: friendly_name: Videos Corporativos icon: mdi:file-video # Media Maya Lands : Intel Guadalajara - switch.jalisco: + switch.chakmool: friendly_name: Imágenes Intel Guadalajara icon: mdi:folder-multiple-image # Media Maya Lands : Visitors Center - switch.hidalgo: + switch.am: friendly_name: Imágenes Centro de Visitantes icon: mdi:folder-multiple-image @@ -673,23 +673,23 @@ switch: # Media Maya Lands: Corporate - guanajuato: - command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guanajuato.sh &" + aak: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Aak.sh &" command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" - guerrero: - command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Guerrero.sh &" + aayin: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Aayin.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" # Media Maya Lands: Intel Guadalajara - jalisco: - command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Jalisco.sh &" + chakmool: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Chakmool.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" # Media Maya Lands: Visitors Center - hidalgo: - command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Hidalgo.sh &" + am: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Am.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" # Media Maya Lands: Drawing @@ -895,18 +895,18 @@ group: southernmayahighlandscorporate: name: Corporativo entities: - - switch.guanajuato - - switch.guerrero + - switch.aak + - switch.aayin southernmayahighlandsintelguadalajara: name: Intel Guadalajara entities: - - switch.jalisco + - switch.chakmool southernmayahighlandsvisitorscenter: name: Centro de Visitantes entities: - - switch.hidalgo + - switch.am southernmayahighlandsdrawing: name: Dibujos From 77e1dc261b3299f6e5300e3b13421f0b455fb472 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 20 Oct 2017 23:22:47 -0500 Subject: [PATCH 0986/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 167 +++++++++++++----- 1 file changed, 127 insertions(+), 40 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 5afb07c6..b60960a5 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -272,22 +272,22 @@ homeassistant: # Media Maya Lands : Drawing - switch.puebla: + switch.chiich: friendly_name: Imágenes de Dibujos icon: mdi:folder-multiple-image # Media Maya Lands : Memories - switch.queretaro: + switch.cho: friendly_name: Imágenes de Visitas icon: mdi:folder-multiple-image - switch.quintanaroo: + switch.chuwen: friendly_name: Videos de Visitas icon: mdi:file-video # Media Maya Lands : Camera - switch.yucatan: + switch.kaab: friendly_name: Vista Previa Cámara icon: mdi:camera @@ -694,22 +694,22 @@ switch: # Media Maya Lands: Drawing - puebla: - command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Puebla.sh &" + chiich: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Chiich.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" # Media Maya Lands: Memories - queretaro: - command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Queretaro.sh &" + cho: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Cho.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" - quintanaroo: - command_on: "~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/QuintanaRoo.sh &" + chuwen: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Chuwen.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" # Media Maya Lands: Camera - yucatan: + kaab: command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0 &" command_off: "pkill -9 vlc" @@ -792,6 +792,8 @@ group: - group.captainmayalandscalendar - group.captainmayalandslanguage + # Southern Maya Highlands + southernmayalands: view: yes name: Home @@ -800,7 +802,9 @@ group: - group.southernmayahighlandsrobot - group.southernmayahighlandstour #- group.southernmayahighlandssandbox - + + # Robot Maya Lands + robotmayalands: view: yes name: Robotics @@ -814,6 +818,8 @@ group: - group.robotmayalandslegs - group.robotmayalandsreset + # Central Maya Lowlands + centralmayalowlands: view: yes name: Beginning @@ -822,6 +828,8 @@ group: - group.centralmayalowlandsquestions #- group.centralmayalowlandssandbox + # Northern Maya Lowlands + northernmayalowlands: view: yes name: Experience @@ -830,6 +838,8 @@ group: - group.northernmayalowlandsstories - group.northernmayalowlandsrobot + # Techie Maya Lands + techiemayalands: view: yes name: Techies @@ -843,25 +853,31 @@ group: - group.techiemayalandsserverinfrastructure - group.techiemayalandssandbox + # Console Maya Lands + consolemayalands: view: yes #icon: mdi:keyboard - name: Interaction + name: Keyboard entities: - group.consolemayalandskeypadyesno - group.consolemayalandskeypadmultiplechoice + # Media Maya Lands + mediamayalands: view: yes #icon: mdi:filmstrip name: Memories entities: - - group.southernmayahighlandscorporate - - group.southernmayahighlandsintelguadalajara - - group.southernmayahighlandsvisitorscenter - - group.southernmayahighlandsdrawing - - group.southernmayahighlandsmemories - - group.southernmayahighlandscamera + - group.mediamayalandscorporate + - group.mediamayalandsintelguadalajara + - group.mediamayalandsvisitorscenter + - group.mediamayalandsdrawing + - group.mediamayalandsmemories + - group.mediamayalandscamera + + # Captain Maya Lands: Calendar captainmayalandscalendar: name: Próxima Visita @@ -869,65 +885,88 @@ group: - sensor.appleimac - sensor.appleipod + # Captain Maya Lands: Language + captainmayalandslanguage: name: Idioma entities: - switch.language + # Southern Maya Highlands: Introduction + southernmayahighlandsintroduction: name: 1 Introduccion entities: - script.aguascalientes + # Southern Maya Highlands: Robot + southernmayahighlandsrobot: name: 2 Robot entities: - script.bajacalifornianorte - script.bajacaliforniasur - script.michoacan - - script.campeche + + # Southern Maya Highlands: Tour southernmayahighlandstour: name: 3 Tour entities: - script.campeche - southernmayahighlandscorporate: + # Southern Maya Highlands: Sandbox + + southernmayahighlandssandbox: + name: Sandbox + entities: + - script.zacatecas + + # Media Maya Lands: Corporate + + mediamayalandscorporate: name: Corporativo entities: - switch.aak - switch.aayin - southernmayahighlandsintelguadalajara: + # Media Maya Lands: Intel Guadalajara + + mediamayalandsintelguadalajara: name: Intel Guadalajara entities: - switch.chakmool - southernmayahighlandsvisitorscenter: + # Media Maya Lands: Visitors Center + + mediamayalandsvisitorscenter: name: Centro de Visitantes entities: - switch.am - southernmayahighlandsdrawing: + # Media Maya Lands: Drawing + + mediamayalandsdrawing: name: Dibujos entities: - - switch.puebla + - switch.chiich - southernmayahighlandsmemories: + # Media Maya Lands: Memories + + mediamayalandsmemories: name: Visitas entities: - - switch.queretaro - - switch.quintanaroo + - switch.cho + - switch.chuwen + + # Media Maya Lands: Camera - southernmayahighlandscamera: + mediamayalandscamera: name: Cámara entities: - - switch.yucatan + - switch.kaab - southernmayahighlandssandbox: - name: Sandbox - entities: - - script.zacatecas + # Central Maya Lowlands: Stations centralmayalowlandsstations: name: Estaciones @@ -938,16 +977,22 @@ group: - script.mazatlan - script.puertovallarta + # Central Maya Lowlands: Questions + centralmayalowlandsquestions: name: Conocimiento entities: - script.ixtapa + # Central Maya Lowlands: Sandbox + centralmayalowlandssandbox: name: Sandbox entities: - script.veracruz + # Northern Maya Highlands: Stations + northernmayalowlandsstations: name: Estaciones entities: @@ -957,39 +1002,53 @@ group: - script.elcielo - script.mapimi + # Northern Maya Highlands: Stations + northernmayalowlandsrobot: name: Robot entities: - script.siankaan + # Northern Maya Highlands: Stations + northernmayalowlandsstories: name: Historias entities: - script.calakmul - script.tiburonballena + # Robot Maya Lands: Language + robotmayalandslanguage: name: Idioma entities: - script.coji + # Robot Maya Lands: Events + robotmayalandsevent: name: Evento entities: - automation.services_internal_event_host_robot - automation.services_external_event_host_robot + # Robot Maya Lands: Questions + robotmayalandsquestions: name: Conocimiento entities: - script.makeblock + # Robot Maya Lands: Head + robotmayalandshead: name: Cabeza entities: - script.headright - script.headleft + # Robot Maya Lands: Arm Right + robotmayalandsarmright: name: Brazo Derecho entities: @@ -998,6 +1057,8 @@ group: - script.rightfold - script.rightunfold + # Robot Maya Lands: Arm Left + robotmayalandsarmleft: name: Brazo Izquierdo entities: @@ -1005,7 +1066,9 @@ group: - script.lefttdown - script.leftfold - script.leftunfold - + + # Robot Maya Lands: Legs + robotmayalandslegs: name: Piernas entities: @@ -1015,17 +1078,23 @@ group: - script.movebackward - script.movestop + # Robot Maya Lands: Reset + robotmayalandsreset: name: Reiniciar entities: - script.resetall + # Techie Maya Lands: System Health + techiemayalandssystemhealth: name: Verificación del Sistema entities: - script.toyota - script.kodak + # Techie Maya Lands: System Calendar + techiemayalandssystemcalendar: name: Calendario de Visitas entities: @@ -1034,6 +1103,8 @@ group: - calendar.hochobvcgmailcom - automation.services_calendar_name + # Techie Maya Lands: System Audio + techiemayalandssystemaudio: name: Audio del Servidor entities: @@ -1043,6 +1114,8 @@ group: - automation.services_sound_pulseaudio_change - automation.services_sound_pulseaudio_read + # Techie Maya Lands: System Monitor + techiemayalandssystemmonitor: name: Monitor del Servidor entities: @@ -1051,33 +1124,52 @@ group: - sensor.disk_use_home #- camera.ffmpeg + # Techie Maya Lands: System Event + techiemayalandssystemevent: name: Evento entities: - automation.services_internal_event_host_server + # Techie Maya Lands: System Season + techiemayalandssystemseason: name: Temporada entities: - automation.services_season + # Techie Maya Lands: System Quote + techiemayalandssystemquote: name: Citas del Servidor entities: - sensor.bosch + # Techie Maya Lands: Server Infrastructure + mayalandsserverinfrastructure: name: Disponibilidad de Servidores entities: - device_tracker.eclipse - device_tracker.hochob + # Techie Maya Lands: Sandbox + + techiemayalandssandbox: + name: Sandbox + entities: + - script.visitorsusb + + # Console Maya Lands: Keypad Yes No + consolemayalandskeypadyesno: name: Teclado Sí No entities: - script.keypadyes - script.keypadno + # Console Maya Lands: Keypad Multiple Choice + consolemayalandskeypadmultiplechoice: name: Teclado Opción Multiple entities: @@ -1085,8 +1177,3 @@ group: - script.keypadtwo - script.keypadthree - script.keypadfour - - techiemayalandssandbox: - name: Sandbox - entities: - - script.visitorsusb From 6a4128165102f0a53a505ff9eff1e722e9a8e94f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 20 Oct 2017 23:25:45 -0500 Subject: [PATCH 0987/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 180 +++++++++--------- 1 file changed, 90 insertions(+), 90 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b60960a5..0d3018f9 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -922,49 +922,73 @@ group: entities: - script.zacatecas - # Media Maya Lands: Corporate + # Robot Maya Lands: Language - mediamayalandscorporate: - name: Corporativo + robotmayalandslanguage: + name: Idioma entities: - - switch.aak - - switch.aayin + - script.coji - # Media Maya Lands: Intel Guadalajara + # Robot Maya Lands: Events + + robotmayalandsevent: + name: Evento + entities: + - automation.services_internal_event_host_robot + - automation.services_external_event_host_robot - mediamayalandsintelguadalajara: - name: Intel Guadalajara + # Robot Maya Lands: Questions + + robotmayalandsquestions: + name: Conocimiento entities: - - switch.chakmool + - script.makeblock - # Media Maya Lands: Visitors Center + # Robot Maya Lands: Head + + robotmayalandshead: + name: Cabeza + entities: + - script.headright + - script.headleft - mediamayalandsvisitorscenter: - name: Centro de Visitantes + # Robot Maya Lands: Arm Right + + robotmayalandsarmright: + name: Brazo Derecho entities: - - switch.am + - script.rightup + - script.rightdown + - script.rightfold + - script.rightunfold - # Media Maya Lands: Drawing + # Robot Maya Lands: Arm Left - mediamayalandsdrawing: - name: Dibujos + robotmayalandsarmleft: + name: Brazo Izquierdo entities: - - switch.chiich + - script.leftup + - script.lefttdown + - script.leftfold + - script.leftunfold - # Media Maya Lands: Memories + # Robot Maya Lands: Legs - mediamayalandsmemories: - name: Visitas + robotmayalandslegs: + name: Piernas entities: - - switch.cho - - switch.chuwen + - script.moveright + - script.moveleft + - script.moveforward + - script.movebackward + - script.movestop - # Media Maya Lands: Camera + # Robot Maya Lands: Reset - mediamayalandscamera: - name: Cámara + robotmayalandsreset: + name: Reiniciar entities: - - switch.kaab + - script.resetall # Central Maya Lowlands: Stations @@ -1017,73 +1041,67 @@ group: - script.calakmul - script.tiburonballena - # Robot Maya Lands: Language + # Console Maya Lands: Keypad Yes No - robotmayalandslanguage: - name: Idioma + consolemayalandskeypadyesno: + name: Teclado Sí No entities: - - script.coji + - script.keypadyes + - script.keypadno - # Robot Maya Lands: Events - - robotmayalandsevent: - name: Evento + # Console Maya Lands: Keypad Multiple Choice + + consolemayalandskeypadmultiplechoice: + name: Teclado Opción Multiple entities: - - automation.services_internal_event_host_robot - - automation.services_external_event_host_robot + - script.keypadone + - script.keypadtwo + - script.keypadthree + - script.keypadfour - # Robot Maya Lands: Questions + # Media Maya Lands: Corporate - robotmayalandsquestions: - name: Conocimiento + mediamayalandscorporate: + name: Corporativo entities: - - script.makeblock + - switch.aak + - switch.aayin - # Robot Maya Lands: Head - - robotmayalandshead: - name: Cabeza + # Media Maya Lands: Intel Guadalajara + + mediamayalandsintelguadalajara: + name: Intel Guadalajara entities: - - script.headright - - script.headleft + - switch.chakmool - # Robot Maya Lands: Arm Right + # Media Maya Lands: Visitors Center - robotmayalandsarmright: - name: Brazo Derecho + mediamayalandsvisitorscenter: + name: Centro de Visitantes entities: - - script.rightup - - script.rightdown - - script.rightfold - - script.rightunfold + - switch.am - # Robot Maya Lands: Arm Left + # Media Maya Lands: Drawing - robotmayalandsarmleft: - name: Brazo Izquierdo + mediamayalandsdrawing: + name: Dibujos entities: - - script.leftup - - script.lefttdown - - script.leftfold - - script.leftunfold + - switch.chiich - # Robot Maya Lands: Legs + # Media Maya Lands: Memories - robotmayalandslegs: - name: Piernas + mediamayalandsmemories: + name: Visitas entities: - - script.moveright - - script.moveleft - - script.moveforward - - script.movebackward - - script.movestop + - switch.cho + - switch.chuwen - # Robot Maya Lands: Reset + # Media Maya Lands: Camera - robotmayalandsreset: - name: Reiniciar + mediamayalandscamera: + name: Cámara entities: - - script.resetall + - switch.kaab # Techie Maya Lands: System Health @@ -1159,21 +1177,3 @@ group: name: Sandbox entities: - script.visitorsusb - - # Console Maya Lands: Keypad Yes No - - consolemayalandskeypadyesno: - name: Teclado Sí No - entities: - - script.keypadyes - - script.keypadno - - # Console Maya Lands: Keypad Multiple Choice - - consolemayalandskeypadmultiplechoice: - name: Teclado Opción Multiple - entities: - - script.keypadone - - script.keypadtwo - - script.keypadthree - - script.keypadfour From 8e4faa8b4d46cc7edac22675402d78e8a71be804 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 20 Oct 2017 23:27:49 -0500 Subject: [PATCH 0988/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0d3018f9..75b5b878 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -838,21 +838,6 @@ group: - group.northernmayalowlandsstories - group.northernmayalowlandsrobot - # Techie Maya Lands - - techiemayalands: - view: yes - name: Techies - entities: - - group.techiemayalandssystemcalendar - - group.techiemayalandssystemaudio - - group.techiemayalandssystemmonitor - - group.techiemayalandssystemevent - - group.techiemayalandssystemseason - - group.techiemayalandssystemquote - - group.techiemayalandsserverinfrastructure - - group.techiemayalandssandbox - # Console Maya Lands consolemayalands: @@ -877,6 +862,21 @@ group: - group.mediamayalandsmemories - group.mediamayalandscamera + # Techie Maya Lands + + techiemayalands: + view: yes + name: Techies + entities: + - group.techiemayalandssystemcalendar + - group.techiemayalandssystemaudio + - group.techiemayalandssystemmonitor + - group.techiemayalandssystemevent + - group.techiemayalandssystemseason + - group.techiemayalandssystemquote + - group.techiemayalandsserverinfrastructure + - group.techiemayalandssandbox + # Captain Maya Lands: Calendar captainmayalandscalendar: From 7b92e28978ba90d2ad05445cf29fd26026fad0c1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:03:44 -0500 Subject: [PATCH 0989/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 66 +++++++++++-------- 1 file changed, 39 insertions(+), 27 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 75b5b878..00337f17 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -641,16 +641,6 @@ shell_command: movebackward: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movebackward movestop: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movestop - # Techie Maya Lands - - toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & - kodak: ssh root@127.0.0.1 sudo reboot - apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & - qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' - windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & - google: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Google.sh & - visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & - # Console Maya Lands keypadyes: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual yes & @@ -660,6 +650,19 @@ shell_command: keypadthree: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 3 & keypadfour: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 4 & + # Tradition Maya Lands + + diademuertos: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos.sh & + + # Techie Maya Lands + + toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & + kodak: ssh root@127.0.0.1 sudo reboot + apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & + qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' + windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & + visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & + switch: - platform: command_line @@ -733,6 +736,17 @@ automation: action: - service: shell_command.meccanoid + # Tradition Maya Lands + + - alias: DiaDeMuertos + initial_state: 'off' + trigger: + platform: time + minutes: '/15' + seconds: 00 + action: + - service: shell_command.diademuertos + # Techie Maya Lands - alias: Services Calendar Name @@ -773,15 +787,6 @@ automation: action: - service: shell_command.windriver - - alias: Services Season - initial_state: 'off' - trigger: - platform: time - minutes: '/15' - seconds: 00 - action: - - service: shell_command.google - group: default_view: @@ -862,6 +867,14 @@ group: - group.mediamayalandsmemories - group.mediamayalandscamera + # Tradition Maya Lands + + traditionmayalands: + view: yes + name: Tradition + entities: + - group.traditionmayalandsdiademuertos + # Techie Maya Lands techiemayalands: @@ -872,7 +885,6 @@ group: - group.techiemayalandssystemaudio - group.techiemayalandssystemmonitor - group.techiemayalandssystemevent - - group.techiemayalandssystemseason - group.techiemayalandssystemquote - group.techiemayalandsserverinfrastructure - group.techiemayalandssandbox @@ -1103,6 +1115,13 @@ group: entities: - switch.kaab + # Tradition Maya Lands: Dia De Muertos + + traditionmayalandsdiademuertos: + name: Dia De Muertos + entities: + - automation.diademuertos + # Techie Maya Lands: System Health techiemayalandssystemhealth: @@ -1149,13 +1168,6 @@ group: entities: - automation.services_internal_event_host_server - # Techie Maya Lands: System Season - - techiemayalandssystemseason: - name: Temporada - entities: - - automation.services_season - # Techie Maya Lands: System Quote techiemayalandssystemquote: From 445b57056145cb96459ed47278661228cb458ac6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:23:23 -0500 Subject: [PATCH 0990/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 00337f17..bfb3b980 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -652,7 +652,7 @@ shell_command: # Tradition Maya Lands - diademuertos: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos.sh & + imix: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Imix.sh & # Techie Maya Lands @@ -738,14 +738,14 @@ automation: # Tradition Maya Lands - - alias: DiaDeMuertos + - alias: Imix initial_state: 'off' trigger: platform: time minutes: '/15' seconds: 00 action: - - service: shell_command.diademuertos + - service: shell_command.imix # Techie Maya Lands @@ -873,7 +873,7 @@ group: view: yes name: Tradition entities: - - group.traditionmayalandsdiademuertos + - group.traditionmayalandsimix # Techie Maya Lands @@ -1117,10 +1117,10 @@ group: # Tradition Maya Lands: Dia De Muertos - traditionmayalandsdiademuertos: + traditionmayalandsimix: name: Dia De Muertos entities: - - automation.diademuertos + - automation.imix # Techie Maya Lands: System Health From 1c3d57b0b3456e32e8e1b97160a57ad8cd39de3b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:27:08 -0500 Subject: [PATCH 0991/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index bfb3b980..92f25872 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -174,7 +174,13 @@ homeassistant: script.movestop: friendly_name: Move Stop icon: mdi:stop - + + # Tradition Maya Lands + + automation.imix: + friendly_name: Sonidos + icon: mdi:speaker + # Techie Maya Lands # Techie Maya Lands : System Health From 740161aee40e48276352880ef913219e5dc0a39e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:36:11 -0500 Subject: [PATCH 0992/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 126 +++++++++--------- 1 file changed, 62 insertions(+), 64 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 92f25872..32756cf9 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -50,6 +50,67 @@ homeassistant: friendly_name: Sandbox icon: mdi:test-tube + # Robot Maya Lands + + script.resetall: + friendly_name: Reset + icon: mdi:lock-reset + script.coji: + friendly_name: Speak + icon: mdi:speaker + script.makeblock: + friendly_name: Preguntas + icon: mdi:audiobook + + script.headright: + friendly_name: Head Right + icon: mdi:arrow-right-thick + script.headleft: + friendly_name: Head Left + icon: mdi:arrow-left-thick + + script.rightup: + friendly_name: Up + icon: mdi:human-handsup + script.rightdown: + friendly_name: Down + icon: mdi:human-handsup + script.rightfold: + friendly_name: Fold + icon: mdi:gesture-swipe-up + script.rightunfold: + friendly_name: Unfold + icon: mdi:gesture-swipe-up + + script.leftup: + friendly_name: Up + icon: mdi:human-handsup + script.leftdown: + friendly_name: Down + icon: mdi:human-handsup + script.leftfold: + friendly_name: Fold + icon: mdi:gesture-swipe-up + script.leftunfold: + friendly_name: Unfold + icon: mdi:gesture-swipe-up + + script.moveright: + friendly_name: Move Right + icon: mdi:arrow-right-thick + script.moveleft: + friendly_name: Move Left + icon: mdi:arrow-left-thick + script.moveforward: + friendly_name: Move Forward + icon: mdi:arrow-up-thick + script.movebackward: + friendly_name: Move Backward + icon: mdi:arrow-down-thick + script.movestop: + friendly_name: Move Stop + icon: mdi:stop + # Central Maya Lowlands, Stations script.acapulco: @@ -114,75 +175,12 @@ homeassistant: friendly_name: Planeta Marte icon: mdi:test-tube - # Robot Maya Lands - - script.resetall: - friendly_name: Reset - icon: mdi:lock-reset - script.coji: - friendly_name: Speak - icon: mdi:speaker - script.makeblock: - friendly_name: Preguntas - icon: mdi:audiobook - - script.headright: - friendly_name: Head Right - icon: mdi:arrow-right-thick - script.headleft: - friendly_name: Head Left - icon: mdi:arrow-left-thick - - script.rightup: - friendly_name: Up - icon: mdi:human-handsup - script.rightdown: - friendly_name: Down - icon: mdi:human-handsup - script.rightfold: - friendly_name: Fold - icon: mdi:gesture-swipe-up - script.rightunfold: - friendly_name: Unfold - icon: mdi:gesture-swipe-up - - script.leftup: - friendly_name: Up - icon: mdi:human-handsup - script.leftdown: - friendly_name: Down - icon: mdi:human-handsup - script.leftfold: - friendly_name: Fold - icon: mdi:gesture-swipe-up - script.leftunfold: - friendly_name: Unfold - icon: mdi:gesture-swipe-up - - script.moveright: - friendly_name: Move Right - icon: mdi:arrow-right-thick - script.moveleft: - friendly_name: Move Left - icon: mdi:arrow-left-thick - script.moveforward: - friendly_name: Move Forward - icon: mdi:arrow-up-thick - script.movebackward: - friendly_name: Move Backward - icon: mdi:arrow-down-thick - script.movestop: - friendly_name: Move Stop - icon: mdi:stop - # Tradition Maya Lands automation.imix: - friendly_name: Sonidos + friendly_name: Sonidos Programados icon: mdi:speaker - # Techie Maya Lands - # Techie Maya Lands : System Health script.toyota: From 5116a20c6267bed04b92e46e0b11e111e80cddc1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:43:20 -0500 Subject: [PATCH 0993/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 147 +++++++++--------- 1 file changed, 77 insertions(+), 70 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 32756cf9..fd1722d7 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -405,74 +405,6 @@ script: sequence: - service: shell_command.zacatecas - # Central Maya Lowlands, Stations - - acapulco: - sequence: - - service: shell_command.acapulco - - cancun: - sequence: - - service: shell_command.cancun - - huatulco: - sequence: - - service: shell_command.huatulco - - mazatlan: - sequence: - - service: shell_command.mazatlan - - puertovallarta: - sequence: - - service: shell_command.puertovallarta - - # Central Maya Lowlands, Questions - - ixtapa: - sequence: - - service: shell_command.ixtapa - - # Central Maya Lowlands, Sandbox - - veracruz: - sequence: - - service: shell_command.veracruz - - # Northern Maya Lowlands - - ojodeliebre: - sequence: - - service: shell_command.ojodeliebre - - montesazules: - sequence: - - service: shell_command.montesazules - - lamichilia: - sequence: - - service: shell_command.lamichilia - - elcielo: - sequence: - - service: shell_command.elcielo - - mapimi: - sequence: - - service: shell_command.mapimi - - siankaan: - sequence: - - service: shell_command.siankaan - - calakmul: - sequence: - - service: shell_command.calakmul - - tiburonballena: - sequence: - - service: shell_command.tiburonballena - # Robot Maya Lands resetall: @@ -546,7 +478,81 @@ script: movestop: sequence: - service: shell_command.movestop - + + # Central Maya Lowlands, Stations + + acapulco: + sequence: + - service: shell_command.acapulco + + cancun: + sequence: + - service: shell_command.cancun + + huatulco: + sequence: + - service: shell_command.huatulco + + mazatlan: + sequence: + - service: shell_command.mazatlan + + puertovallarta: + sequence: + - service: shell_command.puertovallarta + + # Central Maya Lowlands, Questions + + ixtapa: + sequence: + - service: shell_command.ixtapa + + # Central Maya Lowlands, Sandbox + + veracruz: + sequence: + - service: shell_command.veracruz + + # Northern Maya Lowlands + + ojodeliebre: + sequence: + - service: shell_command.ojodeliebre + + montesazules: + sequence: + - service: shell_command.montesazules + + lamichilia: + sequence: + - service: shell_command.lamichilia + + elcielo: + sequence: + - service: shell_command.elcielo + + mapimi: + sequence: + - service: shell_command.mapimi + + siankaan: + sequence: + - service: shell_command.siankaan + + calakmul: + sequence: + - service: shell_command.calakmul + + tiburonballena: + sequence: + - service: shell_command.tiburonballena + + # Tradition Maya Lands + + imix: + sequence: + - service: shell_command.imix + # Techie Maya Lands toyota: @@ -1122,9 +1128,10 @@ group: # Tradition Maya Lands: Dia De Muertos traditionmayalandsimix: - name: Dia De Muertos + name: Dia De Muertos Sonidos entities: - automation.imix + - script.imix # Techie Maya Lands: System Health From 88e898ce67f915f2b1f0a5cbfc46dd108925d433 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:47:47 -0500 Subject: [PATCH 0994/1653] Update Signed-off-by: Abraham Arce --- .../{TechieMayaLands/Google.sh => TraditionMayaLands/Imix.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/{TechieMayaLands/Google.sh => TraditionMayaLands/Imix.sh} (100%) diff --git a/Hochob/Applications/TechieMayaLands/Google.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh similarity index 100% rename from Hochob/Applications/TechieMayaLands/Google.sh rename to Hochob/Applications/TraditionMayaLands/Imix.sh From 3eceb8b85ce6c8512e6b0b21713af2da467293fc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:50:12 -0500 Subject: [PATCH 0995/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index fd1722d7..2070a7e6 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -180,7 +180,11 @@ homeassistant: automation.imix: friendly_name: Sonidos Programados icon: mdi:speaker - + + script.imix: + friendly_name: Sonidos Reproducción + icon: mdi:speaker + # Techie Maya Lands : System Health script.toyota: From 7ea7be109490e4249e9f35262d77718a71a8abde Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:55:27 -0500 Subject: [PATCH 0996/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 2070a7e6..4fbae38b 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -887,7 +887,7 @@ group: view: yes name: Tradition entities: - - group.traditionmayalandsimix + - group.traditionmayalandsdiademuertos # Techie Maya Lands @@ -1131,8 +1131,8 @@ group: # Tradition Maya Lands: Dia De Muertos - traditionmayalandsimix: - name: Dia De Muertos Sonidos + traditionmayalandsdiademuertos: + name: Dia De Muertos entities: - automation.imix - script.imix From 2e5f9116659323974e38a56f1d74ad6e1cc092a1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 00:59:04 -0500 Subject: [PATCH 0997/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 4fbae38b..83de704f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -179,7 +179,7 @@ homeassistant: automation.imix: friendly_name: Sonidos Programados - icon: mdi:speaker + icon: mdi:calendar-clock script.imix: friendly_name: Sonidos Reproducción From 10028b7de61f45a77cb1ae285e54de8fd65500bb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 08:15:54 -0500 Subject: [PATCH 0998/1653] Update Meccanoid.sh --- Hochob/Applications/RobotMayaLands/Meccanoid.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Meccanoid.sh b/Hochob/Applications/RobotMayaLands/Meccanoid.sh index 91a4fd0b..c8561d75 100755 --- a/Hochob/Applications/RobotMayaLands/Meccanoid.sh +++ b/Hochob/Applications/RobotMayaLands/Meccanoid.sh @@ -39,9 +39,9 @@ LogPid.sh $MECCANOID_PID $SPHERO_NAME chooseLanguage if [ "$LOCAL_LANGUAGE" = "english" ]; then - HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" + HostExternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" else - HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" + HostExternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" fi # End of File From b612f716749545f83cbd37a5a6037218f268fd66 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 08:19:09 -0500 Subject: [PATCH 0999/1653] Update Signed-off-by: Abraham Arce --- .../{RobotMayaLands/Sphero.sh => CalendarMayaLands/Pop.sh} | 0 .../{RobotMayaLands/Meccanoid.sh => CalendarMayaLands/Wo.sh} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/{RobotMayaLands/Sphero.sh => CalendarMayaLands/Pop.sh} (100%) rename Hochob/Applications/{RobotMayaLands/Meccanoid.sh => CalendarMayaLands/Wo.sh} (100%) diff --git a/Hochob/Applications/RobotMayaLands/Sphero.sh b/Hochob/Applications/CalendarMayaLands/Pop.sh similarity index 100% rename from Hochob/Applications/RobotMayaLands/Sphero.sh rename to Hochob/Applications/CalendarMayaLands/Pop.sh diff --git a/Hochob/Applications/RobotMayaLands/Meccanoid.sh b/Hochob/Applications/CalendarMayaLands/Wo.sh similarity index 100% rename from Hochob/Applications/RobotMayaLands/Meccanoid.sh rename to Hochob/Applications/CalendarMayaLands/Wo.sh From e434a342f5110058db1f43ade5ddded38a73d0d8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 08:25:13 -0500 Subject: [PATCH 1000/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 47 ++++++++++++------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 83de704f..5c4c0c9d 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -632,8 +632,6 @@ shell_command: resetall: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 coji: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Coji.sh & - sphero: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Sphero.sh & - meccanoid: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Meccanoid.sh & makeblock: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Makeblock.sh & headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 @@ -664,6 +662,11 @@ shell_command: keypadthree: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 3 & keypadfour: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 4 & + # Calendar Maya Lands + + pop: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Pop.sh & + wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & + # Tradition Maya Lands imix: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Imix.sh & @@ -732,23 +735,23 @@ switch: automation: - # Robot Maya Lands + # Calendar Maya Lands - - alias: Services Internal Event Host Robot + - alias: pop initial_state: 'off' trigger: platform: time seconds: '/30' action: - - service: shell_command.sphero + - service: shell_command.pop - - alias: Services External Event Host Robot + - alias: wo initial_state: 'off' trigger: platform: time seconds: '/30' action: - - service: shell_command.meccanoid + - service: shell_command.wo # Tradition Maya Lands @@ -829,7 +832,6 @@ group: name: Robotics entities: - group.robotmayalandslanguage - - group.robotmayalandsevent - group.robotmayalandsquestions - group.robotmayalandshead - group.robotmayalandsarmright @@ -881,6 +883,15 @@ group: - group.mediamayalandsmemories - group.mediamayalandscamera + # Calendar Maya Lands + + calendarmayalands: + view: yes + name: Calendario + entities: + - group.calendarmayalandseventsinternal + - group.calendarmayalandseventsexternal + # Tradition Maya Lands traditionmayalands: @@ -955,14 +966,6 @@ group: entities: - script.coji - # Robot Maya Lands: Events - - robotmayalandsevent: - name: Evento - entities: - - automation.services_internal_event_host_robot - - automation.services_external_event_host_robot - # Robot Maya Lands: Questions robotmayalandsquestions: @@ -1129,6 +1132,18 @@ group: entities: - switch.kaab + # Calendar Maya Lands: Internal Events + + calendarmayalandseventsinternal: + name: Eventos Internos + entities: + - automation.pop + + calendarmayalandseventsexternal: + name: Eventos Externos + entities: + - automation.wo + # Tradition Maya Lands: Dia De Muertos traditionmayalandsdiademuertos: From 17a07117632e0c381ab0c7d87f0e23536087ac95 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 08:32:47 -0500 Subject: [PATCH 1001/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 113 +++++++++--------- 1 file changed, 59 insertions(+), 54 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 5c4c0c9d..d7a137a0 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -175,58 +175,6 @@ homeassistant: friendly_name: Planeta Marte icon: mdi:test-tube - # Tradition Maya Lands - - automation.imix: - friendly_name: Sonidos Programados - icon: mdi:calendar-clock - - script.imix: - friendly_name: Sonidos Reproducción - icon: mdi:speaker - - # Techie Maya Lands : System Health - - script.toyota: - friendly_name: Verificar Infraestructura - icon: mdi:approval - - script.kodak: - friendly_name: Reiniciar Servidor - icon: mdi:restart - - # Techie Maya Lands : System Audio - - input_slider.qualcomm: - friendly_name: Ajustar Volumén % - icon: mdi:volume-high - - sensor.qualcomm: - friendly_name: Nivel de Volumén % - icon: mdi:volume-high - - script.visitorsusb: - friendly_name: Visitantes USB - icon: mdi:usb - - # Techie Maya Lands : System Infrastructure - - device_tracker.eclipse: - friendly_name: IoT Eclipse Org - icon: mdi:server - - device_tracker.hochob: - friendly_name: Hochob Server - icon: mdi:server-network - - # Techie Maya Lands : System Quote - - sensor.bosch: - friendly_name: Hoy digo... - icon: mdi:approval - - # Console Maya Lands - # Console Maya Lands : Keypad Yes No script.keypadyes: @@ -255,8 +203,6 @@ homeassistant: friendly_name: Botón Cuatro icon: mdi:numeric-4-box - # Media Maya Lands - # Media Maya Lands : Corporate switch.aak: @@ -299,6 +245,65 @@ homeassistant: friendly_name: Vista Previa Cámara icon: mdi:camera + # Calendar Maya Lands + + automation.pop: + friendly_name: Bienvenida Programada + icon: mdi:calendar-clock + + automation.wo: + friendly_name: Bienvenida Programada + icon: mdi:calendar-clock + + # Tradition Maya Lands + + automation.imix: + friendly_name: Sonidos Programados + icon: mdi:calendar-clock + + script.imix: + friendly_name: Sonidos Reproducción + icon: mdi:speaker + + # Techie Maya Lands : System Health + + script.toyota: + friendly_name: Verificar Infraestructura + icon: mdi:approval + + script.kodak: + friendly_name: Reiniciar Servidor + icon: mdi:restart + + # Techie Maya Lands : System Audio + + input_slider.qualcomm: + friendly_name: Ajustar Volumén % + icon: mdi:volume-high + + sensor.qualcomm: + friendly_name: Nivel de Volumén % + icon: mdi:volume-high + + script.visitorsusb: + friendly_name: Visitantes USB + icon: mdi:usb + + # Techie Maya Lands : System Infrastructure + + device_tracker.eclipse: + friendly_name: IoT Eclipse Org + icon: mdi:server + + device_tracker.hochob: + friendly_name: Hochob Server + icon: mdi:server-network + + # Techie Maya Lands : System Quote + + sensor.bosch: + friendly_name: Hoy digo... + icon: mdi:approval # Enables the frontend frontend: From 34d32c86acc8849dff685bbe0ac23c1a788d5f48 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 08:42:10 -0500 Subject: [PATCH 1002/1653] Update Signed-off-by: Abraham Arce --- .../{TechieMayaLands/WindRiver.sh => CalendarMayaLands/Pip.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/{TechieMayaLands/WindRiver.sh => CalendarMayaLands/Pip.sh} (100%) diff --git a/Hochob/Applications/TechieMayaLands/WindRiver.sh b/Hochob/Applications/CalendarMayaLands/Pip.sh similarity index 100% rename from Hochob/Applications/TechieMayaLands/WindRiver.sh rename to Hochob/Applications/CalendarMayaLands/Pip.sh From 49aabf86eb9525331e0f0ed63db97240c78b1d77 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 08:47:53 -0500 Subject: [PATCH 1003/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d7a137a0..372d11f4 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -248,11 +248,15 @@ homeassistant: # Calendar Maya Lands automation.pop: - friendly_name: Bienvenida Programada + friendly_name: Robot Bienvenida Programada + icon: mdi:calendar-clock + + automation.sip: + friendly_name: Servidor Bienvenida Programada icon: mdi:calendar-clock automation.wo: - friendly_name: Bienvenida Programada + friendly_name: Robot Bienvenida Programada icon: mdi:calendar-clock # Tradition Maya Lands @@ -671,6 +675,7 @@ shell_command: pop: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Pop.sh & wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & + sip: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sip.sh & # Tradition Maya Lands @@ -682,7 +687,6 @@ shell_command: kodak: ssh root@127.0.0.1 sudo reboot apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' - windriver: ~/CodeLabs/Hochob/Applications/TechieMayaLands/WindRiver.sh & visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & switch: @@ -758,6 +762,14 @@ automation: action: - service: shell_command.wo + - alias: sip + initial_state: 'off' + trigger: + platform: time + seconds: '/30' + action: + - service: shell_command.sip + # Tradition Maya Lands - alias: Imix @@ -801,14 +813,6 @@ automation: entity_id: input_slider.qualcomm value: "{{ states.sensor.qualcomm.state | int }}" - - alias: Services Internal Event Host Server - initial_state: 'off' - trigger: - platform: time - seconds: '/30' - action: - - service: shell_command.windriver - group: default_view: @@ -1143,6 +1147,7 @@ group: name: Eventos Internos entities: - automation.pop + - automation.sip calendarmayalandseventsexternal: name: Eventos Externos @@ -1196,13 +1201,6 @@ group: - sensor.disk_use_home #- camera.ffmpeg - # Techie Maya Lands: System Event - - techiemayalandssystemevent: - name: Evento - entities: - - automation.services_internal_event_host_server - # Techie Maya Lands: System Quote techiemayalandssystemquote: From 04cfd30937a26b618a888d48711d2d3db6d78847 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 08:48:23 -0500 Subject: [PATCH 1004/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/CalendarMayaLands/{Pip.sh => Sip.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/CalendarMayaLands/{Pip.sh => Sip.sh} (100%) diff --git a/Hochob/Applications/CalendarMayaLands/Pip.sh b/Hochob/Applications/CalendarMayaLands/Sip.sh similarity index 100% rename from Hochob/Applications/CalendarMayaLands/Pip.sh rename to Hochob/Applications/CalendarMayaLands/Sip.sh From 48daf60ca9b5b8faeb0653a1d91bf6b247294454 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 08:50:40 -0500 Subject: [PATCH 1005/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 372d11f4..748767b7 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -248,15 +248,15 @@ homeassistant: # Calendar Maya Lands automation.pop: - friendly_name: Robot Bienvenida Programada + friendly_name: Bienvenida Programada Robot icon: mdi:calendar-clock automation.sip: - friendly_name: Servidor Bienvenida Programada + friendly_name: Bienvenida Programada Servidor icon: mdi:calendar-clock automation.wo: - friendly_name: Robot Bienvenida Programada + friendly_name: Bienvenida Programada Robot icon: mdi:calendar-clock # Tradition Maya Lands From 6b6032d7fb78cdd595d3bece9de01af50ad4b7c8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 09:09:05 -0500 Subject: [PATCH 1006/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 748767b7..e522b49f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -353,6 +353,18 @@ input_slider: sensor: + - platform: template + sensors: + imac: + friendly_name: Quien no visita? + value_template: '{{ states.calendar.hochobvcgmailcom.attributes.message }}' + + - platform: template + sensors: + ipod: + friendly_name: Cuando? + value_template: '{{ states.calendar.hochobvcgmailcom.attributes.start_time }}' + - platform: command_line name: Qualcomm command: amixer -D pulse sget Master | grep Left | grep -Eo '\[(\w+)\%\]' | grep -Eo '\w+' @@ -372,18 +384,6 @@ sensor: command: fortune scan_interval: 300 - - platform: template - sensors: - appleimac: - friendly_name: Who is coming? - value_template: '{{ states.calendar.hochobvcgmailcom.attributes.message }}' - - - platform: template - sensors: - appleipod: - friendly_name: When? - value_template: '{{ states.calendar.hochobvcgmailcom.attributes.start_time }}' - device_tracker: - platform: ping hosts: @@ -820,7 +820,7 @@ group: name: Sensei entities: - group.techiemayalandssystemhealth - - group.captainmayalandscalendar + - group.techiemayalandssystemcalendar - group.captainmayalandslanguage # Southern Maya Highlands @@ -915,6 +915,7 @@ group: view: yes name: Techies entities: + - group.techiemayalandssystemhealth - group.techiemayalandssystemcalendar - group.techiemayalandssystemaudio - group.techiemayalandssystemmonitor @@ -923,14 +924,6 @@ group: - group.techiemayalandsserverinfrastructure - group.techiemayalandssandbox - # Captain Maya Lands: Calendar - - captainmayalandscalendar: - name: Próxima Visita - entities: - - sensor.appleimac - - sensor.appleipod - # Captain Maya Lands: Language captainmayalandslanguage: @@ -1173,10 +1166,10 @@ group: # Techie Maya Lands: System Calendar techiemayalandssystemcalendar: - name: Calendario de Visitas + name: Próxima Visita entities: - - sensor.appleimac - - sensor.appleipod + - sensor.imac + - sensor.ipod - calendar.hochobvcgmailcom - automation.services_calendar_name From ce55fa9c0e557d01e37f20fe5425805ed23f0d0d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 09:21:36 -0500 Subject: [PATCH 1007/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index e522b49f..2dbfa9ea 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -289,6 +289,14 @@ homeassistant: friendly_name: Nivel de Volumén % icon: mdi:volume-high + automation.snapdragon: + friendly_name: Bienvenida Programada Robot + + automation.csr101x: + friendly_name: Bienvenida Programada Servidor + + # Techie Maya Lands : System Sandbox + script.visitorsusb: friendly_name: Visitantes USB icon: mdi:usb @@ -781,7 +789,7 @@ automation: action: - service: shell_command.imix - # Techie Maya Lands + # Techie Maya Lands: System Calendar - alias: Services Calendar Name initial_state: 'off' @@ -792,7 +800,9 @@ automation: action: - service: shell_command.apple - - alias: Services Sound PulseAudio Change + # Techie Maya Lands: System Audio + + - alias: snapdragon initial_state: 'on' trigger: - platform: state @@ -802,7 +812,7 @@ automation: data_template: volume_level: "{{ states.input_slider.qualcomm.state }}" - - alias: Services Sound PulseAudio Read + - alias: csr101x initial_state: 'on' trigger: - platform: state @@ -1181,8 +1191,8 @@ group: - input_slider.qualcomm - sensor.qualcomm - shell_command.qualcomm - - automation.services_sound_pulseaudio_change - - automation.services_sound_pulseaudio_read + - automation.snapdragon + - automation.csr101x # Techie Maya Lands: System Monitor From 953f348fbd7f4c4fd97238df9e4859fef740c7cb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 09:23:47 -0500 Subject: [PATCH 1008/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 2dbfa9ea..c217b414 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1190,9 +1190,9 @@ group: entities: - input_slider.qualcomm - sensor.qualcomm - - shell_command.qualcomm - - automation.snapdragon - - automation.csr101x + #- shell_command.qualcomm + #- automation.snapdragon + #- automation.csr101x # Techie Maya Lands: System Monitor From f6fcfaf9db073c3d6b04f98d3e507d300493aa73 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 09:26:07 -0500 Subject: [PATCH 1009/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index c217b414..9e2eb5cf 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -282,18 +282,18 @@ homeassistant: # Techie Maya Lands : System Audio input_slider.qualcomm: - friendly_name: Ajustar Volumén % + friendly_name: Volumén % Ajustar icon: mdi:volume-high sensor.qualcomm: - friendly_name: Nivel de Volumén % + friendly_name: Volumén % Nivel icon: mdi:volume-high - automation.snapdragon: - friendly_name: Bienvenida Programada Robot + #automation.snapdragon: + # friendly_name: Habilitado Ajustar - automation.csr101x: - friendly_name: Bienvenida Programada Servidor + #automation.csr101x: + # friendly_name: Habilitado Nivel # Techie Maya Lands : System Sandbox From d4fddfa071e839f42f4a6074b636f45845987051 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 09:34:08 -0500 Subject: [PATCH 1010/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 9e2eb5cf..f12cdab7 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -791,7 +791,7 @@ automation: # Techie Maya Lands: System Calendar - - alias: Services Calendar Name + - alias: Apple initial_state: 'off' trigger: platform: time @@ -1178,10 +1178,10 @@ group: techiemayalandssystemcalendar: name: Próxima Visita entities: + - automation.apple - sensor.imac - sensor.ipod - - calendar.hochobvcgmailcom - - automation.services_calendar_name + #- calendar.hochobvcgmailcom # Techie Maya Lands: System Audio From 252da7b0738c96641f5590fcb23ff0b8efbfabac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 09:37:10 -0500 Subject: [PATCH 1011/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f12cdab7..f6e9541f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -279,6 +279,11 @@ homeassistant: friendly_name: Reiniciar Servidor icon: mdi:restart + # Techie Maya Lands : System Calendar + + automation.apple: + friendly_name: Anuncio Servidor Programado + # Techie Maya Lands : System Audio input_slider.qualcomm: From deebb2069d1158fe1edba7e3615c03f41ca7c911 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 09:40:16 -0500 Subject: [PATCH 1012/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f6e9541f..b03f0bbc 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -262,11 +262,11 @@ homeassistant: # Tradition Maya Lands automation.imix: - friendly_name: Sonidos Programados + friendly_name: Sonidos Chromecast Programados icon: mdi:calendar-clock script.imix: - friendly_name: Sonidos Reproducción + friendly_name: Sonidos Chromecast Reproducción icon: mdi:speaker # Techie Maya Lands : System Health From 0d2b0dd9f4f19b7401d81eb011702ffc203d091e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:19:53 -0500 Subject: [PATCH 1013/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b03f0bbc..803fe209 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -248,21 +248,21 @@ homeassistant: # Calendar Maya Lands automation.pop: - friendly_name: Bienvenida Programada Robot + friendly_name: Bienvenida Robot / 30 Minutos icon: mdi:calendar-clock automation.sip: - friendly_name: Bienvenida Programada Servidor + friendly_name: Bienvenida Servidor / 30 Minutos icon: mdi:calendar-clock automation.wo: - friendly_name: Bienvenida Programada Robot + friendly_name: Bienvenida Robot / 30 Minutos icon: mdi:calendar-clock # Tradition Maya Lands automation.imix: - friendly_name: Sonidos Chromecast Programados + friendly_name: Sonidos Chromecast / 10 Minutos icon: mdi:calendar-clock script.imix: @@ -282,7 +282,7 @@ homeassistant: # Techie Maya Lands : System Calendar automation.apple: - friendly_name: Anuncio Servidor Programado + friendly_name: Anuncio Servidor / 30 Minutos # Techie Maya Lands : System Audio @@ -369,7 +369,7 @@ sensor: - platform: template sensors: imac: - friendly_name: Quien no visita? + friendly_name: Quién? value_template: '{{ states.calendar.hochobvcgmailcom.attributes.message }}' - platform: template @@ -920,7 +920,7 @@ group: traditionmayalands: view: yes - name: Tradition + name: Tradición entities: - group.traditionmayalandsdiademuertos From c3762a8952741828bca3622be3100361abd676e7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:24:19 -0500 Subject: [PATCH 1014/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 803fe209..18540b01 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -248,21 +248,21 @@ homeassistant: # Calendar Maya Lands automation.pop: - friendly_name: Bienvenida Robot / 30 Minutos + friendly_name: 30 Minutos .. Bienvenida Robot icon: mdi:calendar-clock automation.sip: - friendly_name: Bienvenida Servidor / 30 Minutos + friendly_name: 30 Minutos .. Bienvenida Servidor icon: mdi:calendar-clock automation.wo: - friendly_name: Bienvenida Robot / 30 Minutos + friendly_name: 30 Minutos .. Bienvenida Robot icon: mdi:calendar-clock # Tradition Maya Lands automation.imix: - friendly_name: Sonidos Chromecast / 10 Minutos + friendly_name: Sonidos Chromecast .. 10 Minutos icon: mdi:calendar-clock script.imix: From 4530cacc714f2babf4ba6d2743c3c41c3d524618 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:26:14 -0500 Subject: [PATCH 1015/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 18540b01..29449ad2 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -842,7 +842,7 @@ group: southernmayalands: view: yes - name: Home + name: Casa entities: - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot @@ -853,7 +853,7 @@ group: robotmayalands: view: yes - name: Robotics + name: Robótica entities: - group.robotmayalandslanguage - group.robotmayalandsquestions @@ -867,7 +867,7 @@ group: centralmayalowlands: view: yes - name: Beginning + name: Inicios entities: - group.centralmayalowlandsstations - group.centralmayalowlandsquestions @@ -877,7 +877,7 @@ group: northernmayalowlands: view: yes - name: Experience + name: Experiencia entities: - group.northernmayalowlandsstations - group.northernmayalowlandsstories @@ -888,7 +888,7 @@ group: consolemayalands: view: yes #icon: mdi:keyboard - name: Keyboard + name: Teclado entities: - group.consolemayalandskeypadyesno - group.consolemayalandskeypadmultiplechoice @@ -898,7 +898,7 @@ group: mediamayalands: view: yes #icon: mdi:filmstrip - name: Memories + name: Memorias entities: - group.mediamayalandscorporate - group.mediamayalandsintelguadalajara From a8780f81610799fec1616f90d5b7d173dacaa6f1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:29:32 -0500 Subject: [PATCH 1016/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 29449ad2..aa7a0494 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -928,7 +928,7 @@ group: techiemayalands: view: yes - name: Techies + name: Techie entities: - group.techiemayalandssystemhealth - group.techiemayalandssystemcalendar From cc77974ad7800ad35745a1d0bff3fc91bacd1b52 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:32:14 -0500 Subject: [PATCH 1017/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index aa7a0494..73b3e1da 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -248,21 +248,21 @@ homeassistant: # Calendar Maya Lands automation.pop: - friendly_name: 30 Minutos .. Bienvenida Robot + friendly_name: 30 minutos .. Bienvenida Robot icon: mdi:calendar-clock automation.sip: - friendly_name: 30 Minutos .. Bienvenida Servidor + friendly_name: 30 minutos .. Bienvenida Servidor icon: mdi:calendar-clock automation.wo: - friendly_name: 30 Minutos .. Bienvenida Robot + friendly_name: 30 minutos .. Bienvenida Robot icon: mdi:calendar-clock # Tradition Maya Lands automation.imix: - friendly_name: Sonidos Chromecast .. 10 Minutos + friendly_name: 10 minutos .. Sonidos Chromecast icon: mdi:calendar-clock script.imix: @@ -282,8 +282,9 @@ homeassistant: # Techie Maya Lands : System Calendar automation.apple: - friendly_name: Anuncio Servidor / 30 Minutos - + friendly_name: 30 minutos .. Anuncio Servidor + icon: mdi:calendar-clock + # Techie Maya Lands : System Audio input_slider.qualcomm: From 86333f4b462753aa069667627ab0f789cfa6979d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:42:29 -0500 Subject: [PATCH 1018/1653] Update Coji.sh --- Hochob/Applications/RobotMayaLands/Coji.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Coji.sh b/Hochob/Applications/RobotMayaLands/Coji.sh index 0706aca7..6476e474 100755 --- a/Hochob/Applications/RobotMayaLands/Coji.sh +++ b/Hochob/Applications/RobotMayaLands/Coji.sh @@ -24,18 +24,18 @@ export COJI_DIRECTORY=$(dirname "$COJI_PATH") Robot.sh lupe/inicial 1 sleep 2 -Robot.sh lupe/say "Hello World! One, Two, Three!" +Robot.sh lupe/say "Hello World. I can speak English. One, Two, Three." sleep 2 -Robot.sh lupe/decir "Hola Mundo! Uno, Dos, Tres!" +Robot.sh lupe/decir "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." sleep 2 LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Robot.sh lupe/say \ - "Hello World! One, Two, Three!" + "Hello World. I can speak English. One, Two, Three." else Robot.sh lupe/decir \ - "Hola Mundo! Uno, Dos, Tres!" + "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." fi # End of File From 86e2624156d8036ac9ac016af9b824cfe3557361 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:47:20 -0500 Subject: [PATCH 1019/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 73b3e1da..b6966ef6 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -53,62 +53,62 @@ homeassistant: # Robot Maya Lands script.resetall: - friendly_name: Reset + friendly_name: Ahora icon: mdi:lock-reset script.coji: - friendly_name: Speak + friendly_name: Hablar icon: mdi:speaker script.makeblock: friendly_name: Preguntas icon: mdi:audiobook script.headright: - friendly_name: Head Right + friendly_name: Derecha icon: mdi:arrow-right-thick script.headleft: - friendly_name: Head Left + friendly_name: Izquierda icon: mdi:arrow-left-thick script.rightup: - friendly_name: Up + friendly_name: Arriba icon: mdi:human-handsup script.rightdown: - friendly_name: Down + friendly_name: Abajo icon: mdi:human-handsup script.rightfold: - friendly_name: Fold + friendly_name: Doblar icon: mdi:gesture-swipe-up script.rightunfold: - friendly_name: Unfold + friendly_name: Desdoblar icon: mdi:gesture-swipe-up script.leftup: - friendly_name: Up + friendly_name: Arriba icon: mdi:human-handsup script.leftdown: - friendly_name: Down + friendly_name: Abajo icon: mdi:human-handsup script.leftfold: - friendly_name: Fold + friendly_name: Doblar icon: mdi:gesture-swipe-up script.leftunfold: - friendly_name: Unfold + friendly_name: Desdoblar icon: mdi:gesture-swipe-up script.moveright: - friendly_name: Move Right + friendly_name: Derecha icon: mdi:arrow-right-thick script.moveleft: - friendly_name: Move Left + friendly_name: Izquierda icon: mdi:arrow-left-thick script.moveforward: - friendly_name: Move Forward + friendly_name: Adelanta icon: mdi:arrow-up-thick script.movebackward: - friendly_name: Move Backward + friendly_name: Atras icon: mdi:arrow-down-thick script.movestop: - friendly_name: Move Stop + friendly_name: Parar icon: mdi:stop # Central Maya Lowlands, Stations From 3f6e33c7f186e44fb15140b7dcb67322202c6116 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:49:52 -0500 Subject: [PATCH 1020/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b6966ef6..3eb86d98 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -102,10 +102,10 @@ homeassistant: friendly_name: Izquierda icon: mdi:arrow-left-thick script.moveforward: - friendly_name: Adelanta + friendly_name: Adelante icon: mdi:arrow-up-thick script.movebackward: - friendly_name: Atras + friendly_name: Atrás icon: mdi:arrow-down-thick script.movestop: friendly_name: Parar From b75c06fdff602272aee990d98fbc3c124f9667eb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:50:53 -0500 Subject: [PATCH 1021/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 3eb86d98..f1a1425d 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -59,7 +59,7 @@ homeassistant: friendly_name: Hablar icon: mdi:speaker script.makeblock: - friendly_name: Preguntas + friendly_name: Preguntas Centro de Visitantes icon: mdi:audiobook script.headright: From 5f0f7f32f5846844ea5f8a901c6ae986316cdded Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 11:52:12 -0500 Subject: [PATCH 1022/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f1a1425d..80d9caf3 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -59,7 +59,7 @@ homeassistant: friendly_name: Hablar icon: mdi:speaker script.makeblock: - friendly_name: Preguntas Centro de Visitantes + friendly_name: Centro de Visitantes icon: mdi:audiobook script.headright: @@ -980,7 +980,7 @@ group: # Robot Maya Lands: Language robotmayalandslanguage: - name: Idioma + name: Audio entities: - script.coji From d994d923cfbfa82728a322611a2bfe0a5348bc3a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:30:54 -0500 Subject: [PATCH 1023/1653] Rename StreamAudio.sh to StreamText.sh --- Hochob/Services/Stream/{StreamAudio.sh => StreamText.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Stream/{StreamAudio.sh => StreamText.sh} (100%) diff --git a/Hochob/Services/Stream/StreamAudio.sh b/Hochob/Services/Stream/StreamText.sh similarity index 100% rename from Hochob/Services/Stream/StreamAudio.sh rename to Hochob/Services/Stream/StreamText.sh From 0d0a30baf76078e8deafdefc15a1731fd2ba3692 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:34:30 -0500 Subject: [PATCH 1024/1653] Update Ixtapa.sh --- .../Applications/CentralMayaLowlands/Ixtapa.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index 24f75033..c28a6a9e 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -27,7 +27,7 @@ LOCAL_DEVICE="Juum" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Puedes decirme que aportaron los Mayas a la tecnología? \ Uno, Las pirámides. \ @@ -37,11 +37,11 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Quiénes son los fundadores de Intel? \ " -StreamAudio.sh $LOCAL_DEVICE english robot \ +StreamText.sh $LOCAL_DEVICE english robot \ " Uno, Robert Noyce, Gordon Moore. \ Dos, Steve Allen. \ @@ -50,7 +50,7 @@ StreamAudio.sh $LOCAL_DEVICE english robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Cuántos ingenieros erán cuando empezó Intel Guadalajara? Uno, 60. \ @@ -60,19 +60,19 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " El microprocesador es el cerebro de la computadora? Sí o no? " SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? " SurveyYesNo.sh $LOCAL_DEVICE spanish robot no -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Podemos encontrar el microprocesador en? Uno, Accesorios para las personas. \ @@ -82,7 +82,7 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " En el sistema binario, el cero significa? Uno, Encendido. \ From d5e54ebf5aed8f9fd4a6b6709573729b243611e0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:35:27 -0500 Subject: [PATCH 1025/1653] Update TiburonBallena.sh --- .../Applications/NorthernMayaLowlands/TiburonBallena.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index ee4d5a85..4ca9d485 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -27,19 +27,19 @@ LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ Pero donde puedes ver esto y mas? En el planeta marte! Veamos si puedes responder un par de preguntas. " -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " A Marte se le conoce también como el planeta rojo? que opinas, sí o no?\ " SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Cual fue la primer misión que tomó por primera vez fotos de Marte? \ Uno, Curiosity. \ @@ -51,7 +51,7 @@ SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 exit 0 -StreamAudio.sh $LOCAL_DEVICE english tt \ +StreamText.sh $LOCAL_DEVICE english tt \ " Which spacecraft took the first photos of Mars? \ One, Curiosity. \ From 36c908c23a3cb08525e9609533717e1c65c33ca6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:36:05 -0500 Subject: [PATCH 1026/1653] Update Makeblock.sh --- Hochob/Applications/RobotMayaLands/Makeblock.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Makeblock.sh b/Hochob/Applications/RobotMayaLands/Makeblock.sh index c218ad20..bd676416 100755 --- a/Hochob/Applications/RobotMayaLands/Makeblock.sh +++ b/Hochob/Applications/RobotMayaLands/Makeblock.sh @@ -27,7 +27,7 @@ LOCAL_DEVICE="Amikoo" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Puedes decirme que aportaron los Mayas a la tecnología? \ Uno, Las pirámides. \ @@ -37,11 +37,11 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Quiénes son los fundadores de Intel? \ " -StreamAudio.sh $LOCAL_DEVICE english robot \ +StreamText.sh $LOCAL_DEVICE english robot \ " Uno, Robert Noyce, Gordon Moore. \ Dos, Steve Allen. \ @@ -50,7 +50,7 @@ StreamAudio.sh $LOCAL_DEVICE english robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Cuántos ingenieros erán cuando empezó Intel Guadalajara? Uno, 60. \ @@ -60,19 +60,19 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " El microprocesador es el cerebro de la computadora? Sí o no? " SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? " SurveyYesNo.sh $LOCAL_DEVICE spanish robot no -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " Podemos encontrar el microprocesador en? Uno, Accesorios para las personas. \ @@ -82,7 +82,7 @@ StreamAudio.sh $LOCAL_DEVICE spanish robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 -StreamAudio.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish robot \ " En el sistema binario, el cero significa? Uno, Encendido. \ From 28ba1835289e0f1ac3ab0f15decc69c0290bc107 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:36:36 -0500 Subject: [PATCH 1027/1653] Update SurveyMultipleChoice.sh --- Hochob/Services/Survey/SurveyMultipleChoice.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Survey/SurveyMultipleChoice.sh b/Hochob/Services/Survey/SurveyMultipleChoice.sh index 2cf787d2..f272d569 100755 --- a/Hochob/Services/Survey/SurveyMultipleChoice.sh +++ b/Hochob/Services/Survey/SurveyMultipleChoice.sh @@ -76,10 +76,10 @@ if [ "$LOCAL_CHOICE" = "$LOCAL_CORRECT" ]; then chooseAnswerCorrect $LOCAL_LANGUAGE if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_CORRECT_ANSWER}" else - StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_CORRECT_ANSWER}" fi @@ -87,10 +87,10 @@ else chooseWrongCorrect "$LOCAL_LANGUAGE" if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_WRONG_ANSWER}. the correct answer is ${LOCAL_CORRECT}" else - StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_WRONG_ANSWER}. La respuesta correcta es ${LOCAL_CORRECT}" fi From 51c3679fb69b55a8296e2d7bb3229854bbb73b89 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:36:52 -0500 Subject: [PATCH 1028/1653] Update SurveyYesNo.sh --- Hochob/Services/Survey/SurveyYesNo.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Survey/SurveyYesNo.sh b/Hochob/Services/Survey/SurveyYesNo.sh index 80bf0060..d937eae7 100755 --- a/Hochob/Services/Survey/SurveyYesNo.sh +++ b/Hochob/Services/Survey/SurveyYesNo.sh @@ -76,10 +76,10 @@ if [ "$LOCAL_OPTION" = "$LOCAL_CORRECT" ]; then chooseAnswerCorrect $LOCAL_LANGUAGE if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_CORRECT_ANSWER}" else - StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_CORRECT_ANSWER}" fi @@ -87,10 +87,10 @@ else chooseWrongCorrect "$LOCAL_LANGUAGE" if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_WRONG_ANSWER}. the correct answer is ${LOCAL_CORRECT}" else - StreamAudio.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_CHARACTER \ "${LOCAL_WRONG_ANSWER}. La respuesta correcta es ${LOCAL_CORRECT}" fi From 0bd01004dc5fa2f6f86f60d0a49d0c768e6a0647 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:38:45 -0500 Subject: [PATCH 1029/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 80d9caf3..054cb2b0 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -854,7 +854,7 @@ group: robotmayalands: view: yes - name: Robótica + name: Robot entities: - group.robotmayalandslanguage - group.robotmayalandsquestions From 6f8570d7b11ae70bf74dc7c632192bd0384a7eec Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:43:52 -0500 Subject: [PATCH 1030/1653] Update Coji.sh --- Hochob/Applications/RobotMayaLands/Coji.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Coji.sh b/Hochob/Applications/RobotMayaLands/Coji.sh index 6476e474..68f35c02 100755 --- a/Hochob/Applications/RobotMayaLands/Coji.sh +++ b/Hochob/Applications/RobotMayaLands/Coji.sh @@ -22,13 +22,6 @@ export COJI_DIRECTORY=$(dirname "$COJI_PATH") # Main # ============================================================================= -Robot.sh lupe/inicial 1 -sleep 2 -Robot.sh lupe/say "Hello World. I can speak English. One, Two, Three." -sleep 2 -Robot.sh lupe/decir "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." -sleep 2 - LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Robot.sh lupe/say \ From f65059f26426061526edf1c1541ba45dbd7d8130 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:50:12 -0500 Subject: [PATCH 1031/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 054cb2b0..f469ae37 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -856,8 +856,8 @@ group: view: yes name: Robot entities: - - group.robotmayalandslanguage - - group.robotmayalandsquestions + - group.robotmayalandsskills + - group.robotmayalandsknowledge - group.robotmayalandshead - group.robotmayalandsarmright - group.robotmayalandsarmleft @@ -979,14 +979,14 @@ group: # Robot Maya Lands: Language - robotmayalandslanguage: - name: Audio + robotmayalandsskills: + name: Habilidades entities: - script.coji - # Robot Maya Lands: Questions + # Robot Maya Lands: Knowledge - robotmayalandsquestions: + robotmayalandsknowledge: name: Conocimiento entities: - script.makeblock From 59261bec7e8f1b9c03329cc56757f389c80d4f09 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:54:20 -0500 Subject: [PATCH 1032/1653] Update Coji.sh --- Hochob/Applications/RobotMayaLands/Coji.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/RobotMayaLands/Coji.sh b/Hochob/Applications/RobotMayaLands/Coji.sh index 68f35c02..47313a81 100755 --- a/Hochob/Applications/RobotMayaLands/Coji.sh +++ b/Hochob/Applications/RobotMayaLands/Coji.sh @@ -24,10 +24,10 @@ export COJI_DIRECTORY=$(dirname "$COJI_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Robot.sh lupe/say \ + Robot.sh $AMIKOO_SAY \ "Hello World. I can speak English. One, Two, Three." else - Robot.sh lupe/decir \ + Robot.sh $AMIKOO_DECIR \ "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." fi From 12d1ab79bcfb671b6e57737a17bba656c85dacd1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:55:35 -0500 Subject: [PATCH 1033/1653] Update Imix.sh --- Hochob/Applications/TraditionMayaLands/Imix.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh index 36a12a22..89256f2d 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Imix.sh @@ -29,9 +29,9 @@ LOCAL_DEVICE="Triki" LogPid.sh $GOOGLE_PID $GOOGLE_NAME if [ "$LANGUAGE" = "english" ]; then - Robot.sh lupe/say "Happy Halloween" + Robot.sh $AMIKOO_SAY "Happy Halloween" else - Robot.sh lupe/decir "Feliz dia de muertos" + Robot.sh $AMIKOO_DECIR "Feliz dia de muertos" fi LOCAL_SOUND=`find $SEASON/$LOCAL_SEASON/ -type f | shuf -n 1` From 314921d7bc16ddf634483304fcbb47bce7ef6431 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:56:29 -0500 Subject: [PATCH 1034/1653] Update HostExternal.sh --- Hochob/Services/Events/HostExternal.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index ac4f1d8d..fbca913b 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -108,9 +108,9 @@ if [ "$LOCAL_HOST" = "server" ]; then SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" else if [ "$LANGUAGE" = "english" ]; then - Robot.sh lupe/say "${LOCAL_MESSAGE}" + Robot.sh $AMIKOO_SAY "${LOCAL_MESSAGE}" else - Robot.sh lupe/decir "${LOCAL_MESSAGE}" + Robot.sh $AMIKOO_DECIR "${LOCAL_MESSAGE}" fi fi From 52700d22966f0e8bb226f4a1d335720c6089e426 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:56:54 -0500 Subject: [PATCH 1035/1653] Update HostInternal.sh --- Hochob/Services/Events/HostInternal.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Events/HostInternal.sh b/Hochob/Services/Events/HostInternal.sh index 5018305d..9197d3e9 100755 --- a/Hochob/Services/Events/HostInternal.sh +++ b/Hochob/Services/Events/HostInternal.sh @@ -108,9 +108,9 @@ if [ "$LOCAL_HOST" = "server" ]; then SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" else if [ "$LANGUAGE" = "english" ]; then - Robot.sh lupe/say "${LOCAL_MESSAGE}" + Robot.sh $AMIKOO_SAY "${LOCAL_MESSAGE}" else - Robot.sh lupe/decir "${LOCAL_MESSAGE}" + Robot.sh $AMIKOO_DECIR "${LOCAL_MESSAGE}" fi fi From 479f72946ca496a40143bb27f84e439726ffe915 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:57:26 -0500 Subject: [PATCH 1036/1653] Update Robot.sh --- Hochob/Services/Robot/Remote/Robot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index 9d1e1d20..29669dcb 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -38,9 +38,9 @@ echo $LOCAL_MESSAGE if [ "$LOCAL_COMMAND" = "lupe/message" ]; then LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Mosquitto.sh lupe/say $LOCAL_MESSAGE + Mosquitto.sh $AMIKOO_SAY $LOCAL_MESSAGE else - Mosquitto.sh lupe/decir $LOCAL_MESSAGE + Mosquitto.sh $AMIKOO_DECIR $LOCAL_MESSAGE fi else Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE From 686e4b7ca733ac939419a421388ce4ee57d8aaac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:58:02 -0500 Subject: [PATCH 1037/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index aa15012e..607ed6f5 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -48,7 +48,7 @@ LOCAL_ROBOTAVAILABLE=`RobotAvailable.sh` if [ "$LOCAL_ROBOTAVAILABLE" -eq "0" ]; then Espeak.sh on spanish "Nel" else - Robot.sh lupe/say "Nel" + Robot.sh $AMIKOO_SAY "Nel" fi # End of File From 576240789ad4d6f922c63c799e0637cbff62cd06 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:58:25 -0500 Subject: [PATCH 1038/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index ee7b38d3..5ecf7eb1 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -26,10 +26,10 @@ LOCAL_TEXT="$4" # ============================================================================= if [ "$LOCAL_DEVICE" = "Amikoo" ] && [ "$LOCAL_LANGUAGE" = "english" ]; then - Robot.sh lupe/say \ + Robot.sh $AMIKOO_SAY \ "${LOCAL_TEXT}" elif [ "$LOCAL_DEVICE" = "Amikoo" ] && [ "$LOCAL_LANGUAGE" = "spanish" ]; then - Robot.sh lupe/decir \ + Robot.sh $AMIKOO_DECIR \ "${LOCAL_TEXT}" else if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then From 392cffd9eff978198855cc32e4837f57a87d4bcc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 12:59:08 -0500 Subject: [PATCH 1039/1653] Update Main.sh --- Hochob/Main.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 0079f679..3c8c122b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -204,6 +204,12 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS MQTT_SERVER_ADDRESS=10.215.56.158 MQTT_SERVER_PORT=1883 +# Amikoo + +AMIKOO="lupe/" +AMIKOO_SAY=$AMIKOO/say +AMIKOO_DECIR=$AMIKOO/decir + # ============================================================================= # Functions # ============================================================================= From 89468d42948652ed0c35e6fc576489a37c10dbe9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:00:39 -0500 Subject: [PATCH 1040/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 3c8c122b..e3f4ab25 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -209,6 +209,8 @@ MQTT_SERVER_PORT=1883 AMIKOO="lupe/" AMIKOO_SAY=$AMIKOO/say AMIKOO_DECIR=$AMIKOO/decir +AMIKOO_VISION=$AMIKOO/vision +AMIKOO_TRANSLATE=$AMIKOO/translate # ============================================================================= # Functions From 19116c943f1ff14a335d9e629e59d6c9c1d3e381 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:14:29 -0500 Subject: [PATCH 1041/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f469ae37..2cb6e920 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -55,13 +55,21 @@ homeassistant: script.resetall: friendly_name: Ahora icon: mdi:lock-reset + script.coji: friendly_name: Hablar icon: mdi:speaker + script.amikoogcvisionapi: + friendly_name: Google Vision API + icon: mdi: + script.amikoogctranslateapi: + friendly_name: Google Translation API + icon: mdi:arrow-left-thick + script.makeblock: friendly_name: Centro de Visitantes icon: mdi:audiobook - + script.headright: friendly_name: Derecha icon: mdi:arrow-right-thick @@ -657,6 +665,9 @@ shell_command: coji: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Coji.sh & makeblock: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Makeblock.sh & + gcvisionapi: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh gcvisionapi 1 + gctranslationapi: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh gctranslationapi 1 + headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 headright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 @@ -977,12 +988,14 @@ group: entities: - script.zacatecas - # Robot Maya Lands: Language + # Robot Maya Lands: Skills robotmayalandsskills: name: Habilidades entities: - script.coji + - script.gcvisionapi + - script.gctranslationapi # Robot Maya Lands: Knowledge From 64140611fce338e3fbf6fe5299d0106af22cfdb7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:14:31 -0500 Subject: [PATCH 1042/1653] Update Robot.sh --- Hochob/Services/Robot/Remote/Robot.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index 29669dcb..c6c64978 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -35,6 +35,13 @@ done echo $LOCAL_MESSAGE + +if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then + Mosquitto.sh $AMIKOO_GCVISIONAPI $LOCAL_MESSAGE +elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then + Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI $LOCAL_MESSAGE +fi + if [ "$LOCAL_COMMAND" = "lupe/message" ]; then LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then From 90df947ff1da1a202ec72e38c9a4c8b4f03aa963 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:14:34 -0500 Subject: [PATCH 1043/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index e3f4ab25..c81abd0c 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -209,8 +209,8 @@ MQTT_SERVER_PORT=1883 AMIKOO="lupe/" AMIKOO_SAY=$AMIKOO/say AMIKOO_DECIR=$AMIKOO/decir -AMIKOO_VISION=$AMIKOO/vision -AMIKOO_TRANSLATE=$AMIKOO/translate +AMIKOO_GCVISIONAPI=$AMIKOO/vision +AMIKOO_GCTRANSLATIONAPI=$AMIKOO/translate # ============================================================================= # Functions From 35fddf155f8529a492bb37d1662fa0f862861e4c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:15:00 -0500 Subject: [PATCH 1044/1653] Update Main.sh --- Hochob/Main.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index c81abd0c..ebd0b91a 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -201,7 +201,8 @@ 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_PORT=1883 # Amikoo From 49f18b360ad5a0a20387b50f429494e27c5d4640 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:19:11 -0500 Subject: [PATCH 1045/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 2cb6e920..0bb6e770 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -61,10 +61,10 @@ homeassistant: icon: mdi:speaker script.amikoogcvisionapi: friendly_name: Google Vision API - icon: mdi: + icon: mdi:camera script.amikoogctranslateapi: friendly_name: Google Translation API - icon: mdi:arrow-left-thick + icon: mdi:google-translate script.makeblock: friendly_name: Centro de Visitantes From 8c0f185e355ae8ecad60aa02ec62511f7cdffe72 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:21:29 -0500 Subject: [PATCH 1046/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0bb6e770..0d5b7df8 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -665,8 +665,8 @@ shell_command: coji: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Coji.sh & makeblock: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Makeblock.sh & - gcvisionapi: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh gcvisionapi 1 - gctranslationapi: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh gctranslationapi 1 + amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh gcvisionapi 1 + amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh gctranslationapi 1 headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 headright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 @@ -994,8 +994,8 @@ group: name: Habilidades entities: - script.coji - - script.gcvisionapi - - script.gctranslationapi + - script.amikoogcvisionapi + - script.amikoogctranslationapi # Robot Maya Lands: Knowledge From d163c4f63e45c3be37449f64c4af72c9bde0bf67 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:24:12 -0500 Subject: [PATCH 1047/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0d5b7df8..1f85aa66 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -450,6 +450,14 @@ script: sequence: - service: shell_command.coji + amikoovisionapi: + sequence: + - service: shell_command.amikoovisionapi + + amikootranslateapi: + sequence: + - service: shell_command.amikootranslateapi + makeblock: sequence: - service: shell_command.makeblock From 41098c51eccd416b1d4fbcb83db71ae4a0ad3b78 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:26:12 -0500 Subject: [PATCH 1048/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 1f85aa66..a9cf565e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -59,6 +59,7 @@ homeassistant: script.coji: friendly_name: Hablar icon: mdi:speaker + script.amikoogcvisionapi: friendly_name: Google Vision API icon: mdi:camera @@ -450,13 +451,13 @@ script: sequence: - service: shell_command.coji - amikoovisionapi: + amikoogcvisionapi: sequence: - - service: shell_command.amikoovisionapi + - service: shell_command.amikoogcvisionapi - amikootranslateapi: + amikoogctranslateapi: sequence: - - service: shell_command.amikootranslateapi + - service: shell_command.amikoogctranslateapi makeblock: sequence: From 440844305b2d8054ab4cea47693a8f4e32f4aefc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:27:41 -0500 Subject: [PATCH 1049/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index a9cf565e..d6dda65c 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -63,7 +63,7 @@ homeassistant: script.amikoogcvisionapi: friendly_name: Google Vision API icon: mdi:camera - script.amikoogctranslateapi: + script.amikoogctranslationapi: friendly_name: Google Translation API icon: mdi:google-translate @@ -455,9 +455,9 @@ script: sequence: - service: shell_command.amikoogcvisionapi - amikoogctranslateapi: + amikoogctranslationapi: sequence: - - service: shell_command.amikoogctranslateapi + - service: shell_command.amikoogctranslationapi makeblock: sequence: From cab74ea0e8bca5edc30912dc0123dad211b30811 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:32:19 -0500 Subject: [PATCH 1050/1653] Update Robot.sh --- Hochob/Services/Robot/Remote/Robot.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Robot/Remote/Robot.sh index c6c64978..912d4989 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/Hochob/Services/Robot/Remote/Robot.sh @@ -37,9 +37,9 @@ echo $LOCAL_MESSAGE if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then - Mosquitto.sh $AMIKOO_GCVISIONAPI $LOCAL_MESSAGE + Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then - Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI $LOCAL_MESSAGE + Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" fi if [ "$LOCAL_COMMAND" = "lupe/message" ]; then From 180e516f137d37b5047eff6d7e249be29b880324 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:35:37 -0500 Subject: [PATCH 1051/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d6dda65c..245b3ae8 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1037,7 +1037,7 @@ group: name: Brazo Izquierdo entities: - script.leftup - - script.lefttdown + - script.leftdown - script.leftfold - script.leftunfold From 046841ff86a5c0b154a18d98e72fed599a9697bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:45:55 -0500 Subject: [PATCH 1052/1653] Update Language.sh --- Hochob/Services/Language/Language.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Language/Language.sh b/Hochob/Services/Language/Language.sh index 2d25f427..57eee70c 100755 --- a/Hochob/Services/Language/Language.sh +++ b/Hochob/Services/Language/Language.sh @@ -26,7 +26,6 @@ if [ -z "$1" ] then cat $HOCHOB_SERVER_CONFIGURATION_LANGUAGE else - test -d $HOCHOB_SERVER_MEDIA_SOURCE || mkdir $HOCHOB_SERVER_MEDIA_SOURCE echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_LANGUAGE fi From 03539b127da184e9efa0bcbfb1263fa750ce032e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:46:04 -0500 Subject: [PATCH 1053/1653] Update Wo.sh --- Hochob/Applications/CalendarMayaLands/Wo.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Wo.sh b/Hochob/Applications/CalendarMayaLands/Wo.sh index c8561d75..48a3b712 100755 --- a/Hochob/Applications/CalendarMayaLands/Wo.sh +++ b/Hochob/Applications/CalendarMayaLands/Wo.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export MECCANOID_PID=$$ -export MECCANOID_NAME="Meccanoid" -export MECCANOID_PATH=$(readlink -f "$0") -export MECCANOID_DIRECTORY=$(dirname "$SPHERO_PATH") +export WO_PID=$$ +export WO_NAME="Wo" +export WO_PATH=$(readlink -f "$0") +export WO_DIRECTORY=$(dirname "$WO_PATH") LOCAL_INSTITUTION_NAME="Mexico" LOCAL_EVENT_NAME_ENGLISH="Intel Experience Day 2017" From 93ff8a598ea2c8f67ba28a03f31bc68a7077da39 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:47:17 -0500 Subject: [PATCH 1054/1653] Update Pop.sh --- Hochob/Applications/CalendarMayaLands/Pop.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Pop.sh b/Hochob/Applications/CalendarMayaLands/Pop.sh index c4f5bc70..a996dcb0 100755 --- a/Hochob/Applications/CalendarMayaLands/Pop.sh +++ b/Hochob/Applications/CalendarMayaLands/Pop.sh @@ -8,12 +8,12 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export SPHERO_PID=$$ -export SPHERO_NAME="Sphero" -export SPHERO_PATH=$(readlink -f "$0") -export SPHERO_DIRECTORY=$(dirname "$SPHERO_PATH") +export POP_PID=$$ +export POP_NAME="Pop" +export POP_PATH=$(readlink -f "$0") +export POP_DIRECTORY=$(dirname "$POP_PATH") -LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_INSTITUTION_NAME=`Intel Guadalajara` LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" @@ -34,7 +34,7 @@ chooseLanguage() # Main # ============================================================================= -LogPid.sh $SPHERO_PID $SPHERO_NAME +LogPid.sh $POP_PID $POP_NAME chooseLanguage From 5179cf5d09392bff0fe61ab5a4096a6a3b5550d0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:47:46 -0500 Subject: [PATCH 1055/1653] Update Wo.sh --- Hochob/Applications/CalendarMayaLands/Wo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/Wo.sh b/Hochob/Applications/CalendarMayaLands/Wo.sh index 48a3b712..6b0c03d9 100755 --- a/Hochob/Applications/CalendarMayaLands/Wo.sh +++ b/Hochob/Applications/CalendarMayaLands/Wo.sh @@ -34,7 +34,7 @@ chooseLanguage() # Main # ============================================================================= -LogPid.sh $MECCANOID_PID $SPHERO_NAME +LogPid.sh $WO_PID $WO_NAME chooseLanguage From cea248f8b098708a0f96aceb946b845308b8915b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:48:32 -0500 Subject: [PATCH 1056/1653] Update Sip.sh --- Hochob/Applications/CalendarMayaLands/Sip.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Sip.sh b/Hochob/Applications/CalendarMayaLands/Sip.sh index 6c7258fa..22fea57a 100755 --- a/Hochob/Applications/CalendarMayaLands/Sip.sh +++ b/Hochob/Applications/CalendarMayaLands/Sip.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export WINDRIVER_PID=$$ -export WINDRIVER_NAME="WindRiver" -export WINDRIVER_PATH=$(readlink -f "$0") -export WINDRIVER_DIRECTORY=$(dirname "$WINDRIVER_PATH") +export SIP_PID=$$ +export SIP_NAME="Sip" +export SIP_PATH=$(readlink -f "$0") +export SIP_DIRECTORY=$(dirname "$SIP_PATH") LOCAL_INSTITUTION_NAME=`Name.sh` LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" From fb964ac11a2042a5e18a780a6303f54692164801 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 21 Oct 2017 13:54:35 -0500 Subject: [PATCH 1057/1653] Update Sip.sh --- Hochob/Applications/CalendarMayaLands/Sip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/Sip.sh b/Hochob/Applications/CalendarMayaLands/Sip.sh index 22fea57a..a80fcef1 100755 --- a/Hochob/Applications/CalendarMayaLands/Sip.sh +++ b/Hochob/Applications/CalendarMayaLands/Sip.sh @@ -13,7 +13,7 @@ export SIP_NAME="Sip" export SIP_PATH=$(readlink -f "$0") export SIP_DIRECTORY=$(dirname "$SIP_PATH") -LOCAL_INSTITUTION_NAME=`Name.sh` +LOCAL_INSTITUTION_NAME="Intel Guadalajara" LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" From 388607115d9f42137d54a46f54b2006ced36c971 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 22 Oct 2017 21:35:47 -0500 Subject: [PATCH 1058/1653] Update HandlerMultipleChoice.sh --- Hochob/Services/Keypad/HandlerMultipleChoice.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/HandlerMultipleChoice.sh b/Hochob/Services/Keypad/HandlerMultipleChoice.sh index fa45042a..a20eec51 100755 --- a/Hochob/Services/Keypad/HandlerMultipleChoice.sh +++ b/Hochob/Services/Keypad/HandlerMultipleChoice.sh @@ -24,7 +24,7 @@ LOCAL_IDENTIFICATION="$1" if [ $# -eq 1 ] then - answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerMultipleChoice.py` + answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerMultipleChoice.py $MQTT_SERVER_ADDRESS` echo $answer else echo "Invalid number of arguments, see Documentation" From c40bc8f53de4864972c2b8c415d786f84c7f004d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 22 Oct 2017 21:36:48 -0500 Subject: [PATCH 1059/1653] Update HandlerYesNo.sh --- Hochob/Services/Keypad/HandlerYesNo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/HandlerYesNo.sh b/Hochob/Services/Keypad/HandlerYesNo.sh index 9aa972fc..98afef59 100755 --- a/Hochob/Services/Keypad/HandlerYesNo.sh +++ b/Hochob/Services/Keypad/HandlerYesNo.sh @@ -24,7 +24,7 @@ LOCAL_IDENTIFICATION="$1" if [ $# -eq 1 ] then - answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerYesNo.py` + answer=`$HOCHOB_SERVER_SERVICES_KEYPAD/HandlerYesNo.py $MQTT_SERVER_ADDRESS` echo $answer else echo "Invalid number of arguments, see Documentation" From 778490bad59ea03a44d11ad75b6e755f8e2dd2d1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 22 Oct 2017 21:39:15 -0500 Subject: [PATCH 1060/1653] Update HandlerMultipleChoice.py --- Hochob/Services/Keypad/HandlerMultipleChoice.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/HandlerMultipleChoice.py b/Hochob/Services/Keypad/HandlerMultipleChoice.py index a9e5a292..8bce57c7 100755 --- a/Hochob/Services/Keypad/HandlerMultipleChoice.py +++ b/Hochob/Services/Keypad/HandlerMultipleChoice.py @@ -1,6 +1,7 @@ #!/usr/bin/python import paho.mqtt.client as paho +import sys import time from threading import Thread @@ -16,8 +17,9 @@ def KeypadOptionMessage(mosq, obj, msg): if __name__ == '__main__': + mqtt_server_address = sys.argv[1] mqttclient = paho.Client() - mqttclient.connect("10.215.56.158", 1883, 60) + mqttclient.connect(mqtt_server_address, 1883, 60) mqttclient.subscribe("hochob/keypad/virtual", 0) mqttclient.on_message = KeypadOptionMessage mqttclient.loop_start() From f6a56fc3fc311026c3c479d32662cb1c80df6b6a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 22 Oct 2017 21:40:19 -0500 Subject: [PATCH 1061/1653] Update HandlerYesNo.py --- Hochob/Services/Keypad/HandlerYesNo.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Keypad/HandlerYesNo.py b/Hochob/Services/Keypad/HandlerYesNo.py index 9fd6698b..2e16812a 100755 --- a/Hochob/Services/Keypad/HandlerYesNo.py +++ b/Hochob/Services/Keypad/HandlerYesNo.py @@ -16,8 +16,9 @@ def KeypadOptionMessage(mosq, obj, msg): if __name__ == '__main__': + mqtt_server_address = sys.argv[1] mqttclient = paho.Client() - mqttclient.connect("10.215.56.158", 1883, 60) + mqttclient.connect(mqtt_server_address, 1883, 60) mqttclient.subscribe("hochob/keypad/virtual", 0) mqttclient.on_message = KeypadOptionMessage mqttclient.loop_start() From 775d4518a08138238437273c8fb48d1e5422d2ef Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 25 Oct 2017 08:48:52 -0500 Subject: [PATCH 1062/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 245b3ae8..1cc6a956 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -863,7 +863,7 @@ group: southernmayalands: view: yes - name: Casa + name: Bienvenida entities: - group.southernmayahighlandsintroduction - group.southernmayahighlandsrobot From 6f3906f6e9cf40c0b3f69f5cdd41e754c6892585 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 25 Oct 2017 10:13:43 -0500 Subject: [PATCH 1063/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index ebd0b91a..d1f3c63c 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -201,8 +201,8 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport -#MQTT_SERVER_ADDRESS=10.215.56.158 -MQTT_SERVER_ADDRESS=iot.eclipse.org +MQTT_SERVER_ADDRESS=10.215.56.158 +#MQTT_SERVER_ADDRESS=iot.eclipse.org MQTT_SERVER_PORT=1883 # Amikoo From abe82dc50f3e92eb06f231eb7fa4e4f39cef105b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 25 Oct 2017 10:38:31 -0500 Subject: [PATCH 1064/1653] Update --- Hochob/Services/Keypad/HandlerYesNo.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Keypad/HandlerYesNo.py b/Hochob/Services/Keypad/HandlerYesNo.py index 2e16812a..6bd2e7e9 100755 --- a/Hochob/Services/Keypad/HandlerYesNo.py +++ b/Hochob/Services/Keypad/HandlerYesNo.py @@ -1,6 +1,7 @@ #!/usr/bin/python import paho.mqtt.client as paho +import sys import time from threading import Thread From 7c735739c603c4790d0803e4ddc48722038ef9d4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 25 Oct 2017 10:41:20 -0500 Subject: [PATCH 1065/1653] Update Ixtapa.sh --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index c28a6a9e..7f50d622 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -92,4 +92,8 @@ StreamText.sh $LOCAL_DEVICE spanish robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + Eso es todo. Muchas gracias por tu participacion. + " # End of File From e8c77fc3a519f57f95f3f4676fd6f620c4d7c35d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 25 Oct 2017 10:52:39 -0500 Subject: [PATCH 1066/1653] Update Makeblock.sh --- Hochob/Applications/RobotMayaLands/Makeblock.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Applications/RobotMayaLands/Makeblock.sh b/Hochob/Applications/RobotMayaLands/Makeblock.sh index bd676416..e856ecb3 100755 --- a/Hochob/Applications/RobotMayaLands/Makeblock.sh +++ b/Hochob/Applications/RobotMayaLands/Makeblock.sh @@ -92,4 +92,9 @@ StreamText.sh $LOCAL_DEVICE spanish robot \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + Eso es todo. Muchas gracias por tu participacion. + " + # End of File From abc9622ad8158495cc8317d9a32e8c4e38a1cf98 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 25 Oct 2017 11:12:10 -0500 Subject: [PATCH 1067/1653] Update --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index d1f3c63c..d8ec79b2 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -207,7 +207,7 @@ MQTT_SERVER_PORT=1883 # Amikoo -AMIKOO="lupe/" +AMIKOO="lupe" AMIKOO_SAY=$AMIKOO/say AMIKOO_DECIR=$AMIKOO/decir AMIKOO_GCVISIONAPI=$AMIKOO/vision From 0fa4529ef48a2349aac1b9a0d8c1867f8bb41d35 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 09:35:21 -0500 Subject: [PATCH 1068/1653] Update HochobServerMediaSource.sh --- Hochob/Setup/HochobServerMediaSource.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Setup/HochobServerMediaSource.sh b/Hochob/Setup/HochobServerMediaSource.sh index 1675f790..f63b276c 100755 --- a/Hochob/Setup/HochobServerMediaSource.sh +++ b/Hochob/Setup/HochobServerMediaSource.sh @@ -11,13 +11,20 @@ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE=$HOCHOB_SERVER_MEDIA_SOURCE/Image/ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE/Drawing/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ + +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/Season/ + export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/VoiceRss/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON_HALLOWEEN=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/Season/Halloween + export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ +export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ + test -d $HOCHOB_SERVER_MEDIA_SOURCE && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE test -d $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_CAMERA @@ -27,6 +34,7 @@ test -d $HOCHOB_SERVER_MEDIA_SOURCE_IMAGE && echo "Directory exists" || mkdir $H test -d $HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND +test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS @@ -34,4 +42,6 @@ test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS && echo "Di test -d $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO test -d $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG +test -d $HOCHOB_SERVER_MEDIA_SOURCE_VISITORS && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VISITORS + # End of File From f65e3e86150863fd6a3bd8672ae67ec42e56c2a4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 11:21:51 -0500 Subject: [PATCH 1069/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index eca4fc94..c340adf1 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -1,7 +1,7 @@ #!/bin/sh # Hochob Server Setup -sudo apt install git +sudo apt install git mosquitto_clients # Hochob Server Services Automation Home Assistant sudo apt install python3-setuptools From 69d9f84e9df122ae89eac04e4f4ef9554c15d282 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 15:32:30 -0500 Subject: [PATCH 1070/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index c340adf1..fdf0ab4d 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -1,4 +1,4 @@ -#!/bin/sh +sudo pip install httplib2#!/bin/sh # Hochob Server Setup sudo apt install git mosquitto_clients @@ -10,7 +10,8 @@ sudo pip3 install --upgrade pip sudo pip3 install homeassistant # Hochob Server Services Calendar -# None +sudo pip install httplib2 +sudo python -m pip install --upgrade google-api-python-client # Hochob Server Services Camera sudo apt install fswebcam From 66f8521cea4c48621fd374c77dc0896429841a50 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 15:34:40 -0500 Subject: [PATCH 1071/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index fdf0ab4d..7ae646e4 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -1,7 +1,7 @@ -sudo pip install httplib2#!/bin/sh +sudo apt install fswebcamsudo pip install httplib2#!/bin/sh -# Hochob Server Setup -sudo apt install git mosquitto_clients +# Hochob Server General +sudo apt install git # Hochob Server Services Automation Home Assistant sudo apt install python3-setuptools @@ -17,7 +17,7 @@ sudo python -m pip install --upgrade google-api-python-client sudo apt install fswebcam # Hochob Server Services Communications -# None +sudo apt install git mosquitto_clients # Hochob Server Services Image sudo apt install eog From 4c253cd16db41a11dc51702c11adb25cd251225d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 15:42:12 -0500 Subject: [PATCH 1072/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 7ae646e4..efad510e 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -20,16 +20,20 @@ sudo apt install fswebcam sudo apt install git mosquitto_clients # Hochob Server Services Image +sudo apt install imagemagick sudo apt install eog # Hochob Server Services Institution # None +# Hochob Server Services Keypad +# None + # Hochob Server Services Messaging # None # Hochob Server Services Motion -# None +sudo apt-get install motion # Hochob Server Services Robot # None @@ -47,6 +51,9 @@ sudo apt install libav-tools # Hochob Server Services Usb # None +# Hochob Server Services Survey +# None + # Hochob Server Services Video sudo apt install ffmpeg From 8b30c1fa9905a92cfaf51385931d29bd1f2c884c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 15:42:55 -0500 Subject: [PATCH 1073/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index efad510e..85e8edc3 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -1,4 +1,4 @@ -sudo apt install fswebcamsudo pip install httplib2#!/bin/sh +#!/bin/sh # Hochob Server General sudo apt install git From f82e7b3ac2064f638bc032d588add825fda41ac2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 15:58:03 -0500 Subject: [PATCH 1074/1653] Create Amikoo.sh --- Hochob/Setup/Amikoo.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 Hochob/Setup/Amikoo.sh diff --git a/Hochob/Setup/Amikoo.sh b/Hochob/Setup/Amikoo.sh new file mode 100644 index 00000000..8c3afb94 --- /dev/null +++ b/Hochob/Setup/Amikoo.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +sudo apt-get install espeak +sudo apt-get install nodejs-legacy +sudo apt-get install npm +sudo npm install mqtt --save +sudo npm install espeak --save +sudo npm install sleep --save + +# End of File From 0e60c760075484fb32cb151d8c8d73df3487edd1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 16:54:24 -0500 Subject: [PATCH 1075/1653] Rename amikoo.js to Amikoo.js --- Hochob/Sandbox/LupeRobot/Virtual/{amikoo.js => Amikoo.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Sandbox/LupeRobot/Virtual/{amikoo.js => Amikoo.js} (100%) diff --git a/Hochob/Sandbox/LupeRobot/Virtual/amikoo.js b/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js similarity index 100% rename from Hochob/Sandbox/LupeRobot/Virtual/amikoo.js rename to Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js From 5e3d261044a6ee5688270af8d1bf091be47bdf41 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 16:54:41 -0500 Subject: [PATCH 1076/1653] Update amikoo.sh --- Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh b/Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh index 704440c0..c2081cf2 100755 --- a/Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh +++ b/Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh @@ -5,6 +5,6 @@ set -x #pacmd set-default-sink 0 #pacmd set-default-source 3 -node amikoo.js +node Amikoo.js # End Of File From fcc8813ed123f58977b79cbf48accc84663f8611 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 16:55:20 -0500 Subject: [PATCH 1077/1653] Rename amikoo.sh to Amikoo.sh --- Hochob/Sandbox/LupeRobot/Virtual/{amikoo.sh => Amikoo.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Sandbox/LupeRobot/Virtual/{amikoo.sh => Amikoo.sh} (100%) diff --git a/Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh b/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.sh similarity index 100% rename from Hochob/Sandbox/LupeRobot/Virtual/amikoo.sh rename to Hochob/Sandbox/LupeRobot/Virtual/Amikoo.sh From bfa17f04622d6fb5374dbc81b37fd334724d0afa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 17:03:22 -0500 Subject: [PATCH 1078/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 1cc6a956..b325afce 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -738,7 +738,7 @@ switch: aak: command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Aak.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" aayin: command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Aayin.sh &" command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" From f5df4b3eb6faa82e3a0d0a76bab2f0dfc34766d7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 17:06:35 -0500 Subject: [PATCH 1079/1653] Update Amikoo.js --- Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js b/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js index ef178c94..bb6e7cb8 100644 --- a/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js +++ b/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js @@ -1,5 +1,5 @@ const mqtt = require('mqtt') -const client = mqtt.connect('mqtt://iot.eclipse.org') +const client = mqtt.connect('mqtt://127.0.0.1') var sys = require('sys') var exec = require('child_process').exec; From 8dcc69aaa00d56d2e15265de38583058fe3bf136 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 17:11:47 -0500 Subject: [PATCH 1080/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 85e8edc3..38e12103 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -52,7 +52,7 @@ sudo apt install libav-tools # None # Hochob Server Services Survey -# None +sudo pip install paho-mqtt # Hochob Server Services Video sudo apt install ffmpeg From b90dd65d1d35f6ddc002c36a50d6d48affb6ff42 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 17:15:01 -0500 Subject: [PATCH 1081/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 38e12103..8cdf1e41 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -40,6 +40,7 @@ sudo apt-get install motion # Hochob Server Services Sound Play sudo apt install mpg123 +sudo apt install vlc-bin # Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee From 2e210e5900ceaffc825f789d2353aec713592a0f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 17:18:26 -0500 Subject: [PATCH 1082/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 8cdf1e41..f052b590 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -40,7 +40,7 @@ sudo apt-get install motion # Hochob Server Services Sound Play sudo apt install mpg123 -sudo apt install vlc-bin +sudo apt install vlc # Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee From 083b3f21f4b48f0c83445212bb7232b1520fda97 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 17:42:05 -0500 Subject: [PATCH 1083/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b325afce..aa59d1d8 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -257,15 +257,15 @@ homeassistant: # Calendar Maya Lands automation.pop: - friendly_name: 30 minutos .. Bienvenida Robot + friendly_name: 30 segundos .. Bienvenida Robot icon: mdi:calendar-clock automation.sip: - friendly_name: 30 minutos .. Bienvenida Servidor + friendly_name: 30 segundos .. Bienvenida Servidor icon: mdi:calendar-clock automation.wo: - friendly_name: 30 minutos .. Bienvenida Robot + friendly_name: 30 segundos .. Bienvenida Robot icon: mdi:calendar-clock # Tradition Maya Lands @@ -810,7 +810,7 @@ automation: initial_state: 'off' trigger: platform: time - minutes: '/15' + minutes: '/10' seconds: 00 action: - service: shell_command.imix From 9dbcf875998f3e5b5685edd7ef7d738128cf2290 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 17:43:05 -0500 Subject: [PATCH 1084/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index f052b590..550869a7 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -2,6 +2,7 @@ # Hochob Server General sudo apt install git +sudo apt install fortunes # Hochob Server Services Automation Home Assistant sudo apt install python3-setuptools From a079ea8e1b3141a4259489eb1e25e3f4b463913b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 17:46:38 -0500 Subject: [PATCH 1085/1653] Update Wo.sh --- Hochob/Applications/CalendarMayaLands/Wo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/Wo.sh b/Hochob/Applications/CalendarMayaLands/Wo.sh index 6b0c03d9..31b0ee87 100755 --- a/Hochob/Applications/CalendarMayaLands/Wo.sh +++ b/Hochob/Applications/CalendarMayaLands/Wo.sh @@ -15,7 +15,7 @@ export WO_DIRECTORY=$(dirname "$WO_PATH") LOCAL_INSTITUTION_NAME="Mexico" LOCAL_EVENT_NAME_ENGLISH="Intel Experience Day 2017" -LOCAL_EVENT_NAME_SPANISH="Intel 2017" +LOCAL_EVENT_NAME_SPANISH="Experiencia Intel 2017" LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="spanish" From 9dabad9366072596528523721fc947b08892d71f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 19:58:06 -0500 Subject: [PATCH 1086/1653] Update Imix.sh --- Hochob/Applications/TraditionMayaLands/Imix.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh index 89256f2d..80080976 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Imix.sh @@ -28,15 +28,16 @@ LOCAL_DEVICE="Triki" LogPid.sh $GOOGLE_PID $GOOGLE_NAME + +LOCAL_SOUND=`find $SEASON/$LOCAL_SEASON/ -type f | shuf -n 1` +Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" + if [ "$LANGUAGE" = "english" ]; then Robot.sh $AMIKOO_SAY "Happy Halloween" else Robot.sh $AMIKOO_DECIR "Feliz dia de muertos" fi -LOCAL_SOUND=`find $SEASON/$LOCAL_SEASON/ -type f | shuf -n 1` -Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" - # See implement WindRiver.sh logic, maybe Season service? # End of File From c82f7daa5dcc9fb2974407538b960cb7d0c8fe64 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 19:58:43 -0500 Subject: [PATCH 1087/1653] Update Imix.sh --- Hochob/Applications/TraditionMayaLands/Imix.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh index 80080976..846c9302 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Imix.sh @@ -28,10 +28,11 @@ LOCAL_DEVICE="Triki" LogPid.sh $GOOGLE_PID $GOOGLE_NAME - LOCAL_SOUND=`find $SEASON/$LOCAL_SEASON/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" +exit 0 + if [ "$LANGUAGE" = "english" ]; then Robot.sh $AMIKOO_SAY "Happy Halloween" else From ff63e60a6a81c4fb466ee03a3da2563349bc122a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 20:20:48 -0500 Subject: [PATCH 1088/1653] Update Wo.sh --- Hochob/Applications/CalendarMayaLands/Wo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/Wo.sh b/Hochob/Applications/CalendarMayaLands/Wo.sh index 31b0ee87..bcf875bf 100755 --- a/Hochob/Applications/CalendarMayaLands/Wo.sh +++ b/Hochob/Applications/CalendarMayaLands/Wo.sh @@ -13,7 +13,7 @@ export WO_NAME="Wo" export WO_PATH=$(readlink -f "$0") export WO_DIRECTORY=$(dirname "$WO_PATH") -LOCAL_INSTITUTION_NAME="Mexico" +LOCAL_INSTITUTION_NAME="México" LOCAL_EVENT_NAME_ENGLISH="Intel Experience Day 2017" LOCAL_EVENT_NAME_SPANISH="Experiencia Intel 2017" From fbaad6e109ae2ee2366f6bff90d4adbd20dac730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Thu, 26 Oct 2017 20:40:51 -0500 Subject: [PATCH 1089/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh index d2dc6a8a..e8693d04 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Espeak.sh @@ -33,9 +33,9 @@ LOCAL_TEXT="$2" if [ $# -eq 2 ] then if [ "$LOCAL_LANGUAGE" = "english" ]; then - export ESPEAK_LANGUAGE="-v en-us -a 200" + export ESPEAK_LANGUAGE="-v en-us -a 100 -p 50 -s 170" elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - export ESPEAK_LANGUAGE="-v es-la -a 200" + export ESPEAK_LANGUAGE="-v es-la -a 100 -p 50 -s 170" fi export ESPEAK_INPUT="$LOCAL_TEXT" From cca1e98f735f1b32a21fb5380e594666cb0003e1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Thu, 26 Oct 2017 20:51:26 -0500 Subject: [PATCH 1090/1653] Update HostExternal.sh --- Hochob/Services/Events/HostExternal.sh | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index fbca913b..aa49908e 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -81,14 +81,10 @@ chooseReminder() chooseClosure() { LANGUAGE=$1 - rand=$[ $RANDOM % 3 ] - echo $rand - if [ "$rand" = "1" ]; then - if [ "$LANGUAGE" = "english" ]; then - LOCAL_CLOSURE=${LOCAL_CLOSURE_ENGLISH} - else - LOCAL_CLOSURE=${LOCAL_CLOSURE_SPANISH} - fi + if [ "$LANGUAGE" = "english" ]; then + LOCAL_CLOSURE=${LOCAL_CLOSURE_ENGLISH} + else + LOCAL_CLOSURE=${LOCAL_CLOSURE_SPANISH} fi } From e05a6c8e15f50cfbbe902708ad08131dfa489506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Thu, 26 Oct 2017 20:54:15 -0500 Subject: [PATCH 1091/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js b/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js index bb6e7cb8..b2d88ca2 100644 --- a/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js +++ b/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js @@ -8,14 +8,14 @@ function puts(error, stdout, stderr) { sys.puts(stdout) } function espeakDecir(phrase) { var sleep = require('sleep') - exec("echo " + phrase + " | espeak -v es-la -a 200 -w audio.wav", puts); + exec("echo " + phrase + " | espeak -v es-la -a 200 -p 50 -s 170 -w audio.wav", puts); sleep.msleep(500); exec("aplay audio.wav", puts); } function espeakSay(phrase) { var sleep = require('sleep') - exec("echo " + phrase + " | espeak -v en-us -a 200 -w audio.wav", puts); + exec("echo " + phrase + " | espeak -v en-us -a 200 -p 50 -s 170 -w audio.wav", puts); sleep.msleep(500); exec("aplay audio.wav", puts); } From 4f4a5632768eaf7a303df3c03e74ec783e3bf94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Thu, 26 Oct 2017 21:00:06 -0500 Subject: [PATCH 1092/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js b/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js index b2d88ca2..2041fed5 100644 --- a/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js +++ b/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js @@ -10,7 +10,8 @@ function espeakDecir(phrase) { var sleep = require('sleep') exec("echo " + phrase + " | espeak -v es-la -a 200 -p 50 -s 170 -w audio.wav", puts); sleep.msleep(500); - exec("aplay audio.wav", puts); + exec("aplay audio.wav", puts); + sendAck() } function espeakSay(phrase) { @@ -18,6 +19,7 @@ function espeakSay(phrase) { exec("echo " + phrase + " | espeak -v en-us -a 200 -p 50 -s 170 -w audio.wav", puts); sleep.msleep(500); exec("aplay audio.wav", puts); + sendAck() } var state = 'closed' @@ -142,6 +144,11 @@ function sendStateUpdate () { client.publish('lupe/state', state) } +function sendAck () { + console.log('Sending Ack %s', '1') + client.publish('lupe/ack', '1') +} + function handleRequestOpen (message) { if (state !== 'open' && state !== 'opening') { console.log('Opening Lupe') From 4fc05ee368c3a4712d5b02477fc9e4679a6b3614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 09:56:32 -0500 Subject: [PATCH 1093/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Main.sh | 32 +++++++++---------- .../AmikooAvailable.sh} | 6 ++-- .../Robot.sh => Amikoo/Remote/Amikoo.sh} | 2 +- .../Amikoo/Virtual/AmikooVirtual.js} | 0 .../Virtual/AmikooVirtual.sh} | 2 +- .../Amikoo/Virtual/AmikooVirtualDaemon.sh} | 0 .../Amikoo/Virtual/AmikooVirtualTesting.sh} | 0 .../Communications/MqttClient/Mosquitto.sh | 2 +- Hochob/Services/Stream/Stream.sh | 4 +-- 9 files changed, 23 insertions(+), 25 deletions(-) rename Hochob/Services/{Robot/RobotAvailable.sh => Amikoo/AmikooAvailable.sh} (80%) rename Hochob/Services/{Robot/Remote/Robot.sh => Amikoo/Remote/Amikoo.sh} (98%) rename Hochob/{Sandbox/LupeRobot/Virtual/Amikoo.js => Services/Amikoo/Virtual/AmikooVirtual.js} (100%) rename Hochob/Services/{Robot/Virtual/RobotVirtual.sh => Amikoo/Virtual/AmikooVirtual.sh} (96%) rename Hochob/{Sandbox/LupeRobot/Virtual/Amikoo.sh => Services/Amikoo/Virtual/AmikooVirtualDaemon.sh} (100%) rename Hochob/{Sandbox/LupeRobot/Virtual/testing.sh => Services/Amikoo/Virtual/AmikooVirtualTesting.sh} (100%) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index d8ec79b2..b8d43890 100755 --- a/Hochob/Main.sh +++ b/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 diff --git a/Hochob/Services/Robot/RobotAvailable.sh b/Hochob/Services/Amikoo/AmikooAvailable.sh similarity index 80% rename from Hochob/Services/Robot/RobotAvailable.sh rename to Hochob/Services/Amikoo/AmikooAvailable.sh index f670a347..c3060466 100755 --- a/Hochob/Services/Robot/RobotAvailable.sh +++ b/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 diff --git a/Hochob/Services/Robot/Remote/Robot.sh b/Hochob/Services/Amikoo/Remote/Amikoo.sh similarity index 98% rename from Hochob/Services/Robot/Remote/Robot.sh rename to Hochob/Services/Amikoo/Remote/Amikoo.sh index 912d4989..b22f9f39 100755 --- a/Hochob/Services/Robot/Remote/Robot.sh +++ b/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="" diff --git a/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js similarity index 100% rename from Hochob/Sandbox/LupeRobot/Virtual/Amikoo.js rename to Hochob/Services/Amikoo/Virtual/AmikooVirtual.js diff --git a/Hochob/Services/Robot/Virtual/RobotVirtual.sh b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.sh similarity index 96% rename from Hochob/Services/Robot/Virtual/RobotVirtual.sh rename to Hochob/Services/Amikoo/Virtual/AmikooVirtual.sh index 56848e2e..82a9757e 100755 --- a/Hochob/Services/Robot/Virtual/RobotVirtual.sh +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export ROBOTVIRTUAL_PID=$$ +export AMIKOOVIRTUAL_PID=$$ LOCAL_MESSAGE="$1" diff --git a/Hochob/Sandbox/LupeRobot/Virtual/Amikoo.sh b/Hochob/Services/Amikoo/Virtual/AmikooVirtualDaemon.sh similarity index 100% rename from Hochob/Sandbox/LupeRobot/Virtual/Amikoo.sh rename to Hochob/Services/Amikoo/Virtual/AmikooVirtualDaemon.sh diff --git a/Hochob/Sandbox/LupeRobot/Virtual/testing.sh b/Hochob/Services/Amikoo/Virtual/AmikooVirtualTesting.sh similarity index 100% rename from Hochob/Sandbox/LupeRobot/Virtual/testing.sh rename to Hochob/Services/Amikoo/Virtual/AmikooVirtualTesting.sh diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 97c877d0..4604c723 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.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 diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 607ed6f5..41a24997 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.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" From 3058f3f8f16219ede7ce759a3f601009ebb93373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 10:30:29 -0500 Subject: [PATCH 1094/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- .../NorthernMayaLowlands/SianKaan.sh | 4 +- Hochob/Applications/RobotMayaLands/Coji.sh | 4 +- .../BajaCaliforniaNorte.sh | 14 +- .../BajaCaliforniaSur.sh | 26 +-- .../SouthernMayaHighlands/Michoacan.sh | 30 +-- Hochob/Applications/TechieMayaLands/Toyota.sh | 10 +- .../Applications/TraditionMayaLands/Imix.sh | 4 +- .../LupeRobot/Learning/Recognize/Recognize.sh | 2 +- .../Sandbox/LupeRobot/Sandbox/bluetoothlr.sh | 2 +- Hochob/Sandbox/LupeRobot/Show/LupeRobot.sh | 2 +- Hochob/Sandbox/LupeRobot/Show/LupeRobot01.sh | 2 +- .../Sandbox/LupeRobot/Show/LupeRobot1080p.sh | 14 +- .../LupeRobot/Show/LupeRobot1080p01.sh | 2 +- .../Sandbox/LupeRobot/Show/LupeRobot720p.sh | 10 +- .../Sandbox/LupeRobot/Show/LupeRobot720p01.sh | 2 +- Hochob/Sandbox/LupeRobot/Virtual/audio.wav | Bin 0 -> 187500 bytes Hochob/Services/Amikoo/Remote/Robot.sh | 68 ++++++ Hochob/Services/Amikoo/RobotAvailable.sh | 32 +++ Hochob/Services/Amikoo/Virtual/Amikoo.js | 218 ++++++++++++++++++ Hochob/Services/Amikoo/Virtual/Amikoo.sh | 10 + .../Services/Amikoo/Virtual/AmikooTesting.sh | 41 ++++ .../Services/Amikoo/Virtual/RobotVirtual.sh | 33 +++ .../HomeAssistant/configuration.yaml | 30 +-- .../HomeAssistant/configuration.yaml.1.0 | 30 +-- .../HomeAssistant/configuration.yaml.2.0 | 82 +++---- Hochob/Services/Events/HostExternal.sh | 4 +- Hochob/Services/Events/HostInternal.sh | 4 +- Hochob/Services/Stream/Stream.sh | 2 +- Hochob/Services/Stream/StreamText.sh | 4 +- Hochob/Setup/Packages.sh | 2 +- 30 files changed, 545 insertions(+), 143 deletions(-) create mode 100644 Hochob/Sandbox/LupeRobot/Virtual/audio.wav create mode 100755 Hochob/Services/Amikoo/Remote/Robot.sh create mode 100755 Hochob/Services/Amikoo/RobotAvailable.sh create mode 100644 Hochob/Services/Amikoo/Virtual/Amikoo.js create mode 100755 Hochob/Services/Amikoo/Virtual/Amikoo.sh create mode 100755 Hochob/Services/Amikoo/Virtual/AmikooTesting.sh create mode 100755 Hochob/Services/Amikoo/Virtual/RobotVirtual.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 4e32f7f2..556d1b58 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -38,9 +38,9 @@ fi Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & -Robot.sh lupe/headright 1 +Amikoo.sh lupe/headright 1 sleep .6 -Robot.sh lupe/headleft 1 +Amikoo.sh lupe/headleft 1 sleep .6 #kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') diff --git a/Hochob/Applications/RobotMayaLands/Coji.sh b/Hochob/Applications/RobotMayaLands/Coji.sh index 47313a81..c471e6f8 100755 --- a/Hochob/Applications/RobotMayaLands/Coji.sh +++ b/Hochob/Applications/RobotMayaLands/Coji.sh @@ -24,10 +24,10 @@ export COJI_DIRECTORY=$(dirname "$COJI_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Robot.sh $AMIKOO_SAY \ + Amikoo.sh $AMIKOO_SAY \ "Hello World. I can speak English. One, Two, Three." else - Robot.sh $AMIKOO_DECIR \ + Amikoo.sh $AMIKOO_DECIR \ "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." fi diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 2b7cedfa..89f44a06 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -31,19 +31,19 @@ Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 2 Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 -Robot.sh lupe/decir "Nel Pastel" +Amikoo.sh lupe/decir "Nel Pastel" sleep .6 -Robot.sh lupe/headright 1 +Amikoo.sh lupe/headright 1 sleep .6 -Robot.sh lupe/headleft 1 +Amikoo.sh lupe/headleft 1 sleep .6 -Robot.sh lupe/headright 1 +Amikoo.sh lupe/headright 1 sleep .6 -Robot.sh lupe/headleft 1 +Amikoo.sh lupe/headleft 1 sleep .6 -Robot.sh lupe/headright 1 +Amikoo.sh lupe/headright 1 sleep .6 -Robot.sh lupe/resetall 1 +Amikoo.sh lupe/resetall 1 sleep 5 KillApp.sh "eog" diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index f646b1e0..5649234a 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -28,36 +28,36 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & -(Robot.sh lupe/inicial 1) && sleep 1.25 +(Amikoo.sh lupe/inicial 1) && sleep 1.25 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & -sleep 6.35 && Robot.sh lupe/emocion 1 && sleep 4 +sleep 6.35 && Amikoo.sh lupe/emocion 1 && sleep 4 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & -sleep 2.7 && Robot.sh lupe/porsupuesto 1 && sleep 2.5 +sleep 2.7 && Amikoo.sh lupe/porsupuesto 1 && sleep 2.5 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & -sleep 37.5 && Robot.sh lupe/cerebro 1 +sleep 37.5 && Amikoo.sh lupe/cerebro 1 sleep 2 -Robot.sh lupe/rightup 1 +Amikoo.sh lupe/rightup 1 sleep .25 -Robot.sh lupe/leftup 1 +Amikoo.sh lupe/leftup 1 sleep .25 -Robot.sh lupe/rightfold 1 +Amikoo.sh lupe/rightfold 1 sleep .25 -Robot.sh lupe/leftfold 1 +Amikoo.sh lupe/leftfold 1 sleep 2 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & -sleep 25.5 && Robot.sh lupe/inteledison 1 +sleep 25.5 && Amikoo.sh lupe/inteledison 1 sleep 3 -Robot.sh lupe/rightdown 1 +Amikoo.sh lupe/rightdown 1 sleep .25 -Robot.sh lupe/leftdown 1 +Amikoo.sh lupe/leftdown 1 sleep .25 -Robot.sh lupe/rightunfold 1 +Amikoo.sh lupe/rightunfold 1 sleep .25 -Robot.sh lupe/leftunfold 1 +Amikoo.sh lupe/leftunfold 1 sleep 2 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 0eca397c..1192534c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -28,7 +28,7 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` -#Robot.sh lupe/decir \ +#Amikoo.sh lupe/decir \ # "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ # Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ # hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ @@ -52,32 +52,32 @@ SpeechSynthetizer.sh on espeak spanish \ sleep 1 -#Robot.sh lupe/message \ +#Amikoo.sh lupe/message \ # "Ahora tomaremos una foto para el recuerdo. \ # Primero, me iré a mi lugar preferido, denme unos segundos." SpeechSynthetizer.sh on espeak spanish \ "Ahora tomaremos una foto para el recuerdo. \ Primero, me iré a mi lugar preferido, denme unos segundos." -Robot.sh lupe/headright 1 +Amikoo.sh lupe/headright 1 sleep .6 -Robot.sh lupe/headleft 1 +Amikoo.sh lupe/headleft 1 sleep .6 -Robot.sh lupe/moveleft 1 +Amikoo.sh lupe/moveleft 1 sleep 1.6 -Robot.sh lupe/movestop 1 +Amikoo.sh lupe/movestop 1 sleep .6 -Robot.sh lupe/moveforward 1 +Amikoo.sh lupe/moveforward 1 sleep 4.5 -Robot.sh lupe/movestop 1 +Amikoo.sh lupe/movestop 1 sleep .6 -Robot.sh lupe/moveleft 1 +Amikoo.sh lupe/moveleft 1 sleep 3.6 -Robot.sh lupe/movestop 1 +Amikoo.sh lupe/movestop 1 sleep .6 -#Robot.sh lupe/message \ +#Amikoo.sh lupe/message \ # "Estoy listo! Ahora les toca a ustedes acomodarse. \ # Con mucho cuidado ponganse a ambos lados de mi, \ # viendo hacia la pantalla y sonrían." @@ -90,21 +90,21 @@ FfmpegCamera.sh 20 & sleep 15 -#Robot.sh lupe/message \ +#Amikoo.sh lupe/message \ # "Están listos ${LOCAL_INSTITUTION}?" SpeechSynthetizer.sh on espeak spanish \ "Están listas? listos? ${LOCAL_INSTITUTION}?" sleep 5 -#Robot.sh lupe/message \ +#Amikoo.sh lupe/message \ # "Tomemos la foto, a la cuenta de 3." SpeechSynthetizer.sh on espeak spanish \ "Tomemos la foto, a la cuenta de 3." sleep 1 -#Robot.sh lupe/message \ +#Amikoo.sh lupe/message \ # "1, 2 y 3, Sonrian." SpeechSynthetizer.sh on espeak spanish \ "1, 2 y 3, Sonrían." @@ -115,7 +115,7 @@ ConvertText.sh "$FSWEBCAM_IMAGE" "Bienvenidos ${LOCAL_INSTITUTION}" wait Eog.sh "$FSWEBCAM_IMAGE" & -#Robot.sh lupe/message \ +#Amikoo.sh lupe/message \ # "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." SpeechSynthetizer.sh on espeak spanish \ "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index b7421a0e..c92cf123 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -31,11 +31,11 @@ SpeechSynthetizer.sh on espeak spanish \ Stream.sh "Triki" "1.0" "$SPEECH_MP3" echo $? -Robot.sh lupe/inicial 1 -Robot.sh lupe/emocion 1 -Robot.sh lupe/porsupuesto 1 -Robot.sh lupe/cerebro 1 -Robot.sh lupe/inteledison 1 +Amikoo.sh lupe/inicial 1 +Amikoo.sh lupe/emocion 1 +Amikoo.sh lupe/porsupuesto 1 +Amikoo.sh lupe/cerebro 1 +Amikoo.sh lupe/inteledison 1 Stream.sh "Tran" "1.0" "$SPEECH_MP3" echo $? diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh index 846c9302..aac358f1 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Imix.sh @@ -34,9 +34,9 @@ Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" exit 0 if [ "$LANGUAGE" = "english" ]; then - Robot.sh $AMIKOO_SAY "Happy Halloween" + Amikoo.sh $AMIKOO_SAY "Happy Halloween" else - Robot.sh $AMIKOO_DECIR "Feliz dia de muertos" + Amikoo.sh $AMIKOO_DECIR "Feliz dia de muertos" fi # See implement WindRiver.sh logic, maybe Season service? diff --git a/Hochob/Sandbox/LupeRobot/Learning/Recognize/Recognize.sh b/Hochob/Sandbox/LupeRobot/Learning/Recognize/Recognize.sh index 6f1607cc..ff6d44ec 100755 --- a/Hochob/Sandbox/LupeRobot/Learning/Recognize/Recognize.sh +++ b/Hochob/Sandbox/LupeRobot/Learning/Recognize/Recognize.sh @@ -3,6 +3,6 @@ pacmd set-default-sink 0 #pacmd "set-default-source 3" -cd /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Recognize +cd /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Recognize python3 SrGoogleEs.py diff --git a/Hochob/Sandbox/LupeRobot/Sandbox/bluetoothlr.sh b/Hochob/Sandbox/LupeRobot/Sandbox/bluetoothlr.sh index b97f88ea..d63b3da0 100755 --- a/Hochob/Sandbox/LupeRobot/Sandbox/bluetoothlr.sh +++ b/Hochob/Sandbox/LupeRobot/Sandbox/bluetoothlr.sh @@ -16,4 +16,4 @@ EOF sleep 3 -python /home/root/CodeLabs/Hochob/LupeRobot/bluetoothspp.py & +python /home/root/CodeLabs/Hochob/LupeAmikoo/bluetoothspp.py & diff --git a/Hochob/Sandbox/LupeRobot/Show/LupeRobot.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot.sh index fef49f59..cd42a733 100755 --- a/Hochob/Sandbox/LupeRobot/Show/LupeRobot.sh +++ b/Hochob/Sandbox/LupeRobot/Show/LupeRobot.sh @@ -4,7 +4,7 @@ sleep 1 -sh /home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot01.sh & +sh /home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo01.sh & (sleep 8.5) && echo "Perdon! Lo se!, Es que me emociono" | espeak -v es-la -a 200 (sleep 3.0) && echo "Por supuesto" | espeak -v es-la -a 200 (sleep 38.5) && echo "En mi caso, mi cerebro esta esta ubicado en mi pecho, com pueden ver aqui!" | espeak -v es-la -a 200 diff --git a/Hochob/Sandbox/LupeRobot/Show/LupeRobot01.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot01.sh index 5244236a..4e0765f4 100755 --- a/Hochob/Sandbox/LupeRobot/Show/LupeRobot01.sh +++ b/Hochob/Sandbox/LupeRobot/Show/LupeRobot01.sh @@ -1,2 +1,2 @@ -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/FinalIntroVideo.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/FinalIntroVideo.mp4 & sleep 0.6 && echo hola a todos | espeak -v es-la -a 200 diff --git a/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh index 04f64d97..9d70c856 100755 --- a/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh +++ b/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh @@ -5,19 +5,19 @@ set -x MQTTSERVER=localhost MQTTPORT=1883 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/1080p/Silencio.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Silencio.mp4 & #(sleep 1) && echo "hola a todos" | espeak -v es-la -a 200 (mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/inicial -m 1) && sleep 1.25 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/1080p/Parte1_v3.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte1_v3.mp4 & #(sleep 7.5) && echo "Perdon! Lo se!, Es que me emociono" | espeak -v es-la -a 200 sleep 6.35 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/emocion -m 1 && sleep 4 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/1080p/Parte2_v2.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte2_v2.mp4 & ##(sleep 3.5) && echo "Por supuesto" | espeak -v es-la -a 200 sleep 2.7 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/porsupuesto -m 1 && sleep 2.5 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/1080p/Parte3_v2.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte3_v2.mp4 & ##(sleep 39.5) && echo "En mi caso, mi cerebro esta aqui, en la caja azul!" | espeak -v es-la -a 200 sleep 37.5 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/cerebro -m 1 sleep 2 @@ -30,7 +30,7 @@ sleep .25 mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/leftfold -m 1 sleep 2 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/1080p/Parte4_v2.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte4_v2.mp4 & ##(sleep 26.5) && echo "Yo funciono con la plataforma Intel Edison" | espeak -v es-la -a 200 sleep 25.5 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/inteledison -m 1 sleep 3 @@ -43,8 +43,8 @@ sleep .25 mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/leftunfold -m 1 sleep 2 -cvlc --no-video-title-show --fullscreen --play-and-exit /home/hochob/LupeRobot/1080p/Parte5_v2.mp4 & +cvlc --no-video-title-show --fullscreen --play-and-exit /home/hochob/LupeAmikoo/1080p/Parte5_v2.mp4 & sleep 75 -sh /home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh +sh /home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh # End Of File diff --git a/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p01.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p01.sh index 3684d289..9ec39b8f 100755 --- a/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p01.sh +++ b/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p01.sh @@ -1,2 +1,2 @@ -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/1080p/Parte1_v2.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte1_v2.mp4 & sleep 0.6 && echo hola a todos | espeak -v es-la -a 200 diff --git a/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p.sh index a97a2ba2..7da85a25 100755 --- a/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p.sh +++ b/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p.sh @@ -4,15 +4,15 @@ sleep 1 -sh /home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot720p01.sh & +sh /home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo720p01.sh & (sleep 9.5) && echo "Perdon! Lo se!, Es que me emociono" | espeak -v es-la -a 200 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/720p/Parte2_v2.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/720p/Parte2_v2.mp4 & (sleep 3.5) && echo "Por supuesto" | espeak -v es-la -a 200 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/720p/Parte3_v2.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/720p/Parte3_v2.mp4 & (sleep 39.2) && echo "En mi caso, mi cerebro esta esta ubicado en mi pecho, com pueden ver aqui!" | espeak -v es-la -a 200 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/720p/Parte4_v2.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/720p/Parte4_v2.mp4 & (sleep 26.5) && echo "Yo funciono con la plataforma Intel Edison" | espeak -v es-la -a 200 -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/720p/Parte5_v2.mp4 +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/720p/Parte5_v2.mp4 pkill vlc diff --git a/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p01.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p01.sh index d22c5239..bd085cc6 100755 --- a/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p01.sh +++ b/Hochob/Sandbox/LupeRobot/Show/LupeRobot720p01.sh @@ -1,2 +1,2 @@ -cvlc --no-video-title-show --fullscreen /home/hochob/LupeRobot/720p/Parte1_v2.mp4 & +cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/720p/Parte1_v2.mp4 & sleep 0.6 && echo hola a todos | espeak -v es-la -a 200 diff --git a/Hochob/Sandbox/LupeRobot/Virtual/audio.wav b/Hochob/Sandbox/LupeRobot/Virtual/audio.wav new file mode 100644 index 0000000000000000000000000000000000000000..38627567c3c00c3bd1dc5204e559d98b81db45ca GIT binary patch literal 187500 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 literal 0 HcmV?d00001 diff --git a/Hochob/Services/Amikoo/Remote/Robot.sh b/Hochob/Services/Amikoo/Remote/Robot.sh new file mode 100755 index 00000000..912d4989 --- /dev/null +++ b/Hochob/Services/Amikoo/Remote/Robot.sh @@ -0,0 +1,68 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ROBOTREMOTE_PID=$$ + +LOCAL_COMMAND="$1" +LOCAL_MESSAGE="" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +i=0 +for var in "$@" +do + if [ "$i" -ne 0 ]; then + LOCAL_MESSAGE=$LOCAL_MESSAGE"$var" + echo $LOCAL_MESSAGE + fi + i=`expr $i + 1` +done + +echo $LOCAL_MESSAGE + + +if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then + Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" +elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then + Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" +fi + +if [ "$LOCAL_COMMAND" = "lupe/message" ]; then + LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then + Mosquitto.sh $AMIKOO_SAY $LOCAL_MESSAGE + else + Mosquitto.sh $AMIKOO_DECIR $LOCAL_MESSAGE + fi +else + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE +fi + +exit 0 + +LOCAL_DEMO=`Demo.sh` +if [ "$LOCAL_DEMO" -eq "1" ]; then + if [ "$LOCAL_MESSAGE" != "1" ] + then + Espeak.sh on spanish "$LOCAL_MESSAGE" + fi +else + Mosquitto.sh $LOCAL_COMMAND "$LOCAL_MESSAGE" +fi + +# End of File diff --git a/Hochob/Services/Amikoo/RobotAvailable.sh b/Hochob/Services/Amikoo/RobotAvailable.sh new file mode 100755 index 00000000..f670a347 --- /dev/null +++ b/Hochob/Services/Amikoo/RobotAvailable.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +#. ~/CodeLabs/Hochob/Main.sh + +export ROBOTAVAILABLE_PID=$$ + +LOCAL_COMMAND="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ -z "$1" ] +then + cat $HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE +else + echo $LOCAL_COMMAND > $HOCHOB_SERVER_CONFIGURATION_ROBOTAVAILABLE +fi + +# End of File diff --git a/Hochob/Services/Amikoo/Virtual/Amikoo.js b/Hochob/Services/Amikoo/Virtual/Amikoo.js new file mode 100644 index 00000000..2041fed5 --- /dev/null +++ b/Hochob/Services/Amikoo/Virtual/Amikoo.js @@ -0,0 +1,218 @@ +const mqtt = require('mqtt') +const client = mqtt.connect('mqtt://127.0.0.1') + +var sys = require('sys') +var exec = require('child_process').exec; + +function puts(error, stdout, stderr) { sys.puts(stdout) } + +function espeakDecir(phrase) { + var sleep = require('sleep') + exec("echo " + phrase + " | espeak -v es-la -a 200 -p 50 -s 170 -w audio.wav", puts); + sleep.msleep(500); + exec("aplay audio.wav", puts); + sendAck() +} + +function espeakSay(phrase) { + var sleep = require('sleep') + exec("echo " + phrase + " | espeak -v en-us -a 200 -p 50 -s 170 -w audio.wav", puts); + sleep.msleep(500); + exec("aplay audio.wav", puts); + sendAck() +} + +var state = 'closed' + +client.on('connect', function () { + client.subscribe('lupe/open') + client.subscribe('lupe/close') + client.subscribe('lupe/decir') + client.subscribe('lupe/say') + + client.subscribe('lupe/resetall') + client.subscribe('lupe/headleft') + client.subscribe('lupe/headright') + + client.subscribe('lupe/leftup') + client.subscribe('lupe/leftdown') + client.subscribe('lupe/leftfold') + client.subscribe('lupe/leftunfold') + + client.subscribe('lupe/rightup') + client.subscribe('lupe/rightdown') + client.subscribe('lupe/rightfold') + client.subscribe('lupe/rightunfold') + + client.subscribe('lupe/moveleft') + client.subscribe('lupe/moveright') + client.subscribe('lupe/moveforward') + client.subscribe('lupe/movebackward') + client.subscribe('lupe/movestop') + + client.subscribe('lupe/bienvenida') + client.subscribe('lupe/agradece') + client.subscribe('lupe/dance') + client.subscribe('lupe/creador') + client.subscribe('lupe/norte') + + client.subscribe('lupe/inicial') + client.subscribe('lupe/emocion') + client.subscribe('lupe/porsupuesto') + client.subscribe('lupe/cerebro') + client.subscribe('lupe/inteledison') + + client.publish('lupe/connected', 'true') + sendStateUpdate() +}) + +client.on('message', function (topic, message) { + console.log('Received message %s %s', topic, message) + switch (topic) { + case 'lupe/open': + return handleRequestOpen(message) + case 'lupe/close': + return handleRequestClose(message) + case 'lupe/decir': + return handleRequestDecir(message) + case 'lupe/say': + return handleRequestSay(message) + + case 'lupe/resetall': + return handleLupe('Inicializacion') + case 'lupe/headleft': + return handleLupe('Cabeza Izquierda') + case 'lupe/headright': + return handleLupe('Cabeza Derecha') + + case 'lupe/leftup': + return handleLupe('Mano Izquierda Arriba') + case 'lupe/leftdown': + return handleLupe('Mano Izquierda Abajo') + case 'lupe/leftfold': + return handleLupe('Codo Izquierdo Doblar') + case 'lupe/leftunfold': + return handleLupe('Codo Izquierdo Desdoblar') + + case 'lupe/rightup': + return handleLupe('Mano Derecha Arriba') + case 'lupe/rightdown': + return handleLupe('Mano Derecha Abajo') + case 'lupe/rightfold': + return handleLupe('Codo Derecho Doblar') + case 'lupe/rightunfold': + return handleLupe('Code Derecho Desdoblar') + + case 'lupe/moveleft': + return handleLupe('Mover Izquierda') + case 'lupe/moveright': + return handleLupe('Mover Derecha') + case 'lupe/moveforward': + return handleLupe('Mover Adelante') + case 'lupe/movebackward': + return handleLupe('Mover Atras') + case 'lupe/movestop': + return handleLupe('Mover Alto') + + case 'lupe/bienvenida': + return handleLupe('Bienvenido') + case 'lupe/agradece': + return handleLupe('Gracias') + case 'lupe/dance': + return handleLupe('Bailar') + case 'lupe/creador': + return handleLupe('Creador') + case 'lupe/norte': + return handleLupe('Norte') + + case 'lupe/inicial': + return handleSpeakLupe('Hola a todos!') + case 'lupe/emocion': + return handleSpeakLupe('Perdon! Lo se!, Es que me emociono!') + case 'lupe/porsupuesto': + return handleSpeakLupe('Por supuesto') + case 'lupe/cerebro': + return handleSpeakLupe('En mi caso, mi cerebro esta aqui, en la caja azul!') + case 'lupe/inteledison': + return handleSpeakLupe('Yo funciono con la plataforma Intel Edison') + + } +}) + +function sendStateUpdate () { + console.log('Sending state %s', state) + client.publish('lupe/state', state) +} + +function sendAck () { + console.log('Sending Ack %s', '1') + client.publish('lupe/ack', '1') +} + +function handleRequestOpen (message) { + if (state !== 'open' && state !== 'opening') { + console.log('Opening Lupe') + state = 'opening' + espeak('Opening') + sendStateUpdate() + + setTimeout(function (){ + state = 'open' + sendStateUpdate() + }, 5000) + } +} + +function handleRequestClose (message) { + if (state !== 'closed' && state !== 'closing') { + state = 'closing' + + espeak('Closing') + sendStateUpdate() + + setTimeout(function () { + state = 'closed' + sendStateUpdate() + }, 5000) + } +} + +function handleRequestDecir (message) { + espeakDecir(message) +} + +function handleRequestSay (message) { + espeakSay(message) +} + +function handleLupe (message) { + console.log('Action %s', message) +} + +function handleSpeakLupe (message) { + espeak(message) +} + +function handleAppExit (options, err) { + if (err) { + console.log(err.stack) + } + + if (options.cleanup) { + client.publish('lupe/connected', 'false') + } + + if (options.exit) { + process.exit() + } +} + +process.on('exit', handleAppExit.bind(null, { + cleanup: true +})) +process.on('SIGINT', handleAppExit.bind(null, { + exit: true +})) +process.on('uncaughtException', handleAppExit.bind(null, { + exit: true +})) diff --git a/Hochob/Services/Amikoo/Virtual/Amikoo.sh b/Hochob/Services/Amikoo/Virtual/Amikoo.sh new file mode 100755 index 00000000..c2081cf2 --- /dev/null +++ b/Hochob/Services/Amikoo/Virtual/Amikoo.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +set -x + +#pacmd set-default-sink 0 +#pacmd set-default-source 3 + +node Amikoo.js + +# End Of File diff --git a/Hochob/Services/Amikoo/Virtual/AmikooTesting.sh b/Hochob/Services/Amikoo/Virtual/AmikooTesting.sh new file mode 100755 index 00000000..c1974824 --- /dev/null +++ b/Hochob/Services/Amikoo/Virtual/AmikooTesting.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +array[0]="resetall" +array[1]="headleft" +array[2]="headright" + +array[3]="leftup" +array[4]="leftright" +array[5]="leftfold" +array[6]="leftunfold" + +array[7]="rightup" +array[8]="rightdown" +array[9]="rightfold" +array[10]="rightunfold" + +array[11]="moveleft" +array[12]="moveright" +array[13]="moveforward" +array[14]="movebackward" +array[15]="movestop" + +array[16]="bienvenida" +array[17]="agradece" +array[18]="dance" +array[19]="dance" +array[20]="creador" +array[21]="norte" + +while true +do + + rand=$[$RANDOM % 21] + action=`echo ${array[$rand]}` + device="lupe/" + + topic=$device$action + + mosquitto_pub --qos 1 -h iot.eclipse.org -p 1883 -t $topic -m 1 + sleep 2 +done diff --git a/Hochob/Services/Amikoo/Virtual/RobotVirtual.sh b/Hochob/Services/Amikoo/Virtual/RobotVirtual.sh new file mode 100755 index 00000000..56848e2e --- /dev/null +++ b/Hochob/Services/Amikoo/Virtual/RobotVirtual.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ROBOTVIRTUAL_PID=$$ + +LOCAL_MESSAGE="$1" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 1 ] +then + Espeak.sh "on" "spanish" "$LOCAL_MESSAGE" +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml b/Hochob/Services/Automation/HomeAssistant/configuration.yaml index 3c2f889a..782ae972 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml @@ -52,7 +52,7 @@ homeassistant: friendly_name: Visitor Center Needs Technical Help icon: mdi:block-helper - # Lupe Robot + # Lupe Amikoo switch.leftup: friendly_name: Up @@ -264,7 +264,7 @@ mqtt: script: luperobot: - alias: Lupe Robot + alias: Lupe Amikoo sequence: - alias: Bienvenidos a Intel Guadalajara service: tts.google_say @@ -431,8 +431,8 @@ script: shell_command: restart_ha: sudo systemctl restart home-assistant.service & photography: python /home/hochob/CodeLabs/Hochob/Photography/selfie.py & - lupepresentation: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Presentation/Presentation.sh & - luperecognize: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Recognize/Recognize.sh & + lupepresentation: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Presentation/Presentation.sh & + luperecognize: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Recognize/Recognize.sh & audiosectionone: bash /home/hochob/CodeLabs/Hochob/Audio/Section01.sh & audiosectiontwo: bash /home/hochob/CodeLabs/Hochob/Audio/Section02.sh & audiosectionthree: bash /home/hochob/CodeLabs/Hochob/Audio/Section03.sh & @@ -451,18 +451,18 @@ shell_command: audiostopeek: bash /home/hochob/CodeLabs/Hochob/Audio/Stop.sh "Eek'" & audiopauseeek: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh "Eek'" & audioplayeek: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh "Eek'" & - lupevirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeRobot/Virtual/amikoo.sh & + lupevirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeAmikoo/Virtual/amikoo.sh & lupevirtualstop: pkill node & switch: - platform: command_line switches: luperobot: - command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot1080p.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" + command_on: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo1080p.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh" lupecomplete: - command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" + command_on: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh" camerapreview: command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0 &" command_off: "pkill -9 vlc" @@ -693,7 +693,7 @@ light: platform: hue automation: -# - alias: Lupe Robot Text To Speech +# - alias: Lupe Amikoo Text To Speech # hide_entity: True # trigger: # platform: state @@ -702,9 +702,9 @@ automation: # action: # service: tts.google_say # data: -# message: "Bienvenido Robot Lupe" +# message: "Bienvenido Amikoo Lupe" # language: 'es' - - alias: Lupe Robot Telegram + - alias: Lupe Amikoo Telegram #hide_entity: True trigger: platform: state @@ -713,7 +713,7 @@ automation: action: service: notify.telegram data: - message: "Lupe Robot Station has been activated" + message: "Lupe Amikoo Station has been activated" group: @@ -729,7 +729,7 @@ group: lupeview: view: yes - name: Lupe Robot + name: Lupe Amikoo entities: - group.lupearmleft - group.lupearmright @@ -788,7 +788,7 @@ group: entities: - script.help - # Groups : Lupe Robot + # Groups : Lupe Amikoo lupeactivities: name: Activities diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 index 330c612e..06876642 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 @@ -52,7 +52,7 @@ homeassistant: friendly_name: Visitor Center Needs Technical Help icon: mdi:block-helper - # Lupe Robot + # Lupe Amikoo switch.leftup: friendly_name: Up @@ -264,7 +264,7 @@ mqtt: script: luperobot: - alias: Lupe Robot + alias: Lupe Amikoo sequence: - alias: Bienvenidos a Intel Guadalajara service: tts.google_say @@ -431,8 +431,8 @@ script: shell_command: restart_ha: sudo systemctl restart home-assistant.service & photography: python /home/hochob/CodeLabs/Hochob/Photography/selfie.py & - lupepresentation: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Presentation/Presentation.sh & - luperecognize: /home/hochob/CodeLabs/Hochob/LupeRobot/Learning/Recognize/Recognize.sh & + lupepresentation: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Presentation/Presentation.sh & + luperecognize: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Recognize/Recognize.sh & audiosectionone: bash /home/hochob/CodeLabs/Hochob/Audio/Section01.sh & audiosectiontwo: bash /home/hochob/CodeLabs/Hochob/Audio/Section02.sh & audiosectionthree: bash /home/hochob/CodeLabs/Hochob/Audio/Section03.sh & @@ -451,18 +451,18 @@ shell_command: audiostopeek: bash /home/hochob/CodeLabs/Hochob/Audio/Stop.sh "Eek'" & audiopauseeek: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh "Eek'" & audioplayeek: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh "Eek'" & - lupevirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeRobot/Virtual/amikoo.sh & + lupevirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeAmikoo/Virtual/amikoo.sh & lupevirtualstop: pkill node & switch: - platform: command_line switches: luperobot: - command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot1080p.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" + command_on: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo1080p.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh" lupecomplete: - command_on: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobot.sh &" - command_off: "/home/hochob/CodeLabs/Hochob/LupeRobot/Show/LupeRobotKill.sh" + command_on: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo.sh &" + command_off: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh" camerapreview: command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0 &" command_off: "pkill -9 vlc" @@ -693,7 +693,7 @@ light: platform: hue automation: -# - alias: Lupe Robot Text To Speech +# - alias: Lupe Amikoo Text To Speech # hide_entity: True # trigger: # platform: state @@ -702,9 +702,9 @@ automation: # action: # service: tts.google_say # data: -# message: "Bienvenido Robot Lupe" +# message: "Bienvenido Amikoo Lupe" # language: 'es' - - alias: Lupe Robot Telegram + - alias: Lupe Amikoo Telegram #hide_entity: True trigger: platform: state @@ -713,7 +713,7 @@ automation: action: service: notify.telegram data: - message: "Lupe Robot Station has been activated" + message: "Lupe Amikoo Station has been activated" group: @@ -729,7 +729,7 @@ group: lupeview: view: yes - name: Lupe Robot + name: Lupe Amikoo entities: - group.lupearmleft - group.lupearmright @@ -788,7 +788,7 @@ group: entities: - script.help - # Groups : Lupe Robot + # Groups : Lupe Amikoo lupeactivities: name: Activities diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index aa59d1d8..407914b4 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -26,16 +26,16 @@ homeassistant: friendly_name: 1.1 Bienvenidos Intel, Protocolo de Seguridad icon: mdi:audiobook - # Southern Maya Highlands : 2 Robot + # Southern Maya Highlands : 2 Amikoo script.bajacalifornianorte: friendly_name: 2.1 Bienvenidos Guadalajara Design Center icon: mdi:audiobook script.bajacaliforniasur: - friendly_name: 2.2 Lupe Robot Show + friendly_name: 2.2 Lupe Amikoo Show icon: mdi:video script.michoacan: - friendly_name: 2.3 Lupe Robot Foto Grupal + friendly_name: 2.3 Lupe Amikoo Foto Grupal icon: mdi:video # Southern Maya Highlands : 3 Tour @@ -50,7 +50,7 @@ homeassistant: friendly_name: Sandbox icon: mdi:test-tube - # Robot Maya Lands + # Amikoo Maya Lands script.resetall: friendly_name: Ahora @@ -173,7 +173,7 @@ homeassistant: icon: mdi:audiobook script.siankaan: - friendly_name: El Baile del Robot + friendly_name: El Baile del Amikoo icon: mdi:test-tube script.calakmul: @@ -257,7 +257,7 @@ homeassistant: # Calendar Maya Lands automation.pop: - friendly_name: 30 segundos .. Bienvenida Robot + friendly_name: 30 segundos .. Bienvenida Amikoo icon: mdi:calendar-clock automation.sip: @@ -265,7 +265,7 @@ homeassistant: icon: mdi:calendar-clock automation.wo: - friendly_name: 30 segundos .. Bienvenida Robot + friendly_name: 30 segundos .. Bienvenida Amikoo icon: mdi:calendar-clock # Tradition Maya Lands @@ -441,7 +441,7 @@ script: sequence: - service: shell_command.zacatecas - # Robot Maya Lands + # Amikoo Maya Lands resetall: sequence: @@ -668,33 +668,33 @@ shell_command: calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh & - # Robot Maya Lands + # Amikoo Maya Lands - resetall: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/resetall 1 - coji: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Coji.sh & - makeblock: ~/CodeLabs/Hochob/Applications/RobotMayaLands/Makeblock.sh & + resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/resetall 1 + coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & + makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & - amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh gcvisionapi 1 - amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh gctranslationapi 1 + amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 + amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 - headleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headleft 1 - headright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/headright 1 + headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/headleft 1 + headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/headright 1 - rightup: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightup - rightdown: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightdown - rightfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightfold - rightunfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/rightunfold + rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightup + rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightdown + rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightfold + rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightunfold - leftup: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftup - leftdown: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftdown - leftfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftfold - leftunfold: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/leftunfold + leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftup + leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftdown + leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftfold + leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftunfold - moveright: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveright - moveleft: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveleft - moveforward: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/moveforward - movebackward: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movebackward - movestop: ~/CodeLabs/Hochob/Services/Robot/Remote/Robot.sh lupe/movestop + moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveright + moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveleft + moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveforward + movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/movebackward + movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/movestop # Console Maya Lands @@ -870,11 +870,11 @@ group: - group.southernmayahighlandstour #- group.southernmayahighlandssandbox - # Robot Maya Lands + # Amikoo Maya Lands robotmayalands: view: yes - name: Robot + name: Amikoo entities: - group.robotmayalandsskills - group.robotmayalandsknowledge @@ -974,10 +974,10 @@ group: entities: - script.aguascalientes - # Southern Maya Highlands: Robot + # Southern Maya Highlands: Amikoo southernmayahighlandsrobot: - name: 2 Robot + name: 2 Amikoo entities: - script.bajacalifornianorte - script.bajacaliforniasur @@ -997,7 +997,7 @@ group: entities: - script.zacatecas - # Robot Maya Lands: Skills + # Amikoo Maya Lands: Skills robotmayalandsskills: name: Habilidades @@ -1006,14 +1006,14 @@ group: - script.amikoogcvisionapi - script.amikoogctranslationapi - # Robot Maya Lands: Knowledge + # Amikoo Maya Lands: Knowledge robotmayalandsknowledge: name: Conocimiento entities: - script.makeblock - # Robot Maya Lands: Head + # Amikoo Maya Lands: Head robotmayalandshead: name: Cabeza @@ -1021,7 +1021,7 @@ group: - script.headright - script.headleft - # Robot Maya Lands: Arm Right + # Amikoo Maya Lands: Arm Right robotmayalandsarmright: name: Brazo Derecho @@ -1031,7 +1031,7 @@ group: - script.rightfold - script.rightunfold - # Robot Maya Lands: Arm Left + # Amikoo Maya Lands: Arm Left robotmayalandsarmleft: name: Brazo Izquierdo @@ -1041,7 +1041,7 @@ group: - script.leftfold - script.leftunfold - # Robot Maya Lands: Legs + # Amikoo Maya Lands: Legs robotmayalandslegs: name: Piernas @@ -1052,7 +1052,7 @@ group: - script.movebackward - script.movestop - # Robot Maya Lands: Reset + # Amikoo Maya Lands: Reset robotmayalandsreset: name: Reiniciar @@ -1098,7 +1098,7 @@ group: # Northern Maya Highlands: Stations northernmayalowlandsrobot: - name: Robot + name: Amikoo entities: - script.siankaan diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index aa49908e..1dda4109 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -104,9 +104,9 @@ if [ "$LOCAL_HOST" = "server" ]; then SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" else if [ "$LANGUAGE" = "english" ]; then - Robot.sh $AMIKOO_SAY "${LOCAL_MESSAGE}" + Amikoo.sh $AMIKOO_SAY "${LOCAL_MESSAGE}" else - Robot.sh $AMIKOO_DECIR "${LOCAL_MESSAGE}" + Amikoo.sh $AMIKOO_DECIR "${LOCAL_MESSAGE}" fi fi diff --git a/Hochob/Services/Events/HostInternal.sh b/Hochob/Services/Events/HostInternal.sh index 9197d3e9..14081940 100755 --- a/Hochob/Services/Events/HostInternal.sh +++ b/Hochob/Services/Events/HostInternal.sh @@ -108,9 +108,9 @@ if [ "$LOCAL_HOST" = "server" ]; then SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" else if [ "$LANGUAGE" = "english" ]; then - Robot.sh $AMIKOO_SAY "${LOCAL_MESSAGE}" + Amikoo.sh $AMIKOO_SAY "${LOCAL_MESSAGE}" else - Robot.sh $AMIKOO_DECIR "${LOCAL_MESSAGE}" + Amikoo.sh $AMIKOO_DECIR "${LOCAL_MESSAGE}" fi fi diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 41a24997..7a48b29b 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -48,7 +48,7 @@ LOCAL_AMIKOO_AVAILABLE=`AmikooAvailable.sh` if [ "$LOCAL_AMIKOO_AVAILABLE" -eq "0" ]; then Espeak.sh on spanish "Nel" else - Robot.sh $AMIKOO_SAY "Nel" + Amikoo.sh $AMIKOO_SAY "Nel" fi # End of File diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index 5ecf7eb1..bea2b48b 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -26,10 +26,10 @@ LOCAL_TEXT="$4" # ============================================================================= if [ "$LOCAL_DEVICE" = "Amikoo" ] && [ "$LOCAL_LANGUAGE" = "english" ]; then - Robot.sh $AMIKOO_SAY \ + Amikoo.sh $AMIKOO_SAY \ "${LOCAL_TEXT}" elif [ "$LOCAL_DEVICE" = "Amikoo" ] && [ "$LOCAL_LANGUAGE" = "spanish" ]; then - Robot.sh $AMIKOO_DECIR \ + Amikoo.sh $AMIKOO_DECIR \ "${LOCAL_TEXT}" else if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 550869a7..6f05af6d 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -36,7 +36,7 @@ sudo apt install eog # Hochob Server Services Motion sudo apt-get install motion -# Hochob Server Services Robot +# Hochob Server Services Amikoo # None # Hochob Server Services Sound Play From 236004564f6ff873266bc71896662119a2b28b0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 10:55:19 -0500 Subject: [PATCH 1095/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Main.sh | 4 +- Hochob/Services/Amikoo/Virtual/Amikoo.js | 218 ------------------ Hochob/Services/Amikoo/Virtual/Amikoo.sh | 10 - .../Services/Amikoo/Virtual/AmikooTesting.sh | 41 ---- .../Services/Amikoo/Virtual/AmikooVirtual.js | 8 +- .../Amikoo/Virtual/AmikooVirtualDaemon.sh | 2 +- .../Services/Amikoo/Virtual/RobotVirtual.sh | 33 --- 7 files changed, 7 insertions(+), 309 deletions(-) delete mode 100644 Hochob/Services/Amikoo/Virtual/Amikoo.js delete mode 100755 Hochob/Services/Amikoo/Virtual/Amikoo.sh delete mode 100755 Hochob/Services/Amikoo/Virtual/AmikooTesting.sh mode change 100644 => 100755 Hochob/Services/Amikoo/Virtual/AmikooVirtual.js delete mode 100755 Hochob/Services/Amikoo/Virtual/RobotVirtual.sh diff --git a/Hochob/Main.sh b/Hochob/Main.sh index b8d43890..f8819a37 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -208,8 +208,8 @@ MQTT_SERVER_PORT=1883 AMIKOO="amikoo" AMIKOO_SAY=$AMIKOO/say AMIKOO_DECIR=$AMIKOO/decir -AMIKOO_GCVISIONAPI=$AMIKOO/vision -AMIKOO_GCTRANSLATIONAPI=$AMIKOO/translate +AMIKOO_GCVISIONAPI=$AMIKOO/gcvisionapi +AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gctranslationapi # ============================================================================= # Functions diff --git a/Hochob/Services/Amikoo/Virtual/Amikoo.js b/Hochob/Services/Amikoo/Virtual/Amikoo.js deleted file mode 100644 index 2041fed5..00000000 --- a/Hochob/Services/Amikoo/Virtual/Amikoo.js +++ /dev/null @@ -1,218 +0,0 @@ -const mqtt = require('mqtt') -const client = mqtt.connect('mqtt://127.0.0.1') - -var sys = require('sys') -var exec = require('child_process').exec; - -function puts(error, stdout, stderr) { sys.puts(stdout) } - -function espeakDecir(phrase) { - var sleep = require('sleep') - exec("echo " + phrase + " | espeak -v es-la -a 200 -p 50 -s 170 -w audio.wav", puts); - sleep.msleep(500); - exec("aplay audio.wav", puts); - sendAck() -} - -function espeakSay(phrase) { - var sleep = require('sleep') - exec("echo " + phrase + " | espeak -v en-us -a 200 -p 50 -s 170 -w audio.wav", puts); - sleep.msleep(500); - exec("aplay audio.wav", puts); - sendAck() -} - -var state = 'closed' - -client.on('connect', function () { - client.subscribe('lupe/open') - client.subscribe('lupe/close') - client.subscribe('lupe/decir') - client.subscribe('lupe/say') - - client.subscribe('lupe/resetall') - client.subscribe('lupe/headleft') - client.subscribe('lupe/headright') - - client.subscribe('lupe/leftup') - client.subscribe('lupe/leftdown') - client.subscribe('lupe/leftfold') - client.subscribe('lupe/leftunfold') - - client.subscribe('lupe/rightup') - client.subscribe('lupe/rightdown') - client.subscribe('lupe/rightfold') - client.subscribe('lupe/rightunfold') - - client.subscribe('lupe/moveleft') - client.subscribe('lupe/moveright') - client.subscribe('lupe/moveforward') - client.subscribe('lupe/movebackward') - client.subscribe('lupe/movestop') - - client.subscribe('lupe/bienvenida') - client.subscribe('lupe/agradece') - client.subscribe('lupe/dance') - client.subscribe('lupe/creador') - client.subscribe('lupe/norte') - - client.subscribe('lupe/inicial') - client.subscribe('lupe/emocion') - client.subscribe('lupe/porsupuesto') - client.subscribe('lupe/cerebro') - client.subscribe('lupe/inteledison') - - client.publish('lupe/connected', 'true') - sendStateUpdate() -}) - -client.on('message', function (topic, message) { - console.log('Received message %s %s', topic, message) - switch (topic) { - case 'lupe/open': - return handleRequestOpen(message) - case 'lupe/close': - return handleRequestClose(message) - case 'lupe/decir': - return handleRequestDecir(message) - case 'lupe/say': - return handleRequestSay(message) - - case 'lupe/resetall': - return handleLupe('Inicializacion') - case 'lupe/headleft': - return handleLupe('Cabeza Izquierda') - case 'lupe/headright': - return handleLupe('Cabeza Derecha') - - case 'lupe/leftup': - return handleLupe('Mano Izquierda Arriba') - case 'lupe/leftdown': - return handleLupe('Mano Izquierda Abajo') - case 'lupe/leftfold': - return handleLupe('Codo Izquierdo Doblar') - case 'lupe/leftunfold': - return handleLupe('Codo Izquierdo Desdoblar') - - case 'lupe/rightup': - return handleLupe('Mano Derecha Arriba') - case 'lupe/rightdown': - return handleLupe('Mano Derecha Abajo') - case 'lupe/rightfold': - return handleLupe('Codo Derecho Doblar') - case 'lupe/rightunfold': - return handleLupe('Code Derecho Desdoblar') - - case 'lupe/moveleft': - return handleLupe('Mover Izquierda') - case 'lupe/moveright': - return handleLupe('Mover Derecha') - case 'lupe/moveforward': - return handleLupe('Mover Adelante') - case 'lupe/movebackward': - return handleLupe('Mover Atras') - case 'lupe/movestop': - return handleLupe('Mover Alto') - - case 'lupe/bienvenida': - return handleLupe('Bienvenido') - case 'lupe/agradece': - return handleLupe('Gracias') - case 'lupe/dance': - return handleLupe('Bailar') - case 'lupe/creador': - return handleLupe('Creador') - case 'lupe/norte': - return handleLupe('Norte') - - case 'lupe/inicial': - return handleSpeakLupe('Hola a todos!') - case 'lupe/emocion': - return handleSpeakLupe('Perdon! Lo se!, Es que me emociono!') - case 'lupe/porsupuesto': - return handleSpeakLupe('Por supuesto') - case 'lupe/cerebro': - return handleSpeakLupe('En mi caso, mi cerebro esta aqui, en la caja azul!') - case 'lupe/inteledison': - return handleSpeakLupe('Yo funciono con la plataforma Intel Edison') - - } -}) - -function sendStateUpdate () { - console.log('Sending state %s', state) - client.publish('lupe/state', state) -} - -function sendAck () { - console.log('Sending Ack %s', '1') - client.publish('lupe/ack', '1') -} - -function handleRequestOpen (message) { - if (state !== 'open' && state !== 'opening') { - console.log('Opening Lupe') - state = 'opening' - espeak('Opening') - sendStateUpdate() - - setTimeout(function (){ - state = 'open' - sendStateUpdate() - }, 5000) - } -} - -function handleRequestClose (message) { - if (state !== 'closed' && state !== 'closing') { - state = 'closing' - - espeak('Closing') - sendStateUpdate() - - setTimeout(function () { - state = 'closed' - sendStateUpdate() - }, 5000) - } -} - -function handleRequestDecir (message) { - espeakDecir(message) -} - -function handleRequestSay (message) { - espeakSay(message) -} - -function handleLupe (message) { - console.log('Action %s', message) -} - -function handleSpeakLupe (message) { - espeak(message) -} - -function handleAppExit (options, err) { - if (err) { - console.log(err.stack) - } - - if (options.cleanup) { - client.publish('lupe/connected', 'false') - } - - if (options.exit) { - process.exit() - } -} - -process.on('exit', handleAppExit.bind(null, { - cleanup: true -})) -process.on('SIGINT', handleAppExit.bind(null, { - exit: true -})) -process.on('uncaughtException', handleAppExit.bind(null, { - exit: true -})) diff --git a/Hochob/Services/Amikoo/Virtual/Amikoo.sh b/Hochob/Services/Amikoo/Virtual/Amikoo.sh deleted file mode 100755 index c2081cf2..00000000 --- a/Hochob/Services/Amikoo/Virtual/Amikoo.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -x - -#pacmd set-default-sink 0 -#pacmd set-default-source 3 - -node Amikoo.js - -# End Of File diff --git a/Hochob/Services/Amikoo/Virtual/AmikooTesting.sh b/Hochob/Services/Amikoo/Virtual/AmikooTesting.sh deleted file mode 100755 index c1974824..00000000 --- a/Hochob/Services/Amikoo/Virtual/AmikooTesting.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -array[0]="resetall" -array[1]="headleft" -array[2]="headright" - -array[3]="leftup" -array[4]="leftright" -array[5]="leftfold" -array[6]="leftunfold" - -array[7]="rightup" -array[8]="rightdown" -array[9]="rightfold" -array[10]="rightunfold" - -array[11]="moveleft" -array[12]="moveright" -array[13]="moveforward" -array[14]="movebackward" -array[15]="movestop" - -array[16]="bienvenida" -array[17]="agradece" -array[18]="dance" -array[19]="dance" -array[20]="creador" -array[21]="norte" - -while true -do - - rand=$[$RANDOM % 21] - action=`echo ${array[$rand]}` - device="lupe/" - - topic=$device$action - - mosquitto_pub --qos 1 -h iot.eclipse.org -p 1883 -t $topic -m 1 - sleep 2 -done diff --git a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js old mode 100644 new mode 100755 index 2041fed5..7f201cf1 --- a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js @@ -27,8 +27,8 @@ var state = 'closed' client.on('connect', function () { client.subscribe('lupe/open') client.subscribe('lupe/close') - client.subscribe('lupe/decir') - client.subscribe('lupe/say') + client.subscribe('amikoo/decir') + client.subscribe('amikoo/say') client.subscribe('lupe/resetall') client.subscribe('lupe/headleft') @@ -73,9 +73,9 @@ client.on('message', function (topic, message) { return handleRequestOpen(message) case 'lupe/close': return handleRequestClose(message) - case 'lupe/decir': + case 'amikoo/decir': return handleRequestDecir(message) - case 'lupe/say': + case 'amikoo/say': return handleRequestSay(message) case 'lupe/resetall': diff --git a/Hochob/Services/Amikoo/Virtual/AmikooVirtualDaemon.sh b/Hochob/Services/Amikoo/Virtual/AmikooVirtualDaemon.sh index c2081cf2..edccda8d 100755 --- a/Hochob/Services/Amikoo/Virtual/AmikooVirtualDaemon.sh +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtualDaemon.sh @@ -5,6 +5,6 @@ set -x #pacmd set-default-sink 0 #pacmd set-default-source 3 -node Amikoo.js +node AmikooVirtual.js # End Of File diff --git a/Hochob/Services/Amikoo/Virtual/RobotVirtual.sh b/Hochob/Services/Amikoo/Virtual/RobotVirtual.sh deleted file mode 100755 index 56848e2e..00000000 --- a/Hochob/Services/Amikoo/Virtual/RobotVirtual.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -. ~/CodeLabs/Hochob/Main.sh - -export ROBOTVIRTUAL_PID=$$ - -LOCAL_MESSAGE="$1" - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -if [ $# -eq 1 ] -then - Espeak.sh "on" "spanish" "$LOCAL_MESSAGE" -else - echo "Invalid number of arguments, see Documentation" - exit 1 -fi - -# End of File From 3a6e0f298520de97f0b0e4b0c79d1e95d6609b81 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:07:17 -0500 Subject: [PATCH 1096/1653] Update Main.sh --- Hochob/Main.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index f8819a37..7b30aa8c 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -205,9 +205,11 @@ MQTT_SERVER_PORT=1883 # Amikoo -AMIKOO="amikoo" -AMIKOO_SAY=$AMIKOO/say -AMIKOO_DECIR=$AMIKOO/decir +AMIKOO=amikoo +AMIKOO_SOUND=$AMIKOO/sound +AMIKOO_SOUND_SPEECHSYNTHETIZER=AMIKOO_SOUND/speechsynthetizer +AMIKOO_SAY=$AMIKOO_SOUND_SPEECHSYNTHETIZER/say +AMIKOO_DECIR=$AMIKOO_SOUND_SPEECHSYNTHETIZER/decir AMIKOO_GCVISIONAPI=$AMIKOO/gcvisionapi AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gctranslationapi From d0eaf126883ff80394ae4d9d0e68cd7d2504d003 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:07:27 -0500 Subject: [PATCH 1097/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 407914b4..92e95eeb 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -26,16 +26,16 @@ homeassistant: friendly_name: 1.1 Bienvenidos Intel, Protocolo de Seguridad icon: mdi:audiobook - # Southern Maya Highlands : 2 Amikoo + # Southern Maya Highlands : 2 Robot script.bajacalifornianorte: friendly_name: 2.1 Bienvenidos Guadalajara Design Center icon: mdi:audiobook script.bajacaliforniasur: - friendly_name: 2.2 Lupe Amikoo Show + friendly_name: 2.2 Lupe Robot Show icon: mdi:video script.michoacan: - friendly_name: 2.3 Lupe Amikoo Foto Grupal + friendly_name: 2.3 Lupe Robot Foto Grupal icon: mdi:video # Southern Maya Highlands : 3 Tour @@ -173,7 +173,7 @@ homeassistant: icon: mdi:audiobook script.siankaan: - friendly_name: El Baile del Amikoo + friendly_name: El Baile de Lupe icon: mdi:test-tube script.calakmul: @@ -874,7 +874,7 @@ group: robotmayalands: view: yes - name: Amikoo + name: Robot entities: - group.robotmayalandsskills - group.robotmayalandsknowledge @@ -974,10 +974,10 @@ group: entities: - script.aguascalientes - # Southern Maya Highlands: Amikoo + # Southern Maya Highlands: Robot southernmayahighlandsrobot: - name: 2 Amikoo + name: 2 Robot entities: - script.bajacalifornianorte - script.bajacaliforniasur @@ -1098,7 +1098,7 @@ group: # Northern Maya Highlands: Stations northernmayalowlandsrobot: - name: Amikoo + name: Robot Dance entities: - script.siankaan From 359942afa3ffa55888a195d07c40efb0bffee81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 11:07:47 -0500 Subject: [PATCH 1098/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- .../Coji.sh | 0 .../Makeblock.sh | 0 Hochob/Services/Amikoo/Remote/Robot.sh | 68 ------------------- 3 files changed, 68 deletions(-) rename Hochob/Applications/{RobotMayaLands => AmikooMayaLands}/Coji.sh (100%) rename Hochob/Applications/{RobotMayaLands => AmikooMayaLands}/Makeblock.sh (100%) delete mode 100755 Hochob/Services/Amikoo/Remote/Robot.sh diff --git a/Hochob/Applications/RobotMayaLands/Coji.sh b/Hochob/Applications/AmikooMayaLands/Coji.sh similarity index 100% rename from Hochob/Applications/RobotMayaLands/Coji.sh rename to Hochob/Applications/AmikooMayaLands/Coji.sh diff --git a/Hochob/Applications/RobotMayaLands/Makeblock.sh b/Hochob/Applications/AmikooMayaLands/Makeblock.sh similarity index 100% rename from Hochob/Applications/RobotMayaLands/Makeblock.sh rename to Hochob/Applications/AmikooMayaLands/Makeblock.sh diff --git a/Hochob/Services/Amikoo/Remote/Robot.sh b/Hochob/Services/Amikoo/Remote/Robot.sh deleted file mode 100755 index 912d4989..00000000 --- a/Hochob/Services/Amikoo/Remote/Robot.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -. ~/CodeLabs/Hochob/Main.sh - -export ROBOTREMOTE_PID=$$ - -LOCAL_COMMAND="$1" -LOCAL_MESSAGE="" - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -i=0 -for var in "$@" -do - if [ "$i" -ne 0 ]; then - LOCAL_MESSAGE=$LOCAL_MESSAGE"$var" - echo $LOCAL_MESSAGE - fi - i=`expr $i + 1` -done - -echo $LOCAL_MESSAGE - - -if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then - Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" -elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then - Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" -fi - -if [ "$LOCAL_COMMAND" = "lupe/message" ]; then - LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then - Mosquitto.sh $AMIKOO_SAY $LOCAL_MESSAGE - else - Mosquitto.sh $AMIKOO_DECIR $LOCAL_MESSAGE - fi -else - Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE -fi - -exit 0 - -LOCAL_DEMO=`Demo.sh` -if [ "$LOCAL_DEMO" -eq "1" ]; then - if [ "$LOCAL_MESSAGE" != "1" ] - then - Espeak.sh on spanish "$LOCAL_MESSAGE" - fi -else - Mosquitto.sh $LOCAL_COMMAND "$LOCAL_MESSAGE" -fi - -# End of File From fbc59acd86e5944d22535c01bf932349521c55e5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:10:20 -0500 Subject: [PATCH 1099/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 7b30aa8c..1ebf2c48 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -207,7 +207,7 @@ MQTT_SERVER_PORT=1883 AMIKOO=amikoo AMIKOO_SOUND=$AMIKOO/sound -AMIKOO_SOUND_SPEECHSYNTHETIZER=AMIKOO_SOUND/speechsynthetizer +AMIKOO_SOUND_SPEECHSYNTHETIZER=$AMIKOO_SOUND/speechsynthetizer AMIKOO_SAY=$AMIKOO_SOUND_SPEECHSYNTHETIZER/say AMIKOO_DECIR=$AMIKOO_SOUND_SPEECHSYNTHETIZER/decir AMIKOO_GCVISIONAPI=$AMIKOO/gcvisionapi From e90f29b780f0ea42d52ee43e72db30b400680cce Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:12:17 -0500 Subject: [PATCH 1100/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 1ebf2c48..9b5252ea 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -38,8 +38,8 @@ 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_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_AMIKOO_REMOTE=$HOCHOB_SERVER_SERVICES_AMIKOO/Amikoo/Remote/ +export HOCHOB_SERVER_SERVICES_AMIKOO_VIRTUAL=$HOCHOB_SERVER_SERVICES_AMIKOO/Amikoo/Virtual/ 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/ From a51525aed48e24cd01ee2ce76be2d4c35d0e0566 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:18:49 -0500 Subject: [PATCH 1101/1653] Update AmikooVirtual.js --- Hochob/Services/Amikoo/Virtual/AmikooVirtual.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js index 7f201cf1..f0919d63 100755 --- a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js @@ -27,8 +27,8 @@ var state = 'closed' client.on('connect', function () { client.subscribe('lupe/open') client.subscribe('lupe/close') - client.subscribe('amikoo/decir') - client.subscribe('amikoo/say') + client.subscribe('amikoo/sound/speechsynthetizer/say') + client.subscribe('amikoo/sound/speechsynthetizer/decir') client.subscribe('lupe/resetall') client.subscribe('lupe/headleft') @@ -73,9 +73,9 @@ client.on('message', function (topic, message) { return handleRequestOpen(message) case 'lupe/close': return handleRequestClose(message) - case 'amikoo/decir': + case 'amikoo/sound/speechsynthetizer/decir': return handleRequestDecir(message) - case 'amikoo/say': + case 'amikoo/sound/speechsynthetizer/say': return handleRequestSay(message) case 'lupe/resetall': From 0b188f480831c2da231c78f02fe7d5bf6ae73b6c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:21:13 -0500 Subject: [PATCH 1102/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 9b5252ea..c6f0e509 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -38,8 +38,8 @@ 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_AMIKOO=$HOCHOB_SERVER_SERVICES/Amikoo/ -export HOCHOB_SERVER_SERVICES_AMIKOO_REMOTE=$HOCHOB_SERVER_SERVICES_AMIKOO/Amikoo/Remote/ -export HOCHOB_SERVER_SERVICES_AMIKOO_VIRTUAL=$HOCHOB_SERVER_SERVICES_AMIKOO/Amikoo/Virtual/ +export HOCHOB_SERVER_SERVICES_AMIKOO_REMOTE=$HOCHOB_SERVER_SERVICES_AMIKOO/Remote/ +export HOCHOB_SERVER_SERVICES_AMIKOO_VIRTUAL=$HOCHOB_SERVER_SERVICES_AMIKOO/Virtual/ 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/ From a7ec2d8be2abe341a3798ab29cff0cf31e67bff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 11:28:11 -0500 Subject: [PATCH 1103/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 89f44a06..4350a51e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -31,7 +31,7 @@ Eog.sh "$VISITORSCENTER_IMAGE/*" & sleep 2 Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 -Amikoo.sh lupe/decir "Nel Pastel" +Amikoo.sh $AMIKOO_DECIR "Nel Pastel" sleep .6 Amikoo.sh lupe/headright 1 sleep .6 diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 1192534c..00096f15 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -28,7 +28,7 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` -#Amikoo.sh lupe/decir \ +#Amikoo.sh $AMIKOO_DECIR \ # "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ # Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ # hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ From 10a38e696690dd6c0f5d58fc641712cadfca6375 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:31:44 -0500 Subject: [PATCH 1104/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 92e95eeb..5f020cb0 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -670,31 +670,31 @@ shell_command: # Amikoo Maya Lands - resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/resetall 1 + resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/resetall 1 coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 - headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/headleft 1 - headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/headright 1 + headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headleft 1 + headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headright 1 - rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightup - rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightdown - rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightfold - rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightunfold + rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightup + rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightdown + rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightfold + rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightunfold - leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftup - leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftdown - leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftfold - leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftunfold + leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftup + leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftdown + leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftfold + leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftunfold - moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveright - moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveleft - moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveforward - movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/movebackward - movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/movestop + moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveright + moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveleft + moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveforward + movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movebackward + movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movestop # Console Maya Lands From 803c6bbe151c898be7365d9256ed79cdaf2dd635 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:44:39 -0500 Subject: [PATCH 1105/1653] Update Main.sh --- Hochob/Main.sh | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index c6f0e509..b8e2a338 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -206,13 +206,32 @@ MQTT_SERVER_PORT=1883 # Amikoo AMIKOO=amikoo + AMIKOO_SOUND=$AMIKOO/sound AMIKOO_SOUND_SPEECHSYNTHETIZER=$AMIKOO_SOUND/speechsynthetizer -AMIKOO_SAY=$AMIKOO_SOUND_SPEECHSYNTHETIZER/say -AMIKOO_DECIR=$AMIKOO_SOUND_SPEECHSYNTHETIZER/decir + +AMIKOO_TRADITION=$AMIKOO/tradition +AMIKOO_TRADITION_AUDIO=$AMIKOO_TRADITION/audio +AMIKOO_TRADITION_IMAGE=$AMIKOO_TRADITION/image +AMIKOO_TRADITION_VIDEO=$AMIKOO_TRADITION/video + +AMIKOO_CAMERA=$AMIKOO/camera +AMIKOO_CAMERA_PICTURE=$AMIKOO_CAMERA/picture + +## Skills Advanced + AMIKOO_GCVISIONAPI=$AMIKOO/gcvisionapi AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gctranslationapi +## Skills Basic + +AMIKOO_SAY=$AMIKOO_SOUND_SPEECHSYNTHETIZER/say +AMIKOO_DECIR=$AMIKOO_SOUND_SPEECHSYNTHETIZER/decir +AMIKOO_AUDIO=$AMIKOO_TRADITION_AUDIO +AMIKOO_IMAGE=$AMIKOO_TRADITION_IMAGE +AMIKOO_VIDEO=$AMIKOO_TRADITION_VIDEO +AMIKOO_PICTURE=$AMIKOO_CAMERA_PICTURE + # ============================================================================= # Functions # ============================================================================= From d532b643b828ef4dea6ef800b57b3c99d9e6baa8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:44:49 -0500 Subject: [PATCH 1106/1653] Update Amikoo.sh --- Hochob/Services/Amikoo/Remote/Amikoo.sh | 27 ++++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/Amikoo.sh b/Hochob/Services/Amikoo/Remote/Amikoo.sh index b22f9f39..8fb92de0 100755 --- a/Hochob/Services/Amikoo/Remote/Amikoo.sh +++ b/Hochob/Services/Amikoo/Remote/Amikoo.sh @@ -35,6 +35,7 @@ done echo $LOCAL_MESSAGE +# Skills Advanced if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" @@ -42,19 +43,14 @@ elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" fi -if [ "$LOCAL_COMMAND" = "lupe/message" ]; then - LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then - Mosquitto.sh $AMIKOO_SAY $LOCAL_MESSAGE - else - Mosquitto.sh $AMIKOO_DECIR $LOCAL_MESSAGE - fi -else - Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE -fi +# Skills Basic + +Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE exit 0 +# Sandbox + LOCAL_DEMO=`Demo.sh` if [ "$LOCAL_DEMO" -eq "1" ]; then if [ "$LOCAL_MESSAGE" != "1" ] @@ -65,4 +61,15 @@ else Mosquitto.sh $LOCAL_COMMAND "$LOCAL_MESSAGE" fi +if [ "$LOCAL_COMMAND" = "lupe/message" ]; then + LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then + Mosquitto.sh $AMIKOO_SAY $LOCAL_MESSAGE + else + Mosquitto.sh $AMIKOO_DECIR $LOCAL_MESSAGE + fi +else + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE +fi + # End of File From 40c5282711e1433593d46a94991e8c758094a498 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 11:45:00 -0500 Subject: [PATCH 1107/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 5f020cb0..7c9b9075 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -671,12 +671,19 @@ shell_command: # Amikoo Maya Lands resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/resetall 1 + + # Amikoo Maya Lands: Applications + coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & + # Amikoo Maya Lands: Skills Advanced + amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 + # Amikoo Maya Lands: Skills Basic + headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headleft 1 headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headright 1 From 33c3a018db4ae919f784010117777f5c1d5de6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 12:00:14 -0500 Subject: [PATCH 1108/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- .../NorthernMayaLowlands/SianKaan.sh | 4 +- .../BajaCaliforniaNorte.sh | 12 +- .../BajaCaliforniaSur.sh | 26 +-- .../SouthernMayaHighlands/Michoacan.sh | 28 +-- Hochob/Applications/TechieMayaLands/Toyota.sh | 10 +- Hochob/Sandbox/Audio/Section02.sh | 14 +- .../LupeRobot/Hochob/Release/lupefinal.js | 110 +++++------ .../Sandbox/LupeRobot/Show/LupeRobot1080p.sh | 26 +-- .../Services/Amikoo/Virtual/AmikooVirtual.js | 132 ++++++------- .../Amikoo/Virtual/AmikooVirtualTesting.sh | 2 +- .../HomeAssistant/configuration.yaml | 180 +++++++++--------- .../HomeAssistant/configuration.yaml.1.0 | 180 +++++++++--------- Hochob/documentation/Hochob.md | 8 +- 13 files changed, 366 insertions(+), 366 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 556d1b58..a741baf9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -38,9 +38,9 @@ fi Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & -Amikoo.sh lupe/headright 1 +Amikoo.sh amikoo/headright 1 sleep .6 -Amikoo.sh lupe/headleft 1 +Amikoo.sh amikoo/headleft 1 sleep .6 #kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 4350a51e..9ba79369 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -33,17 +33,17 @@ Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 Amikoo.sh $AMIKOO_DECIR "Nel Pastel" sleep .6 -Amikoo.sh lupe/headright 1 +Amikoo.sh amikoo/headright 1 sleep .6 -Amikoo.sh lupe/headleft 1 +Amikoo.sh amikoo/headleft 1 sleep .6 -Amikoo.sh lupe/headright 1 +Amikoo.sh amikoo/headright 1 sleep .6 -Amikoo.sh lupe/headleft 1 +Amikoo.sh amikoo/headleft 1 sleep .6 -Amikoo.sh lupe/headright 1 +Amikoo.sh amikoo/headright 1 sleep .6 -Amikoo.sh lupe/resetall 1 +Amikoo.sh amikoo/resetall 1 sleep 5 KillApp.sh "eog" diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 5649234a..11cf208c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -28,36 +28,36 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & -(Amikoo.sh lupe/inicial 1) && sleep 1.25 +(Amikoo.sh amikoo/inicial 1) && sleep 1.25 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & -sleep 6.35 && Amikoo.sh lupe/emocion 1 && sleep 4 +sleep 6.35 && Amikoo.sh amikoo/emocion 1 && sleep 4 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & -sleep 2.7 && Amikoo.sh lupe/porsupuesto 1 && sleep 2.5 +sleep 2.7 && Amikoo.sh amikoo/porsupuesto 1 && sleep 2.5 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & -sleep 37.5 && Amikoo.sh lupe/cerebro 1 +sleep 37.5 && Amikoo.sh amikoo/cerebro 1 sleep 2 -Amikoo.sh lupe/rightup 1 +Amikoo.sh amikoo/rightup 1 sleep .25 -Amikoo.sh lupe/leftup 1 +Amikoo.sh amikoo/leftup 1 sleep .25 -Amikoo.sh lupe/rightfold 1 +Amikoo.sh amikoo/rightfold 1 sleep .25 -Amikoo.sh lupe/leftfold 1 +Amikoo.sh amikoo/leftfold 1 sleep 2 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & -sleep 25.5 && Amikoo.sh lupe/inteledison 1 +sleep 25.5 && Amikoo.sh amikoo/inteledison 1 sleep 3 -Amikoo.sh lupe/rightdown 1 +Amikoo.sh amikoo/rightdown 1 sleep .25 -Amikoo.sh lupe/leftdown 1 +Amikoo.sh amikoo/leftdown 1 sleep .25 -Amikoo.sh lupe/rightunfold 1 +Amikoo.sh amikoo/rightunfold 1 sleep .25 -Amikoo.sh lupe/leftunfold 1 +Amikoo.sh amikoo/leftunfold 1 sleep 2 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 00096f15..a150508d 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -52,32 +52,32 @@ SpeechSynthetizer.sh on espeak spanish \ sleep 1 -#Amikoo.sh lupe/message \ +#Amikoo.sh amikoo/message \ # "Ahora tomaremos una foto para el recuerdo. \ # Primero, me iré a mi lugar preferido, denme unos segundos." SpeechSynthetizer.sh on espeak spanish \ "Ahora tomaremos una foto para el recuerdo. \ Primero, me iré a mi lugar preferido, denme unos segundos." -Amikoo.sh lupe/headright 1 +Amikoo.sh amikoo/headright 1 sleep .6 -Amikoo.sh lupe/headleft 1 +Amikoo.sh amikoo/headleft 1 sleep .6 -Amikoo.sh lupe/moveleft 1 +Amikoo.sh amikoo/moveleft 1 sleep 1.6 -Amikoo.sh lupe/movestop 1 +Amikoo.sh amikoo/movestop 1 sleep .6 -Amikoo.sh lupe/moveforward 1 +Amikoo.sh amikoo/moveforward 1 sleep 4.5 -Amikoo.sh lupe/movestop 1 +Amikoo.sh amikoo/movestop 1 sleep .6 -Amikoo.sh lupe/moveleft 1 +Amikoo.sh amikoo/moveleft 1 sleep 3.6 -Amikoo.sh lupe/movestop 1 +Amikoo.sh amikoo/movestop 1 sleep .6 -#Amikoo.sh lupe/message \ +#Amikoo.sh amikoo/message \ # "Estoy listo! Ahora les toca a ustedes acomodarse. \ # Con mucho cuidado ponganse a ambos lados de mi, \ # viendo hacia la pantalla y sonrían." @@ -90,21 +90,21 @@ FfmpegCamera.sh 20 & sleep 15 -#Amikoo.sh lupe/message \ +#Amikoo.sh amikoo/message \ # "Están listos ${LOCAL_INSTITUTION}?" SpeechSynthetizer.sh on espeak spanish \ "Están listas? listos? ${LOCAL_INSTITUTION}?" sleep 5 -#Amikoo.sh lupe/message \ +#Amikoo.sh amikoo/message \ # "Tomemos la foto, a la cuenta de 3." SpeechSynthetizer.sh on espeak spanish \ "Tomemos la foto, a la cuenta de 3." sleep 1 -#Amikoo.sh lupe/message \ +#Amikoo.sh amikoo/message \ # "1, 2 y 3, Sonrian." SpeechSynthetizer.sh on espeak spanish \ "1, 2 y 3, Sonrían." @@ -115,7 +115,7 @@ ConvertText.sh "$FSWEBCAM_IMAGE" "Bienvenidos ${LOCAL_INSTITUTION}" wait Eog.sh "$FSWEBCAM_IMAGE" & -#Amikoo.sh lupe/message \ +#Amikoo.sh amikoo/message \ # "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." SpeechSynthetizer.sh on espeak spanish \ "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index c92cf123..4c2f8920 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -31,11 +31,11 @@ SpeechSynthetizer.sh on espeak spanish \ Stream.sh "Triki" "1.0" "$SPEECH_MP3" echo $? -Amikoo.sh lupe/inicial 1 -Amikoo.sh lupe/emocion 1 -Amikoo.sh lupe/porsupuesto 1 -Amikoo.sh lupe/cerebro 1 -Amikoo.sh lupe/inteledison 1 +Amikoo.sh amikoo/inicial 1 +Amikoo.sh amikoo/emocion 1 +Amikoo.sh amikoo/porsupuesto 1 +Amikoo.sh amikoo/cerebro 1 +Amikoo.sh amikoo/inteledison 1 Stream.sh "Tran" "1.0" "$SPEECH_MP3" echo $? diff --git a/Hochob/Sandbox/Audio/Section02.sh b/Hochob/Sandbox/Audio/Section02.sh index de7f65c4..0d7c5ea5 100755 --- a/Hochob/Sandbox/Audio/Section02.sh +++ b/Hochob/Sandbox/Audio/Section02.sh @@ -29,19 +29,19 @@ feh --fullscreen $IPATH/Images/VisitorsCenter/02/08.jpg & sleep 2 feh --fullscreen $IPATH/Images/VisitorsCenter/02/09.jpg & sleep 2 -feh --fullscreen $IPATH/Images/VisitorsCenter/lupe.jpg & +feh --fullscreen $IPATH/Images/VisitorsCenter/amikoo.jpg & sleep 4 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/headright -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/headright -m 1 sleep .6 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/headleft -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/headleft -m 1 sleep .6 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/headright -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/headright -m 1 sleep .6 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/headleft -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/headleft -m 1 sleep .6 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/headright -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/headright -m 1 sleep .6 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/resetall -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/resetall -m 1 sleep 10 killall -9 feh diff --git a/Hochob/Sandbox/LupeRobot/Hochob/Release/lupefinal.js b/Hochob/Sandbox/LupeRobot/Hochob/Release/lupefinal.js index 33df4009..0fe556d6 100644 --- a/Hochob/Sandbox/LupeRobot/Hochob/Release/lupefinal.js +++ b/Hochob/Sandbox/LupeRobot/Hochob/Release/lupefinal.js @@ -8,37 +8,37 @@ const exec = require('child_process').exec; client.on('connect', () => { - client.subscribe('lupe/leftup') - client.subscribe('lupe/leftdown') - client.subscribe('lupe/leftfold') - client.subscribe('lupe/leftunfold') - client.subscribe('lupe/moveleft') - client.subscribe('lupe/headleft') - client.subscribe('lupe/headright') - client.subscribe('lupe/moveforward') - client.subscribe('lupe/movestop') - client.subscribe('lupe/movebackward') - client.subscribe('lupe/rightup') - client.subscribe('lupe/rightdown') - client.subscribe('lupe/rightfold') - client.subscribe('lupe/rightunfold') - client.subscribe('lupe/moveright') - client.subscribe('lupe/resetall') - client.subscribe('lupe/bienvenida') - client.subscribe('lupe/agradece') - client.subscribe('lupe/dance') - client.subscribe('lupe/creador') - client.subscribe('lupe/norte') + client.subscribe('amikoo/leftup') + client.subscribe('amikoo/leftdown') + client.subscribe('amikoo/leftfold') + client.subscribe('amikoo/leftunfold') + client.subscribe('amikoo/moveleft') + client.subscribe('amikoo/headleft') + client.subscribe('amikoo/headright') + client.subscribe('amikoo/moveforward') + client.subscribe('amikoo/movestop') + client.subscribe('amikoo/movebackward') + client.subscribe('amikoo/rightup') + client.subscribe('amikoo/rightdown') + client.subscribe('amikoo/rightfold') + client.subscribe('amikoo/rightunfold') + client.subscribe('amikoo/moveright') + client.subscribe('amikoo/resetall') + client.subscribe('amikoo/bienvenida') + client.subscribe('amikoo/agradece') + client.subscribe('amikoo/dance') + client.subscribe('amikoo/creador') + client.subscribe('amikoo/norte') //Comandos de voz - client.subscribe('lupe/inicial') - client.subscribe('lupe/emocion') - client.subscribe('lupe/porsupuesto') - client.subscribe('lupe/cerebro') - client.subscribe('lupe/inteledison') + client.subscribe('amikoo/inicial') + client.subscribe('amikoo/emocion') + client.subscribe('amikoo/porsupuesto') + client.subscribe('amikoo/cerebro') + client.subscribe('amikoo/inteledison') - //Saber si lupe esta conectada - client.publish('lupe/connected', '1') + //Saber si amikoo esta conectada + client.publish('amikoo/connected', '1') }) @@ -46,82 +46,82 @@ client.on('message', (topic,message) => { console.log('receive message %s %s', topic, message) switch(topic){ - case 'lupe/leftup': + case 'amikoo/leftup': command = '00' break; - case 'lupe/inicial': + case 'amikoo/inicial': command = '40' break; - case 'lupe/emocion': + case 'amikoo/emocion': command = '41' break; - case 'lupe/porsupuesto': + case 'amikoo/porsupuesto': command = '42' break; - case 'lupe/cerebro': + case 'amikoo/cerebro': command = '43' break; - case 'lupe/inteledison': + case 'amikoo/inteledison': command = '44' break; - case 'lupe/leftdown': + case 'amikoo/leftdown': command = '20' break; - case 'lupe/leftfold': + case 'amikoo/leftfold': command = '01' break; - case 'lupe/leftunfold': + case 'amikoo/leftunfold': command = '21' break; - case 'lupe/moveleft': + case 'amikoo/moveleft': command = '02' break; - case 'lupe/headleft': + case 'amikoo/headleft': command = '04' break; - case 'lupe/headright': + case 'amikoo/headright': command = '24' break; - case 'lupe/moveforward': + case 'amikoo/moveforward': command = '05' break; - case 'lupe/movestop': + case 'amikoo/movestop': command = '06' break; - case 'lupe/movebackward': + case 'amikoo/movebackward': command = '07' break; - case 'lupe/rightup' : + case 'amikoo/rightup' : command = '08' break; - case 'lupe/rightdown': + case 'amikoo/rightdown': command = '28' break; - case 'lupe/rightfold': + case 'amikoo/rightfold': command = '09' break; - case 'lupe/rightunfold': + case 'amikoo/rightunfold': command = '29' break; - case 'lupe/moveright': + case 'amikoo/moveright': command = '10' break; - case 'lupe/resetall': + case 'amikoo/resetall': command = '11' break; - case 'lupe/bienvenida': + case 'amikoo/bienvenida': command = '80' break; - case 'lupe/agradece': + case 'amikoo/agradece': command = '81' break; - case 'lupe/dance': + case 'amikoo/dance': command = '82' break; - case 'lupe/creador': + case 'amikoo/creador': command = '83' break; - case 'lupe/norte': + case 'amikoo/norte': command = '84' break; } @@ -148,7 +148,7 @@ function handleAppExit(options, err){ } if(options.cleanup){ - client.publish('lupe/connected', '0') + client.publish('amikoo/connected', '0') } if(options.exit){ diff --git a/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh b/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh index 9d70c856..2a2cd60e 100755 --- a/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh +++ b/Hochob/Sandbox/LupeRobot/Show/LupeRobot1080p.sh @@ -7,40 +7,40 @@ MQTTPORT=1883 cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Silencio.mp4 & #(sleep 1) && echo "hola a todos" | espeak -v es-la -a 200 -(mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/inicial -m 1) && sleep 1.25 +(mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/inicial -m 1) && sleep 1.25 cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte1_v3.mp4 & #(sleep 7.5) && echo "Perdon! Lo se!, Es que me emociono" | espeak -v es-la -a 200 -sleep 6.35 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/emocion -m 1 && sleep 4 +sleep 6.35 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/emocion -m 1 && sleep 4 cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte2_v2.mp4 & ##(sleep 3.5) && echo "Por supuesto" | espeak -v es-la -a 200 -sleep 2.7 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/porsupuesto -m 1 && sleep 2.5 +sleep 2.7 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/porsupuesto -m 1 && sleep 2.5 cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte3_v2.mp4 & ##(sleep 39.5) && echo "En mi caso, mi cerebro esta aqui, en la caja azul!" | espeak -v es-la -a 200 -sleep 37.5 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/cerebro -m 1 +sleep 37.5 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/cerebro -m 1 sleep 2 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/rightup -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/rightup -m 1 sleep .25 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/leftup -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/leftup -m 1 sleep .25 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/rightfold -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/rightfold -m 1 sleep .25 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/leftfold -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/leftfold -m 1 sleep 2 cvlc --no-video-title-show --fullscreen /home/hochob/LupeAmikoo/1080p/Parte4_v2.mp4 & ##(sleep 26.5) && echo "Yo funciono con la plataforma Intel Edison" | espeak -v es-la -a 200 -sleep 25.5 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/inteledison -m 1 +sleep 25.5 && mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/inteledison -m 1 sleep 3 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/rightdown -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/rightdown -m 1 sleep .25 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/leftdown -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/leftdown -m 1 sleep .25 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/rightunfold -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/rightunfold -m 1 sleep .25 -mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t lupe/leftunfold -m 1 +mosquitto_pub -h $MQTTSERVER -p $MQTTPORT -q 1 -t amikoo/leftunfold -m 1 sleep 2 cvlc --no-video-title-show --fullscreen --play-and-exit /home/hochob/LupeAmikoo/1080p/Parte5_v2.mp4 & diff --git a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js index f0919d63..0238bec5 100755 --- a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js @@ -25,115 +25,115 @@ function espeakSay(phrase) { var state = 'closed' client.on('connect', function () { - client.subscribe('lupe/open') - client.subscribe('lupe/close') + client.subscribe('amikoo/open') + client.subscribe('amikoo/close') client.subscribe('amikoo/sound/speechsynthetizer/say') client.subscribe('amikoo/sound/speechsynthetizer/decir') - client.subscribe('lupe/resetall') - client.subscribe('lupe/headleft') - client.subscribe('lupe/headright') - - client.subscribe('lupe/leftup') - client.subscribe('lupe/leftdown') - client.subscribe('lupe/leftfold') - client.subscribe('lupe/leftunfold') - - client.subscribe('lupe/rightup') - client.subscribe('lupe/rightdown') - client.subscribe('lupe/rightfold') - client.subscribe('lupe/rightunfold') - - client.subscribe('lupe/moveleft') - client.subscribe('lupe/moveright') - client.subscribe('lupe/moveforward') - client.subscribe('lupe/movebackward') - client.subscribe('lupe/movestop') - - client.subscribe('lupe/bienvenida') - client.subscribe('lupe/agradece') - client.subscribe('lupe/dance') - client.subscribe('lupe/creador') - client.subscribe('lupe/norte') - - client.subscribe('lupe/inicial') - client.subscribe('lupe/emocion') - client.subscribe('lupe/porsupuesto') - client.subscribe('lupe/cerebro') - client.subscribe('lupe/inteledison') - - client.publish('lupe/connected', 'true') + client.subscribe('amikoo/resetall') + client.subscribe('amikoo/headleft') + client.subscribe('amikoo/headright') + + client.subscribe('amikoo/leftup') + client.subscribe('amikoo/leftdown') + client.subscribe('amikoo/leftfold') + client.subscribe('amikoo/leftunfold') + + client.subscribe('amikoo/rightup') + client.subscribe('amikoo/rightdown') + client.subscribe('amikoo/rightfold') + client.subscribe('amikoo/rightunfold') + + client.subscribe('amikoo/moveleft') + client.subscribe('amikoo/moveright') + client.subscribe('amikoo/moveforward') + client.subscribe('amikoo/movebackward') + client.subscribe('amikoo/movestop') + + client.subscribe('amikoo/bienvenida') + client.subscribe('amikoo/agradece') + client.subscribe('amikoo/dance') + client.subscribe('amikoo/creador') + client.subscribe('amikoo/norte') + + client.subscribe('amikoo/inicial') + client.subscribe('amikoo/emocion') + client.subscribe('amikoo/porsupuesto') + client.subscribe('amikoo/cerebro') + client.subscribe('amikoo/inteledison') + + client.publish('amikoo/connected', 'true') sendStateUpdate() }) client.on('message', function (topic, message) { console.log('Received message %s %s', topic, message) switch (topic) { - case 'lupe/open': + case 'amikoo/open': return handleRequestOpen(message) - case 'lupe/close': + case 'amikoo/close': return handleRequestClose(message) case 'amikoo/sound/speechsynthetizer/decir': return handleRequestDecir(message) case 'amikoo/sound/speechsynthetizer/say': return handleRequestSay(message) - case 'lupe/resetall': + case 'amikoo/resetall': return handleLupe('Inicializacion') - case 'lupe/headleft': + case 'amikoo/headleft': return handleLupe('Cabeza Izquierda') - case 'lupe/headright': + case 'amikoo/headright': return handleLupe('Cabeza Derecha') - case 'lupe/leftup': + case 'amikoo/leftup': return handleLupe('Mano Izquierda Arriba') - case 'lupe/leftdown': + case 'amikoo/leftdown': return handleLupe('Mano Izquierda Abajo') - case 'lupe/leftfold': + case 'amikoo/leftfold': return handleLupe('Codo Izquierdo Doblar') - case 'lupe/leftunfold': + case 'amikoo/leftunfold': return handleLupe('Codo Izquierdo Desdoblar') - case 'lupe/rightup': + case 'amikoo/rightup': return handleLupe('Mano Derecha Arriba') - case 'lupe/rightdown': + case 'amikoo/rightdown': return handleLupe('Mano Derecha Abajo') - case 'lupe/rightfold': + case 'amikoo/rightfold': return handleLupe('Codo Derecho Doblar') - case 'lupe/rightunfold': + case 'amikoo/rightunfold': return handleLupe('Code Derecho Desdoblar') - case 'lupe/moveleft': + case 'amikoo/moveleft': return handleLupe('Mover Izquierda') - case 'lupe/moveright': + case 'amikoo/moveright': return handleLupe('Mover Derecha') - case 'lupe/moveforward': + case 'amikoo/moveforward': return handleLupe('Mover Adelante') - case 'lupe/movebackward': + case 'amikoo/movebackward': return handleLupe('Mover Atras') - case 'lupe/movestop': + case 'amikoo/movestop': return handleLupe('Mover Alto') - case 'lupe/bienvenida': + case 'amikoo/bienvenida': return handleLupe('Bienvenido') - case 'lupe/agradece': + case 'amikoo/agradece': return handleLupe('Gracias') - case 'lupe/dance': + case 'amikoo/dance': return handleLupe('Bailar') - case 'lupe/creador': + case 'amikoo/creador': return handleLupe('Creador') - case 'lupe/norte': + case 'amikoo/norte': return handleLupe('Norte') - case 'lupe/inicial': + case 'amikoo/inicial': return handleSpeakLupe('Hola a todos!') - case 'lupe/emocion': + case 'amikoo/emocion': return handleSpeakLupe('Perdon! Lo se!, Es que me emociono!') - case 'lupe/porsupuesto': + case 'amikoo/porsupuesto': return handleSpeakLupe('Por supuesto') - case 'lupe/cerebro': + case 'amikoo/cerebro': return handleSpeakLupe('En mi caso, mi cerebro esta aqui, en la caja azul!') - case 'lupe/inteledison': + case 'amikoo/inteledison': return handleSpeakLupe('Yo funciono con la plataforma Intel Edison') } @@ -141,12 +141,12 @@ client.on('message', function (topic, message) { function sendStateUpdate () { console.log('Sending state %s', state) - client.publish('lupe/state', state) + client.publish('amikoo/state', state) } function sendAck () { console.log('Sending Ack %s', '1') - client.publish('lupe/ack', '1') + client.publish('amikoo/ack', '1') } function handleRequestOpen (message) { @@ -199,7 +199,7 @@ function handleAppExit (options, err) { } if (options.cleanup) { - client.publish('lupe/connected', 'false') + client.publish('amikoo/connected', 'false') } if (options.exit) { diff --git a/Hochob/Services/Amikoo/Virtual/AmikooVirtualTesting.sh b/Hochob/Services/Amikoo/Virtual/AmikooVirtualTesting.sh index c1974824..fb0fdf23 100755 --- a/Hochob/Services/Amikoo/Virtual/AmikooVirtualTesting.sh +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtualTesting.sh @@ -32,7 +32,7 @@ do rand=$[$RANDOM % 21] action=`echo ${array[$rand]}` - device="lupe/" + device="amikoo/" topic=$device$action diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml b/Hochob/Services/Automation/HomeAssistant/configuration.yaml index 782ae972..3c2b2f7f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml @@ -24,10 +24,10 @@ homeassistant: script.audiosectiontwo: friendly_name: 2.1 Antes del video icon: mdi:audiobook - switch.luperobot: + switch.amikoorobot: friendly_name: 2.2 Video icon: mdi:video - script.luperobot: + script.amikoorobot: friendly_name: 2.3 Lupe robot icon: mdi:human-greeting script.audiosectionthree: @@ -177,7 +177,7 @@ homeassistant: # Support : Lupe - script.luperecognize: + script.amikoorecognize: friendly_name: Recognize Speech icon: mdi:microphone @@ -197,9 +197,9 @@ homeassistant: media_player.main: hidden: yes - automation.lupe_robot_text_to_speech: + automation.amikoo_robot_text_to_speech: hidden: yes - automation.lupe_robot_telegram: + automation.amikoo_robot_telegram: hidden: yes # Show links to resources in log and frontend @@ -263,7 +263,7 @@ mqtt: keepalive: 60 script: - luperobot: + amikoorobot: alias: Lupe Amikoo sequence: - alias: Bienvenidos a Intel Guadalajara @@ -381,29 +381,29 @@ script: # Lupe Center - lupevirtualstart: + amikoovirtualstart: alias: Lupe Virtual Start sequence: - alias: Lupe Virtual Start - service: shell_command.lupevirtualstart - lupevirtualstop: + service: shell_command.amikoovirtualstart + amikoovirtualstop: alias: Lupe Virtual Stop sequence: - alias: Lupe Virtual Stop - service: shell_command.lupevirtualstop + service: shell_command.amikoovirtualstop - lupepresentation: + amikoopresentation: alias: Lupe Presentation sequence: - alias: Presentation - service: shell_command.lupepresentation - luperecognize: + service: shell_command.amikoopresentation + amikoorecognize: alias: Lupe Recognize sequence: - alias: Recognize Speech - service: shell_command.luperecognize + service: shell_command.amikoorecognize - lupe_arm_left: + amikoo_arm_left: alias: Lupe Arm Left sequence: - alias: Lupe Arm Up @@ -411,7 +411,7 @@ script: data: message: "Lupe Moviendo Brazo Izquierdo" language: 'es' - lupe_arm_right: + amikoo_arm_right: alias: Lupe Arm Right sequence: - alias: Lupe Arm Right @@ -419,7 +419,7 @@ script: data: message: "Lupe Moviendo Brazo Derecho" language: 'es' - lupe_dance: + amikoo_dance: alias: Lupe Dance sequence: - alias: Lupe Dance @@ -431,8 +431,8 @@ script: shell_command: restart_ha: sudo systemctl restart home-assistant.service & photography: python /home/hochob/CodeLabs/Hochob/Photography/selfie.py & - lupepresentation: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Presentation/Presentation.sh & - luperecognize: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Recognize/Recognize.sh & + amikoopresentation: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Presentation/Presentation.sh & + amikoorecognize: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Recognize/Recognize.sh & audiosectionone: bash /home/hochob/CodeLabs/Hochob/Audio/Section01.sh & audiosectiontwo: bash /home/hochob/CodeLabs/Hochob/Audio/Section02.sh & audiosectionthree: bash /home/hochob/CodeLabs/Hochob/Audio/Section03.sh & @@ -451,16 +451,16 @@ shell_command: audiostopeek: bash /home/hochob/CodeLabs/Hochob/Audio/Stop.sh "Eek'" & audiopauseeek: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh "Eek'" & audioplayeek: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh "Eek'" & - lupevirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeAmikoo/Virtual/amikoo.sh & - lupevirtualstop: pkill node & + amikoovirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeAmikoo/Virtual/amikoo.sh & + amikoovirtualstop: pkill node & switch: - platform: command_line switches: - luperobot: + amikoorobot: command_on: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo1080p.sh &" command_off: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh" - lupecomplete: + amikoocomplete: command_on: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo.sh &" command_off: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh" camerapreview: @@ -484,8 +484,8 @@ switch: switch 00: - platform: mqtt name: leftup - command_topic: "lupe/leftup" - state_topic: "lupe/leftup/state" + command_topic: "amikoo/leftup" + state_topic: "amikoo/leftup/state" payload_on: 1 payload_off: 0 qos: 1 @@ -493,8 +493,8 @@ switch 00: switch 01: - platform: mqtt name: leftdown - command_topic: "lupe/leftdown" - state_topic: "lupe/leftdown/state" + command_topic: "amikoo/leftdown" + state_topic: "amikoo/leftdown/state" payload_on: 1 payload_off: 0 qos: 1 @@ -502,8 +502,8 @@ switch 01: switch 02: - platform: mqtt name: leftfold - command_topic: "lupe/leftfold" - state_topic: "lupe/leftfold/state" + command_topic: "amikoo/leftfold" + state_topic: "amikoo/leftfold/state" payload_on: 1 payload_off: 0 qos: 1 @@ -511,8 +511,8 @@ switch 02: switch 03: - platform: mqtt name: leftunfold - command_topic: "lupe/leftunfold" - state_topic: "lupe/leftunfold/state" + command_topic: "amikoo/leftunfold" + state_topic: "amikoo/leftunfold/state" payload_on: 1 payload_off: 0 qos: 1 @@ -520,8 +520,8 @@ switch 03: switch 04: - platform: mqtt name: rightup - command_topic: "lupe/rightup" - state_topic: "lupe/rightup/state" + command_topic: "amikoo/rightup" + state_topic: "amikoo/rightup/state" payload_on: 1 payload_off: 0 qos: 1 @@ -529,8 +529,8 @@ switch 04: switch 05: - platform: mqtt name: rightdown - command_topic: "lupe/rightdown" - state_topic: "lupe/rightdown/state" + command_topic: "amikoo/rightdown" + state_topic: "amikoo/rightdown/state" payload_on: 1 payload_off: 0 qos: 1 @@ -538,8 +538,8 @@ switch 05: switch 06: - platform: mqtt name: rightfold - command_topic: "lupe/rightfold" - state_topic: "lupe/rightfold/state" + command_topic: "amikoo/rightfold" + state_topic: "amikoo/rightfold/state" payload_on: 1 payload_off: 0 qos: 1 @@ -547,8 +547,8 @@ switch 06: switch 07: - platform: mqtt name: rightunfold - command_topic: "lupe/rightunfold" - state_topic: "lupe/rightunfold/state" + command_topic: "amikoo/rightunfold" + state_topic: "amikoo/rightunfold/state" payload_on: 1 payload_off: 0 qos: 1 @@ -556,8 +556,8 @@ switch 07: switch 08: - platform: mqtt name: moveleft - command_topic: "lupe/moveleft" - state_topic: "lupe/moveleft/state" + command_topic: "amikoo/moveleft" + state_topic: "amikoo/moveleft/state" payload_on: 1 payload_off: 0 qos: 1 @@ -565,8 +565,8 @@ switch 08: switch 09: - platform: mqtt name: moveright - command_topic: "lupe/moveright" - state_topic: "lupe/moveright/state" + command_topic: "amikoo/moveright" + state_topic: "amikoo/moveright/state" payload_on: 1 payload_off: 0 qos: 1 @@ -574,8 +574,8 @@ switch 09: switch 10: - platform: mqtt name: moveforward - command_topic: "lupe/moveforward" - state_topic: "lupe/moveforward/state" + command_topic: "amikoo/moveforward" + state_topic: "amikoo/moveforward/state" payload_on: 1 payload_off: 0 qos: 1 @@ -583,8 +583,8 @@ switch 10: switch 11: - platform: mqtt name: movebackward - command_topic: "lupe/movebackward" - state_topic: "lupe/movebackward/state" + command_topic: "amikoo/movebackward" + state_topic: "amikoo/movebackward/state" payload_on: 1 payload_off: 0 qos: 1 @@ -592,8 +592,8 @@ switch 11: switch 12: - platform: mqtt name: movestop - command_topic: "lupe/movestop" - state_topic: "lupe/movestop/state" + command_topic: "amikoo/movestop" + state_topic: "amikoo/movestop/state" payload_on: 1 payload_off: 0 qos: 1 @@ -601,8 +601,8 @@ switch 12: switch 13: - platform: mqtt name: headleft - command_topic: "lupe/headleft" - state_topic: "lupe/headleft/state" + command_topic: "amikoo/headleft" + state_topic: "amikoo/headleft/state" payload_on: 1 payload_off: 0 qos: 1 @@ -610,8 +610,8 @@ switch 13: switch 14: - platform: mqtt name: headright - command_topic: "lupe/headright" - state_topic: "lupe/headright/state" + command_topic: "amikoo/headright" + state_topic: "amikoo/headright/state" payload_on: 1 payload_off: 0 qos: 1 @@ -619,8 +619,8 @@ switch 14: switch 15: - platform: mqtt name: resetall - command_topic: "lupe/resetall" - state_topic: "lupe/resetall/state" + command_topic: "amikoo/resetall" + state_topic: "amikoo/resetall/state" payload_on: 1 payload_off: 0 qos: 1 @@ -628,8 +628,8 @@ switch 15: switch 16: - platform: mqtt name: bienvenida - command_topic: "lupe/bienvenida" - state_topic: "lupe/bienvenida/state" + command_topic: "amikoo/bienvenida" + state_topic: "amikoo/bienvenida/state" payload_on: 1 payload_off: 0 qos: 1 @@ -637,8 +637,8 @@ switch 16: switch 17: - platform: mqtt name: agradece - command_topic: "lupe/agradece" - state_topic: "lupe/agradece/state" + command_topic: "amikoo/agradece" + state_topic: "amikoo/agradece/state" payload_on: 1 payload_off: 0 qos: 1 @@ -646,8 +646,8 @@ switch 17: switch 18: - platform: mqtt name: dance - command_topic: "lupe/dance" - state_topic: "lupe/dance/state" + command_topic: "amikoo/dance" + state_topic: "amikoo/dance/state" payload_on: 1 payload_off: 0 qos: 1 @@ -655,8 +655,8 @@ switch 18: switch 19: - platform: mqtt name: creador - command_topic: "lupe/creador" - state_topic: "lupe/creador/state" + command_topic: "amikoo/creador" + state_topic: "amikoo/creador/state" payload_on: 1 payload_off: 0 qos: 1 @@ -664,8 +664,8 @@ switch 19: switch 20: - platform: mqtt name: norte - command_topic: "lupe/norte" - state_topic: "lupe/norte/state" + command_topic: "amikoo/norte" + state_topic: "amikoo/norte/state" payload_on: 1 payload_off: 0 qos: 1 @@ -697,7 +697,7 @@ automation: # hide_entity: True # trigger: # platform: state -# entity_id: switch.lupe +# entity_id: switch.amikoo # state: 'on' # action: # service: tts.google_say @@ -708,7 +708,7 @@ automation: #hide_entity: True trigger: platform: state - entity_id: switch.lupe + entity_id: switch.amikoo state: 'on' action: service: notify.telegram @@ -727,16 +727,16 @@ group: # Views - lupeview: + amikooview: view: yes name: Lupe Amikoo entities: - - group.lupearmleft - - group.lupearmright - - group.lupelegs - - group.lupehead - - group.lupeactivities - - group.lupediagnostics + - group.amikooarmleft + - group.amikooarmright + - group.amikoolegs + - group.amikoohead + - group.amikooactivities + - group.amikoodiagnostics beginningview: view: yes @@ -756,8 +756,8 @@ group: view: yes name: Support entities: - - group.lupevirtual - - group.lupeskills + - group.amikoovirtual + - group.amikooskills - group.camera # Groups : Default @@ -771,10 +771,10 @@ group: name: 2 Video entities: - script.audiosectiontwo - - switch.luperobot - - script.luperobot + - switch.amikoorobot + - script.amikoorobot - script.audiosectionthree - #- switch.lupecomplete + #- switch.amikoocomplete photography: name: Photography @@ -790,7 +790,7 @@ group: # Groups : Lupe Amikoo - lupeactivities: + amikooactivities: name: Activities entities: - switch.bienvenida @@ -799,7 +799,7 @@ group: - switch.creador - switch.norte - lupearmleft: + amikooarmleft: name: Arm Left entities: - switch.leftup @@ -807,7 +807,7 @@ group: - switch.leftfold - switch.leftunfold - lupearmright: + amikooarmright: name: Arm Right entities: - switch.rightup @@ -815,7 +815,7 @@ group: - switch.rightfold - switch.rightunfold - lupelegs: + amikoolegs: name: Legs entities: - switch.moveleft @@ -824,13 +824,13 @@ group: - switch.movebackward - switch.movestop - lupehead: + amikoohead: name: Head entities: - switch.headleft - switch.headright - lupediagnostics: + amikoodiagnostics: name: Diagnostics entities: - switch.resetall @@ -872,16 +872,16 @@ group: # Groups : Support - lupevirtual: + amikoovirtual: name: Lupe Virtual entities: - - script.lupevirtualstart - - script.lupevirtualstop + - script.amikoovirtualstart + - script.amikoovirtualstop - lupeskills: + amikooskills: name: Lupe Skills entities: - - script.luperecognize + - script.amikoorecognize camera: name: Camera diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 index 06876642..31858f97 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.1.0 @@ -24,10 +24,10 @@ homeassistant: script.audiosectiontwo: friendly_name: 2.1 Antes del video icon: mdi:audiobook - switch.luperobot: + switch.amikoorobot: friendly_name: 2.2 Video icon: mdi:video - script.luperobot: + script.amikoorobot: friendly_name: 2.3 Lupe robot icon: mdi:human-greeting script.audiosectionthree: @@ -177,7 +177,7 @@ homeassistant: # Support : Lupe - script.luperecognize: + script.amikoorecognize: friendly_name: Recognize Speech icon: mdi:microphone @@ -197,9 +197,9 @@ homeassistant: media_player.main: hidden: yes - automation.lupe_robot_text_to_speech: + automation.amikoo_robot_text_to_speech: hidden: yes - automation.lupe_robot_telegram: + automation.amikoo_robot_telegram: hidden: yes # Show links to resources in log and frontend @@ -263,7 +263,7 @@ mqtt: keepalive: 60 script: - luperobot: + amikoorobot: alias: Lupe Amikoo sequence: - alias: Bienvenidos a Intel Guadalajara @@ -381,29 +381,29 @@ script: # Lupe Center - lupevirtualstart: + amikoovirtualstart: alias: Lupe Virtual Start sequence: - alias: Lupe Virtual Start - service: shell_command.lupevirtualstart - lupevirtualstop: + service: shell_command.amikoovirtualstart + amikoovirtualstop: alias: Lupe Virtual Stop sequence: - alias: Lupe Virtual Stop - service: shell_command.lupevirtualstop + service: shell_command.amikoovirtualstop - lupepresentation: + amikoopresentation: alias: Lupe Presentation sequence: - alias: Presentation - service: shell_command.lupepresentation - luperecognize: + service: shell_command.amikoopresentation + amikoorecognize: alias: Lupe Recognize sequence: - alias: Recognize Speech - service: shell_command.luperecognize + service: shell_command.amikoorecognize - lupe_arm_left: + amikoo_arm_left: alias: Lupe Arm Left sequence: - alias: Lupe Arm Up @@ -411,7 +411,7 @@ script: data: message: "Lupe Moviendo Brazo Izquierdo" language: 'es' - lupe_arm_right: + amikoo_arm_right: alias: Lupe Arm Right sequence: - alias: Lupe Arm Right @@ -419,7 +419,7 @@ script: data: message: "Lupe Moviendo Brazo Derecho" language: 'es' - lupe_dance: + amikoo_dance: alias: Lupe Dance sequence: - alias: Lupe Dance @@ -431,8 +431,8 @@ script: shell_command: restart_ha: sudo systemctl restart home-assistant.service & photography: python /home/hochob/CodeLabs/Hochob/Photography/selfie.py & - lupepresentation: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Presentation/Presentation.sh & - luperecognize: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Recognize/Recognize.sh & + amikoopresentation: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Presentation/Presentation.sh & + amikoorecognize: /home/hochob/CodeLabs/Hochob/LupeAmikoo/Learning/Recognize/Recognize.sh & audiosectionone: bash /home/hochob/CodeLabs/Hochob/Audio/Section01.sh & audiosectiontwo: bash /home/hochob/CodeLabs/Hochob/Audio/Section02.sh & audiosectionthree: bash /home/hochob/CodeLabs/Hochob/Audio/Section03.sh & @@ -451,16 +451,16 @@ shell_command: audiostopeek: bash /home/hochob/CodeLabs/Hochob/Audio/Stop.sh "Eek'" & audiopauseeek: bash /home/hochob/CodeLabs/Hochob/Audio/Pause.sh "Eek'" & audioplayeek: bash /home/hochob/CodeLabs/Hochob/Audio/Play.sh "Eek'" & - lupevirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeAmikoo/Virtual/amikoo.sh & - lupevirtualstop: pkill node & + amikoovirtualstart: bash /home/hochob/CodeLabs/Hochob/LupeAmikoo/Virtual/amikoo.sh & + amikoovirtualstop: pkill node & switch: - platform: command_line switches: - luperobot: + amikoorobot: command_on: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo1080p.sh &" command_off: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh" - lupecomplete: + amikoocomplete: command_on: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikoo.sh &" command_off: "/home/hochob/CodeLabs/Hochob/LupeAmikoo/Show/LupeAmikooKill.sh" camerapreview: @@ -484,8 +484,8 @@ switch: switch 00: - platform: mqtt name: leftup - command_topic: "lupe/leftup" - state_topic: "lupe/leftup/state" + command_topic: "amikoo/leftup" + state_topic: "amikoo/leftup/state" payload_on: 1 payload_off: 0 qos: 1 @@ -493,8 +493,8 @@ switch 00: switch 01: - platform: mqtt name: leftdown - command_topic: "lupe/leftdown" - state_topic: "lupe/leftdown/state" + command_topic: "amikoo/leftdown" + state_topic: "amikoo/leftdown/state" payload_on: 1 payload_off: 0 qos: 1 @@ -502,8 +502,8 @@ switch 01: switch 02: - platform: mqtt name: leftfold - command_topic: "lupe/leftfold" - state_topic: "lupe/leftfold/state" + command_topic: "amikoo/leftfold" + state_topic: "amikoo/leftfold/state" payload_on: 1 payload_off: 0 qos: 1 @@ -511,8 +511,8 @@ switch 02: switch 03: - platform: mqtt name: leftunfold - command_topic: "lupe/leftunfold" - state_topic: "lupe/leftunfold/state" + command_topic: "amikoo/leftunfold" + state_topic: "amikoo/leftunfold/state" payload_on: 1 payload_off: 0 qos: 1 @@ -520,8 +520,8 @@ switch 03: switch 04: - platform: mqtt name: rightup - command_topic: "lupe/rightup" - state_topic: "lupe/rightup/state" + command_topic: "amikoo/rightup" + state_topic: "amikoo/rightup/state" payload_on: 1 payload_off: 0 qos: 1 @@ -529,8 +529,8 @@ switch 04: switch 05: - platform: mqtt name: rightdown - command_topic: "lupe/rightdown" - state_topic: "lupe/rightdown/state" + command_topic: "amikoo/rightdown" + state_topic: "amikoo/rightdown/state" payload_on: 1 payload_off: 0 qos: 1 @@ -538,8 +538,8 @@ switch 05: switch 06: - platform: mqtt name: rightfold - command_topic: "lupe/rightfold" - state_topic: "lupe/rightfold/state" + command_topic: "amikoo/rightfold" + state_topic: "amikoo/rightfold/state" payload_on: 1 payload_off: 0 qos: 1 @@ -547,8 +547,8 @@ switch 06: switch 07: - platform: mqtt name: rightunfold - command_topic: "lupe/rightunfold" - state_topic: "lupe/rightunfold/state" + command_topic: "amikoo/rightunfold" + state_topic: "amikoo/rightunfold/state" payload_on: 1 payload_off: 0 qos: 1 @@ -556,8 +556,8 @@ switch 07: switch 08: - platform: mqtt name: moveleft - command_topic: "lupe/moveleft" - state_topic: "lupe/moveleft/state" + command_topic: "amikoo/moveleft" + state_topic: "amikoo/moveleft/state" payload_on: 1 payload_off: 0 qos: 1 @@ -565,8 +565,8 @@ switch 08: switch 09: - platform: mqtt name: moveright - command_topic: "lupe/moveright" - state_topic: "lupe/moveright/state" + command_topic: "amikoo/moveright" + state_topic: "amikoo/moveright/state" payload_on: 1 payload_off: 0 qos: 1 @@ -574,8 +574,8 @@ switch 09: switch 10: - platform: mqtt name: moveforward - command_topic: "lupe/moveforward" - state_topic: "lupe/moveforward/state" + command_topic: "amikoo/moveforward" + state_topic: "amikoo/moveforward/state" payload_on: 1 payload_off: 0 qos: 1 @@ -583,8 +583,8 @@ switch 10: switch 11: - platform: mqtt name: movebackward - command_topic: "lupe/movebackward" - state_topic: "lupe/movebackward/state" + command_topic: "amikoo/movebackward" + state_topic: "amikoo/movebackward/state" payload_on: 1 payload_off: 0 qos: 1 @@ -592,8 +592,8 @@ switch 11: switch 12: - platform: mqtt name: movestop - command_topic: "lupe/movestop" - state_topic: "lupe/movestop/state" + command_topic: "amikoo/movestop" + state_topic: "amikoo/movestop/state" payload_on: 1 payload_off: 0 qos: 1 @@ -601,8 +601,8 @@ switch 12: switch 13: - platform: mqtt name: headleft - command_topic: "lupe/headleft" - state_topic: "lupe/headleft/state" + command_topic: "amikoo/headleft" + state_topic: "amikoo/headleft/state" payload_on: 1 payload_off: 0 qos: 1 @@ -610,8 +610,8 @@ switch 13: switch 14: - platform: mqtt name: headright - command_topic: "lupe/headright" - state_topic: "lupe/headright/state" + command_topic: "amikoo/headright" + state_topic: "amikoo/headright/state" payload_on: 1 payload_off: 0 qos: 1 @@ -619,8 +619,8 @@ switch 14: switch 15: - platform: mqtt name: resetall - command_topic: "lupe/resetall" - state_topic: "lupe/resetall/state" + command_topic: "amikoo/resetall" + state_topic: "amikoo/resetall/state" payload_on: 1 payload_off: 0 qos: 1 @@ -628,8 +628,8 @@ switch 15: switch 16: - platform: mqtt name: bienvenida - command_topic: "lupe/bienvenida" - state_topic: "lupe/bienvenida/state" + command_topic: "amikoo/bienvenida" + state_topic: "amikoo/bienvenida/state" payload_on: 1 payload_off: 0 qos: 1 @@ -637,8 +637,8 @@ switch 16: switch 17: - platform: mqtt name: agradece - command_topic: "lupe/agradece" - state_topic: "lupe/agradece/state" + command_topic: "amikoo/agradece" + state_topic: "amikoo/agradece/state" payload_on: 1 payload_off: 0 qos: 1 @@ -646,8 +646,8 @@ switch 17: switch 18: - platform: mqtt name: dance - command_topic: "lupe/dance" - state_topic: "lupe/dance/state" + command_topic: "amikoo/dance" + state_topic: "amikoo/dance/state" payload_on: 1 payload_off: 0 qos: 1 @@ -655,8 +655,8 @@ switch 18: switch 19: - platform: mqtt name: creador - command_topic: "lupe/creador" - state_topic: "lupe/creador/state" + command_topic: "amikoo/creador" + state_topic: "amikoo/creador/state" payload_on: 1 payload_off: 0 qos: 1 @@ -664,8 +664,8 @@ switch 19: switch 20: - platform: mqtt name: norte - command_topic: "lupe/norte" - state_topic: "lupe/norte/state" + command_topic: "amikoo/norte" + state_topic: "amikoo/norte/state" payload_on: 1 payload_off: 0 qos: 1 @@ -697,7 +697,7 @@ automation: # hide_entity: True # trigger: # platform: state -# entity_id: switch.lupe +# entity_id: switch.amikoo # state: 'on' # action: # service: tts.google_say @@ -708,7 +708,7 @@ automation: #hide_entity: True trigger: platform: state - entity_id: switch.lupe + entity_id: switch.amikoo state: 'on' action: service: notify.telegram @@ -727,16 +727,16 @@ group: # Views - lupeview: + amikooview: view: yes name: Lupe Amikoo entities: - - group.lupearmleft - - group.lupearmright - - group.lupelegs - - group.lupehead - - group.lupeactivities - - group.lupediagnostics + - group.amikooarmleft + - group.amikooarmright + - group.amikoolegs + - group.amikoohead + - group.amikooactivities + - group.amikoodiagnostics beginningview: view: yes @@ -756,8 +756,8 @@ group: view: yes name: Support entities: - - group.lupevirtual - - group.lupeskills + - group.amikoovirtual + - group.amikooskills - group.camera # Groups : Default @@ -771,10 +771,10 @@ group: name: 2 Video entities: - script.audiosectiontwo - - switch.luperobot - - script.luperobot + - switch.amikoorobot + - script.amikoorobot - script.audiosectionthree - #- switch.lupecomplete + #- switch.amikoocomplete photography: name: Fotografia @@ -790,7 +790,7 @@ group: # Groups : Lupe Amikoo - lupeactivities: + amikooactivities: name: Activities entities: - switch.bienvenida @@ -799,7 +799,7 @@ group: - switch.creador - switch.norte - lupearmleft: + amikooarmleft: name: Arm Left entities: - switch.leftup @@ -807,7 +807,7 @@ group: - switch.leftfold - switch.leftunfold - lupearmright: + amikooarmright: name: Arm Right entities: - switch.rightup @@ -815,7 +815,7 @@ group: - switch.rightfold - switch.rightunfold - lupelegs: + amikoolegs: name: Legs entities: - switch.moveleft @@ -824,13 +824,13 @@ group: - switch.movebackward - switch.movestop - lupehead: + amikoohead: name: Head entities: - switch.headleft - switch.headright - lupediagnostics: + amikoodiagnostics: name: Diagnostics entities: - switch.resetall @@ -872,16 +872,16 @@ group: # Groups : Support - lupevirtual: + amikoovirtual: name: Lupe Virtual entities: - - script.lupevirtualstart - - script.lupevirtualstop + - script.amikoovirtualstart + - script.amikoovirtualstop - lupeskills: + amikooskills: name: Lupe Skills entities: - - script.luperecognize + - script.amikoorecognize camera: name: Camera diff --git a/Hochob/documentation/Hochob.md b/Hochob/documentation/Hochob.md index 0750fe1d..b7ddda67 100644 --- a/Hochob/documentation/Hochob.md +++ b/Hochob/documentation/Hochob.md @@ -2,7 +2,7 @@ > Hochob es un sitio arqueológico maya ubicado en el estado mexicano de Campeche, en la región denominada Los Chenes. Las primeras noticias sobre la existencia de este sitio arqueológico se debieron al investigador y explorador Teobert Maler, quien en 1887 visitó el lugar y publicó algunas fotografías en la revista Globus, en 1895. [Wikipedia](https://es.wikipedia.org/wiki/Hochob) -# Lupe Robot +# Lupe Amikoo Development @@ -26,11 +26,11 @@ Same as Wrist Band ## Usability • Easy Guide (Pending) -o Robot +o Amikoo ### Connection 1. USB Cable -2. Mario Robot 192.168.1.102 +2. Mario Amikoo 192.168.1.102 - Ssh: root, inteledison 3 modes @@ -39,7 +39,7 @@ o Robot 2. Predetermined Movements English 3. Predetermined Movements Spanish -MoveStop to restart Mario Robot +MoveStop to restart Mario Amikoo Files 1. MotorsandServos Binary From 2ad6bc899359ab4b3cc89ed648f0ea1450d70a0e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 12:26:07 -0500 Subject: [PATCH 1109/1653] Update Imix.sh --- Hochob/Applications/TraditionMayaLands/Imix.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh index aac358f1..48fe67cc 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Imix.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export GOOGLE_PID=$$ -export GOOGLE_NAME="Zacatecas" -export GOOGLE_PATH=$(readlink -f "$0") -export GOOGLE_DIRECTORY=$(dirname "$GOOGLE_PATH") +export IMIX_PID=$$ +export IMIX_NAME="Zacatecas" +export IMIX_PATH=$(readlink -f "$0") +export IMIX_DIRECTORY=$(dirname "$IMIX_PATH") LOCAL_SEASON="Halloween" LOCAL_DEVICE="Triki" @@ -26,9 +26,9 @@ LOCAL_DEVICE="Triki" # Main # ============================================================================= -LogPid.sh $GOOGLE_PID $GOOGLE_NAME +LogPid.sh $IMIX_PID $IMIX_NAME -LOCAL_SOUND=`find $SEASON/$LOCAL_SEASON/ -type f | shuf -n 1` +LOCAL_SOUND=`find $TRADITION/$LOCAL_SEASON/Sound/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" exit 0 From f340a06312f54a677f0faa3d7c6a98577d19c86e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 12:32:05 -0500 Subject: [PATCH 1110/1653] Update Main.sh --- Hochob/Main.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index b8e2a338..50f4107c 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -134,8 +134,6 @@ export HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SO export HOCHOB_SERVER_MEDIA_SOURCE_SOUND=$HOCHOB_SERVER_MEDIA_SOURCE/Sound/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/Season/ - export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/Speech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/Speech.mp3 @@ -171,8 +169,6 @@ export FSWEBCAM_IMAGE_TEXT=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_IMAGE_TEX export DRAWING_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING export DRAWING_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_IMAGE_DRAWING_ALLFILES -export SEASON=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON - export SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH export SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_SPEECH_MP3 From 8640dea71ffe0655bb4830a995882662b611b4a9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 12:47:25 -0500 Subject: [PATCH 1111/1653] Update Aak.sh --- Hochob/Applications/MediaMayaLands/Aak.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/MediaMayaLands/Aak.sh b/Hochob/Applications/MediaMayaLands/Aak.sh index 77988c48..8375068b 100755 --- a/Hochob/Applications/MediaMayaLands/Aak.sh +++ b/Hochob/Applications/MediaMayaLands/Aak.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export GUANAJUATO_PID=$$ -export GUANAJUATO_NAME="Guanajuato" -export GUANAJUATO_PATH=$(readlink -f "$0") -export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") +export AAK_PID=$$ +export AAK_NAME="Aak" +export AAK_PATH=$(readlink -f "$0") +export AAK_DIRECTORY=$(dirname "$AAK_PATH") # ============================================================================= # Functions @@ -23,8 +23,8 @@ export GUANAJUATO_DIRECTORY=$(dirname "$GUANAJUATO_PATH") # Main # ============================================================================= -LogPid.sh $GUANAJUATO_PID $GUANAJUATO_NAME +LogPid.sh $AAK_PID $AAK_NAME -Eog.sh "$CORPORATE_IMAGE/*" & +Eog.sh "$TRADITION/Intel/Image/*" & # End of File From abf87ae00dc50823967bb3d834b3a73d3cf0a596 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 12:48:57 -0500 Subject: [PATCH 1112/1653] Update Aayin.sh --- Hochob/Applications/MediaMayaLands/Aayin.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/MediaMayaLands/Aayin.sh b/Hochob/Applications/MediaMayaLands/Aayin.sh index 6e41d138..e5051e91 100755 --- a/Hochob/Applications/MediaMayaLands/Aayin.sh +++ b/Hochob/Applications/MediaMayaLands/Aayin.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export GUERRERO_PID=$$ -export GUERRERO_NAME="Guerrero" -export GUERRERO_PATH=$(readlink -f "$0") -export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") +export AAYIN_PID=$$ +export AAYIN_NAME="Aayin" +export AAYIN_PATH=$(readlink -f "$0") +export AAYIN_DIRECTORY=$(dirname "$AAYIN_PATH") # ============================================================================= # Functions @@ -23,8 +23,8 @@ export GUERRERO_DIRECTORY=$(dirname "$GUERRERO_PATH") # Main # ============================================================================= -LogPid.sh $GUERRERO_PID $GUERRERO_NAME +LogPid.sh $AAYIN_PID $AAYIN_NAME -VlcVideo.sh "on" "$CORPORATE_VIDEO/" +VlcVideo.sh "on" "$TRADITION/Intel/Video/*" # End of File From e6a4ef5a6db868c67dfd9e6637d52fa98e776526 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:02:56 -0500 Subject: [PATCH 1113/1653] Update Chakmool.sh --- Hochob/Applications/MediaMayaLands/Chakmool.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/MediaMayaLands/Chakmool.sh b/Hochob/Applications/MediaMayaLands/Chakmool.sh index 63ca4271..45e23fb6 100755 --- a/Hochob/Applications/MediaMayaLands/Chakmool.sh +++ b/Hochob/Applications/MediaMayaLands/Chakmool.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export JALISCO_PID=$$ -export JALISCO_NAME="Hidalgo" -export JALISCO_PATH=$(readlink -f "$0") -export JALISCO_DIRECTORY=$(dirname "$HIDALGO_PATH") +export CHAKMOOL_PID=$$ +export CHAKMOOL_NAME="Chakmool" +export CHAKMOOL_PATH=$(readlink -f "$0") +export CHAKMOOL_DIRECTORY=$(dirname "$CHAKMOOL_PATH") # ============================================================================= # Functions @@ -23,8 +23,8 @@ export JALISCO_DIRECTORY=$(dirname "$HIDALGO_PATH") # Main # ============================================================================= -LogPid.sh $JALISCO_PID $JALISCO_NAME +LogPid.sh $CHAKMOOL_PID $CHAKMOOL_NAME -Eog.sh "$VISITORSCENTER_IMAGE/*" & +Eog.sh "$TRADITION/VisitorsCenter/Image/*" & # End of File From 49c60420e3bbf1775de900588c200358d213514d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:13:06 -0500 Subject: [PATCH 1114/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 79023062..deead042 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -22,8 +22,6 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -#Eog.sh $VISITORSCENTER_IMAGE/RP/RPP-May052017-4536.jpg & - LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` From feb4a82fd8519ada4ea480846b7dc675f0365d0e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:13:25 -0500 Subject: [PATCH 1115/1653] Update Am.sh --- Hochob/Applications/MediaMayaLands/Am.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/MediaMayaLands/Am.sh b/Hochob/Applications/MediaMayaLands/Am.sh index c1ec452f..c5130cf1 100755 --- a/Hochob/Applications/MediaMayaLands/Am.sh +++ b/Hochob/Applications/MediaMayaLands/Am.sh @@ -25,6 +25,6 @@ export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") LogPid.sh $HIDALGO_PID $HIDALGO_NAME -Eog.sh "$VISITORSCENTER_IMAGE/*" & +Eog.sh "$TRADITION/VisitorsCenter/Image/*" & # End of File From a3ba67f97b60a60d3bae46c6c96b72621eea481d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:13:54 -0500 Subject: [PATCH 1116/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 9ba79369..a48ae46e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -27,7 +27,7 @@ LogPid.sh $BAJACALIFORNIANORTE_PID $BAJACALIFORNIANORTE_NAME Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & -Eog.sh "$VISITORSCENTER_IMAGE/*" & +Eog.sh "$TRADITION/VisitorsCenter/Image/*" & sleep 2 Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 From b7c3253e2f0aa5ceeef14a55c551e91c23296d86 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:39:38 -0500 Subject: [PATCH 1117/1653] Update Aak.sh --- Hochob/Applications/MediaMayaLands/Aak.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/MediaMayaLands/Aak.sh b/Hochob/Applications/MediaMayaLands/Aak.sh index 8375068b..05cf32fe 100755 --- a/Hochob/Applications/MediaMayaLands/Aak.sh +++ b/Hochob/Applications/MediaMayaLands/Aak.sh @@ -25,6 +25,6 @@ export AAK_DIRECTORY=$(dirname "$AAK_PATH") LogPid.sh $AAK_PID $AAK_NAME -Eog.sh "$TRADITION/Intel/Image/*" & +Eog.sh "$TRADITION_INTEL/Image/*" & # End of File From 7d42a5d80a85196d899e9a5f6b147c27b916914d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:39:53 -0500 Subject: [PATCH 1118/1653] Update Aayin.sh --- Hochob/Applications/MediaMayaLands/Aayin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/MediaMayaLands/Aayin.sh b/Hochob/Applications/MediaMayaLands/Aayin.sh index e5051e91..0c84f510 100755 --- a/Hochob/Applications/MediaMayaLands/Aayin.sh +++ b/Hochob/Applications/MediaMayaLands/Aayin.sh @@ -25,6 +25,6 @@ export AAYIN_DIRECTORY=$(dirname "$AAYIN_PATH") LogPid.sh $AAYIN_PID $AAYIN_NAME -VlcVideo.sh "on" "$TRADITION/Intel/Video/*" +VlcVideo.sh "on" "$TRADITION_INTEL/Video/*" # End of File From af4589e473e3a75039ecdddb747af11846073f66 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:41:38 -0500 Subject: [PATCH 1119/1653] Update Am.sh --- Hochob/Applications/MediaMayaLands/Am.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/MediaMayaLands/Am.sh b/Hochob/Applications/MediaMayaLands/Am.sh index c5130cf1..42b220ac 100755 --- a/Hochob/Applications/MediaMayaLands/Am.sh +++ b/Hochob/Applications/MediaMayaLands/Am.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export HIDALGO_PID=$$ -export HIDALGO_NAME="Hidalgo" -export HIDALGO_PATH=$(readlink -f "$0") -export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") +export AM_PID=$$ +export AM_NAME="Am" +export AM_PATH=$(readlink -f "$0") +export AM_DIRECTORY=$(dirname "$AM_PATH") # ============================================================================= # Functions @@ -23,8 +23,8 @@ export HIDALGO_DIRECTORY=$(dirname "$HIDALGO_PATH") # Main # ============================================================================= -LogPid.sh $HIDALGO_PID $HIDALGO_NAME +LogPid.sh $AM_PID $AM_NAME -Eog.sh "$TRADITION/VisitorsCenter/Image/*" & +Eog.sh "$TRADITION_VISITORS_CENTER/Image/*" & # End of File From 7020696cd7aab10420959340dad6861aec199c57 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:41:59 -0500 Subject: [PATCH 1120/1653] Update Chakmool.sh --- Hochob/Applications/MediaMayaLands/Chakmool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/MediaMayaLands/Chakmool.sh b/Hochob/Applications/MediaMayaLands/Chakmool.sh index 45e23fb6..8b879c78 100755 --- a/Hochob/Applications/MediaMayaLands/Chakmool.sh +++ b/Hochob/Applications/MediaMayaLands/Chakmool.sh @@ -25,6 +25,6 @@ export CHAKMOOL_DIRECTORY=$(dirname "$CHAKMOOL_PATH") LogPid.sh $CHAKMOOL_PID $CHAKMOOL_NAME -Eog.sh "$TRADITION/VisitorsCenter/Image/*" & +Eog.sh "$TRADITION_INTEL_GUADALAJARA/Image/*" & # End of File From 9505b5b32dca6849516e5d5b551839feaa16fbe9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:42:48 -0500 Subject: [PATCH 1121/1653] Update Main.sh --- Hochob/Main.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 50f4107c..ddb55ea0 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -89,6 +89,11 @@ 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_TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION/Intel/ +export HOCHOB_SERVER_MEDIA_TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION/IntelGuadalajara +export HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION/VisitorsCenter +export HOCHOB_SERVER_MEDIA_TRADITION_HALLOWEEN=$HOCHOB_SERVER_MEDIA_TRADITION/Halloween +export HOCHOB_SERVER_MEDIA_TRADITION_CHRISTMAS=$HOCHOB_SERVER_MEDIA_TRADITION/Christmas export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/ @@ -104,7 +109,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 TRADITION=$HOCHOB_SERVER_MEDIA_TRADITION +export TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION_INTEL +export TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION_INTELGUADALAJARA +export TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER +export TRADITION_HALLOWEEN=$HOCHOB_SERVER_MEDIA_TRADITION_HALLOWEEN +export TRADITION_CHRISTMAS=$HOCHOB_SERVER_MEDIA_TRADITION_CHRISTMAS export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING From 974fa74eca61a5c229d915b1a2f41a7e8512804d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:46:53 -0500 Subject: [PATCH 1122/1653] Update Main.sh --- Hochob/Main.sh | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index ddb55ea0..4573230a 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -97,36 +97,25 @@ export HOCHOB_SERVER_MEDIA_TRADITION_CHRISTMAS=$HOCHOB_SERVER_MEDIA_TRADITION/Ch export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER=$HOCHOB_SERVER_MEDIA/VisitorsCenter/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Image/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Music/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Sound/ -export HOCHOB_SERVER_MEDIA_VISITORSCENTER_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER/Video/ - # Hochob Server Media Executive export AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS 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 MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA +export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING +export MEMORIES_AMIKOO=$HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO +export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO + export TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION_INTEL export TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION_INTELGUADALAJARA export TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER export TRADITION_HALLOWEEN=$HOCHOB_SERVER_MEDIA_TRADITION_HALLOWEEN export TRADITION_CHRISTMAS=$HOCHOB_SERVER_MEDIA_TRADITION_CHRISTMAS -export MEMORIES_CAMERA=$HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA -export MEMORIES_DRAWING=$HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING -export MEMORIES_AMIKOO=$HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO -export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO - export VISITORS=$HOCHOB_SERVER_MEDIA_VISITORS -export VISITORSCENTER_IMAGE=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_IMAGE -export VISITORSCENTER_MUSIC=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_MUSIC -export VISITORSCENTER_SOUND=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_SOUND -export VISITORSCENTER_VIDEO=$HOCHOB_SERVER_MEDIA_VISITORSCENTER_VIDEO - # Hochob Server Media Source Raw export HOCHOB_SERVER_MEDIA_SOURCE=$HOME/HochobServerMediaSource/ From d14b818f638f957192e7b4a9f4550f043ebfe539 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:49:24 -0500 Subject: [PATCH 1123/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index a48ae46e..87b2e489 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -27,7 +27,7 @@ LogPid.sh $BAJACALIFORNIANORTE_PID $BAJACALIFORNIANORTE_NAME Memories.sh "5" "off" "${BAJACALIFORNIANORTE_NAME}" & -Eog.sh "$TRADITION/VisitorsCenter/Image/*" & +Eog.sh "$TRADITION_VISITORS_CENTER/Image/*" & sleep 2 Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 From b822d3b134ae6bc8cfda65d1c7168d7bc826372b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:50:54 -0500 Subject: [PATCH 1124/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 4573230a..68bba7b2 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -92,7 +92,7 @@ export HOCHOB_SERVER_MEDIA_TRADITION=$HOCHOB_SERVER_MEDIA/Tradition/ export HOCHOB_SERVER_MEDIA_TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION/Intel/ export HOCHOB_SERVER_MEDIA_TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION/IntelGuadalajara export HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION/VisitorsCenter -export HOCHOB_SERVER_MEDIA_TRADITION_HALLOWEEN=$HOCHOB_SERVER_MEDIA_TRADITION/Halloween +export HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION/DIADEMUERTOS export HOCHOB_SERVER_MEDIA_TRADITION_CHRISTMAS=$HOCHOB_SERVER_MEDIA_TRADITION/Christmas export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/ @@ -111,7 +111,7 @@ export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO export TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION_INTEL export TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION_INTELGUADALAJARA export TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER -export TRADITION_HALLOWEEN=$HOCHOB_SERVER_MEDIA_TRADITION_HALLOWEEN +export TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS export TRADITION_CHRISTMAS=$HOCHOB_SERVER_MEDIA_TRADITION_CHRISTMAS export VISITORS=$HOCHOB_SERVER_MEDIA_VISITORS From c49d2d2615594eba2533a7d70701cae2d0997c15 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:51:25 -0500 Subject: [PATCH 1125/1653] Update Imix.sh --- Hochob/Applications/TraditionMayaLands/Imix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh index 48fe67cc..7d45068a 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Imix.sh @@ -28,7 +28,7 @@ LOCAL_DEVICE="Triki" LogPid.sh $IMIX_PID $IMIX_NAME -LOCAL_SOUND=`find $TRADITION/$LOCAL_SEASON/Sound/ -type f | shuf -n 1` +LOCAL_SOUND=`find $TRADITION_DIADEMUERTOS/Sound/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" exit 0 From 8b1d63e29c09e1b178ac6716d2a65f29e6585670 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:53:54 -0500 Subject: [PATCH 1126/1653] Update Imix.sh --- Hochob/Applications/TraditionMayaLands/Imix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh index 7d45068a..78f0ad90 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Imix.sh @@ -13,7 +13,7 @@ export IMIX_NAME="Zacatecas" export IMIX_PATH=$(readlink -f "$0") export IMIX_DIRECTORY=$(dirname "$IMIX_PATH") -LOCAL_SEASON="Halloween" +LOCAL_SEASON="DiaDeMuertos" LOCAL_DEVICE="Triki" # ============================================================================= From f8e5581055f0a2005a05a03efa85e445673c780f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 13:56:43 -0500 Subject: [PATCH 1127/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 68bba7b2..cd1fb50b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -93,7 +93,7 @@ export HOCHOB_SERVER_MEDIA_TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION/Intel/ export HOCHOB_SERVER_MEDIA_TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION/IntelGuadalajara export HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION/VisitorsCenter export HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION/DIADEMUERTOS -export HOCHOB_SERVER_MEDIA_TRADITION_CHRISTMAS=$HOCHOB_SERVER_MEDIA_TRADITION/Christmas +export HOCHOB_SERVER_MEDIA_TRADITION_NAVIDAD=$HOCHOB_SERVER_MEDIA_TRADITION/Navidad export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/ @@ -112,7 +112,7 @@ export TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION_INTEL export TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION_INTELGUADALAJARA export TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER export TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS -export TRADITION_CHRISTMAS=$HOCHOB_SERVER_MEDIA_TRADITION_CHRISTMAS +export TRADITION_NAVIDAD=$HOCHOB_SERVER_MEDIA_TRADITION_NAVIDAD export VISITORS=$HOCHOB_SERVER_MEDIA_VISITORS From 198734e8f516b3b96e71e4cb40bd5cd182c4a0a3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:03:21 -0500 Subject: [PATCH 1128/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index cd1fb50b..6f47839e 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -92,7 +92,7 @@ export HOCHOB_SERVER_MEDIA_TRADITION=$HOCHOB_SERVER_MEDIA/Tradition/ export HOCHOB_SERVER_MEDIA_TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION/Intel/ export HOCHOB_SERVER_MEDIA_TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION/IntelGuadalajara export HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION/VisitorsCenter -export HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION/DIADEMUERTOS +export HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION/DiaDeMuertos export HOCHOB_SERVER_MEDIA_TRADITION_NAVIDAD=$HOCHOB_SERVER_MEDIA_TRADITION/Navidad export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/ From 241623cc16528cb55859531e98fbe66588d2e46a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:07:24 -0500 Subject: [PATCH 1129/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 6f47839e..0b8974bb 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -109,7 +109,7 @@ export MEMORIES_AMIKOO=$HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO export MEMORIES_VIDEO=$HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO export TRADITION_INTEL=$HOCHOB_SERVER_MEDIA_TRADITION_INTEL -export TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION_INTELGUADALAJARA +export TRADITION_INTEL_GUADALAJARA=$HOCHOB_SERVER_MEDIA_TRADITION_INTEL_GUADALAJARA export TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER export TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS export TRADITION_NAVIDAD=$HOCHOB_SERVER_MEDIA_TRADITION_NAVIDAD From 6b97456b44be7a3ceb7e637dac92c25f6f0e2c62 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:23:13 -0500 Subject: [PATCH 1130/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 7c9b9075..c3228d43 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -278,6 +278,14 @@ homeassistant: friendly_name: Sonidos Chromecast Reproducción icon: mdi:speaker + automation.ik: + friendly_name: 10 minutos .. Sonidos Robot + icon: mdi:calendar-clock + + script.ik: + friendly_name: Sonidos Robot Reproducción + icon: mdi:speaker + # Techie Maya Lands : System Health script.toyota: @@ -597,6 +605,10 @@ script: sequence: - service: shell_command.imix + ik: + sequence: + - service: shell_command.ik + # Techie Maya Lands toyota: @@ -721,6 +733,7 @@ shell_command: # Tradition Maya Lands imix: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Imix.sh & + ik: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Ik.sh & # Techie Maya Lands @@ -822,6 +835,16 @@ automation: action: - service: shell_command.imix + + - alias: Ik + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.ik + # Techie Maya Lands: System Calendar - alias: Apple @@ -1199,6 +1222,8 @@ group: entities: - automation.imix - script.imix + - automation.imk + - script.ik # Techie Maya Lands: System Health From 0a10fd6bf4b4d114f79cbf589b255844abf65b90 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:25:03 -0500 Subject: [PATCH 1131/1653] Create Ik.sh --- Hochob/Applications/TraditionMayaLands/Ik.sh | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Ik.sh diff --git a/Hochob/Applications/TraditionMayaLands/Ik.sh b/Hochob/Applications/TraditionMayaLands/Ik.sh new file mode 100644 index 00000000..c940b299 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Ik.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export IK_PID=$$ +export IK_NAME="Ik" +export IK_PATH=$(readlink -f "$0") +export IK_DIRECTORY=$(dirname "$IK_PATH") + +LOCAL_SEASON="DiaDeMuertos" +LOCAL_DEVICE="Triki" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $IK_PID $IK_NAME + +LOCAL_SOUND=`find $TRADITION_DIADEMUERTOS/Sound/ -type f | shuf -n 1` +Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" + +# End of File From c1c0f612c15ea982c4876b3b3665aa130aaa4564 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:25:22 -0500 Subject: [PATCH 1132/1653] Update Imix.sh --- Hochob/Applications/TraditionMayaLands/Imix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Imix.sh index 78f0ad90..b853a448 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Imix.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export IMIX_PID=$$ -export IMIX_NAME="Zacatecas" +export IMIX_NAME="Imix" export IMIX_PATH=$(readlink -f "$0") export IMIX_DIRECTORY=$(dirname "$IMIX_PATH") From 6deae8a7626020748270d436a4a455065fa12072 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:27:51 -0500 Subject: [PATCH 1133/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index c3228d43..739e97a3 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1222,7 +1222,7 @@ group: entities: - automation.imix - script.imix - - automation.imk + - automation.ik - script.ik # Techie Maya Lands: System Health From 1493aa2c4eb8dce0d6b18ea34ed0d288219e8d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 14:33:06 -0500 Subject: [PATCH 1134/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Applications/TraditionMayaLands/Ik.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Ik.sh diff --git a/Hochob/Applications/TraditionMayaLands/Ik.sh b/Hochob/Applications/TraditionMayaLands/Ik.sh old mode 100644 new mode 100755 From 8d722938cf7d896250c0c62f315eb8360b2e7e7b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:35:26 -0500 Subject: [PATCH 1135/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 739e97a3..5a7f877f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -973,7 +973,8 @@ group: view: yes name: Tradición entities: - - group.traditionmayalandsdiademuertos + - group.traditionmayalandsdiademuertoschromecast + - group.traditionmayalandsdiademuertosrobot # Techie Maya Lands @@ -1217,11 +1218,15 @@ group: # Tradition Maya Lands: Dia De Muertos - traditionmayalandsdiademuertos: - name: Dia De Muertos + traditionmayalandsdiademuertoschromecast: + name: Dia De Muertos :: Chromecast entities: - automation.imix - script.imix + + traditionmayalandsdiademuertosamikoo: + name: Dia De Muertos :: Robot + entities: - automation.ik - script.ik From 1b0cdc1d81e89fb82e29f0e06fffede5c4042e34 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:37:01 -0500 Subject: [PATCH 1136/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 5a7f877f..d2ff9f2d 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -974,7 +974,7 @@ group: name: Tradición entities: - group.traditionmayalandsdiademuertoschromecast - - group.traditionmayalandsdiademuertosrobot + - group.traditionmayalandsdiademuertosamikoo # Techie Maya Lands From 2f2ccdaa6a58a5f1db72620882078260eddb5587 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:37:56 -0500 Subject: [PATCH 1137/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d2ff9f2d..6f1d0fc9 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1219,13 +1219,13 @@ group: # Tradition Maya Lands: Dia De Muertos traditionmayalandsdiademuertoschromecast: - name: Dia De Muertos :: Chromecast + name: Dia De Muertos Chromecast entities: - automation.imix - script.imix traditionmayalandsdiademuertosamikoo: - name: Dia De Muertos :: Robot + name: Dia De Muertos Robot entities: - automation.ik - script.ik From e8707e56d57e59d5371e7a149b06284563603c45 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:44:37 -0500 Subject: [PATCH 1138/1653] Create AmikooTradition.sh --- .../Services/Amikoo/Remote/AmikooTradition.sh | 50 +++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 Hochob/Services/Amikoo/Remote/AmikooTradition.sh diff --git a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh new file mode 100644 index 00000000..97919225 --- /dev/null +++ b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export AMIKOOTRADITION_PID=$$ + +LOCAL_COMMAND="$1" +LOCAL_MESSAGE="" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +i=0 +for var in "$@" +do + if [ "$i" -ne 0 ]; then + LOCAL_MESSAGE=$LOCAL_MESSAGE"$var" + echo $LOCAL_MESSAGE + fi + i=`expr $i + 1` +done + +echo $LOCAL_MESSAGE + +# Skills Advanced + +if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then + Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" +elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then + Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" +fi + +# Skills Basic + +Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE + +# End of File From 5cf285f5ceeffc218df0d3280b4924e3f1616c18 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:45:02 -0500 Subject: [PATCH 1139/1653] Update Amikoo.sh --- Hochob/Services/Amikoo/Remote/Amikoo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Amikoo/Remote/Amikoo.sh b/Hochob/Services/Amikoo/Remote/Amikoo.sh index 8fb92de0..e5985938 100755 --- a/Hochob/Services/Amikoo/Remote/Amikoo.sh +++ b/Hochob/Services/Amikoo/Remote/Amikoo.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export AMIKOOREMOTE_PID=$$ +export AMIKOO_PID=$$ LOCAL_COMMAND="$1" LOCAL_MESSAGE="" From 53ce92e172e64cbffe4d39a89a7619427e80ccf4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:55:45 -0500 Subject: [PATCH 1140/1653] Update AmikooTradition.sh --- .../Services/Amikoo/Remote/AmikooTradition.sh | 40 ++++++++----------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh index 97919225..272f2504 100644 --- a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh @@ -10,8 +10,10 @@ set -x export AMIKOOTRADITION_PID=$$ -LOCAL_COMMAND="$1" -LOCAL_MESSAGE="" +LOCAL_TRADITION="$1" +LOCAL_SKILL="$2" +LOCAL_ARGUMENT="$3" + # ============================================================================= # Functions @@ -23,28 +25,20 @@ LOCAL_MESSAGE="" # Main # ============================================================================= -i=0 -for var in "$@" -do - if [ "$i" -ne 0 ]; then - LOCAL_MESSAGE=$LOCAL_MESSAGE"$var" - echo $LOCAL_MESSAGE - fi - i=`expr $i + 1` -done - -echo $LOCAL_MESSAGE - -# Skills Advanced - -if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then - Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" -elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then - Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" +if [ "$LOCAL_SKILL" = "audio" ]; then + LOCAL_SKILL=$AMIKOO_TRADITION_AUDIO +elif [ "$LOCAL_SKILL" = "image" ]; then + LOCAL_SKILL=$AMIKOO_TRADITION_IMAGE +elif [ "$LOCAL_SKILL" = "video" ]; then + LOCAL_SKILL=$AMIKOO_TRADITION_VIDEO fi -# Skills Basic - -Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE +if [ "$LOCAL_ARGUMENT" = "stop" ]; then + Mosquitto.sh $LOCAL_SKILL "$LOCAL_TRADITION/Stop" +elif [ "$LOCAL_ARGUMENT" = "image" ]; then + Mosquitto.sh $LOCAL_SKILL "$LOCAL_TRADITION/Random" +else + Mosquitto.sh $LOCAL_SKILL "$LOCAL_TRADITION/$LOCAL_ARGUMENT" +fi # End of File From 0c924685ad5e4a45cb390856398a4f3c89718bd8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 14:56:47 -0500 Subject: [PATCH 1141/1653] Update Ik.sh --- Hochob/Applications/TraditionMayaLands/Ik.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Ik.sh b/Hochob/Applications/TraditionMayaLands/Ik.sh index c940b299..32812471 100755 --- a/Hochob/Applications/TraditionMayaLands/Ik.sh +++ b/Hochob/Applications/TraditionMayaLands/Ik.sh @@ -28,7 +28,6 @@ LOCAL_DEVICE="Triki" LogPid.sh $IK_PID $IK_NAME -LOCAL_SOUND=`find $TRADITION_DIADEMUERTOS/Sound/ -type f | shuf -n 1` -Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" +AmikooTradition.sh "$LOCAL_SEASON" "Audio" "Stop" # End of File From e4a98c61d11dc085b696eb2f32914ce7eb2070e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 14:57:46 -0500 Subject: [PATCH 1142/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Services/Amikoo/Remote/AmikooTradition.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Amikoo/Remote/AmikooTradition.sh diff --git a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh old mode 100644 new mode 100755 From 50417a8c44e9b1572906deb6ce6554e488dcbd7f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 15:02:48 -0500 Subject: [PATCH 1143/1653] Update AmikooTradition.sh --- Hochob/Services/Amikoo/Remote/AmikooTradition.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh index 272f2504..19634fcc 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh @@ -26,11 +26,11 @@ LOCAL_ARGUMENT="$3" # ============================================================================= if [ "$LOCAL_SKILL" = "audio" ]; then - LOCAL_SKILL=$AMIKOO_TRADITION_AUDIO + LOCAL_SKILL=$AMIKOO_AUDIO elif [ "$LOCAL_SKILL" = "image" ]; then - LOCAL_SKILL=$AMIKOO_TRADITION_IMAGE + LOCAL_SKILL=$AMIKOO_IMAGE elif [ "$LOCAL_SKILL" = "video" ]; then - LOCAL_SKILL=$AMIKOO_TRADITION_VIDEO + LOCAL_SKILL=$AMIKOO_VIDEO fi if [ "$LOCAL_ARGUMENT" = "stop" ]; then From 49bb4f9c09c7df11d82448522871dee2328ef063 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 15:02:51 -0500 Subject: [PATCH 1144/1653] Update Ik.sh --- Hochob/Applications/TraditionMayaLands/Ik.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Ik.sh b/Hochob/Applications/TraditionMayaLands/Ik.sh index 32812471..21046040 100755 --- a/Hochob/Applications/TraditionMayaLands/Ik.sh +++ b/Hochob/Applications/TraditionMayaLands/Ik.sh @@ -13,7 +13,7 @@ export IK_NAME="Ik" export IK_PATH=$(readlink -f "$0") export IK_DIRECTORY=$(dirname "$IK_PATH") -LOCAL_SEASON="DiaDeMuertos" +LOCAL_TRADITION="DiaDeMuertos" LOCAL_DEVICE="Triki" # ============================================================================= @@ -28,6 +28,6 @@ LOCAL_DEVICE="Triki" LogPid.sh $IK_PID $IK_NAME -AmikooTradition.sh "$LOCAL_SEASON" "Audio" "Stop" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" # End of File From 0272865c0cc63716c3b7f444dc512b12c3b0e600 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 15:03:47 -0500 Subject: [PATCH 1145/1653] Update AmikooTradition.sh --- Hochob/Services/Amikoo/Remote/AmikooTradition.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh index 19634fcc..05c01c07 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooTradition.sh @@ -25,17 +25,17 @@ LOCAL_ARGUMENT="$3" # Main # ============================================================================= -if [ "$LOCAL_SKILL" = "audio" ]; then +if [ "$LOCAL_SKILL" = "Audio" ]; then LOCAL_SKILL=$AMIKOO_AUDIO -elif [ "$LOCAL_SKILL" = "image" ]; then +elif [ "$LOCAL_SKILL" = "Image" ]; then LOCAL_SKILL=$AMIKOO_IMAGE -elif [ "$LOCAL_SKILL" = "video" ]; then +elif [ "$LOCAL_SKILL" = "Video" ]; then LOCAL_SKILL=$AMIKOO_VIDEO fi -if [ "$LOCAL_ARGUMENT" = "stop" ]; then +if [ "$LOCAL_ARGUMENT" = "Stop" ]; then Mosquitto.sh $LOCAL_SKILL "$LOCAL_TRADITION/Stop" -elif [ "$LOCAL_ARGUMENT" = "image" ]; then +elif [ "$LOCAL_ARGUMENT" = "Random" ]; then Mosquitto.sh $LOCAL_SKILL "$LOCAL_TRADITION/Random" else Mosquitto.sh $LOCAL_SKILL "$LOCAL_TRADITION/$LOCAL_ARGUMENT" From 77ba683d45f3929faa9635c4c96f527acf6620a8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 16:30:45 -0500 Subject: [PATCH 1146/1653] Update Ik.sh --- Hochob/Applications/TraditionMayaLands/Ik.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/TraditionMayaLands/Ik.sh b/Hochob/Applications/TraditionMayaLands/Ik.sh index 21046040..873700d9 100755 --- a/Hochob/Applications/TraditionMayaLands/Ik.sh +++ b/Hochob/Applications/TraditionMayaLands/Ik.sh @@ -28,6 +28,8 @@ LOCAL_DEVICE="Triki" LogPid.sh $IK_PID $IK_NAME +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Random" +sleep 5 AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" # End of File From dc5d4d61234ab453655944a31d87e788a325ad73 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 16:56:00 -0500 Subject: [PATCH 1147/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index 67c78cf7..a6ff4672 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -27,7 +27,7 @@ LogPid.sh $AGUASCALIENTES_PID $AGUASCALIENTES_NAME Memories.sh "5" "off" "${AGUASCALIENTES_NAME}" & -Eog.sh $CORPORATE_IMAGE & +Eog.sh "$TRADITION_INTEL/Image/*" & Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" & sleep 75 From 21802c752dc259569d9b3328d2c6b2a42d6a22fc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 17:00:23 -0500 Subject: [PATCH 1148/1653] Update Ik.sh --- Hochob/Applications/TraditionMayaLands/Ik.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/TraditionMayaLands/Ik.sh b/Hochob/Applications/TraditionMayaLands/Ik.sh index 873700d9..5db0582f 100755 --- a/Hochob/Applications/TraditionMayaLands/Ik.sh +++ b/Hochob/Applications/TraditionMayaLands/Ik.sh @@ -28,6 +28,8 @@ LOCAL_DEVICE="Triki" LogPid.sh $IK_PID $IK_NAME +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "demoniclaughter.mp3" +sleep 30 AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Random" sleep 5 AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" From 23b0e0e6444a40b79b78516b48654a179f619d5c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 17:00:47 -0500 Subject: [PATCH 1149/1653] Update Ik.sh --- Hochob/Applications/TraditionMayaLands/Ik.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Ik.sh b/Hochob/Applications/TraditionMayaLands/Ik.sh index 5db0582f..b4ef8ce3 100755 --- a/Hochob/Applications/TraditionMayaLands/Ik.sh +++ b/Hochob/Applications/TraditionMayaLands/Ik.sh @@ -14,7 +14,6 @@ export IK_PATH=$(readlink -f "$0") export IK_DIRECTORY=$(dirname "$IK_PATH") LOCAL_TRADITION="DiaDeMuertos" -LOCAL_DEVICE="Triki" # ============================================================================= # Functions From 7a367577a656bd6d3b172788d502a208e76c5ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Fri, 27 Oct 2017 17:06:42 -0500 Subject: [PATCH 1150/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- .../Applications/TraditionMayaLands/Akbal.sh | 44 +++++++++++++++++++ Hochob/Applications/TraditionMayaLands/Kan.sh | 35 +++++++++++++++ 2 files changed, 79 insertions(+) create mode 100755 Hochob/Applications/TraditionMayaLands/Akbal.sh create mode 100755 Hochob/Applications/TraditionMayaLands/Kan.sh diff --git a/Hochob/Applications/TraditionMayaLands/Akbal.sh b/Hochob/Applications/TraditionMayaLands/Akbal.sh new file mode 100755 index 00000000..b853a448 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Akbal.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export IMIX_PID=$$ +export IMIX_NAME="Imix" +export IMIX_PATH=$(readlink -f "$0") +export IMIX_DIRECTORY=$(dirname "$IMIX_PATH") + +LOCAL_SEASON="DiaDeMuertos" +LOCAL_DEVICE="Triki" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $IMIX_PID $IMIX_NAME + +LOCAL_SOUND=`find $TRADITION_DIADEMUERTOS/Sound/ -type f | shuf -n 1` +Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" + +exit 0 + +if [ "$LANGUAGE" = "english" ]; then + Amikoo.sh $AMIKOO_SAY "Happy Halloween" +else + Amikoo.sh $AMIKOO_DECIR "Feliz dia de muertos" +fi + +# See implement WindRiver.sh logic, maybe Season service? + +# End of File diff --git a/Hochob/Applications/TraditionMayaLands/Kan.sh b/Hochob/Applications/TraditionMayaLands/Kan.sh new file mode 100755 index 00000000..873700d9 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Kan.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export IK_PID=$$ +export IK_NAME="Ik" +export IK_PATH=$(readlink -f "$0") +export IK_DIRECTORY=$(dirname "$IK_PATH") + +LOCAL_TRADITION="DiaDeMuertos" +LOCAL_DEVICE="Triki" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $IK_PID $IK_NAME + +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Random" +sleep 5 +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" + +# End of File From b777649d32f3cf4d5d4108b933b3082f10552400 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 17:08:04 -0500 Subject: [PATCH 1151/1653] Update Akbal.sh --- .../Applications/TraditionMayaLands/Akbal.sh | 24 ++++++------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Akbal.sh b/Hochob/Applications/TraditionMayaLands/Akbal.sh index b853a448..bd069545 100755 --- a/Hochob/Applications/TraditionMayaLands/Akbal.sh +++ b/Hochob/Applications/TraditionMayaLands/Akbal.sh @@ -8,12 +8,12 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export IMIX_PID=$$ -export IMIX_NAME="Imix" -export IMIX_PATH=$(readlink -f "$0") -export IMIX_DIRECTORY=$(dirname "$IMIX_PATH") +export AKBAL_PID=$$ +export AKBAL_NAME="Imix" +export AKBAL_PATH=$(readlink -f "$0") +export AKBAL_DIRECTORY=$(dirname "$AKBAL_PATH") -LOCAL_SEASON="DiaDeMuertos" +LOCAL_SEASON="Intel" LOCAL_DEVICE="Triki" # ============================================================================= @@ -26,19 +26,9 @@ LOCAL_DEVICE="Triki" # Main # ============================================================================= -LogPid.sh $IMIX_PID $IMIX_NAME +LogPid.sh $AKBAL_PID $AKBAL_NAME -LOCAL_SOUND=`find $TRADITION_DIADEMUERTOS/Sound/ -type f | shuf -n 1` +LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" -exit 0 - -if [ "$LANGUAGE" = "english" ]; then - Amikoo.sh $AMIKOO_SAY "Happy Halloween" -else - Amikoo.sh $AMIKOO_DECIR "Feliz dia de muertos" -fi - -# See implement WindRiver.sh logic, maybe Season service? - # End of File From fe4fdedfacc19711e720d0bbfad76366895d2535 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 17:10:46 -0500 Subject: [PATCH 1152/1653] Update Kan.sh --- Hochob/Applications/TraditionMayaLands/Kan.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Kan.sh b/Hochob/Applications/TraditionMayaLands/Kan.sh index 873700d9..dc96f354 100755 --- a/Hochob/Applications/TraditionMayaLands/Kan.sh +++ b/Hochob/Applications/TraditionMayaLands/Kan.sh @@ -8,13 +8,12 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export IK_PID=$$ -export IK_NAME="Ik" -export IK_PATH=$(readlink -f "$0") -export IK_DIRECTORY=$(dirname "$IK_PATH") +export KAN_PID=$$ +export KAN_NAME="Ik" +export KAN_PATH=$(readlink -f "$0") +export KAN_DIRECTORY=$(dirname "$KAN_PATH") -LOCAL_TRADITION="DiaDeMuertos" -LOCAL_DEVICE="Triki" +LOCAL_TRADITION="Intel" # ============================================================================= # Functions @@ -26,8 +25,10 @@ LOCAL_DEVICE="Triki" # Main # ============================================================================= -LogPid.sh $IK_PID $IK_NAME +LogPid.sh $KAN_PID $KAN_NAME +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" +sleep 5 AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Random" sleep 5 AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" From 50e5ef59e4ea9b6987618094e74b646d05bdd7a9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 17:14:43 -0500 Subject: [PATCH 1153/1653] Update Kan.sh --- Hochob/Applications/TraditionMayaLands/Kan.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Kan.sh b/Hochob/Applications/TraditionMayaLands/Kan.sh index dc96f354..978ec6e2 100755 --- a/Hochob/Applications/TraditionMayaLands/Kan.sh +++ b/Hochob/Applications/TraditionMayaLands/Kan.sh @@ -29,8 +29,7 @@ LogPid.sh $KAN_PID $KAN_NAME AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" sleep 5 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Random" -sleep 5 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBongPeople.mp3" + # End of File From 9a3c6963a2ce855ebf773b51a374e06275be6a86 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 19:41:09 -0500 Subject: [PATCH 1154/1653] Update Amikoo.sh --- Hochob/Setup/Amikoo.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Setup/Amikoo.sh b/Hochob/Setup/Amikoo.sh index 8c3afb94..6dbdba23 100644 --- a/Hochob/Setup/Amikoo.sh +++ b/Hochob/Setup/Amikoo.sh @@ -3,8 +3,8 @@ sudo apt-get install espeak sudo apt-get install nodejs-legacy sudo apt-get install npm -sudo npm install mqtt --save -sudo npm install espeak --save -sudo npm install sleep --save +npm install -g mqtt --save +npm install -g espeak --save +npm install -g sleep --save # End of File From 7fef2b11b599f905a6c33d6fdb3cb920e76d8952 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 19:44:48 -0500 Subject: [PATCH 1155/1653] Update Amikoo.sh --- Hochob/Setup/Amikoo.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Setup/Amikoo.sh b/Hochob/Setup/Amikoo.sh index 6dbdba23..7b79f15c 100644 --- a/Hochob/Setup/Amikoo.sh +++ b/Hochob/Setup/Amikoo.sh @@ -3,6 +3,12 @@ sudo apt-get install espeak sudo apt-get install nodejs-legacy sudo apt-get install npm + +mkdir ~/.npm-global +npm config set prefix '~/.npm-global' +echo "export PATH=~/.npm-global/bin:$PATH" >> ~/.profile +source ~/.profile + npm install -g mqtt --save npm install -g espeak --save npm install -g sleep --save From 8873fc2edb5fd2587c0ae0cbae94ff34f48cd19a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 19:45:39 -0500 Subject: [PATCH 1156/1653] Update Amikoo.sh --- Hochob/Setup/Amikoo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Setup/Amikoo.sh b/Hochob/Setup/Amikoo.sh index 7b79f15c..710916bb 100644 --- a/Hochob/Setup/Amikoo.sh +++ b/Hochob/Setup/Amikoo.sh @@ -6,8 +6,8 @@ sudo apt-get install npm mkdir ~/.npm-global npm config set prefix '~/.npm-global' -echo "export PATH=~/.npm-global/bin:$PATH" >> ~/.profile -source ~/.profile +echo "export PATH=~/.npm-global/bin:$PATH" >> ~/.bashrc +source ~/.bashrc npm install -g mqtt --save npm install -g espeak --save From 6af110f90650b86768630797f4a2bb79bdb9a4fd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 19:52:30 -0500 Subject: [PATCH 1157/1653] Update HochobServerMedia.sh --- Hochob/Setup/HochobServerMedia.sh | 36 +++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/Hochob/Setup/HochobServerMedia.sh b/Hochob/Setup/HochobServerMedia.sh index 520d3127..8b84f680 100755 --- a/Hochob/Setup/HochobServerMedia.sh +++ b/Hochob/Setup/HochobServerMedia.sh @@ -2,4 +2,40 @@ test -d /tmp/HochobMediaSource/ && echo "Directory exists" || mkdir /tmp/HochobMediaSource/ +# Hochob Server Media + +export HOCHOB_SERVER_MEDIA=$HOME/HochobServerMedia/ + +export HOCHOB_SERVER_MEDIA_AREA=$HOCHOB_SERVER_MEDIA/Area/ +export HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_AREA/SouthernMayaHighlands +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_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_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/ + +test -d $HOCHOB_SERVER_MEDIA && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA + +test -d $HOCHOB_SERVER_MEDIA_AREA && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_AREA +test -d $HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS +test -d $HOCHOB_SERVER_MEDIA_AREA_CENTRAL_MAYA_LOWLANDS && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_AREA_CENTRAL_MAYA_LOWLANDS +test -d $HOCHOB_SERVER_MEDIA_AREA_NORTHERN_MAYA_LOWLANDS && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_AREA_NORTHERN_MAYA_LOWLANDS + +test -d $HOCHOB_SERVER_MEDIA_MEMORIES && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_MEMORIES +test -d $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_MEMORIES_CAMERA +test -d $HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_MEMORIES_DRAWING +test -d $HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO +test -d $HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_MEMORIES_VIDEO + +test -d $HOCHOB_SERVER_MEDIA_TRADITION && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_TRADITION + +test -d $HOCHOB_SERVER_MEDIA_VISITORS && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_VISITORS + # End of File From 59a335e76bae634f878354bdf495468299ced1b6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 19:53:46 -0500 Subject: [PATCH 1158/1653] Update HochobServerMedia.sh --- Hochob/Setup/HochobServerMedia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup/HochobServerMedia.sh b/Hochob/Setup/HochobServerMedia.sh index 8b84f680..3ea786a0 100755 --- a/Hochob/Setup/HochobServerMedia.sh +++ b/Hochob/Setup/HochobServerMedia.sh @@ -12,9 +12,9 @@ export HOCHOB_SERVER_MEDIA_AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA/ export HOCHOB_SERVER_MEDIA_AREA_NORTHERN_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA/NorthernMayaLowlands export HOCHOB_SERVER_MEDIA_MEMORIES=$HOCHOB_SERVER_MEDIA/Memories/ +export HOCHOB_SERVER_MEDIA_MEMORIES_AMIKOO=$HOCHOB_SERVER_MEDIA_MEMORIES/Amikoo/ 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_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/ From e3539e7fba098af4c9f593814dbf66552dd24732 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:00:32 -0500 Subject: [PATCH 1159/1653] Create HochobServerConfiguration.sh --- Hochob/Setup/HochobServerConfiguration.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Hochob/Setup/HochobServerConfiguration.sh diff --git a/Hochob/Setup/HochobServerConfiguration.sh b/Hochob/Setup/HochobServerConfiguration.sh new file mode 100644 index 00000000..a8c51551 --- /dev/null +++ b/Hochob/Setup/HochobServerConfiguration.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +# Hochob Server Configuration + +export HOCHOB_SERVER_CONFIGURATION=/tmp/hochob/ +export HOCHOB_SERVER_CONFIGURATION_PID=$HOCHOB_SERVER_CONFIGURATION/pid/ + +test -d $HOCHOB_SERVER_CONFIGURATION || mkdir -p $HOCHOB_SERVER_CONFIGURATION +test -d $HOCHOB_SERVER_CONFIGURATION_PID || mkdir -p $HOCHOB_SERVER_CONFIGURATION_PID + +export HOCHOB_SERVER_CONFIGURATION_DEMO=$HOCHOB_SERVER_CONFIGURATION/demo +export HOCHOB_SERVER_CONFIGURATION_LANGUAGE=$HOCHOB_SERVER_CONFIGURATION/language + +echo 0 > $HOCHOB_SERVER_CONFIGURATION_DEMO +echo spanish > $HOCHOB_SERVER_CONFIGURATION_LANGUAGE + +# End of File From 30ab3c02306f90812da347e9600a2caaced23bc4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:00:59 -0500 Subject: [PATCH 1160/1653] Update Signed-off-by: Abraham Arce --- Hochob/Setup/HochobServerConfiguration.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Setup/HochobServerConfiguration.sh diff --git a/Hochob/Setup/HochobServerConfiguration.sh b/Hochob/Setup/HochobServerConfiguration.sh old mode 100644 new mode 100755 From 87d2822d87db686b1e0726d859abcaa81ec1ca12 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:07:17 -0500 Subject: [PATCH 1161/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 6f05af6d..91f7acb4 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -9,6 +9,8 @@ sudo apt install python3-setuptools sudo apt install python3-pip sudo pip3 install --upgrade pip sudo pip3 install homeassistant +sudo pip3 install flask_sqlalchemy +sudo pip3 install sqlalchemy # Hochob Server Services Calendar sudo pip install httplib2 From 26066726a9bc48dcdd9c4990f8e2eff4555b92ff Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:09:55 -0500 Subject: [PATCH 1162/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 91f7acb4..501771a3 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -11,6 +11,7 @@ sudo pip3 install --upgrade pip sudo pip3 install homeassistant sudo pip3 install flask_sqlalchemy sudo pip3 install sqlalchemy +sudo pip3 install xmltodict # Hochob Server Services Calendar sudo pip install httplib2 From 2eb1e498a191947708b48749a207ac5adbbbe00e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:20:33 -0500 Subject: [PATCH 1163/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 0b8974bb..a8aa67d7 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -192,9 +192,9 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # MQ Telemetry Transport +#MQTT_SERVER_ADDRESS=127.0.0.1 #MQTT_SERVER_ADDRESS=10.215.56.158 -#MQTT_SERVER_ADDRESS=iot.eclipse.org -MQTT_SERVER_ADDRESS=127.0.0.1 +MQTT_SERVER_ADDRESS=iot.eclipse.org MQTT_SERVER_PORT=1883 # Amikoo From 16979743221bdb222ec4df1ee414347fdb29f219 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:21:46 -0500 Subject: [PATCH 1164/1653] Update AmikooVirtual.js --- Hochob/Services/Amikoo/Virtual/AmikooVirtual.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js index 0238bec5..20cc441d 100755 --- a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js @@ -1,5 +1,7 @@ const mqtt = require('mqtt') -const client = mqtt.connect('mqtt://127.0.0.1') +//const client = mqtt.connect('mqtt://127.0.0.1') +const client = mqtt.connect('mqtt://10.215.56.158') +//const client = mqtt.connect('mqtt://iot.eclipse.org') var sys = require('sys') var exec = require('child_process').exec; From c07d483439362cb53c1670ad3b17bca6f10f8f10 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:23:18 -0500 Subject: [PATCH 1165/1653] Update AmikooVirtual.js --- Hochob/Services/Amikoo/Virtual/AmikooVirtual.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js index 20cc441d..d2983682 100755 --- a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js @@ -1,7 +1,7 @@ const mqtt = require('mqtt') //const client = mqtt.connect('mqtt://127.0.0.1') -const client = mqtt.connect('mqtt://10.215.56.158') -//const client = mqtt.connect('mqtt://iot.eclipse.org') +//const client = mqtt.connect('mqtt://10.215.56.158') +const client = mqtt.connect('mqtt://iot.eclipse.org') var sys = require('sys') var exec = require('child_process').exec; From 1a966e4f7ca5efbc589482d5159a3ac9632665f4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:25:15 -0500 Subject: [PATCH 1166/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 6f1d0fc9..414edda2 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -257,7 +257,7 @@ homeassistant: # Calendar Maya Lands automation.pop: - friendly_name: 30 segundos .. Bienvenida Amikoo + friendly_name: 30 segundos .. Bienvenida Robot icon: mdi:calendar-clock automation.sip: @@ -265,7 +265,7 @@ homeassistant: icon: mdi:calendar-clock automation.wo: - friendly_name: 30 segundos .. Bienvenida Amikoo + friendly_name: 30 segundos .. Bienvenida Robot icon: mdi:calendar-clock # Tradition Maya Lands From 451827cdfcaa7e84c538c839624b380854617f5f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:33:47 -0500 Subject: [PATCH 1167/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 78 +++++++++++++++++-- 1 file changed, 73 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 414edda2..9d94ba3d 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -268,7 +268,7 @@ homeassistant: friendly_name: 30 segundos .. Bienvenida Robot icon: mdi:calendar-clock - # Tradition Maya Lands + # Tradition Maya Lands :: Dia De Muertos automation.imix: friendly_name: 10 minutos .. Sonidos Chromecast @@ -286,6 +286,24 @@ homeassistant: friendly_name: Sonidos Robot Reproducción icon: mdi:speaker + # Tradition Maya Lands :: Intel + + automation.akbal: + friendly_name: 10 minutos .. Sonidos Chromecast + icon: mdi:calendar-clock + + script.akbal: + friendly_name: Sonidos Chromecast Reproducción + icon: mdi:speaker + + automation.kan: + friendly_name: 10 minutos .. Sonidos Robot + icon: mdi:calendar-clock + + script.kan: + friendly_name: Sonidos Robot Reproducción + icon: mdi:speaker + # Techie Maya Lands : System Health script.toyota: @@ -599,7 +617,7 @@ script: sequence: - service: shell_command.tiburonballena - # Tradition Maya Lands + # Tradition Maya Lands :: Dia De Muertos imix: sequence: @@ -609,6 +627,16 @@ script: sequence: - service: shell_command.ik + # Tradition Maya Lands :: Intel + + akbal: + sequence: + - service: shell_command.akbal + + kan: + sequence: + - service: shell_command.kan + # Techie Maya Lands toyota: @@ -730,11 +758,16 @@ shell_command: wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & sip: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sip.sh & - # Tradition Maya Lands + # Tradition Maya Lands :: Dia De Muertos imix: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Imix.sh & ik: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Ik.sh & + # Tradition Maya Lands :: Intel + + akbal: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Akbal.sh & + kan: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Kan.sh & + # Techie Maya Lands toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & @@ -824,7 +857,7 @@ automation: action: - service: shell_command.sip - # Tradition Maya Lands + # Tradition Maya Lands :: Dia De Muertos - alias: Imix initial_state: 'off' @@ -845,6 +878,27 @@ automation: action: - service: shell_command.ik + # Tradition Maya Lands :: Intel + + - alias: Akbal + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.akbal + + + - alias: Kan + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.kan + # Techie Maya Lands: System Calendar - alias: Apple @@ -1216,7 +1270,7 @@ group: entities: - automation.wo - # Tradition Maya Lands: Dia De Muertos + # Tradition Maya Lands :: Dia De Muertos traditionmayalandsdiademuertoschromecast: name: Dia De Muertos Chromecast @@ -1230,6 +1284,20 @@ group: - automation.ik - script.ik + # Tradition Maya Lands :: Intel + + traditionmayalandsintelchromecast: + name: Intel Chromecast + entities: + - automation.akbal + - script.akbal + + traditionmayalandsintelamikoo: + name: Intel Robot + entities: + - automation.kan + - script.kan + # Techie Maya Lands: System Health techiemayalandssystemhealth: From 65b7a736f3444a0165b23392279324ae2ffd1008 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:34:24 -0500 Subject: [PATCH 1168/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 9d94ba3d..eb9c4100 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1029,6 +1029,8 @@ group: entities: - group.traditionmayalandsdiademuertoschromecast - group.traditionmayalandsdiademuertosamikoo + - group.traditionmayalandsintelchromecast + - group.traditionmayalandsintelamikoo # Techie Maya Lands From 978e2004b7190e1690c8e0f9315d51ae685b5648 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 20:38:08 -0500 Subject: [PATCH 1169/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index eb9c4100..e02ce185 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1275,13 +1275,13 @@ group: # Tradition Maya Lands :: Dia De Muertos traditionmayalandsdiademuertoschromecast: - name: Dia De Muertos Chromecast + name: Dia De Muertos <> Chromecast entities: - automation.imix - script.imix traditionmayalandsdiademuertosamikoo: - name: Dia De Muertos Robot + name: Dia De Muertos <> Robot entities: - automation.ik - script.ik @@ -1289,13 +1289,13 @@ group: # Tradition Maya Lands :: Intel traditionmayalandsintelchromecast: - name: Intel Chromecast + name: Intel <> Chromecast entities: - automation.akbal - script.akbal traditionmayalandsintelamikoo: - name: Intel Robot + name: Intel <> Robot entities: - automation.kan - script.kan From 9242c275e09c200c75860ce0b25d87a8de87fcda Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:09:49 -0500 Subject: [PATCH 1170/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index e02ce185..940b6c68 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -838,6 +838,10 @@ automation: trigger: platform: time seconds: '/30' + condition: + condition: time + after: '15:00:00' + before: '23:00:00' action: - service: shell_command.pop @@ -846,6 +850,9 @@ automation: trigger: platform: time seconds: '/30' + condition: time + after: '15:00:00' + before: '23:00:00' action: - service: shell_command.wo @@ -854,6 +861,9 @@ automation: trigger: platform: time seconds: '/30' + condition: time + after: '15:00:00' + before: '23:00:00' action: - service: shell_command.sip From fc245d88f878502512d1008c8736b4a6eb744fd5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:16:03 -0500 Subject: [PATCH 1171/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 940b6c68..a24b35a9 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -840,8 +840,8 @@ automation: seconds: '/30' condition: condition: time - after: '15:00:00' - before: '23:00:00' + after: '07:00:00' + before: '21:00:00' action: - service: shell_command.pop @@ -850,9 +850,10 @@ automation: trigger: platform: time seconds: '/30' - condition: time - after: '15:00:00' - before: '23:00:00' + condition: + condition: time + after: '07:00:00' + before: '21:00:00' action: - service: shell_command.wo @@ -861,9 +862,6 @@ automation: trigger: platform: time seconds: '/30' - condition: time - after: '15:00:00' - before: '23:00:00' action: - service: shell_command.sip @@ -875,10 +873,13 @@ automation: platform: time minutes: '/10' seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' action: - service: shell_command.imix - - alias: Ik initial_state: 'off' trigger: @@ -896,10 +897,13 @@ automation: platform: time minutes: '/10' seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' action: - service: shell_command.akbal - - alias: Kan initial_state: 'off' trigger: From f2b44f5f368401f3e1450ac3192b317063342a19 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:18:07 -0500 Subject: [PATCH 1172/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index a24b35a9..31d64b29 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -840,8 +840,8 @@ automation: seconds: '/30' condition: condition: time - after: '07:00:00' - before: '21:00:00' + after: '07:00:00' + before: '21:00:00' action: - service: shell_command.pop @@ -852,8 +852,8 @@ automation: seconds: '/30' condition: condition: time - after: '07:00:00' - before: '21:00:00' + after: '07:00:00' + before: '21:00:00' action: - service: shell_command.wo @@ -875,8 +875,8 @@ automation: seconds: 00 condition: condition: time - after: '07:00:00' - before: '21:00:00' + after: '07:00:00' + before: '21:00:00' action: - service: shell_command.imix @@ -899,8 +899,8 @@ automation: seconds: 00 condition: condition: time - after: '07:00:00' - before: '21:00:00' + after: '07:00:00' + before: '21:00:00' action: - service: shell_command.akbal From e2fc87c63e28a9caa20f9a9dda5809d97725c1a4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:26:12 -0500 Subject: [PATCH 1173/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 31d64b29..0a2e702b 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -755,8 +755,8 @@ shell_command: # Calendar Maya Lands pop: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Pop.sh & - wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & sip: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sip.sh & + wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & # Tradition Maya Lands :: Dia De Muertos @@ -845,7 +845,7 @@ automation: action: - service: shell_command.pop - - alias: wo + - alias: sip initial_state: 'off' trigger: platform: time @@ -855,15 +855,15 @@ automation: after: '07:00:00' before: '21:00:00' action: - - service: shell_command.wo + - service: shell_command.sip - - alias: sip + - alias: wo initial_state: 'off' trigger: platform: time seconds: '/30' action: - - service: shell_command.sip + - service: shell_command.wo # Tradition Maya Lands :: Dia De Muertos From 2d9ad4cd17b706ebbf6ca7f6c0ba01c31d21b0dc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:40:39 -0500 Subject: [PATCH 1174/1653] Create Chikchan.sh --- .../TraditionMayaLands/Chikchan.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Chikchan.sh diff --git a/Hochob/Applications/TraditionMayaLands/Chikchan.sh b/Hochob/Applications/TraditionMayaLands/Chikchan.sh new file mode 100644 index 00000000..4c1b5ccf --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Chikchan.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CHIKCHAN_PID=$$ +export CHIKCHAN_NAME="Chikchan" +export CHIKCHAN_PATH=$(readlink -f "$0") +export CHIKCHAN_DIRECTORY=$(dirname "$CHIKCHAN_PATH") + +LOCAL_TRADITION="DiaDeMuertos" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $CHIKCHAN_PID $CHIKCHAN_NAME + +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" +sleep 10 +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" + +# End of File From 356674aedb7a8f2e2a7a4c14e2ed655d78ec4392 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:46:29 -0500 Subject: [PATCH 1175/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0a2e702b..5535277e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -286,6 +286,14 @@ homeassistant: friendly_name: Sonidos Robot Reproducción icon: mdi:speaker + automation.chikchan: + friendly_name: 10 minutos .. Imágenes Robot + icon: mdi:calendar-clock + + script.chikchan: + friendly_name: Imágenes Robot Mostrar + icon: mdi:file-image + # Tradition Maya Lands :: Intel automation.akbal: @@ -627,6 +635,10 @@ script: sequence: - service: shell_command.ik + chikchan: + sequence: + - service: shell_command.chikchan + # Tradition Maya Lands :: Intel akbal: @@ -762,6 +774,7 @@ shell_command: imix: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Imix.sh & ik: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Ik.sh & + chikchan: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Chikchan.sh & # Tradition Maya Lands :: Intel @@ -889,6 +902,15 @@ automation: action: - service: shell_command.ik + - alias: Chickchan + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.chikchan + # Tradition Maya Lands :: Intel - alias: Akbal @@ -1298,7 +1320,9 @@ group: name: Dia De Muertos <> Robot entities: - automation.ik + - automation.chikchan - script.ik + - script.chikchan # Tradition Maya Lands :: Intel From 71e79d4a76c5836a87e6ba632d5fea410d95367a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:48:46 -0500 Subject: [PATCH 1176/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 5535277e..79456f5e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -902,7 +902,7 @@ automation: action: - service: shell_command.ik - - alias: Chickchan + - alias: Chikchan initial_state: 'off' trigger: platform: time From a539d955183e2615018bdcb2c667dcf07d52c61d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:51:49 -0500 Subject: [PATCH 1177/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 79456f5e..85281b16 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -271,45 +271,45 @@ homeassistant: # Tradition Maya Lands :: Dia De Muertos automation.imix: - friendly_name: 10 minutos .. Sonidos Chromecast + friendly_name: 10 minutos .. Sonidos icon: mdi:calendar-clock script.imix: - friendly_name: Sonidos Chromecast Reproducción + friendly_name: Sonidos icon: mdi:speaker automation.ik: - friendly_name: 10 minutos .. Sonidos Robot + friendly_name: 10 minutos .. Sonidos icon: mdi:calendar-clock script.ik: - friendly_name: Sonidos Robot Reproducción + friendly_name: Sonidos icon: mdi:speaker automation.chikchan: - friendly_name: 10 minutos .. Imágenes Robot + friendly_name: 10 minutos .. Imágenes icon: mdi:calendar-clock script.chikchan: - friendly_name: Imágenes Robot Mostrar + friendly_name: Imágenes icon: mdi:file-image # Tradition Maya Lands :: Intel automation.akbal: - friendly_name: 10 minutos .. Sonidos Chromecast + friendly_name: 10 minutos .. Sonidos icon: mdi:calendar-clock script.akbal: - friendly_name: Sonidos Chromecast Reproducción + friendly_name: Sonidos icon: mdi:speaker automation.kan: - friendly_name: 10 minutos .. Sonidos Robot + friendly_name: 10 minutos .. Sonidos icon: mdi:calendar-clock script.kan: - friendly_name: Sonidos Robot Reproducción + friendly_name: Sonidos icon: mdi:speaker # Techie Maya Lands : System Health From 5164d7e7bfc8cd33d3e96fdf221c31f44d76043f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:57:44 -0500 Subject: [PATCH 1178/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 85281b16..8188c4e5 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -312,6 +312,14 @@ homeassistant: friendly_name: Sonidos icon: mdi:speaker + automation.kimi: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.kimi: + friendly_name: Sonidos + icon: mdi:file-image + # Techie Maya Lands : System Health script.toyota: @@ -649,6 +657,10 @@ script: sequence: - service: shell_command.kan + kimi: + sequence: + - service: shell_command.kimi + # Techie Maya Lands toyota: @@ -780,7 +792,8 @@ shell_command: akbal: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Akbal.sh & kan: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Kan.sh & - + kimi: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Kimi.sh & + # Techie Maya Lands toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & @@ -935,6 +948,15 @@ automation: action: - service: shell_command.kan + - alias: Kimi + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.kimi + # Techie Maya Lands: System Calendar - alias: Apple @@ -1336,7 +1358,9 @@ group: name: Intel <> Robot entities: - automation.kan + - automation.kimi - script.kan + - script.kimi # Techie Maya Lands: System Health From 97d0dded950472a2a66e00c354c9b4f5d95b4b8d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 22:58:44 -0500 Subject: [PATCH 1179/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 8188c4e5..4ad9aa02 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -313,11 +313,11 @@ homeassistant: icon: mdi:speaker automation.kimi: - friendly_name: 10 minutos .. Sonidos + friendly_name: 10 minutos .. Imágenes icon: mdi:calendar-clock script.kimi: - friendly_name: Sonidos + friendly_name: Imágenes icon: mdi:file-image # Techie Maya Lands : System Health From f45ee0ddf7abd9bdf1b797f3e0ea2fd01935a91d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 23:03:45 -0500 Subject: [PATCH 1180/1653] Create Kimi.sh --- .../Applications/TraditionMayaLands/Kimi.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Kimi.sh diff --git a/Hochob/Applications/TraditionMayaLands/Kimi.sh b/Hochob/Applications/TraditionMayaLands/Kimi.sh new file mode 100644 index 00000000..d659455f --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Kimi.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export KIMI_PID=$$ +export KIMI_NAME="Kimi" +export KIMI_PATH=$(readlink -f "$0") +export KIMI_DIRECTORY=$(dirname "$KIMI_PATH") + +LOCAL_TRADITION="Intel" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $CKIMI_PID $KIMI_NAME + +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" +sleep 10 +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" + +# End of File From e4a0e5e86adc0ccf6c1eb87f0a373d7cf86bc802 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 27 Oct 2017 23:05:06 -0500 Subject: [PATCH 1181/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/TraditionMayaLands/Kimi.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Kimi.sh diff --git a/Hochob/Applications/TraditionMayaLands/Kimi.sh b/Hochob/Applications/TraditionMayaLands/Kimi.sh old mode 100644 new mode 100755 From 38fbb4d353b81ed4fc01ee40f70a3af6640579bd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:36:21 -0500 Subject: [PATCH 1182/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 4ad9aa02..63f4d5e0 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -296,27 +296,27 @@ homeassistant: # Tradition Maya Lands :: Intel - automation.akbal: + automation.4004: friendly_name: 10 minutos .. Sonidos icon: mdi:calendar-clock - script.akbal: + script.4004: friendly_name: Sonidos icon: mdi:speaker - automation.kan: + automation.8008: friendly_name: 10 minutos .. Sonidos icon: mdi:calendar-clock - script.kan: + script.8008: friendly_name: Sonidos icon: mdi:speaker - automation.kimi: + automation.8080: friendly_name: 10 minutos .. Imágenes icon: mdi:calendar-clock - script.kimi: + script.8080: friendly_name: Imágenes icon: mdi:file-image @@ -649,17 +649,17 @@ script: # Tradition Maya Lands :: Intel - akbal: + 4004: sequence: - - service: shell_command.akbal + - service: shell_command.4004 - kan: + 8008: sequence: - - service: shell_command.kan + - service: shell_command.8008 - kimi: + 8080: sequence: - - service: shell_command.kimi + - service: shell_command.8080 # Techie Maya Lands @@ -790,9 +790,9 @@ shell_command: # Tradition Maya Lands :: Intel - akbal: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Akbal.sh & - kan: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Kan.sh & - kimi: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Kimi.sh & + 4004: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/4004.sh & + 8008: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8008.sh & + 8080: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8080.sh & # Techie Maya Lands @@ -926,7 +926,7 @@ automation: # Tradition Maya Lands :: Intel - - alias: Akbal + - alias: 4004 initial_state: 'off' trigger: platform: time @@ -937,25 +937,25 @@ automation: after: '07:00:00' before: '21:00:00' action: - - service: shell_command.akbal + - service: shell_command.4004 - - alias: Kan + - alias: 8008 initial_state: 'off' trigger: platform: time minutes: '/10' seconds: 00 action: - - service: shell_command.kan + - service: shell_command.8008 - - alias: Kimi + - alias: 8080 initial_state: 'off' trigger: platform: time minutes: '/10' seconds: 00 action: - - service: shell_command.kimi + - service: shell_command.8080 # Techie Maya Lands: System Calendar @@ -1351,16 +1351,16 @@ group: traditionmayalandsintelchromecast: name: Intel <> Chromecast entities: - - automation.akbal - - script.akbal + - automation.4004 + - script.4004 traditionmayalandsintelamikoo: name: Intel <> Robot entities: - - automation.kan - - automation.kimi - - script.kan - - script.kimi + - automation.8008 + - automation.8080 + - script.8008 + - script.8080 # Techie Maya Lands: System Health From b83e48f09d01a216d8cb406db8b2120b01ec0e57 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:37:31 -0500 Subject: [PATCH 1183/1653] Update and rename Akbal.sh to 4004.sh --- .../TraditionMayaLands/{Akbal.sh => 4004.sh} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename Hochob/Applications/TraditionMayaLands/{Akbal.sh => 4004.sh} (81%) diff --git a/Hochob/Applications/TraditionMayaLands/Akbal.sh b/Hochob/Applications/TraditionMayaLands/4004.sh similarity index 81% rename from Hochob/Applications/TraditionMayaLands/Akbal.sh rename to Hochob/Applications/TraditionMayaLands/4004.sh index bd069545..e6bfed15 100755 --- a/Hochob/Applications/TraditionMayaLands/Akbal.sh +++ b/Hochob/Applications/TraditionMayaLands/4004.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export AKBAL_PID=$$ -export AKBAL_NAME="Imix" -export AKBAL_PATH=$(readlink -f "$0") -export AKBAL_DIRECTORY=$(dirname "$AKBAL_PATH") +export 4004_PID=$$ +export A4004_NAME="Imix" +export 4004_PATH=$(readlink -f "$0") +export 4004_DIRECTORY=$(dirname "$4004_PATH") LOCAL_SEASON="Intel" LOCAL_DEVICE="Triki" @@ -26,7 +26,7 @@ LOCAL_DEVICE="Triki" # Main # ============================================================================= -LogPid.sh $AKBAL_PID $AKBAL_NAME +LogPid.sh $4004_PID $4004_NAME LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" From e21f5899e22be6986f528b6928275c4d38ee2bc0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:37:45 -0500 Subject: [PATCH 1184/1653] Update 4004.sh --- Hochob/Applications/TraditionMayaLands/4004.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/4004.sh b/Hochob/Applications/TraditionMayaLands/4004.sh index e6bfed15..21de6e36 100755 --- a/Hochob/Applications/TraditionMayaLands/4004.sh +++ b/Hochob/Applications/TraditionMayaLands/4004.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export 4004_PID=$$ -export A4004_NAME="Imix" +export 4004_NAME="4004" export 4004_PATH=$(readlink -f "$0") export 4004_DIRECTORY=$(dirname "$4004_PATH") From ef963bb6e3e67dc8b1e29b0f4e46995aeb0090cc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:38:29 -0500 Subject: [PATCH 1185/1653] Update Kan.sh --- Hochob/Applications/TraditionMayaLands/Kan.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Kan.sh b/Hochob/Applications/TraditionMayaLands/Kan.sh index 978ec6e2..473373ac 100755 --- a/Hochob/Applications/TraditionMayaLands/Kan.sh +++ b/Hochob/Applications/TraditionMayaLands/Kan.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export KAN_PID=$$ -export KAN_NAME="Ik" -export KAN_PATH=$(readlink -f "$0") -export KAN_DIRECTORY=$(dirname "$KAN_PATH") +export 8008_PID=$$ +export 8008_NAME="8008" +export 8008_PATH=$(readlink -f "$0") +export 8008_DIRECTORY=$(dirname "$8008_PATH") LOCAL_TRADITION="Intel" @@ -25,7 +25,7 @@ LOCAL_TRADITION="Intel" # Main # ============================================================================= -LogPid.sh $KAN_PID $KAN_NAME +LogPid.sh $8008_PID $8008_NAME AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" sleep 5 From 40fea94cecb3d6f3a54706f5b714ccc71d810f55 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:38:55 -0500 Subject: [PATCH 1186/1653] Rename Kan.sh to 8008.sh --- Hochob/Applications/TraditionMayaLands/{Kan.sh => 8008.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/TraditionMayaLands/{Kan.sh => 8008.sh} (100%) diff --git a/Hochob/Applications/TraditionMayaLands/Kan.sh b/Hochob/Applications/TraditionMayaLands/8008.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/Kan.sh rename to Hochob/Applications/TraditionMayaLands/8008.sh From 5164672fba65ac195fdf646605408e5adecc42a7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:39:33 -0500 Subject: [PATCH 1187/1653] Update Kimi.sh --- Hochob/Applications/TraditionMayaLands/Kimi.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Kimi.sh b/Hochob/Applications/TraditionMayaLands/Kimi.sh index d659455f..2867c9cc 100755 --- a/Hochob/Applications/TraditionMayaLands/Kimi.sh +++ b/Hochob/Applications/TraditionMayaLands/Kimi.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export KIMI_PID=$$ -export KIMI_NAME="Kimi" -export KIMI_PATH=$(readlink -f "$0") -export KIMI_DIRECTORY=$(dirname "$KIMI_PATH") +export 8080_PID=$$ +export 8080_NAME="8080" +export 8080_PATH=$(readlink -f "$0") +export 8080_DIRECTORY=$(dirname "$8080_PATH") LOCAL_TRADITION="Intel" @@ -25,7 +25,7 @@ LOCAL_TRADITION="Intel" # Main # ============================================================================= -LogPid.sh $CKIMI_PID $KIMI_NAME +LogPid.sh $8080_PID $8080_NAME AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" sleep 10 From ab8f47e356c38c02eccc7084e11a1f0199ca8c5b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:40:04 -0500 Subject: [PATCH 1188/1653] Rename Kimi.sh to 8080.sh --- Hochob/Applications/TraditionMayaLands/{Kimi.sh => 8080.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/TraditionMayaLands/{Kimi.sh => 8080.sh} (100%) diff --git a/Hochob/Applications/TraditionMayaLands/Kimi.sh b/Hochob/Applications/TraditionMayaLands/8080.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/Kimi.sh rename to Hochob/Applications/TraditionMayaLands/8080.sh From d61637b016f5fb0f493b36fda79a26438205eeab Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:50:42 -0500 Subject: [PATCH 1189/1653] Update and rename Imix.sh to Veladora.sh --- .../TraditionMayaLands/{Imix.sh => Veladora.sh} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename Hochob/Applications/TraditionMayaLands/{Imix.sh => Veladora.sh} (83%) diff --git a/Hochob/Applications/TraditionMayaLands/Imix.sh b/Hochob/Applications/TraditionMayaLands/Veladora.sh similarity index 83% rename from Hochob/Applications/TraditionMayaLands/Imix.sh rename to Hochob/Applications/TraditionMayaLands/Veladora.sh index b853a448..1c681346 100755 --- a/Hochob/Applications/TraditionMayaLands/Imix.sh +++ b/Hochob/Applications/TraditionMayaLands/Veladora.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export IMIX_PID=$$ -export IMIX_NAME="Imix" -export IMIX_PATH=$(readlink -f "$0") -export IMIX_DIRECTORY=$(dirname "$IMIX_PATH") +export VELADORA_PID=$$ +export VELADORA_NAME="Veladora" +export VELADORA_PATH=$(readlink -f "$0") +export VELADORA_DIRECTORY=$(dirname "$VELADORA_PATH") LOCAL_SEASON="DiaDeMuertos" LOCAL_DEVICE="Triki" @@ -26,7 +26,7 @@ LOCAL_DEVICE="Triki" # Main # ============================================================================= -LogPid.sh $IMIX_PID $IMIX_NAME +LogPid.sh $VELADORA_PID $VELADORA_NAME LOCAL_SOUND=`find $TRADITION_DIADEMUERTOS/Sound/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" From 86e607872a71c25003afbe08d2f50c7ea7c74ad8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:51:29 -0500 Subject: [PATCH 1190/1653] Update and rename Ik.sh to PapelPicado.sh --- .../TraditionMayaLands/{Ik.sh => PapelPicado.sh} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename Hochob/Applications/TraditionMayaLands/{Ik.sh => PapelPicado.sh} (79%) diff --git a/Hochob/Applications/TraditionMayaLands/Ik.sh b/Hochob/Applications/TraditionMayaLands/PapelPicado.sh similarity index 79% rename from Hochob/Applications/TraditionMayaLands/Ik.sh rename to Hochob/Applications/TraditionMayaLands/PapelPicado.sh index b4ef8ce3..2a9d4a65 100755 --- a/Hochob/Applications/TraditionMayaLands/Ik.sh +++ b/Hochob/Applications/TraditionMayaLands/PapelPicado.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export IK_PID=$$ -export IK_NAME="Ik" -export IK_PATH=$(readlink -f "$0") -export IK_DIRECTORY=$(dirname "$IK_PATH") +export PAPELPICADO_PID=$$ +export PAPELPICADO_NAME="PapelPicado" +export PAPELPICADO_PATH=$(readlink -f "$0") +export PAPELPICADO_DIRECTORY=$(dirname "$PAPELPICADO_PATH") LOCAL_TRADITION="DiaDeMuertos" @@ -25,7 +25,7 @@ LOCAL_TRADITION="DiaDeMuertos" # Main # ============================================================================= -LogPid.sh $IK_PID $IK_NAME +LogPid.sh $PAPELPICADO_PID $PAPELPICADO_NAME AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "demoniclaughter.mp3" sleep 30 From 7e343eb4858be2c9495acc1f5711c369ece923fa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:52:17 -0500 Subject: [PATCH 1191/1653] Update and rename Chikchan.sh to Mantel.sh --- .../TraditionMayaLands/{Chikchan.sh => Mantel.sh} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename Hochob/Applications/TraditionMayaLands/{Chikchan.sh => Mantel.sh} (79%) diff --git a/Hochob/Applications/TraditionMayaLands/Chikchan.sh b/Hochob/Applications/TraditionMayaLands/Mantel.sh similarity index 79% rename from Hochob/Applications/TraditionMayaLands/Chikchan.sh rename to Hochob/Applications/TraditionMayaLands/Mantel.sh index 4c1b5ccf..3f6f00c9 100644 --- a/Hochob/Applications/TraditionMayaLands/Chikchan.sh +++ b/Hochob/Applications/TraditionMayaLands/Mantel.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CHIKCHAN_PID=$$ -export CHIKCHAN_NAME="Chikchan" -export CHIKCHAN_PATH=$(readlink -f "$0") -export CHIKCHAN_DIRECTORY=$(dirname "$CHIKCHAN_PATH") +export MANTEL_PID=$$ +export MANTEL_NAME="Mantel" +export MANTEL_PATH=$(readlink -f "$0") +export MANTEL_DIRECTORY=$(dirname "$MANTEL_PATH") LOCAL_TRADITION="DiaDeMuertos" @@ -25,7 +25,7 @@ LOCAL_TRADITION="DiaDeMuertos" # Main # ============================================================================= -LogPid.sh $CHIKCHAN_PID $CHIKCHAN_NAME +LogPid.sh $MANTEL_PID $MANTEL_NAME AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" sleep 10 From b12e08947ee5f78cd82fa270491abe4e27c19cb3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:55:28 -0500 Subject: [PATCH 1192/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 63f4d5e0..0261f331 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -270,27 +270,27 @@ homeassistant: # Tradition Maya Lands :: Dia De Muertos - automation.imix: + automation.veladora: friendly_name: 10 minutos .. Sonidos icon: mdi:calendar-clock - script.imix: + script.veladora: friendly_name: Sonidos icon: mdi:speaker - automation.ik: + automation.papelpicado: friendly_name: 10 minutos .. Sonidos icon: mdi:calendar-clock - script.ik: + script.papelpicado: friendly_name: Sonidos icon: mdi:speaker - automation.chikchan: + automation.mantel: friendly_name: 10 minutos .. Imágenes icon: mdi:calendar-clock - script.chikchan: + script.mantel: friendly_name: Imágenes icon: mdi:file-image @@ -635,17 +635,17 @@ script: # Tradition Maya Lands :: Dia De Muertos - imix: + veladora: sequence: - - service: shell_command.imix + - service: shell_command.veladora - ik: + papelpicado: sequence: - - service: shell_command.ik + - service: shell_command.papelpicado - chikchan: + mantel: sequence: - - service: shell_command.chikchan + - service: shell_command.mantel # Tradition Maya Lands :: Intel @@ -784,9 +784,9 @@ shell_command: # Tradition Maya Lands :: Dia De Muertos - imix: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Imix.sh & - ik: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Ik.sh & - chikchan: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Chikchan.sh & + veladora: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Veladora.sh & + papelpicado: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/PapelPicado.sh & + mantel: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Mantel.sh & # Tradition Maya Lands :: Intel @@ -893,7 +893,7 @@ automation: # Tradition Maya Lands :: Dia De Muertos - - alias: Imix + - alias: Veladora initial_state: 'off' trigger: platform: time @@ -904,25 +904,25 @@ automation: after: '07:00:00' before: '21:00:00' action: - - service: shell_command.imix + - service: shell_command.veladora - - alias: Ik + - alias: PapelPicado initial_state: 'off' trigger: platform: time minutes: '/10' seconds: 00 action: - - service: shell_command.ik + - service: shell_command.papelpicado - - alias: Chikchan + - alias: Mantel initial_state: 'off' trigger: platform: time minutes: '/10' seconds: 00 action: - - service: shell_command.chikchan + - service: shell_command.mantel # Tradition Maya Lands :: Intel @@ -1335,16 +1335,16 @@ group: traditionmayalandsdiademuertoschromecast: name: Dia De Muertos <> Chromecast entities: - - automation.imix - - script.imix + - automation.veladora + - script.veladora traditionmayalandsdiademuertosamikoo: name: Dia De Muertos <> Robot entities: - - automation.ik - - automation.chikchan - - script.ik - - script.chikchan + - automation.papelpicado + - automation.mantel + - script.papelpicado + - script.mantel # Tradition Maya Lands :: Intel From 6d0772ad93d0474d7c434d88ca493f94f64f1ae4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 05:59:06 -0500 Subject: [PATCH 1193/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0261f331..5f0ca773 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -320,6 +320,14 @@ homeassistant: friendly_name: Imágenes icon: mdi:file-image + automation.8086: + friendly_name: 10 minutos .. Imágenes + icon: mdi:calendar-clock + + script.8086: + friendly_name: Imágenes + icon: mdi:file-video + # Techie Maya Lands : System Health script.toyota: @@ -661,6 +669,10 @@ script: sequence: - service: shell_command.8080 + 8086: + sequence: + - service: shell_command.8086 + # Techie Maya Lands toyota: @@ -793,6 +805,7 @@ shell_command: 4004: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/4004.sh & 8008: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8008.sh & 8080: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8080.sh & + 8086: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8086.sh & # Techie Maya Lands @@ -957,6 +970,15 @@ automation: action: - service: shell_command.8080 + - alias: 8086 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.8086 + # Techie Maya Lands: System Calendar - alias: Apple @@ -1359,8 +1381,10 @@ group: entities: - automation.8008 - automation.8080 + - automation.8086 - script.8008 - script.8080 + - script.8086 # Techie Maya Lands: System Health From c129f74b53c7d3a7f18304f0f7bae74089bb316f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:00:18 -0500 Subject: [PATCH 1194/1653] Create 8086.sh --- .../Applications/TraditionMayaLands/8086.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/8086.sh diff --git a/Hochob/Applications/TraditionMayaLands/8086.sh b/Hochob/Applications/TraditionMayaLands/8086.sh new file mode 100644 index 00000000..bd300a13 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/8086.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export 8086_PID=$$ +export 8086_NAME="8086" +export 8086_PATH=$(readlink -f "$0") +export 8086_DIRECTORY=$(dirname "$8086_PATH") + +LOCAL_TRADITION="Intel" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $8086_PID $8086_NAME + +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" +sleep 10 +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" + +# End of File From a71b5198db4a3ba97ca1331ed5a046395026a12e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:02:13 -0500 Subject: [PATCH 1195/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 5f0ca773..2d43fe53 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -410,9 +410,9 @@ logbook: # - platform: ffmpeg # input: /dev/video0 -google: - client_id: !secret google_calendar_client_id - client_secret: !secret google_calendar_client_secret +#google: +# client_id: !secret google_calendar_client_id +# client_secret: !secret google_calendar_client_secret input_slider: From 46f89a985f4810cd03365eb5aeb2a5d19fa99d26 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:03:10 -0500 Subject: [PATCH 1196/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 2d43fe53..65b1a707 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -321,11 +321,11 @@ homeassistant: icon: mdi:file-image automation.8086: - friendly_name: 10 minutos .. Imágenes + friendly_name: 10 minutos .. Video icon: mdi:calendar-clock script.8086: - friendly_name: Imágenes + friendly_name: Video icon: mdi:file-video # Techie Maya Lands : System Health From ea0de80c4e25c72bc40d067cb0fa8deeb5a4407f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:30:16 -0500 Subject: [PATCH 1197/1653] Update 8080.sh --- Hochob/Applications/TraditionMayaLands/8080.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/8080.sh b/Hochob/Applications/TraditionMayaLands/8080.sh index 2867c9cc..5170d099 100755 --- a/Hochob/Applications/TraditionMayaLands/8080.sh +++ b/Hochob/Applications/TraditionMayaLands/8080.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export 8080_PID=$$ -export 8080_NAME="8080" -export 8080_PATH=$(readlink -f "$0") -export 8080_DIRECTORY=$(dirname "$8080_PATH") +export i8080_PID=$$ +export i8080_NAME="i8080" +export i8080_PATH=$(readlink -f "$0") +export i8080_DIRECTORY=$(dirname "$i8080_PATH") LOCAL_TRADITION="Intel" @@ -25,7 +25,7 @@ LOCAL_TRADITION="Intel" # Main # ============================================================================= -LogPid.sh $8080_PID $8080_NAME +LogPid.sh $i8080_PID $i8080_NAME AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" sleep 10 From 473423bd141ca46bffbe2d848f5fb2e9ec245cd8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:30:49 -0500 Subject: [PATCH 1198/1653] Update 4004.sh --- Hochob/Applications/TraditionMayaLands/4004.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/4004.sh b/Hochob/Applications/TraditionMayaLands/4004.sh index 21de6e36..a0ac1fda 100755 --- a/Hochob/Applications/TraditionMayaLands/4004.sh +++ b/Hochob/Applications/TraditionMayaLands/4004.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export 4004_PID=$$ -export 4004_NAME="4004" -export 4004_PATH=$(readlink -f "$0") -export 4004_DIRECTORY=$(dirname "$4004_PATH") +export i4004_PID=$$ +export i4004_NAME="i4004" +export i4004_PATH=$(readlink -f "$0") +export i4004_DIRECTORY=$(dirname "$i4004_PATH") LOCAL_SEASON="Intel" LOCAL_DEVICE="Triki" @@ -26,7 +26,7 @@ LOCAL_DEVICE="Triki" # Main # ============================================================================= -LogPid.sh $4004_PID $4004_NAME +LogPid.sh $i4004_PID $i4004_NAME LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" From 5961546836d055bf36dbab1027e06832c3ec7fd1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:32:15 -0500 Subject: [PATCH 1199/1653] Update 8008.sh --- Hochob/Applications/TraditionMayaLands/8008.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/8008.sh b/Hochob/Applications/TraditionMayaLands/8008.sh index 473373ac..cb0973d8 100755 --- a/Hochob/Applications/TraditionMayaLands/8008.sh +++ b/Hochob/Applications/TraditionMayaLands/8008.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export 8008_PID=$$ -export 8008_NAME="8008" -export 8008_PATH=$(readlink -f "$0") -export 8008_DIRECTORY=$(dirname "$8008_PATH") +export i8008_PID=$$ +export i8008_NAME="i8008" +export i8008_PATH=$(readlink -f "$0") +export i8008_DIRECTORY=$(dirname "$i8008_PATH") LOCAL_TRADITION="Intel" @@ -25,7 +25,7 @@ LOCAL_TRADITION="Intel" # Main # ============================================================================= -LogPid.sh $8008_PID $8008_NAME +LogPid.sh $i8008_PID $i8008_NAME AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" sleep 5 From 35f6813f146f9f1ab68f9caa6d9f3449261f9cfa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:32:34 -0500 Subject: [PATCH 1200/1653] Update 8086.sh --- Hochob/Applications/TraditionMayaLands/8086.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/8086.sh b/Hochob/Applications/TraditionMayaLands/8086.sh index bd300a13..63ed2dc4 100644 --- a/Hochob/Applications/TraditionMayaLands/8086.sh +++ b/Hochob/Applications/TraditionMayaLands/8086.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export 8086_PID=$$ -export 8086_NAME="8086" -export 8086_PATH=$(readlink -f "$0") -export 8086_DIRECTORY=$(dirname "$8086_PATH") +export i8086_PID=$$ +export i8086_NAME="i8086" +export i8086_PATH=$(readlink -f "$0") +export i8086_DIRECTORY=$(dirname "$i8086_PATH") LOCAL_TRADITION="Intel" @@ -25,7 +25,7 @@ LOCAL_TRADITION="Intel" # Main # ============================================================================= -LogPid.sh $8086_PID $8086_NAME +LogPid.sh $i8086_PID $i8086_NAME AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" sleep 10 From c4ca1731dac0df9d6f8c5e0750b2f6a60eade611 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:34:22 -0500 Subject: [PATCH 1201/1653] Update 8086.sh --- Hochob/Applications/TraditionMayaLands/8086.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/8086.sh b/Hochob/Applications/TraditionMayaLands/8086.sh index 63ed2dc4..fc28f8a1 100644 --- a/Hochob/Applications/TraditionMayaLands/8086.sh +++ b/Hochob/Applications/TraditionMayaLands/8086.sh @@ -27,8 +27,8 @@ LOCAL_TRADITION="Intel" LogPid.sh $i8086_PID $i8086_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" +AmikooTradition.sh "$LOCAL_TRADITION" "Video" "Random" sleep 10 -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" +AmikooTradition.sh "$LOCAL_TRADITION" "Video" "Stop" # End of File From eeb94330df5b4099fad4548a84cd952063bd5194 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:46:08 -0500 Subject: [PATCH 1202/1653] Create i486.sh --- .../Applications/TraditionMayaLands/i486.sh | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/i486.sh diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh new file mode 100644 index 00000000..6b8ae6df --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export i486_PID=$$ +export i486_NAME="i486" +export i486_PATH=$(readlink -f "$0") +export i486_DIRECTORY=$(dirname "$i486_PATH") + +LOCAL_SEASON="Intel" +LOCAL_DEVICE="Triki" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $i486_PID $i486_NAME + +Eog.sh "$TRADITION_INTEL/Image/*" & +LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` +Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" + +SpeechSynthetizer.sh on espeak spanish \ + "Saludos \ + " + +KillApp.sh "eog" + +# End of File From 0bc2c02b00100f4f9d3c67816fcd4d5691859f5b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:54:01 -0500 Subject: [PATCH 1203/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 65b1a707..ad10acee 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -328,6 +328,14 @@ homeassistant: friendly_name: Video icon: mdi:file-video + automation.i486: + friendly_name: 10 minutos .. Proud Campaign + icon: mdi:calendar-clock + + script.i486: + friendly_name: Proud Campagin + icon: mdi:file-video + # Techie Maya Lands : System Health script.toyota: @@ -673,6 +681,10 @@ script: sequence: - service: shell_command.8086 + i486: + sequence: + - service: shell_command.i486 + # Techie Maya Lands toyota: @@ -806,6 +818,7 @@ shell_command: 8008: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8008.sh & 8080: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8080.sh & 8086: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8086.sh & + i486: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/i486.sh & # Techie Maya Lands @@ -979,6 +992,15 @@ automation: action: - service: shell_command.8086 + - alias: i486 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.i486 + # Techie Maya Lands: System Calendar - alias: Apple @@ -1111,6 +1133,7 @@ group: - group.traditionmayalandsdiademuertosamikoo - group.traditionmayalandsintelchromecast - group.traditionmayalandsintelamikoo + - group.traditionmayalandsintelnohochtata # Techie Maya Lands @@ -1386,6 +1409,12 @@ group: - script.8080 - script.8086 + traditionmayalandsintelnohochtata: + name: Intel <> Server + entities: + - automation.i486 + - script.i486 + # Techie Maya Lands: System Health techiemayalandssystemhealth: From a5665ff61bac8b73c10ade938e20e326e0dc9ca3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:55:24 -0500 Subject: [PATCH 1204/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/TraditionMayaLands/i486.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/i486.sh diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh old mode 100644 new mode 100755 From 98105a98b4edc68ba3f37300a3dc0e0191706d27 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 06:59:54 -0500 Subject: [PATCH 1205/1653] Update Aguascalientes.sh --- Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh index a6ff4672..e88fbb0e 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh @@ -32,7 +32,7 @@ Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Aguascalientes.mp3" & sleep 75 -KillApp.sh "mpg123" +KillApp.sh "cvlc" KillApp.sh "eog" # End of File From 2739d327230580033a4491e27d69c315a0e0e2cd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:00:11 -0500 Subject: [PATCH 1206/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 87b2e489..16fedba1 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -47,6 +47,6 @@ Amikoo.sh amikoo/resetall 1 sleep 5 KillApp.sh "eog" -KillApp.sh "mpg123" +KillApp.sh "cvlc" # End of File From 6333a39bd8767896657b282566dd4f974438356d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:00:27 -0500 Subject: [PATCH 1207/1653] Update Campeche.sh --- Hochob/Applications/SouthernMayaHighlands/Campeche.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh index 7896dea9..976949be 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Campeche.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Campeche.sh @@ -31,7 +31,7 @@ Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/Campeche.mp3" & sleep 28 -KillApp.sh "mpg123" +KillApp.sh "cvlc" KillApp.sh "eog" # End of File From 038042d928d3f76b9d0ab30d4fa67e0b2f722035 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:21:35 -0500 Subject: [PATCH 1208/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/i486.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index 6b8ae6df..571a43a0 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -28,14 +28,18 @@ LOCAL_DEVICE="Triki" LogPid.sh $i486_PID $i486_NAME -Eog.sh "$TRADITION_INTEL/Image/*" & -LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` -Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" +# Sound +Eog.sh "$TRADITION_INTEL/Image/2017-05-08-131711_1920x1080_scrot.png" & -SpeechSynthetizer.sh on espeak spanish \ - "Saludos \ - " +# Image +LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` +Vlc.sh "$LOCAL_SOUND" +KillApp.sh "cvlc" KillApp.sh "eog" +#SpeechSynthetizer.sh on espeak spanish \ +# "Saludos \ +# " + # End of File From 72ba420308be6b314109ebfdebc55859870d5f35 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:27:04 -0500 Subject: [PATCH 1209/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/i486.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index 571a43a0..4ac9994c 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -28,13 +28,17 @@ LOCAL_DEVICE="Triki" LogPid.sh $i486_PID $i486_NAME -# Sound -Eog.sh "$TRADITION_INTEL/Image/2017-05-08-131711_1920x1080_scrot.png" & # Image +Eog.sh "$TRADITION_INTEL/Image/2017-05-08-131711_1920x1080_scrot.png" & +sleep 1 + +# Sound LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` Vlc.sh "$LOCAL_SOUND" +sleep 5 + KillApp.sh "cvlc" KillApp.sh "eog" From 48c748c63f46c860be8a2defcc7d99e7af171268 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:29:08 -0500 Subject: [PATCH 1210/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/i486.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index 4ac9994c..1669b2e7 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -34,8 +34,9 @@ Eog.sh "$TRADITION_INTEL/Image/2017-05-08-131711_1920x1080_scrot.png" & sleep 1 # Sound -LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` -Vlc.sh "$LOCAL_SOUND" +Vlc.sh $TRADITION_INTEL/Sound/IntelBong.mp3 +#LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` +#Vlc.sh "$LOCAL_SOUND" sleep 5 From 136a2e6551254e3f2e9e49447d3f43f59126233e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:31:23 -0500 Subject: [PATCH 1211/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/i486.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index 1669b2e7..c4c2ffb4 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -30,7 +30,8 @@ LogPid.sh $i486_PID $i486_NAME # Image -Eog.sh "$TRADITION_INTEL/Image/2017-05-08-131711_1920x1080_scrot.png" & +#Eog.sh "$TRADITION_INTEL/Image/*" & +Eog.sh "$TRADITION_INTEL/Image/IntelExperienceWhatsInside.png" & sleep 1 # Sound From 214b062eb0ecc748bb2073ffd3779c4269171981 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:43:39 -0500 Subject: [PATCH 1212/1653] Create 80286.sh --- .../Applications/TraditionMayaLands/80286.sh | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/80286.sh diff --git a/Hochob/Applications/TraditionMayaLands/80286.sh b/Hochob/Applications/TraditionMayaLands/80286.sh new file mode 100644 index 00000000..ec9a7240 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/80286.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export i80286_PID=$$ +export i80286_NAME="i80286" +export i80286_PATH=$(readlink -f "$0") +export i80286_DIRECTORY=$(dirname "$i80286_PATH") + +LOCAL_TRADITION="Intel" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $i80286_PID $i80286_NAME + +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "IntelExperienceWhatsInside.png" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" +sleep 2 +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" + +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "IntelChorus.jpg" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBongChorus.mp3" +sleep 2 +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" + +# End of File From f42a43f5e4775a6f52ac000bfac376250232e8f3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:45:43 -0500 Subject: [PATCH 1213/1653] Update i486.sh --- .../Applications/TraditionMayaLands/i486.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index c4c2ffb4..9ec607de 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -29,23 +29,18 @@ LOCAL_DEVICE="Triki" LogPid.sh $i486_PID $i486_NAME -# Image -#Eog.sh "$TRADITION_INTEL/Image/*" & Eog.sh "$TRADITION_INTEL/Image/IntelExperienceWhatsInside.png" & sleep 1 - -# Sound Vlc.sh $TRADITION_INTEL/Sound/IntelBong.mp3 -#LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` -#Vlc.sh "$LOCAL_SOUND" - -sleep 5 - +sleep 1 KillApp.sh "cvlc" KillApp.sh "eog" -#SpeechSynthetizer.sh on espeak spanish \ -# "Saludos \ -# " +Eog.sh "$TRADITION_INTEL/Image/IntelChorus.png" & +sleep 1 +Vlc.sh $TRADITION_INTEL/Sound/IntelBongChorus.mp3 +sleep 1 +KillApp.sh "cvlc" +KillApp.sh "eog" # End of File From 92106c93d139c47bdbb8054c750fdbc179cdb9cb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:47:01 -0500 Subject: [PATCH 1214/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/i486.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index 9ec607de..4060beb8 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -36,7 +36,7 @@ sleep 1 KillApp.sh "cvlc" KillApp.sh "eog" -Eog.sh "$TRADITION_INTEL/Image/IntelChorus.png" & +Eog.sh "$TRADITION_INTEL/Image/IntelChorus.jpg sleep 1 Vlc.sh $TRADITION_INTEL/Sound/IntelBongChorus.mp3 sleep 1 From d4481a80078261e7336e13bcbc6ad3f4b3f9e417 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:47:50 -0500 Subject: [PATCH 1215/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/i486.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index 4060beb8..f4bf81bb 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -32,14 +32,14 @@ LogPid.sh $i486_PID $i486_NAME Eog.sh "$TRADITION_INTEL/Image/IntelExperienceWhatsInside.png" & sleep 1 Vlc.sh $TRADITION_INTEL/Sound/IntelBong.mp3 -sleep 1 +sleep 2 KillApp.sh "cvlc" KillApp.sh "eog" -Eog.sh "$TRADITION_INTEL/Image/IntelChorus.jpg +Eog.sh "$TRADITION_INTEL/Image/IntelChorus.jpg" sleep 1 Vlc.sh $TRADITION_INTEL/Sound/IntelBongChorus.mp3 -sleep 1 +sleep 2 KillApp.sh "cvlc" KillApp.sh "eog" From e5e7e7907e5327bcebc1d5df0c8932c5bc78fbc8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:48:50 -0500 Subject: [PATCH 1216/1653] Update Vlc.sh --- Hochob/Services/Sound/Play/Vlc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/Play/Vlc.sh b/Hochob/Services/Sound/Play/Vlc.sh index be959a4f..3188c7e3 100755 --- a/Hochob/Services/Sound/Play/Vlc.sh +++ b/Hochob/Services/Sound/Play/Vlc.sh @@ -24,7 +24,7 @@ LOCAL_FILE="$1" if [ $# -eq 1 ] then - $VLC_BINARY $VLC_ARGUMENTS $LOCAL_FILE & + $VLC_BINARY $VLC_ARGUMENTS $LOCAL_FILE else echo "Invalid number of arguments, see Documentation" exit 1 From a189a910d9a0ccbccf63b6fa63c86e6c93cece74 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 07:57:06 -0500 Subject: [PATCH 1217/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/i486.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index f4bf81bb..0c343f53 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -14,7 +14,6 @@ export i486_PATH=$(readlink -f "$0") export i486_DIRECTORY=$(dirname "$i486_PATH") LOCAL_SEASON="Intel" -LOCAL_DEVICE="Triki" # ============================================================================= # Functions From 509abfa93e0cc74cfdaa77a06e2206d6d1bf1bec Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:00:23 -0500 Subject: [PATCH 1218/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index ad10acee..d1505d29 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -328,12 +328,20 @@ homeassistant: friendly_name: Video icon: mdi:file-video + automation.80286: + friendly_name: 10 minutos .. Intel Bong + icon: mdi:calendar-clock + + script.80286: + friendly_name: Intel Bong + icon: mdi:file-image + automation.i486: - friendly_name: 10 minutos .. Proud Campaign + friendly_name: 10 minutos .. Intel Bong icon: mdi:calendar-clock script.i486: - friendly_name: Proud Campagin + friendly_name: Intel Bong icon: mdi:file-video # Techie Maya Lands : System Health @@ -681,6 +689,10 @@ script: sequence: - service: shell_command.8086 + 80286: + sequence: + - service: shell_command.80286 + i486: sequence: - service: shell_command.i486 @@ -818,6 +830,7 @@ shell_command: 8008: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8008.sh & 8080: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8080.sh & 8086: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8086.sh & + 80286: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/80286.sh & i486: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/i486.sh & # Techie Maya Lands @@ -992,6 +1005,15 @@ automation: action: - service: shell_command.8086 + - alias: 80286 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.80286 + - alias: i486 initial_state: 'off' trigger: @@ -1405,9 +1427,11 @@ group: - automation.8008 - automation.8080 - automation.8086 + - automation.80286 - script.8008 - script.8080 - script.8086 + - script.80286 traditionmayalandsintelnohochtata: name: Intel <> Server From cd3c216e45f9df12e217bc0e9f8ee4d96dd07a33 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:01:10 -0500 Subject: [PATCH 1219/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/TraditionMayaLands/80286.sh | 0 Hochob/Applications/TraditionMayaLands/8086.sh | 0 Hochob/Applications/TraditionMayaLands/Mantel.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/80286.sh mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/8086.sh mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Mantel.sh diff --git a/Hochob/Applications/TraditionMayaLands/80286.sh b/Hochob/Applications/TraditionMayaLands/80286.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/TraditionMayaLands/8086.sh b/Hochob/Applications/TraditionMayaLands/8086.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/TraditionMayaLands/Mantel.sh b/Hochob/Applications/TraditionMayaLands/Mantel.sh old mode 100644 new mode 100755 From 9de8c60701ec648c7085a9e3668c9e633a0ae4af Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:07:35 -0500 Subject: [PATCH 1220/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d1505d29..60e69509 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -334,7 +334,7 @@ homeassistant: script.80286: friendly_name: Intel Bong - icon: mdi:file-image + icon: mdi:face-profile automation.i486: friendly_name: 10 minutos .. Intel Bong @@ -342,7 +342,7 @@ homeassistant: script.i486: friendly_name: Intel Bong - icon: mdi:file-video + icon: mdi:face-profile # Techie Maya Lands : System Health From 51f6f304126375dcb76d0976f7658780b620390f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:19:36 -0500 Subject: [PATCH 1221/1653] Create Calaveritas.sh --- .../TraditionMayaLands/Calaveritas.sh | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Calaveritas.sh diff --git a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh new file mode 100644 index 00000000..9c34c68a --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh @@ -0,0 +1,41 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CALAVERITAS_PID=$$ +export CALAVERITAS_NAME="Calaveritas" +export CALAVERITAS_PATH=$(readlink -f "$0") +export CALAVERITAS_DIRECTORY=$(dirname "$PCALAVERITAS_PATH") + +LOCAL_TRADITION="DiaDeMuertos" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $CALAVERITAS_PID $CALAVERITAS_NAME + +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "ghostlymoan.mp3" +Amikoo.sh amikoo/headright 1 && sleep .6 +Amikoo.sh amikoo/headleft 1 && sleep .6 +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "haunting.mp3" +Amikoo.sh amikoo/moveforward 1 && sleep .1 +Amikoo.sh amikoo/movestop 1 && sleep .6 +Amikoo.sh amikoo/movebackward 1 && sleep .1 +Amikoo.sh amikoo/movestop 1 && sleep .6 + +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" + +# End of File From e35baee892ec6f46819f69c82043d14c744adf76 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:23:23 -0500 Subject: [PATCH 1222/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 60e69509..34c4422c 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -294,6 +294,14 @@ homeassistant: friendly_name: Imágenes icon: mdi:file-image + automation.calaveritas: + friendly_name: 10 minutos .. Fantasma + icon: mdi:calendar-clock + + script.calaveritas: + friendly_name: Fantasma + icon: mdi:face-profile + # Tradition Maya Lands :: Intel automation.4004: @@ -671,6 +679,10 @@ script: sequence: - service: shell_command.mantel + calaveritas: + sequence: + - service: shell_command.calaveritas + # Tradition Maya Lands :: Intel 4004: @@ -823,6 +835,7 @@ shell_command: veladora: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Veladora.sh & papelpicado: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/PapelPicado.sh & mantel: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Mantel.sh & + calaveritas: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Calaveritas.sh & # Tradition Maya Lands :: Intel @@ -963,6 +976,15 @@ automation: action: - service: shell_command.mantel + - alias: Calaveritas + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.calaveritas + # Tradition Maya Lands :: Intel - alias: 4004 @@ -1410,8 +1432,10 @@ group: entities: - automation.papelpicado - automation.mantel + - automation.calaveritas - script.papelpicado - script.mantel + - script.calaveritas # Tradition Maya Lands :: Intel From 8f564edd42780950254e51fe2e45c43a33f85af6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:23:52 -0500 Subject: [PATCH 1223/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/TraditionMayaLands/Calaveritas.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Calaveritas.sh diff --git a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh old mode 100644 new mode 100755 From ae025be243729e1de88942ae0143ac516f78a727 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:29:43 -0500 Subject: [PATCH 1224/1653] Update Calaveritas.sh --- Hochob/Applications/TraditionMayaLands/Calaveritas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh index 9c34c68a..f9d2fafa 100755 --- a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh +++ b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh @@ -11,7 +11,7 @@ set -x export CALAVERITAS_PID=$$ export CALAVERITAS_NAME="Calaveritas" export CALAVERITAS_PATH=$(readlink -f "$0") -export CALAVERITAS_DIRECTORY=$(dirname "$PCALAVERITAS_PATH") +export CALAVERITAS_DIRECTORY=$(dirname "$CALAVERITAS_PATH") LOCAL_TRADITION="DiaDeMuertos" From 9d1503de512363be6d06624341fccd2942b65c46 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:34:06 -0500 Subject: [PATCH 1225/1653] Create Fotografia.sh --- .../TraditionMayaLands/Fotografia.sh | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Fotografia.sh diff --git a/Hochob/Applications/TraditionMayaLands/Fotografia.sh b/Hochob/Applications/TraditionMayaLands/Fotografia.sh new file mode 100644 index 00000000..cb68dda0 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Fotografia.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export FOTOGRAFIA_PID=$$ +export FOTOGRAFIA_NAME="Fotografia" +export FOTOGRAFIA_PATH=$(readlink -f "$0") +export FOTOGRAFIA_DIRECTORY=$(dirname "$FOTOGRAFIA_PATH") + +LOCAL_TRADITION="DiaDeMuertos" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $FOTOGRAFIA_PID $FOTOGRAFIA_NAME + +# AMIKOO_PICTURE amikoo/camera/picture +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "witch.mp3" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" +# AMIKOO_PICTURE stop + +# End of File From 8dddde12b89ab2dcdd64532e546c68762ed9e447 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:34:26 -0500 Subject: [PATCH 1226/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index a8aa67d7..67955c8f 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -214,8 +214,8 @@ AMIKOO_CAMERA_PICTURE=$AMIKOO_CAMERA/picture ## Skills Advanced -AMIKOO_GCVISIONAPI=$AMIKOO/gcvisionapi -AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gctranslationapi +AMIKOO_GCVISIONAPI=$AMIKOO/gc/visionapi +AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gc/translationapi ## Skills Basic From d542ab302f0256d21c28bf3adb378379e54349e4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:37:31 -0500 Subject: [PATCH 1227/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 34c4422c..b03e8c8c 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -302,6 +302,14 @@ homeassistant: friendly_name: Fantasma icon: mdi:face-profile + automation.fotografia: + friendly_name: 10 minutos .. Fotógrafo + icon: mdi:calendar-clock + + script.fotografia: + friendly_name: Fotógrafo + icon: mdi:camera + # Tradition Maya Lands :: Intel automation.4004: @@ -683,6 +691,10 @@ script: sequence: - service: shell_command.calaveritas + fotografia: + sequence: + - service: shell_command.fotografia + # Tradition Maya Lands :: Intel 4004: @@ -836,6 +848,7 @@ shell_command: papelpicado: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/PapelPicado.sh & mantel: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Mantel.sh & calaveritas: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Calaveritas.sh & + fotografia: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Fotografia.sh & # Tradition Maya Lands :: Intel @@ -985,6 +998,15 @@ automation: action: - service: shell_command.calaveritas + - alias: Fotografia + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.fotografia + # Tradition Maya Lands :: Intel - alias: 4004 @@ -1433,9 +1455,11 @@ group: - automation.papelpicado - automation.mantel - automation.calaveritas + - automation.fotografia - script.papelpicado - script.mantel - script.calaveritas + - script.fotografia # Tradition Maya Lands :: Intel From bfed8bc9c2c2f92082d90f32e82c1ef33310d462 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:38:14 -0500 Subject: [PATCH 1228/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/TraditionMayaLands/Fotografia.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Fotografia.sh diff --git a/Hochob/Applications/TraditionMayaLands/Fotografia.sh b/Hochob/Applications/TraditionMayaLands/Fotografia.sh old mode 100644 new mode 100755 From eca29d793a022d6cf800535d66e13797cc725744 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:39:46 -0500 Subject: [PATCH 1229/1653] Update Fotografia.sh --- Hochob/Applications/TraditionMayaLands/Fotografia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Fotografia.sh b/Hochob/Applications/TraditionMayaLands/Fotografia.sh index cb68dda0..6a181c40 100755 --- a/Hochob/Applications/TraditionMayaLands/Fotografia.sh +++ b/Hochob/Applications/TraditionMayaLands/Fotografia.sh @@ -28,7 +28,7 @@ LOCAL_TRADITION="DiaDeMuertos" LogPid.sh $FOTOGRAFIA_PID $FOTOGRAFIA_NAME # AMIKOO_PICTURE amikoo/camera/picture -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "witch.mp3" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Witch.mp3" AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" # AMIKOO_PICTURE stop From 11d4db1a69e3c5eb4cf622967d156d55991ed360 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:53:59 -0500 Subject: [PATCH 1230/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b03e8c8c..98cdaae9 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -66,6 +66,10 @@ homeassistant: script.amikoogctranslationapi: friendly_name: Google Translation API icon: mdi:google-translate + + script.amikoopicture: + friendly_name: Fotógrafia + icon: mdi:camera script.makeblock: friendly_name: Centro de Visitantes @@ -541,6 +545,10 @@ script: sequence: - service: shell_command.amikoogctranslationapi + amikoopicture: + sequence: + - service: shell_command.amikoopicture + makeblock: sequence: - service: shell_command.makeblock @@ -805,6 +813,7 @@ shell_command: amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 + amikoopicture: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh picture 1 # Amikoo Maya Lands: Skills Basic @@ -1261,6 +1270,7 @@ group: - script.coji - script.amikoogcvisionapi - script.amikoogctranslationapi + - script.amikoopicture # Amikoo Maya Lands: Knowledge From 40a8a643aa1cbf411cc5a9b155649ccd7f600db8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:55:29 -0500 Subject: [PATCH 1231/1653] Update Main.sh --- Hochob/Main.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 67955c8f..67f0e56e 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -214,17 +214,17 @@ AMIKOO_CAMERA_PICTURE=$AMIKOO_CAMERA/picture ## Skills Advanced +AMIKOO_SAY=$AMIKOO_SOUND_SPEECHSYNTHETIZER/say +AMIKOO_DECIR=$AMIKOO_SOUND_SPEECHSYNTHETIZER/decir AMIKOO_GCVISIONAPI=$AMIKOO/gc/visionapi AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gc/translationapi +AMIKOO_PICTURE=$AMIKOO_CAMERA_PICTURE -## Skills Basic +## Skills Tradition -AMIKOO_SAY=$AMIKOO_SOUND_SPEECHSYNTHETIZER/say -AMIKOO_DECIR=$AMIKOO_SOUND_SPEECHSYNTHETIZER/decir AMIKOO_AUDIO=$AMIKOO_TRADITION_AUDIO AMIKOO_IMAGE=$AMIKOO_TRADITION_IMAGE AMIKOO_VIDEO=$AMIKOO_TRADITION_VIDEO -AMIKOO_PICTURE=$AMIKOO_CAMERA_PICTURE # ============================================================================= # Functions From ea0139e31bcbebd944fd285037ac3b7a99114711 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 08:55:33 -0500 Subject: [PATCH 1232/1653] Update Amikoo.sh --- Hochob/Services/Amikoo/Remote/Amikoo.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Amikoo/Remote/Amikoo.sh b/Hochob/Services/Amikoo/Remote/Amikoo.sh index e5985938..d911b9fc 100755 --- a/Hochob/Services/Amikoo/Remote/Amikoo.sh +++ b/Hochob/Services/Amikoo/Remote/Amikoo.sh @@ -41,6 +41,8 @@ if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" +elif [ "$LOCAL_COMMAND" = "picture" ]; then + Mosquitto.sh $AMIKOO_PICTURE "Camera Picture" fi # Skills Basic From 79fccc5296b33c53512a7b4e0ca630d284b5ef07 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 09:02:39 -0500 Subject: [PATCH 1233/1653] Update Main.sh --- Hochob/Main.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 67f0e56e..a35fa2fb 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -212,19 +212,23 @@ AMIKOO_TRADITION_VIDEO=$AMIKOO_TRADITION/video AMIKOO_CAMERA=$AMIKOO/camera AMIKOO_CAMERA_PICTURE=$AMIKOO_CAMERA/picture -## Skills Advanced +## Applications AMIKOO_SAY=$AMIKOO_SOUND_SPEECHSYNTHETIZER/say AMIKOO_DECIR=$AMIKOO_SOUND_SPEECHSYNTHETIZER/decir + +## Skills + AMIKOO_GCVISIONAPI=$AMIKOO/gc/visionapi AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gc/translationapi AMIKOO_PICTURE=$AMIKOO_CAMERA_PICTURE -## Skills Tradition +## Skill Tradition AMIKOO_AUDIO=$AMIKOO_TRADITION_AUDIO AMIKOO_IMAGE=$AMIKOO_TRADITION_IMAGE AMIKOO_VIDEO=$AMIKOO_TRADITION_VIDEO +AMIKOO_PICTURE=$AMIKOO_CAMERA_PICTURE # ============================================================================= # Functions From a326ca61b0e63fca2d151876bd459d524371c008 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 09:06:14 -0500 Subject: [PATCH 1234/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 37 +++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 98cdaae9..62db259a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -56,21 +56,26 @@ homeassistant: friendly_name: Ahora icon: mdi:lock-reset + # Amikoo Maya Lands :: Applications + script.coji: friendly_name: Hablar icon: mdi:speaker + # Amikoo Maya Lands :: Skills + script.amikoogcvisionapi: friendly_name: Google Vision API icon: mdi:camera script.amikoogctranslationapi: friendly_name: Google Translation API icon: mdi:google-translate - script.amikoopicture: friendly_name: Fotógrafia icon: mdi:camera + # Amikoo Maya Lands :: Knowledge + script.makeblock: friendly_name: Centro de Visitantes icon: mdi:audiobook @@ -533,10 +538,14 @@ script: sequence: - service: shell_command.resetall + # Amikoo Maya Lands :: Applications + coji: sequence: - service: shell_command.coji + # Amikoo Maya Lands :: Skills + amikoogcvisionapi: sequence: - service: shell_command.amikoogcvisionapi @@ -549,10 +558,14 @@ script: sequence: - service: shell_command.amikoopicture + # Amikoo Maya Lands :: Knowledge + makeblock: sequence: - service: shell_command.makeblock + # Amikoo Maya Lands :: Movement + headright: sequence: - service: shell_command.headright @@ -807,15 +820,18 @@ shell_command: # Amikoo Maya Lands: Applications coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & - makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & - - # Amikoo Maya Lands: Skills Advanced + + # Amikoo Maya Lands: Skills amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 amikoopicture: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh picture 1 - # Amikoo Maya Lands: Skills Basic + # Amikoo Maya Lands :: Knowledge + + makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & + + # Amikoo Maya Lands: Movement headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headleft 1 headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headright 1 @@ -1137,6 +1153,7 @@ group: view: yes name: Robot entities: + - group.robotmayalandsapplications - group.robotmayalandsskills - group.robotmayalandsknowledge - group.robotmayalandshead @@ -1262,12 +1279,18 @@ group: entities: - script.zacatecas - # Amikoo Maya Lands: Skills + # Amikoo Maya Lands: Applications - robotmayalandsskills: + robotmayalandsapplications: name: Habilidades entities: - script.coji + + # Amikoo Maya Lands: Applications + + robotmayalandsskills: + name: Habilidades + entities: - script.amikoogcvisionapi - script.amikoogctranslationapi - script.amikoopicture From 682eaa356c3128cb0ff618c7711725272523a498 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 09:09:10 -0500 Subject: [PATCH 1235/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 62db259a..6541f955 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -59,7 +59,7 @@ homeassistant: # Amikoo Maya Lands :: Applications script.coji: - friendly_name: Hablar + friendly_name: Discurso Bilingüe icon: mdi:speaker # Amikoo Maya Lands :: Skills @@ -1282,7 +1282,7 @@ group: # Amikoo Maya Lands: Applications robotmayalandsapplications: - name: Habilidades + name: Aplicaciones entities: - script.coji From 3c5a1387d2d394a437fe673c31f24e9eb76c4861 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 09:10:36 -0500 Subject: [PATCH 1236/1653] Update Coji.sh --- Hochob/Applications/AmikooMayaLands/Coji.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Applications/AmikooMayaLands/Coji.sh b/Hochob/Applications/AmikooMayaLands/Coji.sh index c471e6f8..c5134376 100755 --- a/Hochob/Applications/AmikooMayaLands/Coji.sh +++ b/Hochob/Applications/AmikooMayaLands/Coji.sh @@ -22,6 +22,12 @@ export COJI_DIRECTORY=$(dirname "$COJI_PATH") # Main # ============================================================================= +Amikoo.sh $AMIKOO_SAY \ + "Hello World. I can speak English. One, Two, Three." + +Amikoo.sh $AMIKOO_DECIR \ + "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." + LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Amikoo.sh $AMIKOO_SAY \ From 13aeff1722345bae00a06ecea70c2c9d2f3123b4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 09:11:14 -0500 Subject: [PATCH 1237/1653] Update Coji.sh --- Hochob/Applications/AmikooMayaLands/Coji.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Applications/AmikooMayaLands/Coji.sh b/Hochob/Applications/AmikooMayaLands/Coji.sh index c5134376..d11bfd8c 100755 --- a/Hochob/Applications/AmikooMayaLands/Coji.sh +++ b/Hochob/Applications/AmikooMayaLands/Coji.sh @@ -25,9 +25,13 @@ export COJI_DIRECTORY=$(dirname "$COJI_PATH") Amikoo.sh $AMIKOO_SAY \ "Hello World. I can speak English. One, Two, Three." +sleep 5 + Amikoo.sh $AMIKOO_DECIR \ "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." +sleep 5 + LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then Amikoo.sh $AMIKOO_SAY \ From 7a0ff516b826fc33501ff642a6f3cb3039a8d430 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 10:56:43 -0500 Subject: [PATCH 1238/1653] Update Calaveritas.sh --- Hochob/Applications/TraditionMayaLands/Calaveritas.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh index f9d2fafa..cb487564 100755 --- a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh +++ b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh @@ -27,10 +27,10 @@ LOCAL_TRADITION="DiaDeMuertos" LogPid.sh $CALAVERITAS_PID $CALAVERITAS_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "ghostlymoan.mp3" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "GhostlyMoan.mp3" Amikoo.sh amikoo/headright 1 && sleep .6 Amikoo.sh amikoo/headleft 1 && sleep .6 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "haunting.mp3" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Haunting.mp3" Amikoo.sh amikoo/moveforward 1 && sleep .1 Amikoo.sh amikoo/movestop 1 && sleep .6 Amikoo.sh amikoo/movebackward 1 && sleep .1 From fbdc8f02a1c18068915a7ca4adc7e8a6e9da78d0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:32:59 -0500 Subject: [PATCH 1239/1653] Create Meccanoid.sh --- .../Applications/AmikooMayaLands/Meccanoid.sh | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 Hochob/Applications/AmikooMayaLands/Meccanoid.sh diff --git a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh new file mode 100644 index 00000000..bcab8d78 --- /dev/null +++ b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh @@ -0,0 +1,64 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MECCANOID_PID=$$ +export MECCANOID_NAME="Meccanoid" +export MECCANOID_PATH=$(readlink -f "$0") +export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") + +LOCAL_TRADITION="DiaDeMuertos" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $MECCANOID_PID $MECCANOID_NAME + +LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + Amikoo.sh $AMIKOO_SAY \ + "Let's dance" +else + Amikoo.sh $AMIKOO_DECIR \ + "Vamos a bailar" +fi + +Amikoo.sh $AMIKOO_DECIR \ + "Feliz dia de muertos" + +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "MichaelJacksonThirllerShort.mp3" + +Amikoo.sh amikoo/headright 1 && sleep .6 +Amikoo.sh amikoo/headleft 1 && sleep .6 +Amikoo.sh amikoo/rightup 1 && sleep .6 +Amikoo.sh amikoo/leftup 1 && sleep .6 +Amikoo.sh amikoo/rightfold 1 && sleep .6 +Amikoo.sh amikoo/leftfold 1 && sleep .6 +Amikoo.sh amikoo/moveright 1 && sleep .6 +Amikoo.sh amikoo/moveleft 1 && sleep .6 +Amikoo.sh amikoo/moveleft 1 && sleep .6 +Amikoo.sh amikoo/moveleft 1 && sleep .6 +Amikoo.sh amikoo/leftfold 1 && sleep .6 +Amikoo.sh amikoo/rightfold 1 && sleep .6 +Amikoo.sh amikoo/leftup 1 && sleep .6 +Amikoo.sh amikoo/rightup 1 && sleep .6 +Amikoo.sh amikoo/headleft 1 && sleep .6 +Amikoo.sh amikoo/headright 1 && sleep .6 + +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" + +# End of File From e302b8c3b2dabd9ef3e2fa4205f20fbe734d78ae Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:33:33 -0500 Subject: [PATCH 1240/1653] Update Meccanoid.sh --- Hochob/Applications/AmikooMayaLands/Meccanoid.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh index bcab8d78..6b6e4dbc 100644 --- a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh +++ b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh @@ -37,9 +37,6 @@ else "Vamos a bailar" fi -Amikoo.sh $AMIKOO_DECIR \ - "Feliz dia de muertos" - AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "MichaelJacksonThirllerShort.mp3" Amikoo.sh amikoo/headright 1 && sleep .6 From 5a0d8b4b1ab5065ff87697ab3ec11aed9caa8117 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:37:40 -0500 Subject: [PATCH 1241/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 6541f955..d6f527b4 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -61,6 +61,9 @@ homeassistant: script.coji: friendly_name: Discurso Bilingüe icon: mdi:speaker + script.meccanoid: + friendly_name: Baile Thriller + icon: mdi:account # Amikoo Maya Lands :: Skills @@ -544,6 +547,10 @@ script: sequence: - service: shell_command.coji + meccanoid: + sequence: + - service: shell_command.meccanoid + # Amikoo Maya Lands :: Skills amikoogcvisionapi: @@ -820,6 +827,7 @@ shell_command: # Amikoo Maya Lands: Applications coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & + meccanoid: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Meccanoid.sh & # Amikoo Maya Lands: Skills @@ -1285,6 +1293,7 @@ group: name: Aplicaciones entities: - script.coji + - script.meccanoid # Amikoo Maya Lands: Applications From 3d7223c477769fe562aaa8387b0d3f7f8e0c0e3a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:38:00 -0500 Subject: [PATCH 1242/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/AmikooMayaLands/Meccanoid.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/AmikooMayaLands/Meccanoid.sh diff --git a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh old mode 100644 new mode 100755 From 2dc4d0f8e810ea1a12d248ac20d19a7cc20a2da2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:45:53 -0500 Subject: [PATCH 1243/1653] Update Meccanoid.sh --- Hochob/Applications/AmikooMayaLands/Meccanoid.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh index 6b6e4dbc..8b24c307 100755 --- a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh +++ b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh @@ -37,7 +37,16 @@ else "Vamos a bailar" fi -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "MichaelJacksonThirllerShort.mp3" +AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "MichaelJacksonThrillerShort.mp3" + +sleep 10 + +Amikoo.sh amikoo/headright 1 && sleep .6 +Amikoo.sh amikoo/headleft 1 && sleep .6 +Amikoo.sh amikoo/moveforward 1 && sleep .6 +Amikoo.sh amikoo/movewbackward 1 && sleep .6 + +sleep 14 Amikoo.sh amikoo/headright 1 && sleep .6 Amikoo.sh amikoo/headleft 1 && sleep .6 @@ -46,9 +55,13 @@ Amikoo.sh amikoo/leftup 1 && sleep .6 Amikoo.sh amikoo/rightfold 1 && sleep .6 Amikoo.sh amikoo/leftfold 1 && sleep .6 Amikoo.sh amikoo/moveright 1 && sleep .6 +Amikoo.sh amikoo/movestop 1 && sleep .6 Amikoo.sh amikoo/moveleft 1 && sleep .6 +Amikoo.sh amikoo/movestop 1 && sleep .6 Amikoo.sh amikoo/moveleft 1 && sleep .6 +Amikoo.sh amikoo/movestop 1 && sleep .6 Amikoo.sh amikoo/moveleft 1 && sleep .6 +Amikoo.sh amikoo/movestop 1 && sleep .6 Amikoo.sh amikoo/leftfold 1 && sleep .6 Amikoo.sh amikoo/rightfold 1 && sleep .6 Amikoo.sh amikoo/leftup 1 && sleep .6 From d0ebd50936e3a6a23448949d51443400d3a84d31 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:49:20 -0500 Subject: [PATCH 1244/1653] Update Mosquitto.sh --- Hochob/Services/Communications/MqttClient/Mosquitto.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 4604c723..97c877d0 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -36,7 +36,7 @@ do i=`expr $i + 1` done -$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 2 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\"" +$MOSQUITTO_PUB_BINARY -h $MQTT_SERVER_ADDRESS -p $MQTT_SERVER_PORT -q 1 -t $LOCAL_TOPIC -m "\"${LOCAL_MESSAGE}\"" exit 0 From bf6d02557db5bd8449cca38335c843422436290c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:52:44 -0500 Subject: [PATCH 1245/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d6f527b4..0c1c3d83 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -841,24 +841,24 @@ shell_command: # Amikoo Maya Lands: Movement - headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headleft 1 - headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headright 1 - - rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightup - rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightdown - rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightfold - rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightunfold - - leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftup - leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftdown - leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftfold - leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftunfold + headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headleft "Head Left" + headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headright "Head Right" + + rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightup "Arm Right Up" + rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightdown "Arm Right Down" + rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightfold "Arm Right Fold" + rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightunfold "Arm Right Unfold" + + leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftup "Arm Left Up" + leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftdown "Arm Left Down" + leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftfold "Arm Left Fold" + leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftunfold "Arm Left Unfold" - moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveright - moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveleft - moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveforward - movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movebackward - movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movestop + moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveright "Body Move Right" + moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveleft "Body Move Left" + moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveforward "Body Move Forward" + movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movebackward "Body Move Backward" + movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movestop "Body Stop" # Console Maya Lands From 3329449b92605150bea9c8a4d8f896a75e21a6e8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:55:38 -0500 Subject: [PATCH 1246/1653] Update Meccanoid.sh --- .../Applications/AmikooMayaLands/Meccanoid.sh | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh index 8b24c307..60a58170 100755 --- a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh +++ b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh @@ -41,33 +41,33 @@ AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "MichaelJacksonThrillerShort.mp3" sleep 10 -Amikoo.sh amikoo/headright 1 && sleep .6 -Amikoo.sh amikoo/headleft 1 && sleep .6 -Amikoo.sh amikoo/moveforward 1 && sleep .6 -Amikoo.sh amikoo/movewbackward 1 && sleep .6 +Amikoo.sh amikoo/headright && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 +Amikoo.sh amikoo/moveforward && sleep .6 +Amikoo.sh amikoo/movewbackward && sleep .6 sleep 14 -Amikoo.sh amikoo/headright 1 && sleep .6 -Amikoo.sh amikoo/headleft 1 && sleep .6 -Amikoo.sh amikoo/rightup 1 && sleep .6 -Amikoo.sh amikoo/leftup 1 && sleep .6 -Amikoo.sh amikoo/rightfold 1 && sleep .6 -Amikoo.sh amikoo/leftfold 1 && sleep .6 -Amikoo.sh amikoo/moveright 1 && sleep .6 -Amikoo.sh amikoo/movestop 1 && sleep .6 -Amikoo.sh amikoo/moveleft 1 && sleep .6 -Amikoo.sh amikoo/movestop 1 && sleep .6 -Amikoo.sh amikoo/moveleft 1 && sleep .6 -Amikoo.sh amikoo/movestop 1 && sleep .6 -Amikoo.sh amikoo/moveleft 1 && sleep .6 -Amikoo.sh amikoo/movestop 1 && sleep .6 -Amikoo.sh amikoo/leftfold 1 && sleep .6 -Amikoo.sh amikoo/rightfold 1 && sleep .6 -Amikoo.sh amikoo/leftup 1 && sleep .6 -Amikoo.sh amikoo/rightup 1 && sleep .6 -Amikoo.sh amikoo/headleft 1 && sleep .6 -Amikoo.sh amikoo/headright 1 && sleep .6 +Amikoo.sh amikoo/headright && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 +Amikoo.sh amikoo/rightup && sleep .6 +Amikoo.sh amikoo/leftup && sleep .6 +Amikoo.sh amikoo/rightfold && sleep .6 +Amikoo.sh amikoo/leftfold && sleep .6 +Amikoo.sh amikoo/moveright && sleep .6 +Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/moveleft && sleep .6 +Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/moveleft && sleep .6 +Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/moveleft && sleep .6 +Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/leftfold && sleep .6 +Amikoo.sh amikoo/rightfold && sleep .6 +Amikoo.sh amikoo/leftup && sleep .6 +Amikoo.sh amikoo/rightup && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 +Amikoo.sh amikoo/headright && sleep .6 AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" From 2143a0dc09e66653abd5fa62c4efd1979e56719c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 11:57:51 -0500 Subject: [PATCH 1247/1653] Update Amikoo.sh --- Hochob/Services/Amikoo/Remote/Amikoo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Amikoo/Remote/Amikoo.sh b/Hochob/Services/Amikoo/Remote/Amikoo.sh index d911b9fc..5026e36c 100755 --- a/Hochob/Services/Amikoo/Remote/Amikoo.sh +++ b/Hochob/Services/Amikoo/Remote/Amikoo.sh @@ -45,7 +45,7 @@ elif [ "$LOCAL_COMMAND" = "picture" ]; then Mosquitto.sh $AMIKOO_PICTURE "Camera Picture" fi -# Skills Basic +# Movement & Speak Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE From 4d0c2fdfc2d5c9c9ecbdd8d2dce469a4867b7168 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:05:46 -0500 Subject: [PATCH 1248/1653] Update Fotografia.sh --- Hochob/Applications/TraditionMayaLands/Fotografia.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Fotografia.sh b/Hochob/Applications/TraditionMayaLands/Fotografia.sh index 6a181c40..602dcd37 100755 --- a/Hochob/Applications/TraditionMayaLands/Fotografia.sh +++ b/Hochob/Applications/TraditionMayaLands/Fotografia.sh @@ -27,9 +27,9 @@ LOCAL_TRADITION="DiaDeMuertos" LogPid.sh $FOTOGRAFIA_PID $FOTOGRAFIA_NAME -# AMIKOO_PICTURE amikoo/camera/picture +Amikoo.sh "picture" AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Witch.mp3" +sleep 3 AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" -# AMIKOO_PICTURE stop # End of File From 83767cd9cb2a5e8037aba8b4f202347b6b75440c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:17:27 -0500 Subject: [PATCH 1249/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0c1c3d83..c626329e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -277,7 +277,7 @@ homeassistant: icon: mdi:calendar-clock automation.wo: - friendly_name: 30 segundos .. Bienvenida Robot + friendly_name: 15 segundos .. Bienvenida Robot icon: mdi:calendar-clock # Tradition Maya Lands :: Dia De Muertos @@ -985,7 +985,7 @@ automation: initial_state: 'off' trigger: platform: time - seconds: '/30' + seconds: '/15' action: - service: shell_command.wo From 52de8fc40cff8c11e258413ac49713a0de34dcaf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:22:27 -0500 Subject: [PATCH 1250/1653] Update HostExternal.sh --- Hochob/Services/Events/HostExternal.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index 1dda4109..99405d0a 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -15,7 +15,10 @@ LOCAL_LANGUAGE="$2" LOCAL_INSTITUTION_NAME="$3" LOCAL_EVENT_NAME="$4" -LOCAL_GREETING_ENGLISH[0]="Hi There," +LOCAL_INTRODUCTION_ENGLISH="Hi, I am Lupe." +LOCAL_INTRODUCTION_SPANISH="Hola! Soy Lupe." + +LOCAL_GREETING_ENGLISH[0]="Hey There," LOCAL_GREETING_ENGLISH[1]="Good morning," LOCAL_GREETING_ENGLISH[2]="Hurray," LOCAL_GREETING_ENGLISH[3]="Wait," @@ -29,17 +32,17 @@ LOCAL_GREETING_SPANISH[1]="Buenos dias," LOCAL_GREETING_SPANISH[2]="Hola Cacerola," LOCAL_GREETING_SPANISH[3]="Espera," LOCAL_GREETING_SPANISH[4]="Hey," -LOCAL_GREETING_SPANISH[5]="Hola hola," +LOCAL_GREETING_SPANISH[5]="Que hongo," LOCAL_GREETING_SPANISH[6]="Un minuto por favor," LOCAL_GREETING_SPANISH[7]="Que onda," LOCAL_REMINDER_ENGLISH[0]="Welcome to our" LOCAL_REMINDER_ENGLISH[1]="Great you did not forget about" -LOCAL_REMINDER_ENGLISH[2]="Today is the big day," +LOCAL_REMINDER_ENGLISH[2]="Today is our big meetup," LOCAL_REMINDER_ENGLISH[3]="It is finally here!," LOCAL_REMINDER_ENGLISH[4]="Finally with us," -LOCAL_REMINDER_ENGLISH[5]="The big day has just arrived," -LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, the great event," +LOCAL_REMINDER_ENGLISH[5]="The big boy has just arrived," +LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, this great journey," LOCAL_REMINDER_SPANISH[0]="Bienvenido a nuestro evento," LOCAL_REMINDER_SPANISH[1]="Excelente que estas aqui, " From e1dfdfd6e3a704c9fba76daafdb3157778f79bf9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:29:43 -0500 Subject: [PATCH 1251/1653] Update HostExternal.sh --- Hochob/Services/Events/HostExternal.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index 99405d0a..f092d56d 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -32,7 +32,7 @@ LOCAL_GREETING_SPANISH[1]="Buenos dias," LOCAL_GREETING_SPANISH[2]="Hola Cacerola," LOCAL_GREETING_SPANISH[3]="Espera," LOCAL_GREETING_SPANISH[4]="Hey," -LOCAL_GREETING_SPANISH[5]="Que hongo," +LOCAL_GREETING_SPANISH[5]="Que hongo morongo," LOCAL_GREETING_SPANISH[6]="Un minuto por favor," LOCAL_GREETING_SPANISH[7]="Que onda," @@ -59,6 +59,16 @@ LOCAL_CLOSURE_SPANISH="Que disfrutes el evento." # Functions # ============================================================================= +chooseIntroduction() +{ + LANGUAGE=$1 + if [ "$LANGUAGE" = "english" ]; then + LOCAL_INTRODUCTION=${LOCAL_INTRODUCTION_ENGLISH} + else + LOCAL_INTRODUCTION=${LOCAL_INTRODUCTION_SPANISH} + fi +} + chooseGreeting() { LANGUAGE=$1 @@ -95,11 +105,13 @@ chooseClosure() # Main # ============================================================================= +chooseIntroduction $LOCAL_LANGUAGE chooseGreeting $LOCAL_LANGUAGE chooseReminder $LOCAL_LANGUAGE chooseClosure $LOCAL_LANGUAGE -LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ +LOCAL_MESSAGE="${LOCAL_INTRODUCTION} \ + ${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}. \ ${LOCAL_CLOSURE}" From cfe909d27f849154655366708d1aa3eb1097e436 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:40:43 -0500 Subject: [PATCH 1252/1653] Create Sphero.sh --- Hochob/Applications/AmikooMayaLands/Sphero.sh | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Hochob/Applications/AmikooMayaLands/Sphero.sh diff --git a/Hochob/Applications/AmikooMayaLands/Sphero.sh b/Hochob/Applications/AmikooMayaLands/Sphero.sh new file mode 100644 index 00000000..02711780 --- /dev/null +++ b/Hochob/Applications/AmikooMayaLands/Sphero.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export SPHERO_PID=$$ +export SPHERO_NAME="Sphero" +export SPHERO_PATH=$(readlink -f "$0") +export SPHERO_DIRECTORY=$(dirname "$SPHERO_PATH") + + +LOCAL_PHRASE[0]="¿Que pez, acuaman?" +LOCAL_PHRASE[1]="¿Que pasotes con esos zapatotes, brother?" +LOCAL_PHRASE[2]="¿Que Honduras con las verduras que andan bajas las temperaturas?" +LOCAL_PHRASE[3]="¿Qué Pachuca por Toluca?" +LOCAL_PHRASE[4]="¿Qué Pachuca por Acámbaro?" +LOCAL_PHRASE[5]="¿Qué rollo, Goyo?" +LOCAL_PHRASE[6]="¿Qué Honduras, mi Nicaragua?" +LOCAL_PHRASE[7]="¿Qué transita por tu avenida?" + +# ============================================================================= +# Functions +# ============================================================================= + +choosePhrase() +{ + rand=$[ $RANDOM % 7 ] + LOCAL_PHRASE=${LOCAL_PHRASE[$rand]} +} + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $SPHERO_PID $SPHERO_NAME + +choosePhrase +Amikoo.sh $AMIKOO_DECIR $LOCAL_PHRASE + +# End of File From 49e3b36cf6fcf918ddf06e3d1e5137954e79c8d0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:42:26 -0500 Subject: [PATCH 1253/1653] Update Sphero.sh --- Hochob/Applications/AmikooMayaLands/Sphero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Sphero.sh b/Hochob/Applications/AmikooMayaLands/Sphero.sh index 02711780..d6eda3af 100644 --- a/Hochob/Applications/AmikooMayaLands/Sphero.sh +++ b/Hochob/Applications/AmikooMayaLands/Sphero.sh @@ -40,6 +40,6 @@ choosePhrase() LogPid.sh $SPHERO_PID $SPHERO_NAME choosePhrase -Amikoo.sh $AMIKOO_DECIR $LOCAL_PHRASE +Amikoo.sh $AMIKOO_DECIR "$LOCAL_PHRASE" # End of File From 61b8acdf58bdd3064756095facaa380f6da2f511 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:54:11 -0500 Subject: [PATCH 1254/1653] Update Sphero.sh --- Hochob/Applications/AmikooMayaLands/Sphero.sh | 46 ++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Sphero.sh b/Hochob/Applications/AmikooMayaLands/Sphero.sh index d6eda3af..5502a43d 100644 --- a/Hochob/Applications/AmikooMayaLands/Sphero.sh +++ b/Hochob/Applications/AmikooMayaLands/Sphero.sh @@ -22,6 +22,50 @@ LOCAL_PHRASE[4]="¿Qué Pachuca por Acámbaro?" LOCAL_PHRASE[5]="¿Qué rollo, Goyo?" LOCAL_PHRASE[6]="¿Qué Honduras, mi Nicaragua?" LOCAL_PHRASE[7]="¿Qué transita por tu avenida?" +LOCAL_PHRASE[8]="¿Que transita por tus venas?" +LOCAL_PHRASE[9]="¿Como estanques?" +LOCAL_PHRASE[10]="¿Qué trampa, cazador?" +LOCAL_PHRASE[11]="¿Te conozco, Orozco?" +LOCAL_PHRASE[12]="¿Que ondón, Ramón?" +LOCAL_PHRASE[13]="¿Cómo estanques, mi pescado?" +LOCAL_PHRASE[14]="¿Que tranza, Carranza?" +LOCAL_PHRASE[15]=" ¿Qué pez, marques?" +LOCAL_PHRASE[16]="¿Qué ondón, panzón?" +LOCAL_PHRASE[17]="¿Qué pasó mi rín cromado?" +LOCAL_PHRASE[18]="Vientos huracanados del norte y del sur con tendencias a la baja." +LOCAL_PHRASE[19]=" Según lo programado por los meteorólogos y Tucson Arizona como has Estados Unidos." +LOCAL_PHRASE[20]="Yo pensé que ya estabas morongas, pero nopales, estas bien vivorolas." +LOCAL_PHRASE[21]="Nadando de muertito. " +LOCAL_PHRASE[22]="¡Chido, Liro, Ramiro y el vampiro Clodomiro!" +LOCAL_PHRASE[23]="Me late un restorán!" +LOCAL_PHRASE[24]="¡Me late, cacahuate!" +LOCAL_PHRASE[25]="¡Chido one, Tehuacán!" +LOCAL_PHRASE[26]="¡Camara conchinchín!" +LOCAL_PHRASE[27]="¡Me gusta un montón ese pachangón!" +LOCAL_PHRASE[28]="¡Asústame pantera!" +LOCAL_PHRASE[29]="¡Espántame panteón!" +LOCAL_PHRASE[30]="¡Ay nanita, manita!" +LOCAL_PHRASE[31]=" ¡Abuelo, soy tu nieto!" +LOCAL_PHRASE[32]="¡A hueso!" +LOCAL_PHRASE[33]="¡Yes en inglés, Takanaka en Japonés!" +LOCAL_PHRASE[34]="¡A Wilson mi Nike!" +LOCAL_PHRASE[35]="¡Abuelita de Batman!" +LOCAL_PHRASE[36]="¡Cámara pibote y rín!" +LOCAL_PHRASE[37]="¡Ya rugiste pantera!" +LOCAL_PHRASE[38]="Como dijo el gran Tom Boy, ¡yo ya me voy!" +LOCAL_PHRASE[39]="¡Este osito de peluche, ya se va para su estuche!" +LOCAL_PHRASE[40]="Este muñeco cambia de aparador." +LOCAL_PHRASE[41]="Aquí se rompió un taza, cada quien para su casa." +LOCAL_PHRASE[42]="Ay nos vidrios." +LOCAL_PHRASE[43]="¡Al ratón vaquero!" +LOCAL_PHRASE[45]="Como dijo el resorte: ¡me restiro!" +LOCAL_PHRASE[46]="¡Ahí nos vemos cocodrilo! " +LOCAL_PHRASE[47]="¡Como dijo el gran queso al rato regreso! " +LOCAL_PHRASE[48]="¡Si tienen lavadora ahí lavemos! " +LOCAL_PHRASE[49]="¡Me multiplico por Serapio Rendon! " +LOCAL_PHRASE[50]="¡Ahí la vemos de Niu Yor!" + +# From https://www.taringa.net/posts/humor/10591773/Frases-Nacas-corrientes-o-populares.html # ============================================================================= # Functions @@ -29,7 +73,7 @@ LOCAL_PHRASE[7]="¿Qué transita por tu avenida?" choosePhrase() { - rand=$[ $RANDOM % 7 ] + rand=$[ $RANDOM % 50 ] LOCAL_PHRASE=${LOCAL_PHRASE[$rand]} } From 6decaae2d81cb1a9e57a35e35a87cdeab40c5245 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:54:36 -0500 Subject: [PATCH 1255/1653] Update Sphero.sh --- Hochob/Applications/AmikooMayaLands/Sphero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Sphero.sh b/Hochob/Applications/AmikooMayaLands/Sphero.sh index 5502a43d..1b3bcf96 100644 --- a/Hochob/Applications/AmikooMayaLands/Sphero.sh +++ b/Hochob/Applications/AmikooMayaLands/Sphero.sh @@ -55,7 +55,7 @@ LOCAL_PHRASE[37]="¡Ya rugiste pantera!" LOCAL_PHRASE[38]="Como dijo el gran Tom Boy, ¡yo ya me voy!" LOCAL_PHRASE[39]="¡Este osito de peluche, ya se va para su estuche!" LOCAL_PHRASE[40]="Este muñeco cambia de aparador." -LOCAL_PHRASE[41]="Aquí se rompió un taza, cada quien para su casa." +LOCAL_PHRASE[41]="Aquí se rompió una taza, cada quien para su casa." LOCAL_PHRASE[42]="Ay nos vidrios." LOCAL_PHRASE[43]="¡Al ratón vaquero!" LOCAL_PHRASE[45]="Como dijo el resorte: ¡me restiro!" From e186373d1a88db71a775a9fcc19b2dc06de83860 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:56:38 -0500 Subject: [PATCH 1256/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/AmikooMayaLands/Sphero.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/AmikooMayaLands/Sphero.sh diff --git a/Hochob/Applications/AmikooMayaLands/Sphero.sh b/Hochob/Applications/AmikooMayaLands/Sphero.sh old mode 100644 new mode 100755 From 77d9cf1a45ed28aec275d17b1a9118d450b7d0cc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 12:58:30 -0500 Subject: [PATCH 1257/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index c626329e..65c1890a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -79,6 +79,10 @@ homeassistant: # Amikoo Maya Lands :: Knowledge + script.sphero: + friendly_name: Frases Populares + icon: mdi:audiobook + script.makeblock: friendly_name: Centro de Visitantes icon: mdi:audiobook @@ -567,6 +571,10 @@ script: # Amikoo Maya Lands :: Knowledge + sphero: + sequence: + - service: shell_command.sphero + makeblock: sequence: - service: shell_command.makeblock @@ -837,6 +845,7 @@ shell_command: # Amikoo Maya Lands :: Knowledge + sphero: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Sphero.sh & makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & # Amikoo Maya Lands: Movement @@ -1310,6 +1319,7 @@ group: name: Conocimiento entities: - script.makeblock + - script.sphero # Amikoo Maya Lands: Head From 2cdaea3310e269d7322c89c30693a885e38d4f61 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 28 Oct 2017 13:00:40 -0500 Subject: [PATCH 1258/1653] Update Sphero.sh --- Hochob/Applications/AmikooMayaLands/Sphero.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Sphero.sh b/Hochob/Applications/AmikooMayaLands/Sphero.sh index 1b3bcf96..1c4b61cf 100755 --- a/Hochob/Applications/AmikooMayaLands/Sphero.sh +++ b/Hochob/Applications/AmikooMayaLands/Sphero.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -x From 976caf8f132b23c75e55e83fe40acb3b81e92081 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 09:03:09 -0500 Subject: [PATCH 1259/1653] Update Main.sh --- Hochob/Main.sh | 93 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 64 insertions(+), 29 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index a35fa2fb..be5030a9 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -4,7 +4,9 @@ # Variables # ============================================================================= -# Hochob Server Configuration +# --------------------------- # +# Hochob Server Configuration # +# --------------------------- # export HOCHOB_SERVER_CONFIGURATION=/tmp/hochob/ export HOCHOB_SERVER_CONFIGURATION_PID=$HOCHOB_SERVER_CONFIGURATION/pid/ @@ -16,12 +18,16 @@ export HOCHOB_SERVER_CONFIGURATION_DEMO=$HOCHOB_SERVER_CONFIGURATION/demo export HOCHOB_SERVER_CONFIGURATION_LANGUAGE=$HOCHOB_SERVER_CONFIGURATION/language export HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE=$HOCHOB_SERVER_CONFIGURATION/amikooavailable -# Hochob Server Root +# ------------------ # +# Hochob Server Root # +# ------------------ # cd ~/CodeLabs/Hochob/ export HOCHOB_ROOT=`pwd` -# Hochob Server Services +# ---------------------- # +# Hochob Server Services # +# ---------------------- # export HOCHOB_SERVER=$HOCHOB_ROOT @@ -73,7 +79,9 @@ export PATH=$PATH:$HOCHOB_SERVER_SERVICES_SURVEY export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VIDEO export PATH=$PATH:$HOCHOB_SERVER_SERVICES_VISITORS -# Hochob Server Media Raw +# ------------------- # +# Hochob Server Media # +# ------------------- # export HOCHOB_SERVER_MEDIA=$HOME/HochobServerMedia/ @@ -97,7 +105,9 @@ export HOCHOB_SERVER_MEDIA_TRADITION_NAVIDAD=$HOCHOB_SERVER_MEDIA_TRADITION/Navi export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/ -# Hochob Server Media Executive +# ----------------------------- # +# Hochob Server Media Executive # +# ----------------------------- # export AREA_SOUTERN_MAYA_HIGHLANDS=$HOCHOB_SERVER_MEDIA_AREA_SOUTERN_MAYA_HIGHLANDS export AREA_CENTRAL_MAYA_LOWLANDS=$HOCHOB_SERVER_MEDIA_AREA_CENTRAL_MAYA_LOWLANDS @@ -116,7 +126,9 @@ export TRADITION_NAVIDAD=$HOCHOB_SERVER_MEDIA_TRADITION_NAVIDAD export VISITORS=$HOCHOB_SERVER_MEDIA_VISITORS -# Hochob Server Media Source Raw +# -------------------------- # +# Hochob Server Media Source # +# -------------------------- # export HOCHOB_SERVER_MEDIA_SOURCE=$HOME/HochobServerMediaSource/ @@ -157,7 +169,9 @@ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_ export HOCHOB_SERVER_MEDIA_SOURCE_VISITORS=$HOCHOB_SERVER_MEDIA_SOURCE/Visitors/ -# Hochob Server Media Source Executive +# ------------------------------------ # +# Hochob Server Media Source Executive # +# ------------------------------------ # export FSWEBCAM_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM export FSWEBCAM_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_CAMERA_FSWEBCAM_ALLFILES @@ -190,45 +204,66 @@ export FFMPEG_VIDEO_AUDIO=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_VIDEO_AUDIO export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS -# MQ Telemetry Transport +# ---------------------- # +# MQ Telemetry Transport # +# ---------------------- # #MQTT_SERVER_ADDRESS=127.0.0.1 #MQTT_SERVER_ADDRESS=10.215.56.158 MQTT_SERVER_ADDRESS=iot.eclipse.org MQTT_SERVER_PORT=1883 -# Amikoo +# ------ # +# Amikoo # +# ------ # AMIKOO=amikoo -AMIKOO_SOUND=$AMIKOO/sound -AMIKOO_SOUND_SPEECHSYNTHETIZER=$AMIKOO_SOUND/speechsynthetizer +# Musculoskeletal System # +## Tbd -AMIKOO_TRADITION=$AMIKOO/tradition -AMIKOO_TRADITION_AUDIO=$AMIKOO_TRADITION/audio -AMIKOO_TRADITION_IMAGE=$AMIKOO_TRADITION/image -AMIKOO_TRADITION_VIDEO=$AMIKOO_TRADITION/video +# Nervous System # -AMIKOO_CAMERA=$AMIKOO/camera -AMIKOO_CAMERA_PICTURE=$AMIKOO_CAMERA/picture +## Voice ## +AMIKOO_HUMANVOICE=$AMIKOO/sound/speechsynthetizer +AMIKOO_SAY=$AMIKOO_HUMANVOICE/say +AMIKOO_DECIR=$AMIKOO_HUMANVOICE/decir -## Applications +## Sense ## +AMIKOO_SENSE=$AMIKOO/sense -AMIKOO_SAY=$AMIKOO_SOUND_SPEECHSYNTHETIZER/say -AMIKOO_DECIR=$AMIKOO_SOUND_SPEECHSYNTHETIZER/decir +### Sight (Vision) ### +AMIKOO_SENSE_SIGHT=$AMIKOO_SENSE/sight +AMIKOO_SENSE_SIGHT_PICTURE=$AMIKOO_SENSE_SIGHT/picture +AMIKOO_PICTURE=$AMIKOO_SENSE_SIGHT_PICTURE +AMIKOO_PICTURE=/amikoo/camera/picture -## Skills +### Hearing (Audition) ### +AMIKOO_SENSE_HEARING=$AMIKOO_SENSE/hearing -AMIKOO_GCVISIONAPI=$AMIKOO/gc/visionapi -AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gc/translationapi -AMIKOO_PICTURE=$AMIKOO_CAMERA_PICTURE +### Taste (Gustation) ### +#### Tbd + +### Smell (Olfaction) ### +#### Tbd + +### Touch (Somatosensation) ### +#### Tbd -## Skill Tradition +# Communication # +AMIKOO_COMMUNICATION=$AMIKOO/tradition -AMIKOO_AUDIO=$AMIKOO_TRADITION_AUDIO -AMIKOO_IMAGE=$AMIKOO_TRADITION_IMAGE -AMIKOO_VIDEO=$AMIKOO_TRADITION_VIDEO -AMIKOO_PICTURE=$AMIKOO_CAMERA_PICTURE +## Communication :: Verbal ## +AMIKOO_AUDIO=$AMIKOO_COMMUNICATION/audio + +## Communication :: Visual ## +AMIKOO_IMAGE=$AMIKOO_COMMUNICATION/image +AMIKOO_VIDEO=$AMIKOO_COMMUNICATION/video + +# Expertise # +AMIKOO_SKILLS=$AMIKOO/skills +AMIKOO_GCVISIONAPI=$AMIKOO/gc/visionapi +AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gc/translationapi # ============================================================================= # Functions From bc5aaaabd5f2cd36dd393b8ba7768475b053ff61 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 10:03:58 -0500 Subject: [PATCH 1260/1653] Create AmikooSense.sh --- Hochob/Services/Amikoo/Remote/AmikooSense.sh | 32 ++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Hochob/Services/Amikoo/Remote/AmikooSense.sh diff --git a/Hochob/Services/Amikoo/Remote/AmikooSense.sh b/Hochob/Services/Amikoo/Remote/AmikooSense.sh new file mode 100644 index 00000000..e16859e6 --- /dev/null +++ b/Hochob/Services/Amikoo/Remote/AmikooSense.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export AMIKOOSENSE_PID=$$ + +LOCAL_SENSE="$1" +LOCAL_COMMAND="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ "$LOCAL_SENSE" = "sight" ]; then + if [ "$LOCAL_COMMAND" = "picture" ]; then + Mosquitto.sh $AMIKOO_PICTURE "Camera Picture" + fi +fi + +# End of File From ec4c9ca2ac84add2b3256b6545d1ce807eb360af Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 10:17:20 -0500 Subject: [PATCH 1261/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 271 +++++++++++------- 1 file changed, 164 insertions(+), 107 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 65c1890a..7721c8b3 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -56,36 +56,7 @@ homeassistant: friendly_name: Ahora icon: mdi:lock-reset - # Amikoo Maya Lands :: Applications - - script.coji: - friendly_name: Discurso Bilingüe - icon: mdi:speaker - script.meccanoid: - friendly_name: Baile Thriller - icon: mdi:account - - # Amikoo Maya Lands :: Skills - - script.amikoogcvisionapi: - friendly_name: Google Vision API - icon: mdi:camera - script.amikoogctranslationapi: - friendly_name: Google Translation API - icon: mdi:google-translate - script.amikoopicture: - friendly_name: Fotógrafia - icon: mdi:camera - - # Amikoo Maya Lands :: Knowledge - - script.sphero: - friendly_name: Frases Populares - icon: mdi:audiobook - - script.makeblock: - friendly_name: Centro de Visitantes - icon: mdi:audiobook + # Amikoo Maya Lands :: Movement script.headright: friendly_name: Derecha @@ -93,7 +64,7 @@ homeassistant: script.headleft: friendly_name: Izquierda icon: mdi:arrow-left-thick - + script.rightup: friendly_name: Arriba icon: mdi:human-handsup @@ -136,6 +107,48 @@ homeassistant: friendly_name: Parar icon: mdi:stop + # Amikoo Maya Lands :: Voice + + # Tbd + + # Amikoo Maya Lands :: Sense + + script.amikoosensesight: + friendly_name: Vista + icon: mdi:camera + + # Amikoo Maya Lands :: Communication + + # Tbd + + # Amikoo Maya Lands :: Knowledge + + script.sphero: + friendly_name: Frases Populares + icon: mdi:audiobook + + script.makeblock: + friendly_name: Centro de Visitantes + icon: mdi:audiobook + + # Amikoo Maya Lands :: Expertise + + script.amikoogcvisionapi: + friendly_name: Google Vision API + icon: mdi:camera + script.amikoogctranslationapi: + friendly_name: Google Translation API + icon: mdi:google-translate + + # Amikoo Maya Lands :: Applications + + script.coji: + friendly_name: Discurso Bilingüe + icon: mdi:speaker + script.meccanoid: + friendly_name: Baile Thriller + icon: mdi:account + # Central Maya Lowlands, Stations script.acapulco: @@ -545,40 +558,6 @@ script: sequence: - service: shell_command.resetall - # Amikoo Maya Lands :: Applications - - coji: - sequence: - - service: shell_command.coji - - meccanoid: - sequence: - - service: shell_command.meccanoid - - # Amikoo Maya Lands :: Skills - - amikoogcvisionapi: - sequence: - - service: shell_command.amikoogcvisionapi - - amikoogctranslationapi: - sequence: - - service: shell_command.amikoogctranslationapi - - amikoopicture: - sequence: - - service: shell_command.amikoopicture - - # Amikoo Maya Lands :: Knowledge - - sphero: - sequence: - - service: shell_command.sphero - - makeblock: - sequence: - - service: shell_command.makeblock - # Amikoo Maya Lands :: Movement headright: @@ -641,6 +620,52 @@ script: sequence: - service: shell_command.movestop + # Amikoo Maya Lands :: Voice + + # Tbd + + # Amikoo Maya Lands :: Sense + + # Tbd + + # Amikoo Maya Lands :: Communication + + # Tbd + + # Amikoo Maya Lands :: Knowledge + + sphero: + sequence: + - service: shell_command.sphero + + makeblock: + sequence: + - service: shell_command.makeblock + + # Amikoo Maya Lands :: Expertise + + amikoogcvisionapi: + sequence: + - service: shell_command.amikoogcvisionapi + + amikoogctranslationapi: + sequence: + - service: shell_command.amikoogctranslationapi + + amikoosensesight: + sequence: + - service: shell_command.amikoosensesight + + # Amikoo Maya Lands :: Application + + coji: + sequence: + - service: shell_command.coji + + meccanoid: + sequence: + - service: shell_command.meccanoid + # Central Maya Lowlands, Stations acapulco: @@ -831,22 +856,6 @@ shell_command: # Amikoo Maya Lands resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/resetall 1 - - # Amikoo Maya Lands: Applications - - coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & - meccanoid: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Meccanoid.sh & - - # Amikoo Maya Lands: Skills - - amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 - amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 - amikoopicture: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh picture 1 - - # Amikoo Maya Lands :: Knowledge - - sphero: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Sphero.sh & - makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & # Amikoo Maya Lands: Movement @@ -868,7 +877,32 @@ shell_command: moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveforward "Body Move Forward" movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movebackward "Body Move Backward" movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movestop "Body Stop" + + # Amikoo Maya Lands :: Voice + # Tbd + + # Amikoo Maya Lands: Sense + amikoosensesight: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooSense.sh sight picture + + # Amikoo Maya Lands :: Communication + # Tbd + + # Amikoo Maya Lands :: Knowledge + + sphero: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Sphero.sh & + makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & + + # Amikoo Maya Lands: Expertise + + amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 + amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 + + # Amikoo Maya Lands: Application + + coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & + meccanoid: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Meccanoid.sh & + # Console Maya Lands keypadyes: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual yes & @@ -1171,8 +1205,11 @@ group: name: Robot entities: - group.robotmayalandsapplications - - group.robotmayalandsskills + - group.robotmayalandsexpertise - group.robotmayalandsknowledge + - group.robotmayalandscommunication + - group.robotmayalandssense + - group.robotmayalandsvoice - group.robotmayalandshead - group.robotmayalandsarmright - group.robotmayalandsarmleft @@ -1296,30 +1333,12 @@ group: entities: - script.zacatecas - # Amikoo Maya Lands: Applications - - robotmayalandsapplications: - name: Aplicaciones - entities: - - script.coji - - script.meccanoid - - # Amikoo Maya Lands: Applications - - robotmayalandsskills: - name: Habilidades - entities: - - script.amikoogcvisionapi - - script.amikoogctranslationapi - - script.amikoopicture - - # Amikoo Maya Lands: Knowledge + # Amikoo Maya Lands - robotmayalandsknowledge: - name: Conocimiento + robotmayalandsreset: + name: Reiniciar entities: - - script.makeblock - - script.sphero + - script.resetall # Amikoo Maya Lands: Head @@ -1360,13 +1379,51 @@ group: - script.movebackward - script.movestop - # Amikoo Maya Lands: Reset + # Amikoo Maya Lands: Voice - robotmayalandsreset: - name: Reiniciar + robotmayalandsvoice: + name: Voz entities: - script.resetall + # Amikoo Maya Lands: Sense + + robotmayalandssense: + name: Sentidos + entities: + - script.amikoosensesight + + # Amikoo Maya Lands: Communication + + robotmayalandscommunication: + name: Comunicaciones + entities: + - script.resetall + + # Amikoo Maya Lands: Knowledge + + robotmayalandsknowledge: + name: Conocimiento + entities: + - script.makeblock + - script.sphero + + # Amikoo Maya Lands: Expertise + + robotmayalandsexpertise: + name: Expertise + entities: + - script.amikoogcvisionapi + - script.amikoogctranslationapi + + # Amikoo Maya Lands: Applications + + robotmayalandsapplications: + name: Aplicaciones + entities: + - script.coji + - script.meccanoid + # Central Maya Lowlands: Stations centralmayalowlandsstations: From 1de7624831dc06663932caa0723d6d444bc7528a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 10:27:19 -0500 Subject: [PATCH 1262/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 104 +++++++++--------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 7721c8b3..873d3a8e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1204,12 +1204,12 @@ group: view: yes name: Robot entities: - - group.robotmayalandsapplications + - group.robotmayalandsvoice + - group.robotmayalandssense + - group.robotmayalandscommunication - group.robotmayalandsexpertise + - group.robotmayalandsapplications - group.robotmayalandsknowledge - - group.robotmayalandscommunication - - group.robotmayalandssense - - group.robotmayalandsvoice - group.robotmayalandshead - group.robotmayalandsarmright - group.robotmayalandsarmleft @@ -1333,52 +1333,13 @@ group: entities: - script.zacatecas - # Amikoo Maya Lands + # Amikoo Maya Lands :: Reset robotmayalandsreset: name: Reiniciar entities: - script.resetall - # Amikoo Maya Lands: Head - - robotmayalandshead: - name: Cabeza - entities: - - script.headright - - script.headleft - - # Amikoo Maya Lands: Arm Right - - robotmayalandsarmright: - name: Brazo Derecho - entities: - - script.rightup - - script.rightdown - - script.rightfold - - script.rightunfold - - # Amikoo Maya Lands: Arm Left - - robotmayalandsarmleft: - name: Brazo Izquierdo - entities: - - script.leftup - - script.leftdown - - script.leftfold - - script.leftunfold - - # Amikoo Maya Lands: Legs - - robotmayalandslegs: - name: Piernas - entities: - - script.moveright - - script.moveleft - - script.moveforward - - script.movebackward - - script.movestop - # Amikoo Maya Lands: Voice robotmayalandsvoice: @@ -1400,14 +1361,6 @@ group: entities: - script.resetall - # Amikoo Maya Lands: Knowledge - - robotmayalandsknowledge: - name: Conocimiento - entities: - - script.makeblock - - script.sphero - # Amikoo Maya Lands: Expertise robotmayalandsexpertise: @@ -1424,6 +1377,53 @@ group: - script.coji - script.meccanoid + # Amikoo Maya Lands: Knowledge + + robotmayalandsknowledge: + name: Conocimiento + entities: + - script.makeblock + - script.sphero + + # Amikoo Maya Lands :: Movement :: Head + + robotmayalandshead: + name: Cabeza + entities: + - script.headright + - script.headleft + + # Amikoo Maya Lands :: Movement :: Arm Right + + robotmayalandsarmright: + name: Brazo Derecho + entities: + - script.rightup + - script.rightdown + - script.rightfold + - script.rightunfold + + # Amikoo Maya Lands :: Movement :: Arm Left + + robotmayalandsarmleft: + name: Brazo Izquierdo + entities: + - script.leftup + - script.leftdown + - script.leftfold + - script.leftunfold + + # Amikoo Maya Lands :: Movement :: Legs + + robotmayalandslegs: + name: Piernas + entities: + - script.moveright + - script.moveleft + - script.moveforward + - script.movebackward + - script.movestop + # Central Maya Lowlands: Stations centralmayalowlandsstations: From ebabc31f2d683a88d1b3560a627a9a31789215b8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 10:29:06 -0500 Subject: [PATCH 1263/1653] Update and rename AmikooTradition.sh to AmikooCommunication.sh --- .../Remote/{AmikooTradition.sh => AmikooCommunication.sh} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Hochob/Services/Amikoo/Remote/{AmikooTradition.sh => AmikooCommunication.sh} (97%) diff --git a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh b/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh similarity index 97% rename from Hochob/Services/Amikoo/Remote/AmikooTradition.sh rename to Hochob/Services/Amikoo/Remote/AmikooCommunication.sh index 05c01c07..547b631e 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooTradition.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export AMIKOOTRADITION_PID=$$ +export AMIKOOCOMMUNICATION_PID=$$ LOCAL_TRADITION="$1" LOCAL_SKILL="$2" From 960abcef58e6f71c098a92d0131e7c3190bd120a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 10:30:40 -0500 Subject: [PATCH 1264/1653] Update AmikooCommunication.sh --- Hochob/Services/Amikoo/Remote/AmikooCommunication.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh b/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh index 547b631e..74d70346 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh @@ -14,7 +14,6 @@ LOCAL_TRADITION="$1" LOCAL_SKILL="$2" LOCAL_ARGUMENT="$3" - # ============================================================================= # Functions # ============================================================================= From 21fe018328ab642f8118304ddbb74c231e8885dc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 10:32:43 -0500 Subject: [PATCH 1265/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/AmikooMayaLands/Meccanoid.sh | 4 ++-- Hochob/Applications/TraditionMayaLands/8008.sh | 4 ++-- Hochob/Applications/TraditionMayaLands/80286.sh | 16 ++++++++-------- Hochob/Applications/TraditionMayaLands/8080.sh | 4 ++-- Hochob/Applications/TraditionMayaLands/8086.sh | 4 ++-- .../TraditionMayaLands/Calaveritas.sh | 6 +++--- .../TraditionMayaLands/Fotografia.sh | 4 ++-- Hochob/Applications/TraditionMayaLands/Mantel.sh | 4 ++-- .../TraditionMayaLands/PapelPicado.sh | 6 +++--- Hochob/Services/Amikoo/Remote/AmikooSense.sh | 0 10 files changed, 26 insertions(+), 26 deletions(-) mode change 100644 => 100755 Hochob/Services/Amikoo/Remote/AmikooSense.sh diff --git a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh index 60a58170..880e0b2f 100755 --- a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh +++ b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh @@ -37,7 +37,7 @@ else "Vamos a bailar" fi -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "MichaelJacksonThrillerShort.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "MichaelJacksonThrillerShort.mp3" sleep 10 @@ -69,6 +69,6 @@ Amikoo.sh amikoo/rightup && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/8008.sh b/Hochob/Applications/TraditionMayaLands/8008.sh index cb0973d8..ba5119dd 100755 --- a/Hochob/Applications/TraditionMayaLands/8008.sh +++ b/Hochob/Applications/TraditionMayaLands/8008.sh @@ -27,9 +27,9 @@ LOCAL_TRADITION="Intel" LogPid.sh $i8008_PID $i8008_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" sleep 5 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBongPeople.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "IntelBongPeople.mp3" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/80286.sh b/Hochob/Applications/TraditionMayaLands/80286.sh index ec9a7240..9d5e6d27 100755 --- a/Hochob/Applications/TraditionMayaLands/80286.sh +++ b/Hochob/Applications/TraditionMayaLands/80286.sh @@ -27,16 +27,16 @@ LOCAL_TRADITION="Intel" LogPid.sh $i80286_PID $i80286_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "IntelExperienceWhatsInside.png" -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "IntelExperienceWhatsInside.png" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" sleep 2 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Stop" -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "IntelChorus.jpg" -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "IntelBongChorus.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "IntelChorus.jpg" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "IntelBongChorus.mp3" sleep 2 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Stop" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/8080.sh b/Hochob/Applications/TraditionMayaLands/8080.sh index 5170d099..7921c983 100755 --- a/Hochob/Applications/TraditionMayaLands/8080.sh +++ b/Hochob/Applications/TraditionMayaLands/8080.sh @@ -27,8 +27,8 @@ LOCAL_TRADITION="Intel" LogPid.sh $i8080_PID $i8080_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Random" sleep 10 -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Stop" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/8086.sh b/Hochob/Applications/TraditionMayaLands/8086.sh index fc28f8a1..23a260b7 100755 --- a/Hochob/Applications/TraditionMayaLands/8086.sh +++ b/Hochob/Applications/TraditionMayaLands/8086.sh @@ -27,8 +27,8 @@ LOCAL_TRADITION="Intel" LogPid.sh $i8086_PID $i8086_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Video" "Random" +AmikooCommunication.sh "$LOCAL_TRADITION" "Video" "Random" sleep 10 -AmikooTradition.sh "$LOCAL_TRADITION" "Video" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Video" "Stop" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh index cb487564..556abe61 100755 --- a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh +++ b/Hochob/Applications/TraditionMayaLands/Calaveritas.sh @@ -27,15 +27,15 @@ LOCAL_TRADITION="DiaDeMuertos" LogPid.sh $CALAVERITAS_PID $CALAVERITAS_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "GhostlyMoan.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "GhostlyMoan.mp3" Amikoo.sh amikoo/headright 1 && sleep .6 Amikoo.sh amikoo/headleft 1 && sleep .6 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Haunting.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Haunting.mp3" Amikoo.sh amikoo/moveforward 1 && sleep .1 Amikoo.sh amikoo/movestop 1 && sleep .6 Amikoo.sh amikoo/movebackward 1 && sleep .1 Amikoo.sh amikoo/movestop 1 && sleep .6 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/Fotografia.sh b/Hochob/Applications/TraditionMayaLands/Fotografia.sh index 602dcd37..5d1c01ba 100755 --- a/Hochob/Applications/TraditionMayaLands/Fotografia.sh +++ b/Hochob/Applications/TraditionMayaLands/Fotografia.sh @@ -28,8 +28,8 @@ LOCAL_TRADITION="DiaDeMuertos" LogPid.sh $FOTOGRAFIA_PID $FOTOGRAFIA_NAME Amikoo.sh "picture" -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Witch.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Witch.mp3" sleep 3 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/Mantel.sh b/Hochob/Applications/TraditionMayaLands/Mantel.sh index 3f6f00c9..8b0107ac 100755 --- a/Hochob/Applications/TraditionMayaLands/Mantel.sh +++ b/Hochob/Applications/TraditionMayaLands/Mantel.sh @@ -27,8 +27,8 @@ LOCAL_TRADITION="DiaDeMuertos" LogPid.sh $MANTEL_PID $MANTEL_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Random" +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Random" sleep 10 -AmikooTradition.sh "$LOCAL_TRADITION" "Image" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Stop" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/PapelPicado.sh b/Hochob/Applications/TraditionMayaLands/PapelPicado.sh index 2a9d4a65..aaee7659 100755 --- a/Hochob/Applications/TraditionMayaLands/PapelPicado.sh +++ b/Hochob/Applications/TraditionMayaLands/PapelPicado.sh @@ -27,10 +27,10 @@ LOCAL_TRADITION="DiaDeMuertos" LogPid.sh $PAPELPICADO_PID $PAPELPICADO_NAME -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "demoniclaughter.mp3" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "demoniclaughter.mp3" sleep 30 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Random" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Random" sleep 5 -AmikooTradition.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" # End of File diff --git a/Hochob/Services/Amikoo/Remote/AmikooSense.sh b/Hochob/Services/Amikoo/Remote/AmikooSense.sh old mode 100644 new mode 100755 From 0d54ed2d4b11016dd48fa7f912ce027daecd524e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 16:57:01 -0500 Subject: [PATCH 1266/1653] Create AmikooVoice.sh --- Hochob/Services/Amikoo/Remote/AmikooVoice.sh | 43 ++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Hochob/Services/Amikoo/Remote/AmikooVoice.sh diff --git a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh new file mode 100644 index 00000000..f76daf09 --- /dev/null +++ b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export AMIKOOVOICE_PID=$$ + +LOCAL_LANGUAGE="$1" +LOCAL_MESSAGE="" +LOCAL_TOPIC="" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +i=0 +for var in "$@" +do + if [ "$i" -ne 0 ]; then + LOCAL_MESSAGE=$LOCAL_MESSAGE"$var" + echo $LOCAL_MESSAGE + fi + i=`expr $i + 1` +done + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + LOCAL_TOPIC=$AMIKOO_TALK +elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + LOCAL_TOPIC=$AMIKOO_HABLAR +fi + +Mosquitto.sh $LOCAL_TOPIC $LOCAL_MESSAGE From 827d852c056477f3c507c041abde97766400e64b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 16:58:36 -0500 Subject: [PATCH 1267/1653] Update AmikooVoice.sh --- Hochob/Services/Amikoo/Remote/AmikooVoice.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh index f76daf09..ca381922 100644 --- a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh @@ -11,7 +11,7 @@ set -x export AMIKOOVOICE_PID=$$ LOCAL_LANGUAGE="$1" -LOCAL_MESSAGE="" +LOCAL_MESSAGE="$2" LOCAL_TOPIC="" # ============================================================================= @@ -34,6 +34,8 @@ do i=`expr $i + 1` done +echo $LOCAL_MESSAGE + if [ "$LOCAL_LANGUAGE" = "english" ]; then LOCAL_TOPIC=$AMIKOO_TALK elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then From d70812e13ccc6c9981c9e116af8d295b0f0296ef Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:00:02 -0500 Subject: [PATCH 1268/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index be5030a9..14cf12e6 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -226,8 +226,8 @@ AMIKOO=amikoo ## Voice ## AMIKOO_HUMANVOICE=$AMIKOO/sound/speechsynthetizer -AMIKOO_SAY=$AMIKOO_HUMANVOICE/say -AMIKOO_DECIR=$AMIKOO_HUMANVOICE/decir +AMIKOO_TALK=$AMIKOO_HUMANVOICE/say +AMIKOO_HABLAR=$AMIKOO_HUMANVOICE/decir ## Sense ## AMIKOO_SENSE=$AMIKOO/sense From 90c38ff5f4cf6bb108d1d58ade1acc7945b12542 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:00:08 -0500 Subject: [PATCH 1269/1653] Update AmikooVoice.sh --- Hochob/Services/Amikoo/Remote/AmikooVoice.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh index ca381922..b2397a60 100644 --- a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh @@ -11,7 +11,7 @@ set -x export AMIKOOVOICE_PID=$$ LOCAL_LANGUAGE="$1" -LOCAL_MESSAGE="$2" +LOCAL_MESSAGE="" LOCAL_TOPIC="" # ============================================================================= From eedcc56c5ce0c3e3e0597d512ba0841b932d3a52 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:01:54 -0500 Subject: [PATCH 1270/1653] Update Coji.sh --- Hochob/Applications/AmikooMayaLands/Coji.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Coji.sh b/Hochob/Applications/AmikooMayaLands/Coji.sh index d11bfd8c..172b0c2d 100755 --- a/Hochob/Applications/AmikooMayaLands/Coji.sh +++ b/Hochob/Applications/AmikooMayaLands/Coji.sh @@ -22,22 +22,22 @@ export COJI_DIRECTORY=$(dirname "$COJI_PATH") # Main # ============================================================================= -Amikoo.sh $AMIKOO_SAY \ +AmikooVoice.sh english \ "Hello World. I can speak English. One, Two, Three." sleep 5 -Amikoo.sh $AMIKOO_DECIR \ +AmikooVoice.sh spanish \ "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." sleep 5 LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Amikoo.sh $AMIKOO_SAY \ + Amikoo.sh $LOCAL_LANGUAGE \ "Hello World. I can speak English. One, Two, Three." else - Amikoo.sh $AMIKOO_DECIR \ + Amikoo.sh $LOCAL_LANGUAGE \ "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." fi From 75638a4086d3073a33057bc342bdaa04aeee98ea Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:02:37 -0500 Subject: [PATCH 1271/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Amikoo/Remote/AmikooVoice.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Amikoo/Remote/AmikooVoice.sh diff --git a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh old mode 100644 new mode 100755 From c22513e7b63503ff19aac24c7f5e1eac3dbfc86d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:04:51 -0500 Subject: [PATCH 1272/1653] Update Coji.sh --- Hochob/Applications/AmikooMayaLands/Coji.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Coji.sh b/Hochob/Applications/AmikooMayaLands/Coji.sh index 172b0c2d..83831842 100755 --- a/Hochob/Applications/AmikooMayaLands/Coji.sh +++ b/Hochob/Applications/AmikooMayaLands/Coji.sh @@ -34,10 +34,10 @@ sleep 5 LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Amikoo.sh $LOCAL_LANGUAGE \ + AmikooVoice.sh $LOCAL_LANGUAGE \ "Hello World. I can speak English. One, Two, Three." else - Amikoo.sh $LOCAL_LANGUAGE \ + AmikooVoice.sh $LOCAL_LANGUAGE \ "Hola Mundo. Puedo hablar Español. Uno, Dos, Tres." fi From cf84b4be810774e24afd0b02623b5f89bc562745 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:06:27 -0500 Subject: [PATCH 1273/1653] Update Meccanoid.sh --- Hochob/Applications/AmikooMayaLands/Meccanoid.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh index 880e0b2f..bcb5fb69 100755 --- a/Hochob/Applications/AmikooMayaLands/Meccanoid.sh +++ b/Hochob/Applications/AmikooMayaLands/Meccanoid.sh @@ -13,8 +13,6 @@ export MECCANOID_NAME="Meccanoid" export MECCANOID_PATH=$(readlink -f "$0") export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") -LOCAL_TRADITION="DiaDeMuertos" - # ============================================================================= # Functions # ============================================================================= @@ -30,14 +28,14 @@ LogPid.sh $MECCANOID_PID $MECCANOID_NAME LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Amikoo.sh $AMIKOO_SAY \ + AmikooVoice.sh $LOCAL_LANGUAGE \ "Let's dance" else - Amikoo.sh $AMIKOO_DECIR \ + AmikooVoice.sh $LOCAL_LANGUAGE \ "Vamos a bailar" fi -AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "MichaelJacksonThrillerShort.mp3" +AmikooCommunication.sh "DiaDeMuertos" "Audio" "MichaelJacksonThrillerShort.mp3" sleep 10 @@ -69,6 +67,6 @@ Amikoo.sh amikoo/rightup && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 -AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" +AmikooCommunication.sh "DiaDeMuertos" "Audio" "Stop" # End of File From 0a34ebecfab041e6d821c8447700862743284a61 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:08:07 -0500 Subject: [PATCH 1274/1653] Update Veladora.sh --- Hochob/Applications/TraditionMayaLands/Veladora.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Veladora.sh b/Hochob/Applications/TraditionMayaLands/Veladora.sh index 1c681346..9ee33e48 100755 --- a/Hochob/Applications/TraditionMayaLands/Veladora.sh +++ b/Hochob/Applications/TraditionMayaLands/Veladora.sh @@ -13,7 +13,6 @@ export VELADORA_NAME="Veladora" export VELADORA_PATH=$(readlink -f "$0") export VELADORA_DIRECTORY=$(dirname "$VELADORA_PATH") -LOCAL_SEASON="DiaDeMuertos" LOCAL_DEVICE="Triki" # ============================================================================= @@ -31,14 +30,4 @@ LogPid.sh $VELADORA_PID $VELADORA_NAME LOCAL_SOUND=`find $TRADITION_DIADEMUERTOS/Sound/ -type f | shuf -n 1` Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" -exit 0 - -if [ "$LANGUAGE" = "english" ]; then - Amikoo.sh $AMIKOO_SAY "Happy Halloween" -else - Amikoo.sh $AMIKOO_DECIR "Feliz dia de muertos" -fi - -# See implement WindRiver.sh logic, maybe Season service? - # End of File From 5519bbc239bfb0cd262d0b782b0f8b2cf444fd28 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:10:44 -0500 Subject: [PATCH 1275/1653] Update AmikooVoice.sh --- Hochob/Services/Amikoo/Remote/AmikooVoice.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh index b2397a60..7ac311ad 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh @@ -34,7 +34,14 @@ do i=`expr $i + 1` done -echo $LOCAL_MESSAGE +LOCAL_DEMO=`Demo.sh` +if [ "$LOCAL_DEMO" -eq "1" ]; then + if [ "$LOCAL_MESSAGE" != "1" ] + then + Espeak.sh on spanish "$LOCAL_MESSAGE" + fi + exit 0 +fi if [ "$LOCAL_LANGUAGE" = "english" ]; then LOCAL_TOPIC=$AMIKOO_TALK From 516577de22ef1b382e2bf51816d79e1225845f1d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:12:07 -0500 Subject: [PATCH 1276/1653] Update AmikooVoice.sh --- Hochob/Services/Amikoo/Remote/AmikooVoice.sh | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh index 7ac311ad..319ecc7e 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh @@ -40,13 +40,12 @@ if [ "$LOCAL_DEMO" -eq "1" ]; then then Espeak.sh on spanish "$LOCAL_MESSAGE" fi - exit 0 -fi - -if [ "$LOCAL_LANGUAGE" = "english" ]; then - LOCAL_TOPIC=$AMIKOO_TALK -elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - LOCAL_TOPIC=$AMIKOO_HABLAR +else + if [ "$LOCAL_LANGUAGE" = "english" ]; then + LOCAL_TOPIC=$AMIKOO_TALK + elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + LOCAL_TOPIC=$AMIKOO_HABLAR + fi + Mosquitto.sh $LOCAL_TOPIC $LOCAL_MESSAGE fi -Mosquitto.sh $LOCAL_TOPIC $LOCAL_MESSAGE From 3add349b5050e296af73cd664ea4c740b95a2e7d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:13:17 -0500 Subject: [PATCH 1277/1653] Update AmikooVoice.sh --- Hochob/Services/Amikoo/Remote/AmikooVoice.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh index 319ecc7e..ed8566e8 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooVoice.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooVoice.sh @@ -34,18 +34,21 @@ do i=`expr $i + 1` done +if [ "$LOCAL_LANGUAGE" = "english" ]; then + LOCAL_TOPIC=$AMIKOO_TALK +elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + LOCAL_TOPIC=$AMIKOO_HABLAR +fi + +Mosquitto.sh $LOCAL_TOPIC $LOCAL_MESSAGE + +exit 0 + LOCAL_DEMO=`Demo.sh` if [ "$LOCAL_DEMO" -eq "1" ]; then if [ "$LOCAL_MESSAGE" != "1" ] then Espeak.sh on spanish "$LOCAL_MESSAGE" fi -else - if [ "$LOCAL_LANGUAGE" = "english" ]; then - LOCAL_TOPIC=$AMIKOO_TALK - elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - LOCAL_TOPIC=$AMIKOO_HABLAR - fi - Mosquitto.sh $LOCAL_TOPIC $LOCAL_MESSAGE fi From 296cacc02e90d2ae33bf344061ddf474c3498030 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:14:33 -0500 Subject: [PATCH 1278/1653] Update HostExternal.sh --- Hochob/Services/Events/HostExternal.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index f092d56d..60d0fba7 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -118,11 +118,7 @@ LOCAL_MESSAGE="${LOCAL_INTRODUCTION} \ if [ "$LOCAL_HOST" = "server" ]; then SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" else - if [ "$LANGUAGE" = "english" ]; then - Amikoo.sh $AMIKOO_SAY "${LOCAL_MESSAGE}" - else - Amikoo.sh $AMIKOO_DECIR "${LOCAL_MESSAGE}" - fi + AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_MESSAGE}" fi From 18e457bcb4d04045cb392e2ecefcd9695d3c3a20 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:15:57 -0500 Subject: [PATCH 1279/1653] Update HostInternal.sh --- Hochob/Services/Events/HostInternal.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Hochob/Services/Events/HostInternal.sh b/Hochob/Services/Events/HostInternal.sh index 14081940..1c1d8c01 100755 --- a/Hochob/Services/Events/HostInternal.sh +++ b/Hochob/Services/Events/HostInternal.sh @@ -107,12 +107,7 @@ LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ if [ "$LOCAL_HOST" = "server" ]; then SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" else - if [ "$LANGUAGE" = "english" ]; then - Amikoo.sh $AMIKOO_SAY "${LOCAL_MESSAGE}" - else - Amikoo.sh $AMIKOO_DECIR "${LOCAL_MESSAGE}" - fi + Amikoo.sh $LOCAL_LANGUAGE "${LOCAL_MESSAGE}" fi - # End of File From f29aa996f4e04e4790c4b93a7071bae2cf7517f7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:16:42 -0500 Subject: [PATCH 1280/1653] Update HostInternal.sh --- Hochob/Services/Events/HostInternal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Events/HostInternal.sh b/Hochob/Services/Events/HostInternal.sh index 1c1d8c01..88c15c63 100755 --- a/Hochob/Services/Events/HostInternal.sh +++ b/Hochob/Services/Events/HostInternal.sh @@ -107,7 +107,7 @@ LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ if [ "$LOCAL_HOST" = "server" ]; then SpeechSynthetizer.sh on voicerss $LANGUAGE "${LOCAL_MESSAGE}" else - Amikoo.sh $LOCAL_LANGUAGE "${LOCAL_MESSAGE}" + AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_MESSAGE}" fi # End of File From 396008d9812eb52f810fa10f90a0ae5f4d5b0298 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:19:17 -0500 Subject: [PATCH 1281/1653] Update HostExternal.sh --- Hochob/Services/Events/HostExternal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index 60d0fba7..c1e07cc2 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -39,7 +39,7 @@ LOCAL_GREETING_SPANISH[7]="Que onda," LOCAL_REMINDER_ENGLISH[0]="Welcome to our" LOCAL_REMINDER_ENGLISH[1]="Great you did not forget about" LOCAL_REMINDER_ENGLISH[2]="Today is our big meetup," -LOCAL_REMINDER_ENGLISH[3]="It is finally here!," +LOCAL_REMINDER_ENGLISH[3]="It is finally here," LOCAL_REMINDER_ENGLISH[4]="Finally with us," LOCAL_REMINDER_ENGLISH[5]="The big boy has just arrived," LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, this great journey," From e49739651091b306d9a9ce39be04d9145821b433 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:19:57 -0500 Subject: [PATCH 1282/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index 7a48b29b..fee40c7e 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -48,7 +48,7 @@ LOCAL_AMIKOO_AVAILABLE=`AmikooAvailable.sh` if [ "$LOCAL_AMIKOO_AVAILABLE" -eq "0" ]; then Espeak.sh on spanish "Nel" else - Amikoo.sh $AMIKOO_SAY "Nel" + AmikooVoice.sh english "Nel" fi # End of File From a5c16f03e1e849e4163dd38e9f667b4a60a31382 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:20:11 -0500 Subject: [PATCH 1283/1653] Update Stream.sh --- Hochob/Services/Stream/Stream.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/Stream.sh index fee40c7e..ab502ab4 100755 --- a/Hochob/Services/Stream/Stream.sh +++ b/Hochob/Services/Stream/Stream.sh @@ -48,7 +48,7 @@ LOCAL_AMIKOO_AVAILABLE=`AmikooAvailable.sh` if [ "$LOCAL_AMIKOO_AVAILABLE" -eq "0" ]; then Espeak.sh on spanish "Nel" else - AmikooVoice.sh english "Nel" + AmikooVoice.sh spanish "Nel" fi # End of File From 24ba9b632a5512b11823c3e8dda352f30781447e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:21:54 -0500 Subject: [PATCH 1284/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index bea2b48b..61bf2c91 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -25,12 +25,8 @@ LOCAL_TEXT="$4" # Main # ============================================================================= -if [ "$LOCAL_DEVICE" = "Amikoo" ] && [ "$LOCAL_LANGUAGE" = "english" ]; then - Amikoo.sh $AMIKOO_SAY \ - "${LOCAL_TEXT}" -elif [ "$LOCAL_DEVICE" = "Amikoo" ] && [ "$LOCAL_LANGUAGE" = "spanish" ]; then - Amikoo.sh $AMIKOO_DECIR \ - "${LOCAL_TEXT}" +if [ "$LOCAL_DEVICE" = "Amikoo" ]; then + AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" else if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" From 8f38278ef30f4e08abaa6dce9fa3fcaa88ec132b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:23:56 -0500 Subject: [PATCH 1285/1653] Update Amikoo.sh --- Hochob/Services/Amikoo/Remote/Amikoo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/Amikoo.sh b/Hochob/Services/Amikoo/Remote/Amikoo.sh index 5026e36c..1d3b87a2 100755 --- a/Hochob/Services/Amikoo/Remote/Amikoo.sh +++ b/Hochob/Services/Amikoo/Remote/Amikoo.sh @@ -66,9 +66,9 @@ fi if [ "$LOCAL_COMMAND" = "lupe/message" ]; then LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Mosquitto.sh $AMIKOO_SAY $LOCAL_MESSAGE + AmikooVoice.sh $LOCAL_LANGUAGE $LOCAL_MESSAGE else - Mosquitto.sh $AMIKOO_DECIR $LOCAL_MESSAGE + AmikooVoice.sh $LOCAL_LANGUAGE $LOCAL_MESSAGE fi else Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE From b851594a58e9fb7eb8805b3487c548dbb4522b1f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:26:39 -0500 Subject: [PATCH 1286/1653] Update Sphero.sh --- Hochob/Applications/AmikooMayaLands/Sphero.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Sphero.sh b/Hochob/Applications/AmikooMayaLands/Sphero.sh index 1c4b61cf..89cc6949 100755 --- a/Hochob/Applications/AmikooMayaLands/Sphero.sh +++ b/Hochob/Applications/AmikooMayaLands/Sphero.sh @@ -13,7 +13,6 @@ export SPHERO_NAME="Sphero" export SPHERO_PATH=$(readlink -f "$0") export SPHERO_DIRECTORY=$(dirname "$SPHERO_PATH") - LOCAL_PHRASE[0]="¿Que pez, acuaman?" LOCAL_PHRASE[1]="¿Que pasotes con esos zapatotes, brother?" LOCAL_PHRASE[2]="¿Que Honduras con las verduras que andan bajas las temperaturas?" @@ -84,6 +83,6 @@ choosePhrase() LogPid.sh $SPHERO_PID $SPHERO_NAME choosePhrase -Amikoo.sh $AMIKOO_DECIR "$LOCAL_PHRASE" +AmikooVoice.sh spanish "$LOCAL_PHRASE" # End of File From 5cc0acceb15735f44ab7786c2b881cf1450a580b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:27:25 -0500 Subject: [PATCH 1287/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index 16fedba1..ca84e9f9 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -31,7 +31,7 @@ Eog.sh "$TRADITION_VISITORS_CENTER/Image/*" & sleep 2 Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 -Amikoo.sh $AMIKOO_DECIR "Nel Pastel" +AmikooVoice.sh spanish "Nel Pastel" sleep .6 Amikoo.sh amikoo/headright 1 sleep .6 From 285763e16a037f67851f8e379f43489af627c0a0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:29:05 -0500 Subject: [PATCH 1288/1653] Update Michoacan.sh --- .../SouthernMayaHighlands/Michoacan.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index a150508d..8f6304a5 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -28,7 +28,7 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` -#Amikoo.sh $AMIKOO_DECIR \ +#AmikooVoice.sh spanish \ # "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ # Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ # hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ @@ -52,7 +52,7 @@ SpeechSynthetizer.sh on espeak spanish \ sleep 1 -#Amikoo.sh amikoo/message \ +#AmikooVoice.sh spanish \ # "Ahora tomaremos una foto para el recuerdo. \ # Primero, me iré a mi lugar preferido, denme unos segundos." SpeechSynthetizer.sh on espeak spanish \ @@ -77,7 +77,7 @@ sleep 3.6 Amikoo.sh amikoo/movestop 1 sleep .6 -#Amikoo.sh amikoo/message \ +#AmikooVoice.sh spanish \ # "Estoy listo! Ahora les toca a ustedes acomodarse. \ # Con mucho cuidado ponganse a ambos lados de mi, \ # viendo hacia la pantalla y sonrían." @@ -90,21 +90,21 @@ FfmpegCamera.sh 20 & sleep 15 -#Amikoo.sh amikoo/message \ +#AmikooVoice.sh spanish \ # "Están listos ${LOCAL_INSTITUTION}?" SpeechSynthetizer.sh on espeak spanish \ "Están listas? listos? ${LOCAL_INSTITUTION}?" sleep 5 -#Amikoo.sh amikoo/message \ +#AmikooVoice.sh spanish \ # "Tomemos la foto, a la cuenta de 3." SpeechSynthetizer.sh on espeak spanish \ "Tomemos la foto, a la cuenta de 3." sleep 1 -#Amikoo.sh amikoo/message \ +#AmikooVoice.sh spanish \ # "1, 2 y 3, Sonrian." SpeechSynthetizer.sh on espeak spanish \ "1, 2 y 3, Sonrían." @@ -115,7 +115,7 @@ ConvertText.sh "$FSWEBCAM_IMAGE" "Bienvenidos ${LOCAL_INSTITUTION}" wait Eog.sh "$FSWEBCAM_IMAGE" & -#Amikoo.sh amikoo/message \ +#AmikooVoice.sh spanish \ # "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." SpeechSynthetizer.sh on espeak spanish \ "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." From eca47cfc6ad2b3fc208bf4811961225281f9e0bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:34:39 -0500 Subject: [PATCH 1289/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 873d3a8e..d01c3dfd 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -109,7 +109,9 @@ homeassistant: # Amikoo Maya Lands :: Voice - # Tbd + script.amikoovoice: + friendly_name: 1 2 3 4 5 + icon: mdi:voice # Amikoo Maya Lands :: Sense @@ -622,7 +624,9 @@ script: # Amikoo Maya Lands :: Voice - # Tbd + amikoovoice: + sequence: + - service: shell_command.amikoovoice # Amikoo Maya Lands :: Sense @@ -879,7 +883,8 @@ shell_command: movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movestop "Body Stop" # Amikoo Maya Lands :: Voice - # Tbd + + amikoovoice: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "5 4 3 2 1" # Amikoo Maya Lands: Sense @@ -1345,7 +1350,7 @@ group: robotmayalandsvoice: name: Voz entities: - - script.resetall + - script.amikoovoice # Amikoo Maya Lands: Sense From ed033c1a33502b7c8f3642ff89a3670fd9e22476 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:36:07 -0500 Subject: [PATCH 1290/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d01c3dfd..2621ea11 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -110,7 +110,7 @@ homeassistant: # Amikoo Maya Lands :: Voice script.amikoovoice: - friendly_name: 1 2 3 4 5 + friendly_name: 5 4 3 2 1 0 icon: mdi:voice # Amikoo Maya Lands :: Sense @@ -884,7 +884,7 @@ shell_command: # Amikoo Maya Lands :: Voice - amikoovoice: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "5 4 3 2 1" + amikoovoice: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "5 4 3 2 1 0" # Amikoo Maya Lands: Sense From 65edc705ee2671173bd8d7c1915b76327cfcc157 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:45:14 -0500 Subject: [PATCH 1291/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 43 ++++++++++++++----- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 2621ea11..0d990056 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -119,9 +119,19 @@ homeassistant: friendly_name: Vista icon: mdi:camera - # Amikoo Maya Lands :: Communication + # Amikoo Maya Lands :: Communication :: - # Tbd + script.amikoocommunicationaudio: + friendly_name: Audio + icon: mdi:audiobook + + script.amikoocommunicationimage: + friendly_name: Imágen + icon: mdi:file-image + + script.amikoocommunicationvideo: + friendly_name: Video + icon: mdi:file-video # Amikoo Maya Lands :: Knowledge @@ -630,11 +640,23 @@ script: # Amikoo Maya Lands :: Sense - # Tbd + amikoosensesight: + sequence: + - service: shell_command.amikoosensesight # Amikoo Maya Lands :: Communication - # Tbd + amikoocommunicationaudio: + sequence: + - service: shell_command.amikoocommunicationaudio + + amikoocommunicationimage: + sequence: + - service: shell_command.amikoocommunicationimage + + amikoocommunicationvideo: + sequence: + - service: shell_command.amikoocommunicationvideo # Amikoo Maya Lands :: Knowledge @@ -656,10 +678,6 @@ script: sequence: - service: shell_command.amikoogctranslationapi - amikoosensesight: - sequence: - - service: shell_command.amikoosensesight - # Amikoo Maya Lands :: Application coji: @@ -891,7 +909,10 @@ shell_command: amikoosensesight: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooSense.sh sight picture # Amikoo Maya Lands :: Communication - # Tbd + + amikoocommunicationaudio: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Audio Random + amikoocommunicationimage: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Image Random + amikoocommunicationvideo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Video Random # Amikoo Maya Lands :: Knowledge @@ -1364,7 +1385,9 @@ group: robotmayalandscommunication: name: Comunicaciones entities: - - script.resetall + - script.amikoocommunicationaudio + - script.amikoocommunicationimage + - script.amikoocommunicationvideo # Amikoo Maya Lands: Expertise From cdf2c2143d2fedb1cde93e87cc7b7f327b8c4bf5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:48:34 -0500 Subject: [PATCH 1292/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0d990056..58bb83d1 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1359,13 +1359,6 @@ group: entities: - script.zacatecas - # Amikoo Maya Lands :: Reset - - robotmayalandsreset: - name: Reiniciar - entities: - - script.resetall - # Amikoo Maya Lands: Voice robotmayalandsvoice: @@ -1452,6 +1445,13 @@ group: - script.movebackward - script.movestop + # Amikoo Maya Lands :: Reset + + robotmayalandsreset: + name: Reiniciar + entities: + - script.resetall + # Central Maya Lowlands: Stations centralmayalowlandsstations: From 25e27cfa8694aca76afa1104b522619924bab9f3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:51:35 -0500 Subject: [PATCH 1293/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 14cf12e6..d1d899b9 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -236,7 +236,7 @@ AMIKOO_SENSE=$AMIKOO/sense AMIKOO_SENSE_SIGHT=$AMIKOO_SENSE/sight AMIKOO_SENSE_SIGHT_PICTURE=$AMIKOO_SENSE_SIGHT/picture AMIKOO_PICTURE=$AMIKOO_SENSE_SIGHT_PICTURE -AMIKOO_PICTURE=/amikoo/camera/picture +AMIKOO_PICTURE=amikoo/camera/picture ### Hearing (Audition) ### AMIKOO_SENSE_HEARING=$AMIKOO_SENSE/hearing From 73d3fe9b552656264e0d874de94517c6ec425be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Sun, 29 Oct 2017 17:52:04 -0500 Subject: [PATCH 1294/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Services/Amikoo/Virtual/AmikooVirtual.js | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js index d2983682..ebf2a62a 100755 --- a/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js +++ b/Hochob/Services/Amikoo/Virtual/AmikooVirtual.js @@ -27,6 +27,7 @@ function espeakSay(phrase) { var state = 'closed' client.on('connect', function () { + client.subscribe('amikoo/#') client.subscribe('amikoo/open') client.subscribe('amikoo/close') client.subscribe('amikoo/sound/speechsynthetizer/say') From ce055f3cb5391d24dc9fd200a900854c468f2cd0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 17:58:59 -0500 Subject: [PATCH 1295/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 58bb83d1..d9e44a70 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1369,14 +1369,14 @@ group: # Amikoo Maya Lands: Sense robotmayalandssense: - name: Sentidos + name: Sentido entities: - script.amikoosensesight # Amikoo Maya Lands: Communication robotmayalandscommunication: - name: Comunicaciones + name: Comunicacion entities: - script.amikoocommunicationaudio - script.amikoocommunicationimage From a2f0d859a254f50d1997378c78d60b46483a2a8d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:00:32 -0500 Subject: [PATCH 1296/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d9e44a70..13cf0f48 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1376,7 +1376,7 @@ group: # Amikoo Maya Lands: Communication robotmayalandscommunication: - name: Comunicacion + name: Comunicación entities: - script.amikoocommunicationaudio - script.amikoocommunicationimage @@ -1385,7 +1385,7 @@ group: # Amikoo Maya Lands: Expertise robotmayalandsexpertise: - name: Expertise + name: Especialización entities: - script.amikoogcvisionapi - script.amikoogctranslationapi From ecd27184671b432aedb75114efe3f53cabb4815b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:02:51 -0500 Subject: [PATCH 1297/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 13cf0f48..cbd365be 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -133,6 +133,15 @@ homeassistant: friendly_name: Video icon: mdi:file-video + # Amikoo Maya Lands :: Expertise + + script.amikoogcvisionapi: + friendly_name: Google Vision API + icon: mdi:camera + script.amikoogctranslationapi: + friendly_name: Google Translation API + icon: mdi:google-translate + # Amikoo Maya Lands :: Knowledge script.sphero: @@ -143,15 +152,6 @@ homeassistant: friendly_name: Centro de Visitantes icon: mdi:audiobook - # Amikoo Maya Lands :: Expertise - - script.amikoogcvisionapi: - friendly_name: Google Vision API - icon: mdi:camera - script.amikoogctranslationapi: - friendly_name: Google Translation API - icon: mdi:google-translate - # Amikoo Maya Lands :: Applications script.coji: @@ -658,16 +658,6 @@ script: sequence: - service: shell_command.amikoocommunicationvideo - # Amikoo Maya Lands :: Knowledge - - sphero: - sequence: - - service: shell_command.sphero - - makeblock: - sequence: - - service: shell_command.makeblock - # Amikoo Maya Lands :: Expertise amikoogcvisionapi: @@ -678,6 +668,16 @@ script: sequence: - service: shell_command.amikoogctranslationapi + # Amikoo Maya Lands :: Knowledge + + sphero: + sequence: + - service: shell_command.sphero + + makeblock: + sequence: + - service: shell_command.makeblock + # Amikoo Maya Lands :: Application coji: @@ -914,16 +914,16 @@ shell_command: amikoocommunicationimage: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Image Random amikoocommunicationvideo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Video Random - # Amikoo Maya Lands :: Knowledge - - sphero: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Sphero.sh & - makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & - # Amikoo Maya Lands: Expertise amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 + # Amikoo Maya Lands :: Knowledge + + sphero: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Sphero.sh & + makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & + # Amikoo Maya Lands: Application coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & From a3538b3096e22b28e65d1069d345bed6a240438e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:06:29 -0500 Subject: [PATCH 1298/1653] Update HostExternal.sh --- Hochob/Services/Events/HostExternal.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index c1e07cc2..4aa22f44 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -27,9 +27,9 @@ LOCAL_GREETING_ENGLISH[5]="Hello There," LOCAL_GREETING_ENGLISH[6]="One minute please, " LOCAL_GREETING_ENGLISH[7]="What's up, " -LOCAL_GREETING_SPANISH[0]="Hola Hola," +LOCAL_GREETING_SPANISH[0]="Bienvenidos," LOCAL_GREETING_SPANISH[1]="Buenos dias," -LOCAL_GREETING_SPANISH[2]="Hola Cacerola," +LOCAL_GREETING_SPANISH[2]="Saludos," LOCAL_GREETING_SPANISH[3]="Espera," LOCAL_GREETING_SPANISH[4]="Hey," LOCAL_GREETING_SPANISH[5]="Que hongo morongo," From d631ade436b67c4a6b05eaabf3422e5313a36dab Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:08:04 -0500 Subject: [PATCH 1299/1653] Update HostInternal.sh --- Hochob/Services/Events/HostInternal.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Events/HostInternal.sh b/Hochob/Services/Events/HostInternal.sh index 88c15c63..42914504 100755 --- a/Hochob/Services/Events/HostInternal.sh +++ b/Hochob/Services/Events/HostInternal.sh @@ -15,6 +15,9 @@ LOCAL_LANGUAGE="$2" LOCAL_INSTITUTION_NAME="$3" LOCAL_EVENT_NAME="$4" +LOCAL_INTRODUCTION_ENGLISH="Hi, I am Lupe." +LOCAL_INTRODUCTION_SPANISH="Hola! Soy Lupe." + LOCAL_GREETING_ENGLISH[0]="Hi There," LOCAL_GREETING_ENGLISH[1]="Good morning," LOCAL_GREETING_ENGLISH[2]="Hurray," @@ -56,6 +59,16 @@ LOCAL_CLOSURE_SPANISH="Verifica tu correo electrónico para mas información." # Functions # ============================================================================= +chooseIntroduction() +{ + LANGUAGE=$1 + if [ "$LANGUAGE" = "english" ]; then + LOCAL_INTRODUCTION=${LOCAL_INTRODUCTION_ENGLISH} + else + LOCAL_INTRODUCTION=${LOCAL_INTRODUCTION_SPANISH} + fi +} + chooseGreeting() { LANGUAGE=$1 @@ -96,11 +109,13 @@ chooseClosure() # Main # ============================================================================= +chooseIntroduction $LOCAL_LANGUAGE chooseGreeting $LOCAL_LANGUAGE chooseReminder $LOCAL_LANGUAGE chooseClosure $LOCAL_LANGUAGE -LOCAL_MESSAGE="${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ +LOCAL_MESSAGE="${LOCAL_INTRODUCTION} \ + ${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}. \ ${LOCAL_CLOSURE}" From df724c0e646a5c0d6c600f4f74b058bc58d1df18 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:22:37 -0500 Subject: [PATCH 1300/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index cbd365be..6cb48b96 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -119,7 +119,7 @@ homeassistant: friendly_name: Vista icon: mdi:camera - # Amikoo Maya Lands :: Communication :: + # Amikoo Maya Lands :: Communication script.amikoocommunicationaudio: friendly_name: Audio @@ -160,6 +160,9 @@ homeassistant: script.meccanoid: friendly_name: Baile Thriller icon: mdi:account + script.chip: + friendly_name: Fotógrafo + icon: mdi:camera # Central Maya Lowlands, Stations @@ -688,6 +691,10 @@ script: sequence: - service: shell_command.meccanoid + chip: + sequence: + - service: shell_command.chip + # Central Maya Lowlands, Stations acapulco: @@ -928,6 +935,7 @@ shell_command: coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & meccanoid: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Meccanoid.sh & + chip: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Chip.sh & # Console Maya Lands @@ -1397,6 +1405,7 @@ group: entities: - script.coji - script.meccanoid + - script.chip # Amikoo Maya Lands: Knowledge From 919a5416c9d57ce25572cff4518a24a2c4ba0886 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:28:38 -0500 Subject: [PATCH 1301/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 6cb48b96..f205bab7 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -913,7 +913,7 @@ shell_command: # Amikoo Maya Lands: Sense - amikoosensesight: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooSense.sh sight picture + amikoosensesight: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooSense.sh Sight Picture # Amikoo Maya Lands :: Communication From 1053e66a533170e3d7851b4a2b6677f3f8bd57e8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:29:09 -0500 Subject: [PATCH 1302/1653] Create Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 45 +++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Hochob/Applications/AmikooMayaLands/Chip.sh diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh new file mode 100644 index 00000000..bed792ec --- /dev/null +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CHIP_PID=$$ +export CHIP_NAME="Chip" +export CHIP_PATH=$(readlink -f "$0") +export CHIP_DIRECTORY=$(dirname "$CHIP_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $CHIP_PID $CHIP_NAME + +LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + AmikooVoice.sh $LOCAL_LANGUAGE \ + "Time to take you a picture, Smile when you hear the sound." +else + AmikooVoice.sh $LOCAL_LANGUAGE \ + "Es hora de tomarte una foto, Sonríe cuando escuches un sonido." +fi + +Amikoo.sh amikoo/headright && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 + +AmikooCommunication.sh "Amikoo" "Audio" "TakePictureEllie.mp3" + +AmikooSense.sh "Sight" "Picture" + +AmikooCommunication.sh "DiaDeMuertos" "Audio" "Stop" From 3038a66181349d6b14d2d250f87a846c8188a739 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:30:52 -0500 Subject: [PATCH 1303/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/AmikooMayaLands/Chip.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/AmikooMayaLands/Chip.sh diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh old mode 100644 new mode 100755 From 3fa61a78328d9bd5e6b50a90c651b7a5a0effecf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:31:57 -0500 Subject: [PATCH 1304/1653] Update Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh index bed792ec..920eca9a 100755 --- a/Hochob/Applications/AmikooMayaLands/Chip.sh +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -35,6 +35,8 @@ else "Es hora de tomarte una foto, Sonríe cuando escuches un sonido." fi +sleep 1 + Amikoo.sh amikoo/headright && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 From f48f6ff1cecca3dcbd635833688454ad05c603e0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:32:58 -0500 Subject: [PATCH 1305/1653] Update Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh index 920eca9a..c6a114d5 100755 --- a/Hochob/Applications/AmikooMayaLands/Chip.sh +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -35,7 +35,7 @@ else "Es hora de tomarte una foto, Sonríe cuando escuches un sonido." fi -sleep 1 +sleep 3 Amikoo.sh amikoo/headright && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 From b50d941920aad8d76f989f658d50fcc115cff347 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:33:46 -0500 Subject: [PATCH 1306/1653] Update AmikooSense.sh --- Hochob/Services/Amikoo/Remote/AmikooSense.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooSense.sh b/Hochob/Services/Amikoo/Remote/AmikooSense.sh index e16859e6..4000c8b9 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooSense.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooSense.sh @@ -23,9 +23,9 @@ LOCAL_COMMAND="$2" # Main # ============================================================================= -if [ "$LOCAL_SENSE" = "sight" ]; then - if [ "$LOCAL_COMMAND" = "picture" ]; then - Mosquitto.sh $AMIKOO_PICTURE "Camera Picture" +if [ "$LOCAL_SENSE" = "Sight" ]; then + if [ "$LOCAL_COMMAND" = "Picture" ]; then + Mosquitto.sh $AMIKOO_PICTURE "Sense Sight Picture" fi fi From cb1364e8849e37a1955d1663fb870cbf50fb71bd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:34:52 -0500 Subject: [PATCH 1307/1653] Update Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh index c6a114d5..8f859a0f 100755 --- a/Hochob/Applications/AmikooMayaLands/Chip.sh +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -29,10 +29,10 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then AmikooVoice.sh $LOCAL_LANGUAGE \ - "Time to take you a picture, Smile when you hear the sound." + "Time to take you a picture, Smile." else AmikooVoice.sh $LOCAL_LANGUAGE \ - "Es hora de tomarte una foto, Sonríe cuando escuches un sonido." + "Es hora de tomarte una foto, Sonríe." fi sleep 3 From 174bbad3930fc7bff6af4487d33a3bac8ae1c4e7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:37:58 -0500 Subject: [PATCH 1308/1653] Update Amikoo.sh --- Hochob/Services/Amikoo/Remote/Amikoo.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/Amikoo.sh b/Hochob/Services/Amikoo/Remote/Amikoo.sh index 1d3b87a2..94eb57f1 100755 --- a/Hochob/Services/Amikoo/Remote/Amikoo.sh +++ b/Hochob/Services/Amikoo/Remote/Amikoo.sh @@ -41,11 +41,9 @@ if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" -elif [ "$LOCAL_COMMAND" = "picture" ]; then - Mosquitto.sh $AMIKOO_PICTURE "Camera Picture" fi -# Movement & Speak +# Movement Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE From c375717b72fc8336d272ea0372c5d26211e9ec32 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:40:11 -0500 Subject: [PATCH 1309/1653] Update Fotografia.sh --- .../Applications/TraditionMayaLands/Fotografia.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Fotografia.sh b/Hochob/Applications/TraditionMayaLands/Fotografia.sh index 5d1c01ba..4c7a33ca 100755 --- a/Hochob/Applications/TraditionMayaLands/Fotografia.sh +++ b/Hochob/Applications/TraditionMayaLands/Fotografia.sh @@ -27,7 +27,18 @@ LOCAL_TRADITION="DiaDeMuertos" LogPid.sh $FOTOGRAFIA_PID $FOTOGRAFIA_NAME -Amikoo.sh "picture" +LOCAL_LANGUAGE=`Language.sh` + +if [ "$LOCAL_LANGUAGE" = "english" ]; then + AmikooVoice.sh $LOCAL_LANGUAGE \ + "Happy Halloween and Monsters Day." +else + AmikooVoice.sh $LOCAL_LANGUAGE \ + "Feliz día de los Muertos." +fi + +AmikooSense.sh "Sight" "Picture" +sleep 2 AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Witch.mp3" sleep 3 AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" From 36729310677cf2ca3e7532f567fbc0ba6814b366 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:44:42 -0500 Subject: [PATCH 1310/1653] Update Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh index 8f859a0f..66524bfa 100755 --- a/Hochob/Applications/AmikooMayaLands/Chip.sh +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -29,10 +29,10 @@ LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then AmikooVoice.sh $LOCAL_LANGUAGE \ - "Time to take you a picture, Smile." + "Photography express service, Smile." else AmikooVoice.sh $LOCAL_LANGUAGE \ - "Es hora de tomarte una foto, Sonríe." + "Servicio express de fotógrafia, Sonríe." fi sleep 3 From 56e888266714638a2e3e8527a8a84d5567248dfe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:45:41 -0500 Subject: [PATCH 1311/1653] Update Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh index 66524bfa..9eeae393 100755 --- a/Hochob/Applications/AmikooMayaLands/Chip.sh +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -32,7 +32,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then "Photography express service, Smile." else AmikooVoice.sh $LOCAL_LANGUAGE \ - "Servicio express de fotógrafia, Sonríe." + "Servicio express de fotografía, Sonríe." fi sleep 3 From 6eb1434d1c60c91814baf698fee9533a079879ff Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 18:46:42 -0500 Subject: [PATCH 1312/1653] Update Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh index 9eeae393..ed9297e7 100755 --- a/Hochob/Applications/AmikooMayaLands/Chip.sh +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -44,4 +44,4 @@ AmikooCommunication.sh "Amikoo" "Audio" "TakePictureEllie.mp3" AmikooSense.sh "Sight" "Picture" -AmikooCommunication.sh "DiaDeMuertos" "Audio" "Stop" +AmikooCommunication.sh "Amikoo" "Audio" "Stop" From 1e0dcb4c808d546c2ae62b2a2ea8b211082a5987 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 19:46:37 -0500 Subject: [PATCH 1313/1653] Create Sotz.sh --- Hochob/Applications/CalendarMayaLands/Sotz.sh | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 Hochob/Applications/CalendarMayaLands/Sotz.sh diff --git a/Hochob/Applications/CalendarMayaLands/Sotz.sh b/Hochob/Applications/CalendarMayaLands/Sotz.sh new file mode 100644 index 00000000..4145e289 --- /dev/null +++ b/Hochob/Applications/CalendarMayaLands/Sotz.sh @@ -0,0 +1,94 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export SOTZ_PID=$$ +export SOTZ_NAME="Sotz" +export SOTZ_PATH=$(readlink -f "$0") +export SOTZ_DIRECTORY=$(dirname "$SOTZ_PATH") + +LOCAL_INSTITUTION_NAME="México" + +LOCAL_EVENT_NAME_ENGLISH="Aerial Technology" +LOCAL_EVENT_NAME_SPANISH="Tecnología Aérea" + +LOCAL_LANGUAGE[0]="english" +LOCAL_LANGUAGE[1]="spanish" + +# ============================================================================= +# Functions +# ============================================================================= + +chooseLanguage() +{ + rand=$[ $RANDOM % 2 ] + LOCAL_LANGUAGE=${LOCAL_LANGUAGE[$rand]} + +} + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $SOTZ_PID $SOTZ_NAME + +AmikooCommunication.sh "Drones" "Image" "IntelAeroReadyToFlyDrone.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE "The Airbone Revolution in Drone Innovation" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Experience the amazing innovation driving the next frontier of flight. \ + Our technology propels everything from commercial inspection, surveying and \ + mapping to world record setting light show spectacles" + +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Intel Aero Ready to Fly Drone is an Unmanned Aerial Vehicle \ + development platform: fully assembled, fully functional quadcopter" + +sleep 20 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsDronecode.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "The Complete “End-to-End” Open Source UAV Platform. \ + A neutral place where industry and ecosystem developers \ + can work to build the world’s leading open UAV software platform." + +sleep 15 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationKaan.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Drone Simulation using Software In The Loop \ + and Ground Control Station" + +sleep 5 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Drone Simulation using Mavlink and DroneKit" + +sleep 5 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Drone Simulation using Mavlink and DroneKit" + +sleep 5 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Intel Aero Ready to Fly Drone controlled via Mavlink with Python Programming Language" + +sleep 5 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Intel Aero Ready to Fly Drone via Remote Control" + +sleep 5 + +AmikooCommunication.sh "Drones" "Image" "Stop" +# End of File From 4bfdec37efc92da050f9d616878ebf82279a5843 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 22:10:38 -0500 Subject: [PATCH 1314/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f205bab7..3a0f9f7e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -312,6 +312,14 @@ homeassistant: friendly_name: 15 segundos .. Bienvenida Robot icon: mdi:calendar-clock + automation.sotz: + friendly_name: 15 segundos .. PoC Campaign Drones + icon: mdi:calendar-clock + + script.sotz: + friendly_name: PoC Campaign Drones + icon: mdi:drone + # Tradition Maya Lands :: Dia De Muertos automation.veladora: @@ -763,6 +771,12 @@ script: sequence: - service: shell_command.tiburonballena + # Calendar Maya Lands + + sotz: + sequence: + - service: shell_command.sotz + # Tradition Maya Lands :: Dia De Muertos veladora: @@ -951,7 +965,8 @@ shell_command: pop: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Pop.sh & sip: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sip.sh & wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & - + sotz: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sotz.sh & + # Tradition Maya Lands :: Dia De Muertos veladora: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Veladora.sh & @@ -1062,10 +1077,18 @@ automation: initial_state: 'off' trigger: platform: time - seconds: '/15' + seconds: '/30' action: - service: shell_command.wo + - alias: sotz + initial_state: 'off' + trigger: + platform: time + seconds: '/30' + action: + - service: shell_command.sotz + # Tradition Maya Lands :: Dia De Muertos - alias: Veladora @@ -1302,6 +1325,7 @@ group: entities: - group.calendarmayalandseventsinternal - group.calendarmayalandseventsexternal + - group.calendarmayalandseventscampaign # Tradition Maya Lands @@ -1587,6 +1611,12 @@ group: entities: - automation.wo + calendarmayalandseventscampaigns: + name: Campañas + entities: + - automation.sotz + - script.sotz + # Tradition Maya Lands :: Dia De Muertos traditionmayalandsdiademuertoschromecast: From cb383c3e9dc0d4ecf7d9afdd0c6fb0b711392758 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 22:12:54 -0500 Subject: [PATCH 1315/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 3a0f9f7e..9b3e0733 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1611,8 +1611,8 @@ group: entities: - automation.wo - calendarmayalandseventscampaigns: - name: Campañas + calendarmayalandseventscampaign: + name: Campaña entities: - automation.sotz - script.sotz From 012e7d2320ba4facac7c7fce731d7983390255ea Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 22:15:08 -0500 Subject: [PATCH 1316/1653] Update Sotz.sh --- Hochob/Applications/CalendarMayaLands/Sotz.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/CalendarMayaLands/Sotz.sh b/Hochob/Applications/CalendarMayaLands/Sotz.sh index 4145e289..6d8788cb 100644 --- a/Hochob/Applications/CalendarMayaLands/Sotz.sh +++ b/Hochob/Applications/CalendarMayaLands/Sotz.sh @@ -38,6 +38,8 @@ chooseLanguage() LogPid.sh $SOTZ_PID $SOTZ_NAME +LOCAL_LANGUAGE="english" + AmikooCommunication.sh "Drones" "Image" "IntelAeroReadyToFlyDrone.jpg" AmikooVoice.sh $LOCAL_LANGUAGE "The Airbone Revolution in Drone Innovation" AmikooVoice.sh $LOCAL_LANGUAGE \ From 1aa1ea937d45f613ee926b14d3be09ab20f51c9d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 22:15:56 -0500 Subject: [PATCH 1317/1653] Update Sotz.sh --- Hochob/Applications/CalendarMayaLands/Sotz.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/Sotz.sh b/Hochob/Applications/CalendarMayaLands/Sotz.sh index 6d8788cb..1d187be0 100644 --- a/Hochob/Applications/CalendarMayaLands/Sotz.sh +++ b/Hochob/Applications/CalendarMayaLands/Sotz.sh @@ -42,16 +42,21 @@ LOCAL_LANGUAGE="english" AmikooCommunication.sh "Drones" "Image" "IntelAeroReadyToFlyDrone.jpg" AmikooVoice.sh $LOCAL_LANGUAGE "The Airbone Revolution in Drone Innovation" + +sleep 1 + AmikooVoice.sh $LOCAL_LANGUAGE \ "Experience the amazing innovation driving the next frontier of flight. \ Our technology propels everything from commercial inspection, surveying and \ mapping to world record setting light show spectacles" +sleep 15 + AmikooVoice.sh $LOCAL_LANGUAGE \ "Intel Aero Ready to Fly Drone is an Unmanned Aerial Vehicle \ development platform: fully assembled, fully functional quadcopter" -sleep 20 +sleep 10 AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsDronecode.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ From 3bda89f7957acaf4e922a158bddb90d24c0d985c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 22:21:27 -0500 Subject: [PATCH 1318/1653] Update Sotz.sh --- Hochob/Applications/CalendarMayaLands/Sotz.sh | 32 ++++++++----------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Sotz.sh b/Hochob/Applications/CalendarMayaLands/Sotz.sh index 1d187be0..b540e6e2 100644 --- a/Hochob/Applications/CalendarMayaLands/Sotz.sh +++ b/Hochob/Applications/CalendarMayaLands/Sotz.sh @@ -41,21 +41,19 @@ LogPid.sh $SOTZ_PID $SOTZ_NAME LOCAL_LANGUAGE="english" AmikooCommunication.sh "Drones" "Image" "IntelAeroReadyToFlyDrone.jpg" -AmikooVoice.sh $LOCAL_LANGUAGE "The Airbone Revolution in Drone Innovation" - -sleep 1 +AmikooVoice.sh $LOCAL_LANGUAGE \ + "The Airbone Revolution in Drone Innovation, visit our Drone Stands" +sleep 4 AmikooVoice.sh $LOCAL_LANGUAGE \ "Experience the amazing innovation driving the next frontier of flight. \ Our technology propels everything from commercial inspection, surveying and \ mapping to world record setting light show spectacles" - sleep 15 AmikooVoice.sh $LOCAL_LANGUAGE \ "Intel Aero Ready to Fly Drone is an Unmanned Aerial Vehicle \ development platform: fully assembled, fully functional quadcopter" - sleep 10 AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsDronecode.jpg" @@ -63,39 +61,37 @@ AmikooVoice.sh $LOCAL_LANGUAGE \ "The Complete “End-to-End” Open Source UAV Platform. \ A neutral place where industry and ecosystem developers \ can work to build the world’s leading open UAV software platform." - sleep 15 AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationKaan.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Drone Simulation using Software In The Loop \ and Ground Control Station" - -sleep 5 +sleep 4 AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Drone Simulation using Mavlink and DroneKit" +sleep 3 -sleep 5 - -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsIntelAeroRTFSpecs.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ - "Drone Simulation using Mavlink and DroneKit" - + "Intel Aero Ready to Fly Drone is an Unmanned Aerial Vehicle development \ + platform: fully assembled, fully functional quadcopter" sleep 5 -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationIik.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Intel Aero Ready to Fly Drone controlled via Mavlink with Python Programming Language" +sleep 4 -sleep 5 - -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationChakiik.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Intel Aero Ready to Fly Drone via Remote Control" +sleep 3 -sleep 5 +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Come and talk to us about your ideas." AmikooCommunication.sh "Drones" "Image" "Stop" # End of File From 6203dd837a42f8366bb6d272b7442b58c43cde9a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 29 Oct 2017 22:23:02 -0500 Subject: [PATCH 1319/1653] Update Sotz.sh --- Hochob/Applications/CalendarMayaLands/Sotz.sh | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Sotz.sh b/Hochob/Applications/CalendarMayaLands/Sotz.sh index b540e6e2..ecb1232a 100644 --- a/Hochob/Applications/CalendarMayaLands/Sotz.sh +++ b/Hochob/Applications/CalendarMayaLands/Sotz.sh @@ -43,7 +43,7 @@ LOCAL_LANGUAGE="english" AmikooCommunication.sh "Drones" "Image" "IntelAeroReadyToFlyDrone.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "The Airbone Revolution in Drone Innovation, visit our Drone Stands" -sleep 4 +sleep 5 AmikooVoice.sh $LOCAL_LANGUAGE \ "Experience the amazing innovation driving the next frontier of flight. \ @@ -51,11 +51,6 @@ AmikooVoice.sh $LOCAL_LANGUAGE \ mapping to world record setting light show spectacles" sleep 15 -AmikooVoice.sh $LOCAL_LANGUAGE \ - "Intel Aero Ready to Fly Drone is an Unmanned Aerial Vehicle \ - development platform: fully assembled, fully functional quadcopter" -sleep 10 - AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsDronecode.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "The Complete “End-to-End” Open Source UAV Platform. \ @@ -67,28 +62,28 @@ AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationKaan.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Drone Simulation using Software In The Loop \ and Ground Control Station" -sleep 4 +sleep 5 AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Drone Simulation using Mavlink and DroneKit" -sleep 3 +sleep 5 AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsIntelAeroRTFSpecs.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Intel Aero Ready to Fly Drone is an Unmanned Aerial Vehicle development \ platform: fully assembled, fully functional quadcopter" -sleep 5 +sleep 10 AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationIik.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Intel Aero Ready to Fly Drone controlled via Mavlink with Python Programming Language" -sleep 4 +sleep 5 AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationChakiik.jpg" AmikooVoice.sh $LOCAL_LANGUAGE \ "Intel Aero Ready to Fly Drone via Remote Control" -sleep 3 +sleep 5 AmikooVoice.sh $LOCAL_LANGUAGE \ "Come and talk to us about your ideas." From 8172cc8a848c933bcb7ebd15674e50a7f12993f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Mon, 30 Oct 2017 20:15:49 -0500 Subject: [PATCH 1320/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Applications/CalendarMayaLands/Sotz.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/CalendarMayaLands/Sotz.sh diff --git a/Hochob/Applications/CalendarMayaLands/Sotz.sh b/Hochob/Applications/CalendarMayaLands/Sotz.sh old mode 100644 new mode 100755 From 15a26b3206d4054f768a8ad854fae404e7f1eb91 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 22:42:26 -0500 Subject: [PATCH 1321/1653] Update Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh index ed9297e7..a3aabb44 100755 --- a/Hochob/Applications/AmikooMayaLands/Chip.sh +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -37,11 +37,10 @@ fi sleep 3 -Amikoo.sh amikoo/headright && sleep .6 -Amikoo.sh amikoo/headleft && sleep .6 - -AmikooCommunication.sh "Amikoo" "Audio" "TakePictureEllie.mp3" +Amikoo.sh amikoo/headright && sleep 1 +Amikoo.sh amikoo/headleft && sleep 1 AmikooSense.sh "Sight" "Picture" - +AmikooCommunication.sh "Amikoo" "Audio" "TakePictureEllie.mp3" +sleep 3 AmikooCommunication.sh "Amikoo" "Audio" "Stop" From 21769bd6c86c89638be3d4223c8f385e0f620be1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 22:43:36 -0500 Subject: [PATCH 1322/1653] Update Chip.sh --- Hochob/Applications/AmikooMayaLands/Chip.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Chip.sh b/Hochob/Applications/AmikooMayaLands/Chip.sh index a3aabb44..57b62808 100755 --- a/Hochob/Applications/AmikooMayaLands/Chip.sh +++ b/Hochob/Applications/AmikooMayaLands/Chip.sh @@ -40,7 +40,7 @@ sleep 3 Amikoo.sh amikoo/headright && sleep 1 Amikoo.sh amikoo/headleft && sleep 1 -AmikooSense.sh "Sight" "Picture" AmikooCommunication.sh "Amikoo" "Audio" "TakePictureEllie.mp3" -sleep 3 +sleep .5 +AmikooSense.sh "Sight" "Picture" AmikooCommunication.sh "Amikoo" "Audio" "Stop" From 9737cf23606c7d1d59de95c7418a99b1e1e1c3c5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 22:59:19 -0500 Subject: [PATCH 1323/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 9b3e0733..da1f60ee 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1354,6 +1354,12 @@ group: - group.techiemayalandsserverinfrastructure - group.techiemayalandssandbox + intelexperiencedaylands: + view: yes + name: Techie + entities: + - group.intelexperiencedaylandspoc + # Captain Maya Lands: Language captainmayalandslanguage: @@ -1723,3 +1729,8 @@ group: name: Sandbox entities: - script.visitorsusb + + intelexperiencedaylandspoc: + name: Intel Experience Day + entities: + - script.resetall From f5e1c7744fffc37cd3d0358a0e7fb0c68c8dc2e1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:01:59 -0500 Subject: [PATCH 1324/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index da1f60ee..983218de 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1356,9 +1356,9 @@ group: intelexperiencedaylands: view: yes - name: Techie + name: Intel Experience Day entities: - - group.intelexperiencedaylandspoc + - group.intelexperiencedaylandsopening # Captain Maya Lands: Language @@ -1730,7 +1730,7 @@ group: entities: - script.visitorsusb - intelexperiencedaylandspoc: + intelexperiencedaylandsopening: name: Intel Experience Day entities: - script.resetall From e97899d512d58c7432f52d39ba659ef9ad3badf4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:05:11 -0500 Subject: [PATCH 1325/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 983218de..62d444de 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -992,6 +992,11 @@ shell_command: qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & + # Intel Experience Day + + one: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Hola, bienvenidos al show de baile de Intel" + two: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Que es eso" + switch: - platform: command_line @@ -1733,4 +1738,5 @@ group: intelexperiencedaylandsopening: name: Intel Experience Day entities: - - script.resetall + - shell_command.one + - shell_command.two From 9f65992bdfba42287e681e90b64bd34bf9c3d6b3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:08:14 -0500 Subject: [PATCH 1326/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 62d444de..eb20398f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -859,6 +859,12 @@ script: sequence: - service: shell_command.keypadfour + # Intel Experience Day + + iedone: + sequence: + - service: shell_command.iedone + shell_command: # Southern Maya Highlands @@ -994,8 +1000,8 @@ shell_command: # Intel Experience Day - one: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Hola, bienvenidos al show de baile de Intel" - two: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Que es eso" + iedone: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Hola, bienvenidos al show de baile de Intel" + iedtwo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Que es eso" switch: @@ -1738,5 +1744,5 @@ group: intelexperiencedaylandsopening: name: Intel Experience Day entities: - - shell_command.one - - shell_command.two + - script.iedone + - script.eidtwo From c50a017f36c70c5cc63a1f99f2147367ceba77df Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:10:39 -0500 Subject: [PATCH 1327/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index eb20398f..626068bb 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -865,6 +865,14 @@ script: sequence: - service: shell_command.iedone + iedtwo: + sequence: + - service: shell_command.iedtwo + + iedthree: + sequence: + - service: shell_command.iedthree + shell_command: # Southern Maya Highlands @@ -1002,6 +1010,7 @@ shell_command: iedone: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Hola, bienvenidos al show de baile de Intel" iedtwo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Que es eso" + iedthree: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Como yo" switch: @@ -1745,4 +1754,5 @@ group: name: Intel Experience Day entities: - script.iedone - - script.eidtwo + - script.iedtwo + - script.iedthree From d5c62b5160db92ddfeab25da8131b40bb7b89550 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:39:26 -0500 Subject: [PATCH 1328/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 626068bb..f1d5518a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -873,6 +873,10 @@ script: sequence: - service: shell_command.iedthree + ieddance: + sequence: + - service: shell_command.ieddance + shell_command: # Southern Maya Highlands @@ -1011,6 +1015,7 @@ shell_command: iedone: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Hola, bienvenidos al show de baile de Intel" iedtwo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Que es eso" iedthree: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Como yo" + ieddance: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Dance.sh switch: @@ -1379,6 +1384,7 @@ group: name: Intel Experience Day entities: - group.intelexperiencedaylandsopening + - group.intelexperiencedaylandsdance # Captain Maya Lands: Language @@ -1751,8 +1757,13 @@ group: - script.visitorsusb intelexperiencedaylandsopening: - name: Intel Experience Day + name: Opening entities: - script.iedone - script.iedtwo - script.iedthree + + intelexperiencedaylandsdance: + name: Dance + entities: + - script.ieddance From bb1ee086860390e6c85093921e29b8b5fc12e509 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:42:08 -0500 Subject: [PATCH 1329/1653] Create Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 49 ++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 Hochob/Applications/AmikooMayaLands/Dance.sh diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh new file mode 100644 index 00000000..82c1f4dd --- /dev/null +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export DANCE_PID=$$ +export DANCE_NAME="Dance" +export DANCE_PATH=$(readlink -f "$0") +export DANCE_DIRECTORY=$(dirname "$DANCE_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $MECCANOID_PID $MECCANOID_NAME + +Amikoo.sh amikoo/headright && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 +Amikoo.sh amikoo/rightup && sleep .8 +Amikoo.sh amikoo/leftup && sleep .8 +Amikoo.sh amikoo/rightfold && sleep .8 +Amikoo.sh amikoo/leftfold && sleep .8 +#Amikoo.sh amikoo/moveright && sleep .8 +#Amikoo.sh amikoo/movestop && sleep .8 +#Amikoo.sh amikoo/moveleft && sleep .8 +#Amikoo.sh amikoo/movestop && sleep .8 +#Amikoo.sh amikoo/moveleft && sleep .8 +#Amikoo.sh amikoo/movestop && sleep .8 +#Amikoo.sh amikoo/moveleft && sleep .8 +#Amikoo.sh amikoo/movestop && sleep .8 +Amikoo.sh amikoo/leftfold && sleep .8 +Amikoo.sh amikoo/rightfold && sleep .8 +Amikoo.sh amikoo/leftup && sleep .8 +Amikoo.sh amikoo/rightup && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 +Amikoo.sh amikoo/headright && sleep .8 + +# End of File From f9514344153aae53cff38e71b66b219e17d9660f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Mon, 30 Oct 2017 23:42:54 -0500 Subject: [PATCH 1330/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Applications/AmikooMayaLands/Dance.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/AmikooMayaLands/Dance.sh diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh old mode 100644 new mode 100755 From 5d80b4e4d35c5ee4e1997b671795a713ef2886b6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:45:26 -0500 Subject: [PATCH 1331/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 82c1f4dd..01434a15 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -39,10 +39,10 @@ Amikoo.sh amikoo/leftfold && sleep .8 #Amikoo.sh amikoo/movestop && sleep .8 #Amikoo.sh amikoo/moveleft && sleep .8 #Amikoo.sh amikoo/movestop && sleep .8 -Amikoo.sh amikoo/leftfold && sleep .8 -Amikoo.sh amikoo/rightfold && sleep .8 -Amikoo.sh amikoo/leftup && sleep .8 -Amikoo.sh amikoo/rightup && sleep .8 +Amikoo.sh amikoo/leftunfold && sleep .8 +Amikoo.sh amikoo/rightunfold && sleep .8 +Amikoo.sh amikoo/leftdown && sleep .8 +Amikoo.sh amikoo/rightdown && sleep .8 Amikoo.sh amikoo/headleft && sleep .8 Amikoo.sh amikoo/headright && sleep .8 From b43ed602f16277a08d9e26b729393cfd16946c7e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:47:22 -0500 Subject: [PATCH 1332/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 01434a15..cd33ec8f 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -25,25 +25,25 @@ export DANCE_DIRECTORY=$(dirname "$DANCE_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME -Amikoo.sh amikoo/headright && sleep .8 -Amikoo.sh amikoo/headleft && sleep .8 -Amikoo.sh amikoo/rightup && sleep .8 -Amikoo.sh amikoo/leftup && sleep .8 -Amikoo.sh amikoo/rightfold && sleep .8 -Amikoo.sh amikoo/leftfold && sleep .8 -#Amikoo.sh amikoo/moveright && sleep .8 -#Amikoo.sh amikoo/movestop && sleep .8 -#Amikoo.sh amikoo/moveleft && sleep .8 -#Amikoo.sh amikoo/movestop && sleep .8 +Amikoo.sh amikoo/headright && sleep .7 +Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/rightup && sleep .7 +Amikoo.sh amikoo/leftup && sleep .7 +Amikoo.sh amikoo/rightfold && sleep .7 +Amikoo.sh amikoo/leftfold && sleep .7 +#Amikoo.sh amikoo/moveright && sleep .7 +#Amikoo.sh amikoo/movestop && sleep .7 #Amikoo.sh amikoo/moveleft && sleep .8 #Amikoo.sh amikoo/movestop && sleep .8 #Amikoo.sh amikoo/moveleft && sleep .8 #Amikoo.sh amikoo/movestop && sleep .8 -Amikoo.sh amikoo/leftunfold && sleep .8 -Amikoo.sh amikoo/rightunfold && sleep .8 -Amikoo.sh amikoo/leftdown && sleep .8 -Amikoo.sh amikoo/rightdown && sleep .8 -Amikoo.sh amikoo/headleft && sleep .8 -Amikoo.sh amikoo/headright && sleep .8 +#Amikoo.sh amikoo/moveleft && sleep .7 +#Amikoo.sh amikoo/movestop && sleep .7 +Amikoo.sh amikoo/leftunfold && sleep .7 +Amikoo.sh amikoo/rightunfold && sleep .7 +Amikoo.sh amikoo/leftdown && sleep .7 +Amikoo.sh amikoo/rightdown && sleep .7 +Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/headright && sleep .7 # End of File From 232f871a66bb7acb2834e829823bae5291659406 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:52:58 -0500 Subject: [PATCH 1333/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index cd33ec8f..efba1b45 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -25,12 +25,19 @@ export DANCE_DIRECTORY=$(dirname "$DANCE_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightup && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftup && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightfold && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftfold && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" #Amikoo.sh amikoo/moveright && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 #Amikoo.sh amikoo/moveleft && sleep .8 @@ -40,10 +47,15 @@ Amikoo.sh amikoo/leftfold && sleep .7 #Amikoo.sh amikoo/moveleft && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 Amikoo.sh amikoo/leftunfold && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightunfold && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftdown && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightdown && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 - +AmikooCommunication.sh "Intel" "Image" "Stop" # End of File From e5c17f28a121c951340866aaafc6a0422807fc1b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 30 Oct 2017 23:57:12 -0500 Subject: [PATCH 1334/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index efba1b45..8d1dd61f 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -57,5 +57,5 @@ AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 -AmikooCommunication.sh "Intel" "Image" "Stop" +AmikooCommunication.sh "Intel" "Image" "IntelExperienceWhatsInside.png" # End of File From 8606c650d624bd3a592b97012696d0f3f1bb4fc4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:06:46 -0500 Subject: [PATCH 1335/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 8d1dd61f..56d3116f 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -46,6 +46,12 @@ AmikooCommunication.sh "Intel" "Image" "Random" #Amikoo.sh amikoo/movestop && sleep .8 #Amikoo.sh amikoo/moveleft && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 + +AmikooCommunication.sh "Intel" "Image" "Random" +Amikoo.sh amikoo/headright && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" +Amikoo.sh amikoo/headleft && sleep .7 + Amikoo.sh amikoo/leftunfold && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightunfold && sleep .7 From 70aac5295bffe2400cbf0b86a485d658312bcddb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:08:38 -0500 Subject: [PATCH 1336/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 56d3116f..4f1d875c 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -49,8 +49,10 @@ AmikooCommunication.sh "Intel" "Image" "Random" AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 +AmikooAudio.sh spanish "eeh" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 +AmikooAudio.sh spanish "eeh" && sleep .7 Amikoo.sh amikoo/leftunfold && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" From 59ca4d39e4441be61ccee159b5042103520bda65 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:09:54 -0500 Subject: [PATCH 1337/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 4f1d875c..35c1eef9 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -49,10 +49,10 @@ AmikooCommunication.sh "Intel" "Image" "Random" AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 -AmikooAudio.sh spanish "eeh" && sleep .7 +AmikooVoice.sh spanish "eeh" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 -AmikooAudio.sh spanish "eeh" && sleep .7 +AmikooVoice.sh spanish "eeh" && sleep .7 Amikoo.sh amikoo/leftunfold && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" From 3e7b2bda739f9d148da003c9109fb1ef1a17655f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:10:54 -0500 Subject: [PATCH 1338/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 35c1eef9..47bc0aca 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -47,12 +47,11 @@ AmikooCommunication.sh "Intel" "Image" "Random" #Amikoo.sh amikoo/moveleft && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 +AmikooVoice.sh spanish "eh eh" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 -AmikooVoice.sh spanish "eeh" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 -AmikooVoice.sh spanish "eeh" && sleep .7 Amikoo.sh amikoo/leftunfold && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" From 77de73a04f0ebd3170f3f83086c923b65b7525ed Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:11:33 -0500 Subject: [PATCH 1339/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 47bc0aca..dc4e88be 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -47,7 +47,7 @@ AmikooCommunication.sh "Intel" "Image" "Random" #Amikoo.sh amikoo/moveleft && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 -AmikooVoice.sh spanish "eh eh" && sleep .7 +AmikooVoice.sh spanish "eeeh eeeh" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" From 2b639096f52e13fd51d381d7ee5aa0b789316603 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:12:07 -0500 Subject: [PATCH 1340/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index dc4e88be..f57e8687 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -47,7 +47,7 @@ AmikooCommunication.sh "Intel" "Image" "Random" #Amikoo.sh amikoo/moveleft && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 -AmikooVoice.sh spanish "eeeh eeeh" && sleep .7 +AmikooVoice.sh spanish "eah eah" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" From 59566b40e265147ddcfb230114543cc0788eb2ee Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:14:33 -0500 Subject: [PATCH 1341/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index f57e8687..2284cd5f 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -25,6 +25,7 @@ export DANCE_DIRECTORY=$(dirname "$DANCE_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME +AmikooVoice.sh spanish "Aplausos por favor" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" @@ -47,7 +48,6 @@ AmikooCommunication.sh "Intel" "Image" "Random" #Amikoo.sh amikoo/moveleft && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 -AmikooVoice.sh spanish "eah eah" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" From 885076a70d6b813d692e4071d74401f85441adca Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:18:27 -0500 Subject: [PATCH 1342/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 2284cd5f..56d3116f 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -25,7 +25,6 @@ export DANCE_DIRECTORY=$(dirname "$DANCE_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME -AmikooVoice.sh spanish "Aplausos por favor" && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" From eae30ec6a33dc1d3085c97c1eec514cfb1259646 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:25:23 -0500 Subject: [PATCH 1343/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 56d3116f..fb71a96e 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -27,17 +27,26 @@ LogPid.sh $MECCANOID_PID $MECCANOID_NAME AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightup && sleep .7 +Amikoo.sh amikoo/headright && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftup && sleep .7 +Amikoo.sh amikoo/headleft && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightfold && sleep .7 +Amikoo.sh amikoo/headright && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftfold && sleep .7 -AmikooCommunication.sh "Intel" "Image" "Random" +Amikoo.sh amikoo/headleft && sleep .7 + #Amikoo.sh amikoo/moveright && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 #Amikoo.sh amikoo/moveleft && sleep .8 @@ -49,18 +58,28 @@ AmikooCommunication.sh "Intel" "Image" "Random" AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 +AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftunfold && sleep .7 +Amikoo.sh amikoo/headright && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightunfold && sleep .7 +Amikoo.sh amikoo/headleft && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftdown && sleep .7 +Amikoo.sh amikoo/headright && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/rightdown && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headleft && sleep .7 + AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/headright && sleep .7 AmikooCommunication.sh "Intel" "Image" "IntelExperienceWhatsInside.png" From 42832452ee07514d082811a05fce9b6eb59d87c2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:28:23 -0500 Subject: [PATCH 1344/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index fb71a96e..060a3573 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -47,6 +47,9 @@ AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftfold && sleep .7 Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/moveright && sleep 2 +Amikoo.sh amikoo/move left && sleep 2 + #Amikoo.sh amikoo/moveright && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 #Amikoo.sh amikoo/moveleft && sleep .8 From 58e795c201b435a30bd4f0b07685e25bec032156 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:29:31 -0500 Subject: [PATCH 1345/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index 060a3573..fb71a96e 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -47,9 +47,6 @@ AmikooCommunication.sh "Intel" "Image" "Random" Amikoo.sh amikoo/leftfold && sleep .7 Amikoo.sh amikoo/headleft && sleep .7 -Amikoo.sh amikoo/moveright && sleep 2 -Amikoo.sh amikoo/move left && sleep 2 - #Amikoo.sh amikoo/moveright && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 #Amikoo.sh amikoo/moveleft && sleep .8 From ae2ee1d03e9a0bcb873e0576682c4ce2563d68d6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 00:38:02 -0500 Subject: [PATCH 1346/1653] Update Dance.sh --- Hochob/Applications/AmikooMayaLands/Dance.sh | 50 +++++++++----------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/AmikooMayaLands/Dance.sh index fb71a96e..b09bd1e7 100755 --- a/Hochob/Applications/AmikooMayaLands/Dance.sh +++ b/Hochob/Applications/AmikooMayaLands/Dance.sh @@ -26,26 +26,24 @@ export DANCE_DIRECTORY=$(dirname "$DANCE_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/headright && sleep .7 +Amikoo.sh amikoo/headright && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/rightup && sleep .8 +Amikoo.sh amikoo/headright && sleep .8 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/rightup && sleep .7 -Amikoo.sh amikoo/headright && sleep .7 +Amikoo.sh amikoo/leftup && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/leftup && sleep .7 -Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/rightfold && sleep .8 +Amikoo.sh amikoo/headright && sleep .8 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/rightfold && sleep .7 -Amikoo.sh amikoo/headright && sleep .7 - -AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/leftfold && sleep .7 -Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/leftfold && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 #Amikoo.sh amikoo/moveright && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 @@ -57,30 +55,26 @@ Amikoo.sh amikoo/headleft && sleep .7 #Amikoo.sh amikoo/movestop && sleep .7 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/headright && sleep .7 - -AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/headright && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/leftunfold && sleep .7 -Amikoo.sh amikoo/headright && sleep .7 +Amikoo.sh amikoo/leftunfold && sleep .8 +Amikoo.sh amikoo/headright && sleep .8 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/rightunfold && sleep .7 -Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/rightunfold && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/leftdown && sleep .7 -Amikoo.sh amikoo/headright && sleep .7 +Amikoo.sh amikoo/leftdown && sleep .8 +Amikoo.sh amikoo/headright && sleep .8 AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/rightdown && sleep .7 +Amikoo.sh amikoo/rightdown && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 -AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/headleft && sleep .7 +Amikoo.sh amikoo/headright && sleep .8 +Amikoo.sh amikoo/headleft && sleep .8 -AmikooCommunication.sh "Intel" "Image" "Random" -Amikoo.sh amikoo/headright && sleep .7 -AmikooCommunication.sh "Intel" "Image" "IntelExperienceWhatsInside.png" # End of File From 9fde99a239daccf893f1bcc1482a02179c32fde4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 01:56:49 -0500 Subject: [PATCH 1347/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index f1d5518a..a1b67763 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -466,6 +466,23 @@ homeassistant: friendly_name: Hoy digo... icon: mdi:approval + # Intel Experience Day + + script.iedone: + friendly_name: Hola, bienvenidos... + icon: mdi:numeric-1-box + + script.iedtwo: + friendly_name: Que es eso? + icon: mdi:numeric-2-box + + script.iedthree: + friendly_name: Como yo? + icon: mdi:numeric-3-box + + script.ieddance: + friendly_name: Bailar... + # Enables the frontend frontend: From 6de899818cce7f3e07b947703c0b9a9c733c669c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 02:10:08 -0500 Subject: [PATCH 1348/1653] Create Welcome.sh --- .../Applications/AmikooMayaLands/Welcome.sh | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Hochob/Applications/AmikooMayaLands/Welcome.sh diff --git a/Hochob/Applications/AmikooMayaLands/Welcome.sh b/Hochob/Applications/AmikooMayaLands/Welcome.sh new file mode 100644 index 00000000..495661cf --- /dev/null +++ b/Hochob/Applications/AmikooMayaLands/Welcome.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export WO_PID=$$ +export WO_NAME="Wo" +export WO_PATH=$(readlink -f "$0") +export WO_DIRECTORY=$(dirname "$WO_PATH") + +LOCAL_INSTITUTION_NAME="México" +LOCAL_EVENT_NAME_ENGLISH="Intel Experience Day 2017" +LOCAL_EVENT_NAME_SPANISH="Experiencia Intel 2017" + +LOCAL_LANGUAGE[0]="english" +LOCAL_LANGUAGE[1]="spanish" + +# ============================================================================= +# Functions +# ============================================================================= + +Tbd + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $WO_PID $WO_NAME + +HostExternal.sh robot spanish "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" + +# End of File From d9eff3cbf909be3a936039fe97862fc67c0efc9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Tue, 31 Oct 2017 02:11:25 -0500 Subject: [PATCH 1349/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Applications/AmikooMayaLands/Welcome.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/AmikooMayaLands/Welcome.sh diff --git a/Hochob/Applications/AmikooMayaLands/Welcome.sh b/Hochob/Applications/AmikooMayaLands/Welcome.sh old mode 100644 new mode 100755 From eea256fb7f0f3bf14219e700557eeaa8315b9823 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 02:12:14 -0500 Subject: [PATCH 1350/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index a1b67763..8dc00ac2 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -483,6 +483,9 @@ homeassistant: script.ieddance: friendly_name: Bailar... + script.iedwelcmewelcome: + friendly_name: Saludo + # Enables the frontend frontend: @@ -894,6 +897,10 @@ script: sequence: - service: shell_command.ieddance + iedwelcome: + sequence: + - service: shell_command.iedwelcome + shell_command: # Southern Maya Highlands @@ -1033,6 +1040,7 @@ shell_command: iedtwo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Que es eso" iedthree: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Como yo" ieddance: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Dance.sh + iedwelcome: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Welcome.sh switch: @@ -1402,6 +1410,7 @@ group: entities: - group.intelexperiencedaylandsopening - group.intelexperiencedaylandsdance + - group.intelexperiencedaylandswelcome # Captain Maya Lands: Language @@ -1774,13 +1783,18 @@ group: - script.visitorsusb intelexperiencedaylandsopening: - name: Opening + name: Escenario entities: - script.iedone - script.iedtwo - script.iedthree intelexperiencedaylandsdance: - name: Dance + name: Baile entities: - script.ieddance + + intelexperiencedaylandswelcome: + name: Bienvenida + entities: + - script.iedwelcome From 6f128c19867952c3c24efa89fb7d0de66f7c57fb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 06:41:56 -0500 Subject: [PATCH 1351/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 8dc00ac2..de41ceee 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -483,7 +483,7 @@ homeassistant: script.ieddance: friendly_name: Bailar... - script.iedwelcmewelcome: + script.iedwelcome: friendly_name: Saludo # Enables the frontend @@ -1798,3 +1798,4 @@ group: name: Bienvenida entities: - script.iedwelcome + - script.wo From 2414b08e635591587b3ed68a81206f1296bb898e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 06:45:31 -0500 Subject: [PATCH 1352/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index de41ceee..4ff87be1 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1798,4 +1798,3 @@ group: name: Bienvenida entities: - script.iedwelcome - - script.wo From 7fb90efaeb132f5ce91414a750c20f4d200e7444 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 06:54:01 -0500 Subject: [PATCH 1353/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 4ff87be1..de41ceee 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1798,3 +1798,4 @@ group: name: Bienvenida entities: - script.iedwelcome + - script.wo From 76bec43400c337b8a7de2eebdab2f7170b121df6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 06:54:53 -0500 Subject: [PATCH 1354/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index de41ceee..bf2d6e11 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1798,4 +1798,4 @@ group: name: Bienvenida entities: - script.iedwelcome - - script.wo + - automation.wo From d911fa35c07a4601e02b48b2d6c29882897bc60b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 31 Oct 2017 06:55:26 -0500 Subject: [PATCH 1355/1653] Update Wo.sh --- Hochob/Applications/CalendarMayaLands/Wo.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Applications/CalendarMayaLands/Wo.sh b/Hochob/Applications/CalendarMayaLands/Wo.sh index bcf875bf..342eb3da 100755 --- a/Hochob/Applications/CalendarMayaLands/Wo.sh +++ b/Hochob/Applications/CalendarMayaLands/Wo.sh @@ -36,6 +36,10 @@ chooseLanguage() LogPid.sh $WO_PID $WO_NAME +HostExternal.sh robot spanish "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" + +exit 0 + chooseLanguage if [ "$LOCAL_LANGUAGE" = "english" ]; then From 634bf9dd4699210fb9ba88b766220f477bfdc169 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 5 Nov 2017 00:39:55 -0500 Subject: [PATCH 1356/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/i486.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/i486.sh index 0c343f53..736df0ac 100755 --- a/Hochob/Applications/TraditionMayaLands/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/i486.sh @@ -35,6 +35,8 @@ sleep 2 KillApp.sh "cvlc" KillApp.sh "eog" +sleep 1 + Eog.sh "$TRADITION_INTEL/Image/IntelChorus.jpg" sleep 1 Vlc.sh $TRADITION_INTEL/Sound/IntelBongChorus.mp3 From 3bd0173d185d724593864229fb1d30e5eb7ffc63 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 5 Nov 2017 00:41:53 -0500 Subject: [PATCH 1357/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 8f6304a5..b0e44ac0 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -44,7 +44,7 @@ SpeechSynthetizer.sh on espeak spanish \ leer cuentos divertidos, hacer ejercicio y aprender con mis familiares y amigos \ todo el conocimiento científico y tecnológico que está presente en nuestra vida cotidiana. \ También soy guia en este emocionante Centro de Visitantes. \ - Hace rato estaba un poco chiveado pero ya estoy listo para mostrarles \ + Hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ lo interesante que es el mundo de las Ciencias, la Tecnología, \ las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ que aquí trabajamos les deseamos la mejor de las experiencias. \ From f9e2142349e505aa37cbe7b5a67a378d52183f65 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 5 Nov 2017 00:48:03 -0500 Subject: [PATCH 1358/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index bf2d6e11..c56bbddd 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1011,20 +1011,20 @@ shell_command: # Tradition Maya Lands :: Dia De Muertos - veladora: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Veladora.sh & - papelpicado: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/PapelPicado.sh & - mantel: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Mantel.sh & - calaveritas: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Calaveritas.sh & - fotografia: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Fotografia.sh & + veladora: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh & + papelpicado: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/PapelPicado.sh & + mantel: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Mantel.sh & + calaveritas: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaveritas.sh & + fotografia: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh & # Tradition Maya Lands :: Intel - 4004: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/4004.sh & - 8008: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8008.sh & - 8080: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8080.sh & - 8086: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/8086.sh & - 80286: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/80286.sh & - i486: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/i486.sh & + 4004: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/4004.sh & + 8008: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/8008.sh & + 8080: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/8080.sh & + 8086: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/8086.sh & + 80286: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/80286.sh & + i486: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/i486.sh & # Techie Maya Lands From bf6a0b8f7a6bd2c97da2b153ad9a852329940d11 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 5 Nov 2017 00:50:00 -0500 Subject: [PATCH 1359/1653] Update Signed-off-by: Abraham Arce --- .../TraditionMayaLands/{ => DiaDeMuertos}/Calaveritas.sh | 0 .../TraditionMayaLands/{ => DiaDeMuertos}/Fotografia.sh | 0 .../Applications/TraditionMayaLands/{ => DiaDeMuertos}/Mantel.sh | 0 .../TraditionMayaLands/{ => DiaDeMuertos}/PapelPicado.sh | 0 .../TraditionMayaLands/{ => DiaDeMuertos}/Veladora.sh | 0 Hochob/Applications/TraditionMayaLands/{ => Intel}/4004.sh | 0 Hochob/Applications/TraditionMayaLands/{ => Intel}/8008.sh | 0 Hochob/Applications/TraditionMayaLands/{ => Intel}/80286.sh | 0 Hochob/Applications/TraditionMayaLands/{ => Intel}/8080.sh | 0 Hochob/Applications/TraditionMayaLands/{ => Intel}/8086.sh | 0 Hochob/Applications/TraditionMayaLands/{ => Intel}/i486.sh | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/TraditionMayaLands/{ => DiaDeMuertos}/Calaveritas.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => DiaDeMuertos}/Fotografia.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => DiaDeMuertos}/Mantel.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => DiaDeMuertos}/PapelPicado.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => DiaDeMuertos}/Veladora.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => Intel}/4004.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => Intel}/8008.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => Intel}/80286.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => Intel}/8080.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => Intel}/8086.sh (100%) rename Hochob/Applications/TraditionMayaLands/{ => Intel}/i486.sh (100%) diff --git a/Hochob/Applications/TraditionMayaLands/Calaveritas.sh b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaveritas.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/Calaveritas.sh rename to Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaveritas.sh diff --git a/Hochob/Applications/TraditionMayaLands/Fotografia.sh b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/Fotografia.sh rename to Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh diff --git a/Hochob/Applications/TraditionMayaLands/Mantel.sh b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Mantel.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/Mantel.sh rename to Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Mantel.sh diff --git a/Hochob/Applications/TraditionMayaLands/PapelPicado.sh b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/PapelPicado.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/PapelPicado.sh rename to Hochob/Applications/TraditionMayaLands/DiaDeMuertos/PapelPicado.sh diff --git a/Hochob/Applications/TraditionMayaLands/Veladora.sh b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/Veladora.sh rename to Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh diff --git a/Hochob/Applications/TraditionMayaLands/4004.sh b/Hochob/Applications/TraditionMayaLands/Intel/4004.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/4004.sh rename to Hochob/Applications/TraditionMayaLands/Intel/4004.sh diff --git a/Hochob/Applications/TraditionMayaLands/8008.sh b/Hochob/Applications/TraditionMayaLands/Intel/8008.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/8008.sh rename to Hochob/Applications/TraditionMayaLands/Intel/8008.sh diff --git a/Hochob/Applications/TraditionMayaLands/80286.sh b/Hochob/Applications/TraditionMayaLands/Intel/80286.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/80286.sh rename to Hochob/Applications/TraditionMayaLands/Intel/80286.sh diff --git a/Hochob/Applications/TraditionMayaLands/8080.sh b/Hochob/Applications/TraditionMayaLands/Intel/8080.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/8080.sh rename to Hochob/Applications/TraditionMayaLands/Intel/8080.sh diff --git a/Hochob/Applications/TraditionMayaLands/8086.sh b/Hochob/Applications/TraditionMayaLands/Intel/8086.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/8086.sh rename to Hochob/Applications/TraditionMayaLands/Intel/8086.sh diff --git a/Hochob/Applications/TraditionMayaLands/i486.sh b/Hochob/Applications/TraditionMayaLands/Intel/i486.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/i486.sh rename to Hochob/Applications/TraditionMayaLands/Intel/i486.sh From e8b888ec9d26dc55043e119bf20ab1777f65ddac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 6 Nov 2017 15:00:50 -0600 Subject: [PATCH 1360/1653] Update Pop.sh --- Hochob/Applications/CalendarMayaLands/Pop.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/Pop.sh b/Hochob/Applications/CalendarMayaLands/Pop.sh index a996dcb0..402d68c5 100755 --- a/Hochob/Applications/CalendarMayaLands/Pop.sh +++ b/Hochob/Applications/CalendarMayaLands/Pop.sh @@ -13,12 +13,18 @@ export POP_NAME="Pop" export POP_PATH=$(readlink -f "$0") export POP_DIRECTORY=$(dirname "$POP_PATH") +# Innovation Week 2017 LOCAL_INSTITUTION_NAME=`Intel Guadalajara` LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" +# PCIE Tech Week 2017 +LOCAL_INSTITUTION_NAME=`Intel Guadalajara` +LOCAL_EVENT_NAME_ENGLISH="PCI Express Tech Week" +LOCAL_EVENT_NAME_SPANISH="Semana de Tecnología PCI Express" + LOCAL_LANGUAGE[0]="english" -LOCAL_LANGUAGE[1]="spanish" +LOCAL_LANGUAGE[1]="english" # ============================================================================= # Functions From e052a689ab7bbcdc656ecc224113e4d721d533e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C2=B4Abraham?= Date: Mon, 6 Nov 2017 15:04:48 -0600 Subject: [PATCH 1361/1653] Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: ´Abraham --- Hochob/Services/Events/HostExternal.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Events/HostExternal.sh b/Hochob/Services/Events/HostExternal.sh index 4aa22f44..78978c19 100755 --- a/Hochob/Services/Events/HostExternal.sh +++ b/Hochob/Services/Events/HostExternal.sh @@ -32,7 +32,7 @@ LOCAL_GREETING_SPANISH[1]="Buenos dias," LOCAL_GREETING_SPANISH[2]="Saludos," LOCAL_GREETING_SPANISH[3]="Espera," LOCAL_GREETING_SPANISH[4]="Hey," -LOCAL_GREETING_SPANISH[5]="Que hongo morongo," +LOCAL_GREETING_SPANISH[5]="Hola," LOCAL_GREETING_SPANISH[6]="Un minuto por favor," LOCAL_GREETING_SPANISH[7]="Que onda," @@ -44,7 +44,7 @@ LOCAL_REMINDER_ENGLISH[4]="Finally with us," LOCAL_REMINDER_ENGLISH[5]="The big boy has just arrived," LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, this great journey," -LOCAL_REMINDER_SPANISH[0]="Bienvenido a nuestro evento," +LOCAL_REMINDER_SPANISH[0]="Excelente que estas aqui, " LOCAL_REMINDER_SPANISH[1]="Excelente que estas aqui, " LOCAL_REMINDER_SPANISH[2]="Hoy es el gran día," LOCAL_REMINDER_SPANISH[3]="Finalmente aquí," From 8309973bbb394a12f18b6acdc06f88cd79843a3a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 6 Nov 2017 15:06:15 -0600 Subject: [PATCH 1362/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index d1d899b9..5090f85b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -254,7 +254,7 @@ AMIKOO_SENSE_HEARING=$AMIKOO_SENSE/hearing AMIKOO_COMMUNICATION=$AMIKOO/tradition ## Communication :: Verbal ## -AMIKOO_AUDIO=$AMIKOO_COMMUNICATION/audio +AMIKOO_AUDIO=$AMIKOO_COMMUNICATION/sound ## Communication :: Visual ## AMIKOO_IMAGE=$AMIKOO_COMMUNICATION/image From 76c739513f3ad91117589494576cff5999d52226 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 6 Nov 2017 15:15:00 -0600 Subject: [PATCH 1363/1653] Update HostInternal.sh --- Hochob/Services/Events/HostInternal.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Events/HostInternal.sh b/Hochob/Services/Events/HostInternal.sh index 42914504..e82236c8 100755 --- a/Hochob/Services/Events/HostInternal.sh +++ b/Hochob/Services/Events/HostInternal.sh @@ -14,6 +14,7 @@ LOCAL_HOST="$1" LOCAL_LANGUAGE="$2" LOCAL_INSTITUTION_NAME="$3" LOCAL_EVENT_NAME="$4" +LOCAL_PHRASE="$5" LOCAL_INTRODUCTION_ENGLISH="Hi, I am Lupe." LOCAL_INTRODUCTION_SPANISH="Hola! Soy Lupe." @@ -117,6 +118,7 @@ chooseClosure $LOCAL_LANGUAGE LOCAL_MESSAGE="${LOCAL_INTRODUCTION} \ ${LOCAL_GREETING} ${LOCAL_INSTITUTION_NAME}. \ ${LOCAL_REMINDER} ${LOCAL_EVENT_NAME}. \ + ${LOCAL_PHRASE}. \ ${LOCAL_CLOSURE}" if [ "$LOCAL_HOST" = "server" ]; then From 7336cd1bbccbb23a63c210fd81b0c86614800643 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 6 Nov 2017 15:22:17 -0600 Subject: [PATCH 1364/1653] Update Pop.sh --- Hochob/Applications/CalendarMayaLands/Pop.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hochob/Applications/CalendarMayaLands/Pop.sh b/Hochob/Applications/CalendarMayaLands/Pop.sh index 402d68c5..68017670 100755 --- a/Hochob/Applications/CalendarMayaLands/Pop.sh +++ b/Hochob/Applications/CalendarMayaLands/Pop.sh @@ -17,6 +17,9 @@ export POP_DIRECTORY=$(dirname "$POP_PATH") LOCAL_INSTITUTION_NAME=`Intel Guadalajara` LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" +LOCAL_PHRASE="The PCI Center of Excellence invites you to attend \ + the PCIE Tech Week at Intel GDC Auditorium this November 7th, 8th and 9th. \ + We will host Senior Principal Engineers, Principal Engineers and Technical Leaders." # PCIE Tech Week 2017 LOCAL_INSTITUTION_NAME=`Intel Guadalajara` From 5f201b2c57349dcd651cb1a380d4fff4ef11ddad Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 6 Nov 2017 15:24:31 -0600 Subject: [PATCH 1365/1653] Update Pop.sh --- Hochob/Applications/CalendarMayaLands/Pop.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Pop.sh b/Hochob/Applications/CalendarMayaLands/Pop.sh index 68017670..cbf20190 100755 --- a/Hochob/Applications/CalendarMayaLands/Pop.sh +++ b/Hochob/Applications/CalendarMayaLands/Pop.sh @@ -17,14 +17,14 @@ export POP_DIRECTORY=$(dirname "$POP_PATH") LOCAL_INSTITUTION_NAME=`Intel Guadalajara` LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" -LOCAL_PHRASE="The PCI Center of Excellence invites you to attend \ - the PCIE Tech Week at Intel GDC Auditorium this November 7th, 8th and 9th. \ - We will host Senior Principal Engineers, Principal Engineers and Technical Leaders." # PCIE Tech Week 2017 LOCAL_INSTITUTION_NAME=`Intel Guadalajara` LOCAL_EVENT_NAME_ENGLISH="PCI Express Tech Week" LOCAL_EVENT_NAME_SPANISH="Semana de Tecnología PCI Express" +LOCAL_PHRASE="The PCI Center of Excellence invites you to attend \ + the PCIE Tech Week at Intel GDC Auditorium this November 7th, 8th and 9th. \ + We will host Senior Principal Engineers, Principal Engineers and Technical Leaders." LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="english" @@ -48,9 +48,9 @@ LogPid.sh $POP_PID $POP_NAME chooseLanguage if [ "$LOCAL_LANGUAGE" = "english" ]; then - HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" + HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_ENGLISH}" "${LOCAL_PHRASE}" else - HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" + HostInternal.sh robot $LOCAL_LANGUAGE "${LOCAL_INSTITUTION_NAME}" "${LOCAL_EVENT_NAME_SPANISH}" "${LOCAL_PHRASE}" fi # End of File From a5e7b5445b63e8671ef1bc70ae2ea20b4fcbfcea Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 6 Nov 2017 15:25:33 -0600 Subject: [PATCH 1366/1653] Update HostInternal.sh --- Hochob/Services/Events/HostInternal.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Events/HostInternal.sh b/Hochob/Services/Events/HostInternal.sh index e82236c8..4bb3a22b 100755 --- a/Hochob/Services/Events/HostInternal.sh +++ b/Hochob/Services/Events/HostInternal.sh @@ -40,7 +40,7 @@ LOCAL_GREETING_SPANISH[7]="Que onda," LOCAL_REMINDER_ENGLISH[0]="Remember we have today our" LOCAL_REMINDER_ENGLISH[1]="Do not forget about" LOCAL_REMINDER_ENGLISH[2]="Today is the big day," -LOCAL_REMINDER_ENGLISH[3]="It is finally here!," +LOCAL_REMINDER_ENGLISH[3]="It is finally here," LOCAL_REMINDER_ENGLISH[4]="Finally with us," LOCAL_REMINDER_ENGLISH[5]="The big day has just arrived," LOCAL_REMINDER_ENGLISH[6]="Let's not say anything else, the great event," From 9109f641216d4203da1d4d92957c80db9182d02e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 6 Nov 2017 15:28:32 -0600 Subject: [PATCH 1367/1653] Update Pop.sh --- Hochob/Applications/CalendarMayaLands/Pop.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/Pop.sh b/Hochob/Applications/CalendarMayaLands/Pop.sh index cbf20190..1101197c 100755 --- a/Hochob/Applications/CalendarMayaLands/Pop.sh +++ b/Hochob/Applications/CalendarMayaLands/Pop.sh @@ -24,7 +24,9 @@ LOCAL_EVENT_NAME_ENGLISH="PCI Express Tech Week" LOCAL_EVENT_NAME_SPANISH="Semana de Tecnología PCI Express" LOCAL_PHRASE="The PCI Center of Excellence invites you to attend \ the PCIE Tech Week at Intel GDC Auditorium this November 7th, 8th and 9th. \ - We will host Senior Principal Engineers, Principal Engineers and Technical Leaders." + Senior Principal Engineers, Principal Engineers and Technical Leaders \ + will be available to hear your ideas. Please come and share your knowledge so \ + we can provide customer support with excellende and efficiency." LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="english" From 4714d61aa02c9ce655b4675f8c9683cdcd71c52c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 7 Nov 2017 08:27:22 -0600 Subject: [PATCH 1368/1653] Update Pop.sh --- Hochob/Applications/CalendarMayaLands/Pop.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Pop.sh b/Hochob/Applications/CalendarMayaLands/Pop.sh index 1101197c..947c897a 100755 --- a/Hochob/Applications/CalendarMayaLands/Pop.sh +++ b/Hochob/Applications/CalendarMayaLands/Pop.sh @@ -14,9 +14,9 @@ export POP_PATH=$(readlink -f "$0") export POP_DIRECTORY=$(dirname "$POP_PATH") # Innovation Week 2017 -LOCAL_INSTITUTION_NAME=`Intel Guadalajara` -LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" -LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" +#LOCAL_INSTITUTION_NAME=`Intel Guadalajara` +#LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" +#LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" # PCIE Tech Week 2017 LOCAL_INSTITUTION_NAME=`Intel Guadalajara` From 6b8739d86585db0071709ef95ac8ddf608fe14eb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 7 Nov 2017 08:28:18 -0600 Subject: [PATCH 1369/1653] Update Sip.sh --- Hochob/Applications/CalendarMayaLands/Sip.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Sip.sh b/Hochob/Applications/CalendarMayaLands/Sip.sh index a80fcef1..78d80b98 100755 --- a/Hochob/Applications/CalendarMayaLands/Sip.sh +++ b/Hochob/Applications/CalendarMayaLands/Sip.sh @@ -13,12 +13,22 @@ export SIP_NAME="Sip" export SIP_PATH=$(readlink -f "$0") export SIP_DIRECTORY=$(dirname "$SIP_PATH") -LOCAL_INSTITUTION_NAME="Intel Guadalajara" -LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" -LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" +#LOCAL_INSTITUTION_NAME="Intel Guadalajara" +#LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" +#LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" + +# PCIE Tech Week 2017 +LOCAL_INSTITUTION_NAME=`Intel Guadalajara` +LOCAL_EVENT_NAME_ENGLISH="PCI Express Tech Week" +LOCAL_EVENT_NAME_SPANISH="Semana de Tecnología PCI Express" +LOCAL_PHRASE="The PCI Center of Excellence invites you to attend \ + the PCIE Tech Week at Intel GDC Auditorium this November 7th, 8th and 9th. \ + Senior Principal Engineers, Principal Engineers and Technical Leaders \ + will be available to hear your ideas. Please come and share your knowledge so \ + we can provide customer support with excellende and efficiency." LOCAL_LANGUAGE[0]="english" -LOCAL_LANGUAGE[1]="spanish" +LOCAL_LANGUAGE[1]="english" # ============================================================================= # Functions From d317ab1baa2f7a9a45ca560f4db15e622d3dd60a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 7 Nov 2017 08:36:10 -0600 Subject: [PATCH 1370/1653] Update Sip.sh --- Hochob/Applications/CalendarMayaLands/Sip.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Sip.sh b/Hochob/Applications/CalendarMayaLands/Sip.sh index 78d80b98..9a66e87f 100755 --- a/Hochob/Applications/CalendarMayaLands/Sip.sh +++ b/Hochob/Applications/CalendarMayaLands/Sip.sh @@ -13,9 +13,10 @@ export SIP_NAME="Sip" export SIP_PATH=$(readlink -f "$0") export SIP_DIRECTORY=$(dirname "$SIP_PATH") -#LOCAL_INSTITUTION_NAME="Intel Guadalajara" -#LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" -#LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" +# Innovation Week 2017 +LOCAL_INSTITUTION_NAME="Intel Guadalajara" +LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" +LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" # PCIE Tech Week 2017 LOCAL_INSTITUTION_NAME=`Intel Guadalajara` From 429937d4744e61aa230c6b3511b5a0090ab3f997 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 7 Nov 2017 08:36:33 -0600 Subject: [PATCH 1371/1653] Update Pop.sh --- Hochob/Applications/CalendarMayaLands/Pop.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/Pop.sh b/Hochob/Applications/CalendarMayaLands/Pop.sh index 947c897a..1101197c 100755 --- a/Hochob/Applications/CalendarMayaLands/Pop.sh +++ b/Hochob/Applications/CalendarMayaLands/Pop.sh @@ -14,9 +14,9 @@ export POP_PATH=$(readlink -f "$0") export POP_DIRECTORY=$(dirname "$POP_PATH") # Innovation Week 2017 -#LOCAL_INSTITUTION_NAME=`Intel Guadalajara` -#LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" -#LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" +LOCAL_INSTITUTION_NAME=`Intel Guadalajara` +LOCAL_EVENT_NAME_ENGLISH="Innovation Week 2017" +LOCAL_EVENT_NAME_SPANISH="Semana de Innovación 2017" # PCIE Tech Week 2017 LOCAL_INSTITUTION_NAME=`Intel Guadalajara` From 24f73ac2f245ad229575685c1060132c5540546d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 7 Nov 2017 17:48:50 -0600 Subject: [PATCH 1372/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index c56bbddd..dde70b2f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -940,28 +940,28 @@ shell_command: # Amikoo Maya Lands - resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/resetall 1 + resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/resetall 1 # Amikoo Maya Lands: Movement - headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headleft "Head Left" - headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headright "Head Right" + headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/headleft "Head Left" + headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/headright "Head Right" - rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightup "Arm Right Up" - rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightdown "Arm Right Down" - rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightfold "Arm Right Fold" - rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightunfold "Arm Right Unfold" + rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightup "Arm Right Up" + rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightdown "Arm Right Down" + rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightfold "Arm Right Fold" + rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightunfold "Arm Right Unfold" - leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftup "Arm Left Up" - leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftdown "Arm Left Down" - leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftfold "Arm Left Fold" - leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftunfold "Arm Left Unfold" + leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftup "Arm Left Up" + leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftdown "Arm Left Down" + leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftfold "Arm Left Fold" + leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftunfold "Arm Left Unfold" - moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveright "Body Move Right" - moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveleft "Body Move Left" - moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveforward "Body Move Forward" - movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movebackward "Body Move Backward" - movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movestop "Body Stop" + moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveright "Body Move Right" + moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveleft "Body Move Left" + moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveforward "Body Move Forward" + movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/movebackward "Body Move Backward" + movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/movestop "Body Stop" # Amikoo Maya Lands :: Voice From 2deef867550653720d05bd44a552cbeaa6004162 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 8 Nov 2017 09:11:19 -0600 Subject: [PATCH 1373/1653] Update BajaCaliforniaSur.sh --- .../BajaCaliforniaSur.sh | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 11cf208c..5649234a 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -28,36 +28,36 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & -(Amikoo.sh amikoo/inicial 1) && sleep 1.25 +(Amikoo.sh lupe/inicial 1) && sleep 1.25 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & -sleep 6.35 && Amikoo.sh amikoo/emocion 1 && sleep 4 +sleep 6.35 && Amikoo.sh lupe/emocion 1 && sleep 4 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & -sleep 2.7 && Amikoo.sh amikoo/porsupuesto 1 && sleep 2.5 +sleep 2.7 && Amikoo.sh lupe/porsupuesto 1 && sleep 2.5 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & -sleep 37.5 && Amikoo.sh amikoo/cerebro 1 +sleep 37.5 && Amikoo.sh lupe/cerebro 1 sleep 2 -Amikoo.sh amikoo/rightup 1 +Amikoo.sh lupe/rightup 1 sleep .25 -Amikoo.sh amikoo/leftup 1 +Amikoo.sh lupe/leftup 1 sleep .25 -Amikoo.sh amikoo/rightfold 1 +Amikoo.sh lupe/rightfold 1 sleep .25 -Amikoo.sh amikoo/leftfold 1 +Amikoo.sh lupe/leftfold 1 sleep 2 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & -sleep 25.5 && Amikoo.sh amikoo/inteledison 1 +sleep 25.5 && Amikoo.sh lupe/inteledison 1 sleep 3 -Amikoo.sh amikoo/rightdown 1 +Amikoo.sh lupe/rightdown 1 sleep .25 -Amikoo.sh amikoo/leftdown 1 +Amikoo.sh lupe/leftdown 1 sleep .25 -Amikoo.sh amikoo/rightunfold 1 +Amikoo.sh lupe/rightunfold 1 sleep .25 -Amikoo.sh amikoo/leftunfold 1 +Amikoo.sh lupe/leftunfold 1 sleep 2 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & From 827f4c7768ae080a57556d7ca81c6b719a8577a3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 8 Nov 2017 09:14:25 -0600 Subject: [PATCH 1374/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index dde70b2f..c2e0cbe6 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -907,7 +907,7 @@ shell_command: aguascalientes: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & bajacalifornianorte: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh & - bajacaliforniasur: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh & + bajacaliforniasur: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh & campeche: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Campeche.sh & michoacan: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & zacatecas: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh & From 39dd7c4b59e767d5d8ad229fa3a9805e4d0d5f78 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 14 Nov 2017 11:42:20 -0600 Subject: [PATCH 1375/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 5090f85b..1ed88034 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -209,8 +209,8 @@ export VISITORS_SOURCE=$HOCHOB_SERVER_MEDIA_SOURCE_VISITORS # ---------------------- # #MQTT_SERVER_ADDRESS=127.0.0.1 -#MQTT_SERVER_ADDRESS=10.215.56.158 -MQTT_SERVER_ADDRESS=iot.eclipse.org +MQTT_SERVER_ADDRESS=10.215.56.158 +#MQTT_SERVER_ADDRESS=iot.eclipse.org MQTT_SERVER_PORT=1883 # ------ # From 1450db7b523346cfc0af2ca5bea517b43b02465e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 14 Nov 2017 11:44:19 -0600 Subject: [PATCH 1376/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index c2e0cbe6..e9258bf0 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -940,28 +940,28 @@ shell_command: # Amikoo Maya Lands - resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/resetall 1 + resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/resetall 1 # Amikoo Maya Lands: Movement - headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/headleft "Head Left" - headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/headright "Head Right" + headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headleft "Head Left" + headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headright "Head Right" - rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightup "Arm Right Up" - rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightdown "Arm Right Down" - rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightfold "Arm Right Fold" - rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/rightunfold "Arm Right Unfold" + rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightup "Arm Right Up" + rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightdown "Arm Right Down" + rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightfold "Arm Right Fold" + rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightunfold "Arm Right Unfold" - leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftup "Arm Left Up" - leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftdown "Arm Left Down" - leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftfold "Arm Left Fold" - leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/leftunfold "Arm Left Unfold" + leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftup "Arm Left Up" + leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftdown "Arm Left Down" + leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftfold "Arm Left Fold" + leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftunfold "Arm Left Unfold" - moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveright "Body Move Right" - moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveleft "Body Move Left" - moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/moveforward "Body Move Forward" - movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/movebackward "Body Move Backward" - movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh lupe/movestop "Body Stop" + moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveright "Body Move Right" + moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveleft "Body Move Left" + moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveforward "Body Move Forward" + movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movebackward "Body Move Backward" + movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movestop "Body Stop" # Amikoo Maya Lands :: Voice From 9036630fbe68a00d6b8413f119d2f5c37887d9e9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:02:26 -0600 Subject: [PATCH 1377/1653] Create Familia.sh --- .../TraditionMayaLands/Navidad/Familia.sh | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh new file mode 100644 index 00000000..e8e08d39 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export FAMILIA_PID=$$ +export FAMILIA_NAME="Familia" +export FAMILIA_PATH=$(readlink -f "$0") +export FAMILIA_DIRECTORY=$(dirname "$FAMILIA_PATH") + +LOCAL_DEVICE="Triki" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $FAMILIA_PID $FAMILIA_NAME + +LOCAL_SOUND=`find $TRADITION_NAVIDAD/Sound/ -type f | shuf -n 1` +Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" From 86c3bd092fd38b0cc57a11d3e4a85bfadf654cba Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:04:37 -0600 Subject: [PATCH 1378/1653] Create Campanas.sh --- .../TraditionMayaLands/Navidad/Campanas.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Navidad/Campanas.sh diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Campanas.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Campanas.sh new file mode 100644 index 00000000..7a970202 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Navidad/Campanas.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CAMPANAS_PID=$$ +export CAMPANAS_NAME="Campanas" +export CAMPANAS_PATH=$(readlink -f "$0") +export CAMPANAS_DIRECTORY=$(dirname "$CAMPANAS_PATH") + +LOCAL_TRADITION="Navidad" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $CAMPANAS_PID $CAMPANAS_NAME + +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Random" +sleep 5 +AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" + +# End of File From 335bc2931b09c3f64e977a8a160a9f6e4b524f20 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:07:09 -0600 Subject: [PATCH 1379/1653] Create Pesebre.sh --- .../TraditionMayaLands/Navidad/Pesebre.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh new file mode 100644 index 00000000..73475b00 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export PESEBRE_PID=$$ +export PESEBRE_NAME="Pesebre" +export PESEBRE_PATH=$(readlink -f "$0") +export PESEBRE_DIRECTORY=$(dirname "$PESEBRE_PATH") + +LOCAL_TRADITION="Navidad" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $PESEBRE_PID $PESEBRE_NAME + +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Random" +sleep 10 +AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Stop" + +# End of File From 03ed1cca8e53cc9178c230d70190627b3b867543 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:09:10 -0600 Subject: [PATCH 1380/1653] Create Trineo.sh --- .../TraditionMayaLands/Navidad/Trineo.sh | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh new file mode 100644 index 00000000..1de13e49 --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export TRINEO_PID=$$ +export TRINEO_NAME="Trineo" +export TRINEO_PATH=$(readlink -f "$0") +export TRINEO_DIRECTORY=$(dirname "$TRINEO_PATH") + +LOCAL_TRADITION="Navidad" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $TRINEO_PID $TRINEO_NAME + +AmikooCommunication.sh "$LOCAL_TRADITION" "Video" "Random" +sleep 10 +AmikooCommunication.sh "$LOCAL_TRADITION" "Video" "Stop" + +# End of File From d7e51390e2d005a1a5700bee86cbf483459d3821 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:11:59 -0600 Subject: [PATCH 1381/1653] Update and rename Campanas.sh to Campana.sh --- .../Navidad/{Campanas.sh => Campana.sh} | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename Hochob/Applications/TraditionMayaLands/Navidad/{Campanas.sh => Campana.sh} (79%) diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Campanas.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh similarity index 79% rename from Hochob/Applications/TraditionMayaLands/Navidad/Campanas.sh rename to Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh index 7a970202..0c569c3e 100644 --- a/Hochob/Applications/TraditionMayaLands/Navidad/Campanas.sh +++ b/Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export CAMPANAS_PID=$$ -export CAMPANAS_NAME="Campanas" -export CAMPANAS_PATH=$(readlink -f "$0") -export CAMPANAS_DIRECTORY=$(dirname "$CAMPANAS_PATH") +export CAMPANA_PID=$$ +export CAMPANA_NAME="Campana" +export CAMPANA_PATH=$(readlink -f "$0") +export CAMPANA_DIRECTORY=$(dirname "$CAMPANA_PATH") LOCAL_TRADITION="Navidad" @@ -25,7 +25,7 @@ LOCAL_TRADITION="Navidad" # Main # ============================================================================= -LogPid.sh $CAMPANAS_PID $CAMPANAS_NAME +LogPid.sh $CAMPANA_PID $CAMPANA_NAME AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Random" sleep 5 From 5413c2aefef985c1fd95249eed67cb60ba87e64c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:13:37 -0600 Subject: [PATCH 1382/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index e9258bf0..64e9b9d2 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -346,11 +346,11 @@ homeassistant: friendly_name: Imágenes icon: mdi:file-image - automation.calaveritas: + automation.calaverita: friendly_name: 10 minutos .. Fantasma icon: mdi:calendar-clock - script.calaveritas: + script.calaverita: friendly_name: Fantasma icon: mdi:face-profile @@ -811,9 +811,9 @@ script: sequence: - service: shell_command.mantel - calaveritas: + calaverita: sequence: - - service: shell_command.calaveritas + - service: shell_command.calaverita fotografia: sequence: @@ -1014,7 +1014,7 @@ shell_command: veladora: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh & papelpicado: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/PapelPicado.sh & mantel: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Mantel.sh & - calaveritas: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaveritas.sh & + calaverita: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaverita.sh & fotografia: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh & # Tradition Maya Lands :: Intel @@ -1172,14 +1172,14 @@ automation: action: - service: shell_command.mantel - - alias: Calaveritas + - alias: Calaverita initial_state: 'off' trigger: platform: time minutes: '/10' seconds: 00 action: - - service: shell_command.calaveritas + - service: shell_command.calaverita - alias: Fotografia initial_state: 'off' @@ -1688,11 +1688,11 @@ group: entities: - automation.papelpicado - automation.mantel - - automation.calaveritas + - automation.calaverita - automation.fotografia - script.papelpicado - script.mantel - - script.calaveritas + - script.calaverita - script.fotografia # Tradition Maya Lands :: Intel From 7856d26ca81746a4ea1ceeaf515e415c041262c0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:13:46 -0600 Subject: [PATCH 1383/1653] Rename Calaveritas.sh to Calaverita.sh --- .../DiaDeMuertos/{Calaveritas.sh => Calaverita.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/TraditionMayaLands/DiaDeMuertos/{Calaveritas.sh => Calaverita.sh} (100%) diff --git a/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaveritas.sh b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaverita.sh similarity index 100% rename from Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaveritas.sh rename to Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaverita.sh From 779bf108c743ff9bc5f4780ed8d0721f0c8c4cfd Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:24:42 -0600 Subject: [PATCH 1384/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 141 +++++++++++++++++- 1 file changed, 137 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 64e9b9d2..de903df4 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -320,6 +320,40 @@ homeassistant: friendly_name: PoC Campaign Drones icon: mdi:drone + # Tradition Maya Lands :: Navidad + + automation.familia: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.familia: + friendly_name: Sonidos + icon: mdi:speaker + + automation.campana: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.campana: + friendly_name: Sonidos + icon: mdi:speaker + + automation.pesebre: + friendly_name: 10 minutos .. Imágenes + icon: mdi:calendar-clock + + script.pesebre: + friendly_name: Imágenes + icon: mdi:file-image + + automation.trineo: + friendly_name: 10 minutos .. Video + icon: mdi:calendar-clock + + script.trineo: + friendly_name: Video + icon: mdi:file-video + # Tradition Maya Lands :: Dia De Muertos automation.veladora: @@ -797,6 +831,24 @@ script: sequence: - service: shell_command.sotz + # Tradition Maya Lands :: Navidad + + familia: + sequence: + - service: shell_command.familia + + campana: + sequence: + - service: shell_command.campana + + pesebre: + sequence: + - service: shell_command.pesebre + + trineo: + sequence: + - service: shell_command.trineo + # Tradition Maya Lands :: Dia De Muertos veladora: @@ -1008,7 +1060,14 @@ shell_command: sip: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sip.sh & wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & sotz: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sotz.sh & - + + # Tradition Maya Lands :: Navidad + + familia: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh & + campana: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh & + pesebre: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh & + trineo: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh & + # Tradition Maya Lands :: Dia De Muertos veladora: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh & @@ -1139,6 +1198,60 @@ automation: action: - service: shell_command.sotz + # Tradition Maya Lands :: Navidad + + - alias: Familia + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.familia + + - alias: Campana + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.campana + + - alias: Pesebre + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.pesebre + + - alias: Trineo + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.trineo + # Tradition Maya Lands :: Dia De Muertos - alias: Veladora @@ -1383,11 +1496,13 @@ group: view: yes name: Tradición entities: - - group.traditionmayalandsdiademuertoschromecast - - group.traditionmayalandsdiademuertosamikoo + - group.traditionmayalandsnavidadchromecast + - group.traditionmayalandsnavidadamikoo - group.traditionmayalandsintelchromecast - group.traditionmayalandsintelamikoo - - group.traditionmayalandsintelnohochtata + - group.traditionmayalandsintelnohochtata + - group.traditionmayalandsdiademuertoschromecast + - group.traditionmayalandsdiademuertosamikoo # Techie Maya Lands @@ -1675,6 +1790,24 @@ group: - automation.sotz - script.sotz + # Tradition Maya Lands :: Navidad + + traditionmayalandsnavidadchromecast: + name: Navidad <> Chromecast + entities: + - automation.familia + - script.familia + + traditionmayalandsnavidadamikoo: + name: Navidad <> Robot + entities: + - automation.campana + - automation.pesebre + - automation.trineo + - script.campana + - script.pesebre + - script.trineo + # Tradition Maya Lands :: Dia De Muertos traditionmayalandsdiademuertoschromecast: From 0ec07e16cb434d07e313e26f625d02c1d8210bd9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:25:18 -0600 Subject: [PATCH 1385/1653] Update i486.sh --- Hochob/Applications/TraditionMayaLands/Intel/i486.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/Intel/i486.sh b/Hochob/Applications/TraditionMayaLands/Intel/i486.sh index 736df0ac..357b0dbb 100755 --- a/Hochob/Applications/TraditionMayaLands/Intel/i486.sh +++ b/Hochob/Applications/TraditionMayaLands/Intel/i486.sh @@ -28,7 +28,7 @@ LOCAL_SEASON="Intel" LogPid.sh $i486_PID $i486_NAME -Eog.sh "$TRADITION_INTEL/Image/IntelExperienceWhatsInside.png" & +Eog.sh "$TRADITION_INTEL/Image/IntelExperienceWhatsInside.png" sleep 1 Vlc.sh $TRADITION_INTEL/Sound/IntelBong.mp3 sleep 2 From 932b47b2cd25a45f861cc7437e4aa44392ea9caa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:31:27 -0600 Subject: [PATCH 1386/1653] Create SantaClaus.sh --- .../TraditionMayaLands/Navidad/SantaClaus.sh | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh b/Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh new file mode 100644 index 00000000..beacdcaa --- /dev/null +++ b/Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export SANTACLAUS_PID=$$ +export SANTACLAUS_NAME="SantaClaus" +export SANTACLAUS_PATH=$(readlink -f "$0") +export SANTACLAUS_DIRECTORY=$(dirname "$SANTACLAUS_PATH") + +LOCAL_SEASON="Navidad" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $SANTACLAUS_PID $SANTACLAUS_NAME + +Eog.sh "$TRADITION_NAVIDAD/Image/SantaClausVector.jpg" +sleep 1 +Vlc.sh $TRADITION_NAVIDAD/Sound/SantaClauseJollyLaughSoundBibleCom.mp3 +sleep 2 +KillApp.sh "cvlc" +KillApp.sh "eog" + +# End of File From 0da49ce0e5999f2598ba74fe0f197cd2813d1c24 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 20 Nov 2017 15:37:04 -0600 Subject: [PATCH 1387/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 37 ++++++++++++++++++- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index de903df4..c2f230d6 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -396,6 +396,14 @@ homeassistant: friendly_name: Fotógrafo icon: mdi:camera + automation.santaclaus: + friendly_name: 10 minutos .. Feliz Navidad + icon: mdi:calendar-clock + + script.santaclaus: + friendly_name: Feliz Navidad + icon: mdi:face-profile + # Tradition Maya Lands :: Intel automation.4004: @@ -849,6 +857,10 @@ script: sequence: - service: shell_command.trineo + santaclaus: + sequence: + - service: shell_command.santaclaus + # Tradition Maya Lands :: Dia De Muertos veladora: @@ -1067,6 +1079,7 @@ shell_command: campana: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh & pesebre: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh & trineo: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh & + santaclaus: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh & # Tradition Maya Lands :: Dia De Muertos @@ -1252,6 +1265,19 @@ automation: action: - service: shell_command.trineo + - alias: SantaClaus + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.santaclaus + # Tradition Maya Lands :: Dia De Muertos - alias: Veladora @@ -1497,10 +1523,11 @@ group: name: Tradición entities: - group.traditionmayalandsnavidadchromecast - - group.traditionmayalandsnavidadamikoo + - group.traditionmayalandsnavidadamikoo + - group.traditionmayalandsnavidadnohochtata - group.traditionmayalandsintelchromecast - group.traditionmayalandsintelamikoo - - group.traditionmayalandsintelnohochtata + - group.traditionmayalandsintelnohochtata - group.traditionmayalandsdiademuertoschromecast - group.traditionmayalandsdiademuertosamikoo @@ -1808,6 +1835,12 @@ group: - script.pesebre - script.trineo + traditionmayalandsnavidadnohochtata: + name: Navidad <> Server + entities: + - automation.santaclaus + - script.santaclaus + # Tradition Maya Lands :: Dia De Muertos traditionmayalandsdiademuertoschromecast: From 214b26a88774a90d2cd6e846c6d7beeb9048343a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 21 Nov 2017 11:39:24 -0600 Subject: [PATCH 1388/1653] Update --- Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh | 0 Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh | 0 Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh | 0 Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh | 0 Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh | 0 5 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh mode change 100644 => 100755 Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh b/Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh old mode 100644 new mode 100755 diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh old mode 100644 new mode 100755 From e0bf7e429d4db06876c943879b3f8034a36e26ce Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 26 Nov 2017 08:33:57 -0600 Subject: [PATCH 1389/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 32 +++++++++++++++++-- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index c2f230d6..dae989db 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -556,9 +556,14 @@ logbook: # - platform: ffmpeg # input: /dev/video0 -#google: -# client_id: !secret google_calendar_client_id -# client_secret: !secret google_calendar_client_secret +google: + client_id: !secret google_calendar_client_id + client_secret: !secret google_calendar_client_secret + +tts: + - platform: google + cache: true + time_memory: 300 input_slider: @@ -1169,6 +1174,27 @@ switch: automation: +- alias: TTS Clear Cache + trigger: + platform: time + hours: '/24' + condition: + - condition: time + weekday: + - mon + action: + service: tts.clear_cache + + - alias: Home Assistant Start + trigger: + platform: homeassistant + event: start + action: + - delay: '00:00:10' + - service: tts.google_say + data: + message: 'Home Assistant has started' + # Calendar Maya Lands - alias: pop From 2b0948b110d02850bcaa6d386e3fdfac74b8f3c5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 27 Nov 2017 18:48:32 -0600 Subject: [PATCH 1390/1653] Update --- .../BajaCaliforniaSur.sh | 26 +++++++++---------- .../SouthernMayaHighlands/Michoacan.sh | 4 +-- .../HomeAssistant/configuration.yaml.2.0 | 20 +++++++------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh index 5649234a..0137c518 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh @@ -28,36 +28,36 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & -(Amikoo.sh lupe/inicial 1) && sleep 1.25 +$(AmikooVoice.sh spanish "Hola a todos") && sleep 1.25 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & -sleep 6.35 && Amikoo.sh lupe/emocion 1 && sleep 4 +sleep 6.35 && AmikooVoice.sh spanish "Perdon! Lo se!, Es que me emociono" && sleep 4 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & -sleep 2.7 && Amikoo.sh lupe/porsupuesto 1 && sleep 2.5 +sleep 2.7 && AmikooVoice.sh spanish "Por supuesto" && sleep 2.5 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & -sleep 37.5 && Amikoo.sh lupe/cerebro 1 +sleep 37.5 && AmikooVoice.sh spanish "En mi caso mi cerebro, esta en mi espalda!" sleep 2 -Amikoo.sh lupe/rightup 1 +Amikoo.sh amikoo/rightup 1 sleep .25 -Amikoo.sh lupe/leftup 1 +Amikoo.sh amikoo/leftup 1 sleep .25 -Amikoo.sh lupe/rightfold 1 +Amikoo.sh amikoo/rightfold 1 sleep .25 -Amikoo.sh lupe/leftfold 1 +Amikoo.sh amikoo/leftfold 1 sleep 2 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & -sleep 25.5 && Amikoo.sh lupe/inteledison 1 +sleep 25.5 && AmikooVoice.sh spanish "Yo funciono con la platafoma Intel Edison y Uppboard" sleep 3 -Amikoo.sh lupe/rightdown 1 +Amikoo.sh amikoo/rightdown 1 sleep .25 -Amikoo.sh lupe/leftdown 1 +Amikoo.sh amikoo/leftdown 1 sleep .25 -Amikoo.sh lupe/rightunfold 1 +Amikoo.sh amikoo/rightunfold 1 sleep .25 -Amikoo.sh lupe/leftunfold 1 +Amikoo.sh amikoo/leftunfold 1 sleep 2 VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index b0e44ac0..73cc66f7 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -64,7 +64,7 @@ sleep .6 Amikoo.sh amikoo/headleft 1 sleep .6 -Amikoo.sh amikoo/moveleft 1 +Amikoo.sh amikoo/moveright 1 sleep 1.6 Amikoo.sh amikoo/movestop 1 sleep .6 @@ -72,7 +72,7 @@ Amikoo.sh amikoo/moveforward 1 sleep 4.5 Amikoo.sh amikoo/movestop 1 sleep .6 -Amikoo.sh amikoo/moveleft 1 +Amikoo.sh amikoo/moveright 1 sleep 3.6 Amikoo.sh amikoo/movestop 1 sleep .6 diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index dae989db..6e74c575 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1174,16 +1174,16 @@ switch: automation: -- alias: TTS Clear Cache - trigger: - platform: time - hours: '/24' - condition: - - condition: time - weekday: - - mon - action: - service: tts.clear_cache + - alias: TTS Clear Cache + trigger: + platform: time + hours: '/24' + condition: + - condition: time + weekday: + - mon + action: + service: tts.clear_cache - alias: Home Assistant Start trigger: From eb6aacf5fdc14f8ae9a8e18b0d162f57679de718 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 27 Nov 2017 19:26:23 -0600 Subject: [PATCH 1391/1653] Update Stream2Chromecast.sh --- .../Stream/Stream2Chromecast/Stream2Chromecast.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 4fbb3395..94e496a3 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -26,6 +26,14 @@ LOCAL_FILE="$3" # Main # ============================================================================= +if [ "$LOCAL_DEVICE" = "Triki" ]; +then + LOCAL_DEVICE="10.215.56.102" +elif [ "$LOCAL_DEVICE" = "Juum" ]; +then + LOCAL_DEVICE="10.215.56.103" +fi + if [ $# -eq 3 ] then $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop From 5a283db835fe00775f59c4f8204bb469620cd7e1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 27 Nov 2017 20:32:45 -0600 Subject: [PATCH 1392/1653] Create configuration.yaml.adriana --- .../HomeAssistant/configuration.yaml.adriana | 1993 +++++++++++++++++ 1 file changed, 1993 insertions(+) create mode 100644 Hochob/Services/Automation/HomeAssistant/configuration.yaml.adriana diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.adriana b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.adriana new file mode 100644 index 00000000..de46ad62 --- /dev/null +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.adriana @@ -0,0 +1,1993 @@ +homeassistant: + # Name of the location where Home Assistant is running + name: Home + # Location required to calculate the time the sun rises and sets + latitude: 20.35 + longitude: -102 + # Impacts weather/sunrise data (altitude above sea level in meters) + elevation: 1674 + # metric for Metric, imperial for Imperial + unit_system: metric + # Pick yours from here: http://en.wikipedia.org/wiki/List_of_tz_database_time_zones + time_zone: America/Mexico_City + customize: + + # Language + + switch.language: + friendly_name: Idioma English / Español + icon: mdi:audiobook + + # Southern Maya Highlands + + # Southern Maya Highlands : 1 Introducción + + script.aguascalientes: + friendly_name: 1.1 Bienvenidos Intel, Protocolo de Seguridad + icon: mdi:audiobook + + # Southern Maya Highlands : 2 Robot + + script.bajacalifornianorte: + friendly_name: 2.1 Bienvenidos Guadalajara Design Center + icon: mdi:audiobook + script.bajacaliforniasur: + friendly_name: 2.2 Lupe Robot Show + icon: mdi:video + script.michoacan: + friendly_name: 2.3 Lupe Robot Foto Grupal + icon: mdi:video + + # Southern Maya Highlands : 3 Tour + + script.campeche: + friendly_name: 3.1 Bienvenidos Recorrido + icon: mdi:audiobook + + # Southern Maya Highlands : Sandbox + + script.zacatecas: + friendly_name: Sandbox + icon: mdi:test-tube + + # Amikoo Maya Lands + + script.resetall: + friendly_name: Ahora + icon: mdi:lock-reset + + # Amikoo Maya Lands :: Movement + + script.headright: + friendly_name: Derecha + icon: mdi:arrow-right-thick + script.headleft: + friendly_name: Izquierda + icon: mdi:arrow-left-thick + + script.rightup: + friendly_name: Arriba + icon: mdi:human-handsup + script.rightdown: + friendly_name: Abajo + icon: mdi:human-handsup + script.rightfold: + friendly_name: Doblar + icon: mdi:gesture-swipe-up + script.rightunfold: + friendly_name: Desdoblar + icon: mdi:gesture-swipe-up + + script.leftup: + friendly_name: Arriba + icon: mdi:human-handsup + script.leftdown: + friendly_name: Abajo + icon: mdi:human-handsup + script.leftfold: + friendly_name: Doblar + icon: mdi:gesture-swipe-up + script.leftunfold: + friendly_name: Desdoblar + icon: mdi:gesture-swipe-up + + script.moveright: + friendly_name: Derecha + icon: mdi:arrow-right-thick + script.moveleft: + friendly_name: Izquierda + icon: mdi:arrow-left-thick + script.moveforward: + friendly_name: Adelante + icon: mdi:arrow-up-thick + script.movebackward: + friendly_name: Atrás + icon: mdi:arrow-down-thick + script.movestop: + friendly_name: Parar + icon: mdi:stop + + # Amikoo Maya Lands :: Voice + + script.amikoovoice: + friendly_name: 5 4 3 2 1 0 + icon: mdi:voice + + # Amikoo Maya Lands :: Sense + + script.amikoosensesight: + friendly_name: Vista + icon: mdi:camera + + # Amikoo Maya Lands :: Communication + + script.amikoocommunicationaudio: + friendly_name: Audio + icon: mdi:audiobook + + script.amikoocommunicationimage: + friendly_name: Imágen + icon: mdi:file-image + + script.amikoocommunicationvideo: + friendly_name: Video + icon: mdi:file-video + + # Amikoo Maya Lands :: Expertise + + script.amikoogcvisionapi: + friendly_name: Google Vision API + icon: mdi:camera + script.amikoogctranslationapi: + friendly_name: Google Translation API + icon: mdi:google-translate + + # Amikoo Maya Lands :: Knowledge + + script.sphero: + friendly_name: Frases Populares + icon: mdi:audiobook + + script.makeblock: + friendly_name: Centro de Visitantes + icon: mdi:audiobook + + # Amikoo Maya Lands :: Applications + + script.coji: + friendly_name: Discurso Bilingüe + icon: mdi:speaker + script.meccanoid: + friendly_name: Baile Thriller + icon: mdi:account + script.chip: + friendly_name: Fotógrafo + icon: mdi:camera + + # Central Maya Lowlands, Stations + + script.acapulco: + friendly_name: 1. Antes del inicio + icon: mdi:audiobook + script.cancun: + friendly_name: 2. Intel + icon: mdi:audiobook + script.huatulco: + friendly_name: 3. Intel GDC + icon: mdi:audiobook + script.mazatlan: + friendly_name: 4. El microprocesador + icon: mdi:audiobook + script.puertovallarta: + friendly_name: 5. Labs y Fabs + icon: mdi:audiobook + + # Central Maya Lowlands, Stations + + script.ixtapa: + friendly_name: Preguntas + icon: mdi:audiobook + + # Central Maya Lowlands, Sandbox + + script.veracruz: + friendly_name: Sandbox + icon: mdi:test-tube + + # Northern Maya Lowlands + + script.montesazules: + friendly_name: 1. Bienvenida Experiencia Intel + icon: mdi:audiobook + + script.ojodeliebre: + friendly_name: 2. Juego Binario + icon: mdi:audiobook + + script.lamichilia: + friendly_name: 3. Intel en el Espacio + icon: mdi:audiobook + + script.elcielo: + friendly_name: 4. Los Muones + icon: mdi:audiobook + + script.mapimi: + friendly_name: 5. Hasta Pronto + icon: mdi:audiobook + + script.siankaan: + friendly_name: El Baile de Lupe + icon: mdi:test-tube + + script.calakmul: + friendly_name: La Ciencia + icon: mdi:test-tube + + script.tiburonballena: + friendly_name: Planeta Marte + icon: mdi:test-tube + + # Console Maya Lands : Keypad Yes No + + script.keypadyes: + friendly_name: Botón Sí + icon: mdi:check-circle + + script.keypadno: + friendly_name: Botón No + icon: mdi:checkbox-blank-circle + + # Console Maya Lands : Keypad Multiple Choice + + script.keypadone: + friendly_name: Botón Uno + icon: mdi:numeric-1-box + + script.keypadtwo: + friendly_name: Botón Dos + icon: mdi:numeric-2-box + + script.keypadthree: + friendly_name: Botón Tres + icon: mdi:numeric-3-box + + script.keypadfour: + friendly_name: Botón Cuatro + icon: mdi:numeric-4-box + + # Media Maya Lands : Corporate + + switch.aak: + friendly_name: Imágenes Corporativas + icon: mdi:folder-multiple-image + switch.aayin: + friendly_name: Videos Corporativos + icon: mdi:file-video + + # Media Maya Lands : Intel Guadalajara + + switch.chakmool: + friendly_name: Imágenes Intel Guadalajara + icon: mdi:folder-multiple-image + + # Media Maya Lands : Visitors Center + + switch.am: + friendly_name: Imágenes Centro de Visitantes + icon: mdi:folder-multiple-image + + # Media Maya Lands : Drawing + + switch.chiich: + friendly_name: Imágenes de Dibujos + icon: mdi:folder-multiple-image + + # Media Maya Lands : Memories + + switch.cho: + friendly_name: Imágenes de Visitas + icon: mdi:folder-multiple-image + switch.chuwen: + friendly_name: Videos de Visitas + icon: mdi:file-video + + # Media Maya Lands : Camera + + switch.kaab: + friendly_name: Vista Previa Cámara + icon: mdi:camera + + # Calendar Maya Lands + + automation.pop: + friendly_name: 30 segundos .. Bienvenida Robot + icon: mdi:calendar-clock + + automation.sip: + friendly_name: 30 segundos .. Bienvenida Servidor + icon: mdi:calendar-clock + + automation.wo: + friendly_name: 15 segundos .. Bienvenida Robot + icon: mdi:calendar-clock + + automation.sotz: + friendly_name: 15 segundos .. PoC Campaign Drones + icon: mdi:calendar-clock + + script.sotz: + friendly_name: PoC Campaign Drones + icon: mdi:drone + + # Tradition Maya Lands :: Navidad + + automation.familia: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.familia: + friendly_name: Sonidos + icon: mdi:speaker + + automation.campana: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.campana: + friendly_name: Sonidos + icon: mdi:speaker + + automation.pesebre: + friendly_name: 10 minutos .. Imágenes + icon: mdi:calendar-clock + + script.pesebre: + friendly_name: Imágenes + icon: mdi:file-image + + automation.trineo: + friendly_name: 10 minutos .. Video + icon: mdi:calendar-clock + + script.trineo: + friendly_name: Video + icon: mdi:file-video + + # Tradition Maya Lands :: Dia De Muertos + + automation.veladora: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.veladora: + friendly_name: Sonidos + icon: mdi:speaker + + automation.papelpicado: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.papelpicado: + friendly_name: Sonidos + icon: mdi:speaker + + automation.mantel: + friendly_name: 10 minutos .. Imágenes + icon: mdi:calendar-clock + + script.mantel: + friendly_name: Imágenes + icon: mdi:file-image + + automation.calaverita: + friendly_name: 10 minutos .. Fantasma + icon: mdi:calendar-clock + + script.calaverita: + friendly_name: Fantasma + icon: mdi:face-profile + + automation.fotografia: + friendly_name: 10 minutos .. Fotógrafo + icon: mdi:calendar-clock + + script.fotografia: + friendly_name: Fotógrafo + icon: mdi:camera + + automation.santaclaus: + friendly_name: 10 minutos .. Feliz Navidad + icon: mdi:calendar-clock + + script.santaclaus: + friendly_name: Feliz Navidad + icon: mdi:face-profile + + # Tradition Maya Lands :: Intel + + automation.4004: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.4004: + friendly_name: Sonidos + icon: mdi:speaker + + automation.8008: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.8008: + friendly_name: Sonidos + icon: mdi:speaker + + automation.8080: + friendly_name: 10 minutos .. Imágenes + icon: mdi:calendar-clock + + script.8080: + friendly_name: Imágenes + icon: mdi:file-image + + automation.8086: + friendly_name: 10 minutos .. Video + icon: mdi:calendar-clock + + script.8086: + friendly_name: Video + icon: mdi:file-video + + automation.80286: + friendly_name: 10 minutos .. Intel Bong + icon: mdi:calendar-clock + + script.80286: + friendly_name: Intel Bong + icon: mdi:face-profile + + automation.i486: + friendly_name: 10 minutos .. Intel Bong + icon: mdi:calendar-clock + + script.i486: + friendly_name: Intel Bong + icon: mdi:face-profile + + # Techie Maya Lands : System Health + + script.toyota: + friendly_name: Verificar Infraestructura + icon: mdi:approval + + script.kodak: + friendly_name: Reiniciar Servidor + icon: mdi:restart + + # Techie Maya Lands : System Calendar + + automation.apple: + friendly_name: 30 minutos .. Anuncio Servidor + icon: mdi:calendar-clock + + # Techie Maya Lands : System Audio + + input_slider.qualcomm: + friendly_name: Volumén % Ajustar + icon: mdi:volume-high + + sensor.qualcomm: + friendly_name: Volumén % Nivel + icon: mdi:volume-high + + #automation.snapdragon: + # friendly_name: Habilitado Ajustar + + #automation.csr101x: + # friendly_name: Habilitado Nivel + + # Techie Maya Lands : System Sandbox + + script.visitorsusb: + friendly_name: Visitantes USB + icon: mdi:usb + + # Techie Maya Lands : System Infrastructure + + device_tracker.eclipse: + friendly_name: IoT Eclipse Org + icon: mdi:server + + device_tracker.hochob: + friendly_name: Hochob Server + icon: mdi:server-network + + # Techie Maya Lands : System Quote + + sensor.bosch: + friendly_name: Hoy digo... + icon: mdi:approval + + # Intel Experience Day + + script.iedone: + friendly_name: Hola, bienvenidos... + icon: mdi:numeric-1-box + + script.iedtwo: + friendly_name: Que es eso? + icon: mdi:numeric-2-box + + script.iedthree: + friendly_name: Como yo? + icon: mdi:numeric-3-box + + script.ieddance: + friendly_name: Bailar... + + script.iedwelcome: + friendly_name: Saludo + +# Enables the frontend +frontend: + +http: + # Uncomment this to add a password (recommended!) + # api_password: PASSWORD + # Uncomment this if you are using SSL or running in Docker etc + # base_url: example.duckdns.org:8123 + +# Checks for available updates +updater: + +# Discover some devices automatically +#discovery: + +# Allows you to issue voice commands from the frontend in enabled browsers +conversation: + +# Enables support for tracking state changes over time. +history: + +# View all events in a logbook +logbook: + +#camera: +# - platform: ffmpeg +# input: /dev/video0 + +google: + client_id: !secret google_calendar_client_id + client_secret: !secret google_calendar_client_secret + +tts: + - platform: google + cache: true + time_memory: 300 + +input_slider: + + qualcomm: + name: Server Volume + initial: 50 + min: 0 + max: 100 + step: 5 + icon: mdi:volume-medium + +sensor: + + - platform: template + sensors: + imac: + friendly_name: Quién? + value_template: '{{ states.calendar.hochobvcgmailcom.attributes.message }}' + + - platform: template + sensors: + ipod: + friendly_name: Cuando? + value_template: '{{ states.calendar.hochobvcgmailcom.attributes.start_time }}' + + - platform: command_line + name: Qualcomm + command: amixer -D pulse sget Master | grep Left | grep -Eo '\[(\w+)\%\]' | grep -Eo '\w+' + unit_of_measurement: "%" + value_template: '{{ value | int }}' + + - platform: systemmonitor + name: SpaceX + resources: + - type: processor_use + - type: memory_free + - type: disk_use_percent + arg: /home/ + + - platform: command_line + name: Bosch + command: fortune + scan_interval: 300 + +device_tracker: + - platform: ping + hosts: + eclipse: iot.eclipse.org + hochob: 10.215.56.158 + +script: + + # Southern Maya Highlands + + aguascalientes: + sequence: + - service: shell_command.aguascalientes + + bajacalifornianorte: + sequence: + - service: shell_command.bajacalifornianorte + + bajacaliforniasur: + sequence: + - service: shell_command.bajacaliforniasur + + campeche: + sequence: + - service: shell_command.campeche + + michoacan: + sequence: + - service: shell_command.michoacan + + zacatecas: + sequence: + - service: shell_command.zacatecas + + # Amikoo Maya Lands + + resetall: + sequence: + - service: shell_command.resetall + + # Amikoo Maya Lands :: Movement + + headright: + sequence: + - service: shell_command.headright + + headleft: + sequence: + - service: shell_command.headleft + + rightup: + sequence: + - service: shell_command.rightup + + rightdown: + sequence: + - service: shell_command.rightdown + + rightfold: + sequence: + - service: shell_command.rightfold + + rightunfold: + sequence: + - service: shell_command.rightunfold + + leftup: + sequence: + - service: shell_command.leftup + + leftdown: + sequence: + - service: shell_command.leftdown + + leftfold: + sequence: + - service: shell_command.leftfold + + leftunfold: + sequence: + - service: shell_command.leftunfold + + moveright: + sequence: + - service: shell_command.moveright + + moveleft: + sequence: + - service: shell_command.moveleft + + moveforward: + sequence: + - service: shell_command.moveforward + + movebackward: + sequence: + - service: shell_command.movebackward + + movestop: + sequence: + - service: shell_command.movestop + + # Amikoo Maya Lands :: Voice + + amikoovoice: + sequence: + - service: shell_command.amikoovoice + + # Amikoo Maya Lands :: Sense + + amikoosensesight: + sequence: + - service: shell_command.amikoosensesight + + # Amikoo Maya Lands :: Communication + + amikoocommunicationaudio: + sequence: + - service: shell_command.amikoocommunicationaudio + + amikoocommunicationimage: + sequence: + - service: shell_command.amikoocommunicationimage + + amikoocommunicationvideo: + sequence: + - service: shell_command.amikoocommunicationvideo + + # Amikoo Maya Lands :: Expertise + + amikoogcvisionapi: + sequence: + - service: shell_command.amikoogcvisionapi + + amikoogctranslationapi: + sequence: + - service: shell_command.amikoogctranslationapi + + # Amikoo Maya Lands :: Knowledge + + sphero: + sequence: + - service: shell_command.sphero + + makeblock: + sequence: + - service: shell_command.makeblock + + # Amikoo Maya Lands :: Application + + coji: + sequence: + - service: shell_command.coji + + meccanoid: + sequence: + - service: shell_command.meccanoid + + chip: + sequence: + - service: shell_command.chip + + # Central Maya Lowlands, Stations + + acapulco: + sequence: + - service: shell_command.acapulco + + cancun: + sequence: + - service: shell_command.cancun + + huatulco: + sequence: + - service: shell_command.huatulco + + mazatlan: + sequence: + - service: shell_command.mazatlan + + puertovallarta: + sequence: + - service: shell_command.puertovallarta + + # Central Maya Lowlands, Questions + + ixtapa: + sequence: + - service: shell_command.ixtapa + + # Central Maya Lowlands, Sandbox + + veracruz: + sequence: + - service: shell_command.veracruz + + # Northern Maya Lowlands + + ojodeliebre: + sequence: + - service: shell_command.ojodeliebre + + montesazules: + sequence: + - service: shell_command.montesazules + + lamichilia: + sequence: + - service: shell_command.lamichilia + + elcielo: + sequence: + - service: shell_command.elcielo + + mapimi: + sequence: + - service: shell_command.mapimi + + siankaan: + sequence: + - service: shell_command.siankaan + + calakmul: + sequence: + - service: shell_command.calakmul + + tiburonballena: + sequence: + - service: shell_command.tiburonballena + + # Calendar Maya Lands + + sotz: + sequence: + - service: shell_command.sotz + + # Tradition Maya Lands :: Navidad + + familia: + sequence: + - service: shell_command.familia + + campana: + sequence: + - service: shell_command.campana + + pesebre: + sequence: + - service: shell_command.pesebre + + trineo: + sequence: + - service: shell_command.trineo + + santaclaus: + sequence: + - service: shell_command.santaclaus + + # Tradition Maya Lands :: Dia De Muertos + + veladora: + sequence: + - service: shell_command.veladora + + papelpicado: + sequence: + - service: shell_command.papelpicado + + mantel: + sequence: + - service: shell_command.mantel + + calaverita: + sequence: + - service: shell_command.calaverita + + fotografia: + sequence: + - service: shell_command.fotografia + + # Tradition Maya Lands :: Intel + + 4004: + sequence: + - service: shell_command.4004 + + 8008: + sequence: + - service: shell_command.8008 + + 8080: + sequence: + - service: shell_command.8080 + + 8086: + sequence: + - service: shell_command.8086 + + 80286: + sequence: + - service: shell_command.80286 + + i486: + sequence: + - service: shell_command.i486 + + # Techie Maya Lands + + toyota: + sequence: + - service: shell_command.toyota + kodak: + sequence: + - service: shell_command.kodak + + visitorsusb: + sequence: + - service: shell_command.visitorsusb + + # Console Maya Lands + + keypadyes: + sequence: + - service: shell_command.keypadyes + keypadno: + sequence: + - service: shell_command.keypadno + keypadone: + sequence: + - service: shell_command.keypadone + keypadtwo: + sequence: + - service: shell_command.keypadtwo + keypadthree: + sequence: + - service: shell_command.keypadthree + keypadfour: + sequence: + - service: shell_command.keypadfour + + # Intel Experience Day + + iedone: + sequence: + - service: shell_command.iedone + + iedtwo: + sequence: + - service: shell_command.iedtwo + + iedthree: + sequence: + - service: shell_command.iedthree + + ieddance: + sequence: + - service: shell_command.ieddance + + iedwelcome: + sequence: + - service: shell_command.iedwelcome + +shell_command: + + # Southern Maya Highlands + + aguascalientes: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Aguascalientes.sh & + bajacalifornianorte: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh & + bajacaliforniasur: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSur.sh & + campeche: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Campeche.sh & + michoacan: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh & + zacatecas: ~/CodeLabs/Hochob/Applications/SouthernMayaHighlands/Zacatecas.sh & + + # Central Maya Lowlands, Stations + + acapulco: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Acapulco.sh & + cancun: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Cancun.sh & + huatulco: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Huatulco.sh & + mazatlan: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh & + puertovallarta: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh & + + # Central Maya Lowlands, Questions + ixtapa: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh & + + # Central Maya Lowlands, Sandbox + + veracruz: ~/CodeLabs/Hochob/Applications/CentralMayaLowlands/Veracruz.sh & + + # Northern Maya Lowlands + + montesazules: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh & + ojodeliebre: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & + lamichilia: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & + elcielo: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & + mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & + siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh & + calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & + tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh & + + # Amikoo Maya Lands + + resetall: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/resetall 1 + + # Amikoo Maya Lands: Movement + + headleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headleft "Head Left" + headright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/headright "Head Right" + + rightup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightup "Arm Right Up" + rightdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightdown "Arm Right Down" + rightfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightfold "Arm Right Fold" + rightunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/rightunfold "Arm Right Unfold" + + leftup: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftup "Arm Left Up" + leftdown: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftdown "Arm Left Down" + leftfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftfold "Arm Left Fold" + leftunfold: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/leftunfold "Arm Left Unfold" + + moveright: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveright "Body Move Right" + moveleft: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveleft "Body Move Left" + moveforward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/moveforward "Body Move Forward" + movebackward: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movebackward "Body Move Backward" + movestop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh amikoo/movestop "Body Stop" + + # Amikoo Maya Lands :: Voice + + amikoovoice: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "5 4 3 2 1 0" + + # Amikoo Maya Lands: Sense + + amikoosensesight: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooSense.sh Sight Picture + + # Amikoo Maya Lands :: Communication + + amikoocommunicationaudio: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Audio Random + amikoocommunicationimage: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Image Random + amikoocommunicationvideo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Video Random + + # Amikoo Maya Lands: Expertise + + amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 + amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 + + # Amikoo Maya Lands :: Knowledge + + sphero: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Sphero.sh & + makeblock: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Makeblock.sh & + + # Amikoo Maya Lands: Application + + coji: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Coji.sh & + meccanoid: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Meccanoid.sh & + chip: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Chip.sh & + + # Console Maya Lands + + keypadyes: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual yes & + keypadno: ~/CodeLabs/Hochob/Services/Keypad/KeypadYesNo.sh virtual no & + keypadone: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 1 & + keypadtwo: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 2 & + keypadthree: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 3 & + keypadfour: ~/CodeLabs/Hochob/Services/Keypad/KeypadMultipleChoice.sh virtual 4 & + + # Calendar Maya Lands + + pop: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Pop.sh & + sip: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sip.sh & + wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & + sotz: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sotz.sh & + + # Tradition Maya Lands :: Navidad + + familia: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh & + campana: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh & + pesebre: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh & + trineo: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Trineo.sh & + santaclaus: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/SantaClaus.sh & + + # Tradition Maya Lands :: Dia De Muertos + + veladora: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh & + papelpicado: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/PapelPicado.sh & + mantel: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Mantel.sh & + calaverita: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Calaverita.sh & + fotografia: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh & + + # Tradition Maya Lands :: Intel + + 4004: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/4004.sh & + 8008: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/8008.sh & + 8080: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/8080.sh & + 8086: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/8086.sh & + 80286: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/80286.sh & + i486: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Intel/i486.sh & + + # Techie Maya Lands + + toyota: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Toyota.sh & + kodak: ssh root@127.0.0.1 sudo reboot + apple: ~/CodeLabs/Hochob/Applications/TechieMayaLands/Apple.sh & + qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' + visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & + + # Intel Experience Day + + iedone: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Hola, bienvenidos al show de baile de Intel" + iedtwo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Que es eso" + iedthree: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Como yo" + ieddance: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Dance.sh + iedwelcome: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Welcome.sh + +switch: + + - platform: command_line + switches: + + # Language + + language: + command_on: "~/CodeLabs/Hochob/Services/Language/Language.sh spanish &" + command_off: "~/CodeLabs/Hochob/Services/Language/Language.sh english &" + + # Media Maya Lands: Corporate + + aak: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Aak.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + aayin: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Aayin.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" + + # Media Maya Lands: Intel Guadalajara + + chakmool: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Chakmool.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + + # Media Maya Lands: Visitors Center + + am: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Am.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + + # Media Maya Lands: Drawing + + chiich: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Chiich.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + + # Media Maya Lands: Memories + + cho: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Cho.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh eog" + chuwen: + command_on: "~/CodeLabs/Hochob/Applications/MediaMayaLands/Chuwen.sh &" + command_off: "~/CodeLabs/Hochob/Services/Kill/KillApp.sh vlc" + + # Media Maya Lands: Camera + + kaab: + command_on: "cvlc --no-video-title-show --fullscreen v4l2:///dev/video0 &" + command_off: "pkill -9 vlc" + +automation: + + - alias: TTS Clear Cache + trigger: + platform: time + hours: '/24' + condition: + - condition: time + weekday: + - mon + action: + service: tts.clear_cache + + - alias: Home Assistant Start + trigger: + platform: homeassistant + event: start + action: + - delay: '00:00:10' + - service: tts.google_say + data: + message: 'Home Assistant has started' + + # Calendar Maya Lands + + - alias: pop + initial_state: 'off' + trigger: + platform: time + seconds: '/30' + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.pop + + - alias: sip + initial_state: 'off' + trigger: + platform: time + seconds: '/30' + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.sip + + - alias: wo + initial_state: 'off' + trigger: + platform: time + seconds: '/30' + action: + - service: shell_command.wo + + - alias: sotz + initial_state: 'off' + trigger: + platform: time + seconds: '/30' + action: + - service: shell_command.sotz + + # Tradition Maya Lands :: Navidad + + - alias: Familia + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.familia + + - alias: Campana + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.campana + + - alias: Pesebre + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.pesebre + + - alias: Trineo + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.trineo + + - alias: SantaClaus + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.santaclaus + + # Tradition Maya Lands :: Dia De Muertos + + - alias: Veladora + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.veladora + + - alias: PapelPicado + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.papelpicado + + - alias: Mantel + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.mantel + + - alias: Calaverita + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.calaverita + + - alias: Fotografia + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.fotografia + + # Tradition Maya Lands :: Intel + + - alias: 4004 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.4004 + + - alias: 8008 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.8008 + + - alias: 8080 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.8080 + + - alias: 8086 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.8086 + + - alias: 80286 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.80286 + + - alias: i486 + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + action: + - service: shell_command.i486 + + # Techie Maya Lands: System Calendar + + - alias: Apple + initial_state: 'off' + trigger: + platform: time + minutes: '/30' + seconds: 00 + action: + - service: shell_command.apple + + # Techie Maya Lands: System Audio + + - alias: snapdragon + initial_state: 'on' + trigger: + - platform: state + entity_id: input_slider.qualcomm + action: + - service: shell_command.qualcomm + data_template: + volume_level: "{{ states.input_slider.qualcomm.state }}" + + - alias: csr101x + initial_state: 'on' + trigger: + - platform: state + entity_id: sensor.qualcomm + action: + - service: input_slider.select_value + data_template: + entity_id: input_slider.qualcomm + value: "{{ states.sensor.qualcomm.state | int }}" + +group: + + default_view: + view: yes + name: Sensei + entities: + - group.techiemayalandssystemhealth + - group.techiemayalandssystemcalendar + - group.captainmayalandslanguage + + # Southern Maya Highlands + + southernmayalands: + view: yes + name: Bienvenida + entities: + - group.southernmayahighlandsintroduction + - group.southernmayahighlandsrobot + - group.southernmayahighlandstour + #- group.southernmayahighlandssandbox + + # Amikoo Maya Lands + + robotmayalands: + view: yes + name: Robot + entities: + #- group.robotmayalandsvoice + #- group.robotmayalandssense + #- group.robotmayalandscommunication + #- group.robotmayalandsexpertise + #- group.robotmayalandsapplications + #- group.robotmayalandsknowledge + - group.robotmayalandshead + - group.robotmayalandsarmright + - group.robotmayalandsarmleft + - group.robotmayalandslegs + - group.robotmayalandsreset + + # Central Maya Lowlands + + centralmayalowlands: + view: yes + name: Inicios + entities: + - group.centralmayalowlandsstations + #- group.centralmayalowlandsquestions + #- group.centralmayalowlandssandbox + + # Northern Maya Lowlands + + northernmayalowlands: + view: yes + name: Experiencia + entities: + - group.northernmayalowlandsstations + #- group.northernmayalowlandsstories + #- group.northernmayalowlandsrobot + + # Console Maya Lands + + consolemayalands: + view: no + #icon: mdi:keyboard + name: Teclado + entities: + - group.consolemayalandskeypadyesno + - group.consolemayalandskeypadmultiplechoice + + # Media Maya Lands + + mediamayalands: + view: no + #icon: mdi:filmstrip + name: Memorias + entities: + - group.mediamayalandscorporate + - group.mediamayalandsintelguadalajara + - group.mediamayalandsvisitorscenter + - group.mediamayalandsdrawing + - group.mediamayalandsmemories + - group.mediamayalandscamera + + # Calendar Maya Lands + + calendarmayalands: + view: no + name: Calendario + entities: + - group.calendarmayalandseventsinternal + - group.calendarmayalandseventsexternal + - group.calendarmayalandseventscampaign + + # Tradition Maya Lands + + traditionmayalands: + view: no + name: Tradición + entities: + - group.traditionmayalandsnavidadchromecast + - group.traditionmayalandsnavidadamikoo + - group.traditionmayalandsnavidadnohochtata + - group.traditionmayalandsintelchromecast + - group.traditionmayalandsintelamikoo + - group.traditionmayalandsintelnohochtata + - group.traditionmayalandsdiademuertoschromecast + - group.traditionmayalandsdiademuertosamikoo + + # Techie Maya Lands + + techiemayalands: + view: yes + name: Techie + entities: + - group.techiemayalandssystemhealth + - group.techiemayalandssystemcalendar + - group.techiemayalandssystemaudio + - group.techiemayalandssystemmonitor + - group.techiemayalandssystemevent + - group.techiemayalandssystemquote + - group.techiemayalandsserverinfrastructure + #- group.techiemayalandssandbox + + intelexperiencedaylands: + view: no + name: Intel Experience Day + entities: + - group.intelexperiencedaylandsopening + - group.intelexperiencedaylandsdance + - group.intelexperiencedaylandswelcome + + # Captain Maya Lands: Language + + captainmayalandslanguage: + name: Idioma + entities: + - switch.language + + # Southern Maya Highlands: Introduction + + southernmayahighlandsintroduction: + name: 1 Introduccion + entities: + - script.aguascalientes + + # Southern Maya Highlands: Robot + + southernmayahighlandsrobot: + name: 2 Robot + entities: + - script.bajacalifornianorte + - script.bajacaliforniasur + - script.michoacan + + # Southern Maya Highlands: Tour + + southernmayahighlandstour: + name: 3 Tour + entities: + - script.campeche + + # Southern Maya Highlands: Sandbox + + southernmayahighlandssandbox: + name: Sandbox + entities: + - script.zacatecas + + # Amikoo Maya Lands: Voice + + robotmayalandsvoice: + name: Voz + entities: + - script.amikoovoice + + # Amikoo Maya Lands: Sense + + robotmayalandssense: + name: Sentido + entities: + - script.amikoosensesight + + # Amikoo Maya Lands: Communication + + robotmayalandscommunication: + name: Comunicación + entities: + - script.amikoocommunicationaudio + - script.amikoocommunicationimage + - script.amikoocommunicationvideo + + # Amikoo Maya Lands: Expertise + + robotmayalandsexpertise: + name: Especialización + entities: + - script.amikoogcvisionapi + - script.amikoogctranslationapi + + # Amikoo Maya Lands: Applications + + robotmayalandsapplications: + name: Aplicaciones + entities: + - script.coji + - script.meccanoid + - script.chip + + # Amikoo Maya Lands: Knowledge + + robotmayalandsknowledge: + name: Conocimiento + entities: + - script.makeblock + - script.sphero + + # Amikoo Maya Lands :: Movement :: Head + + robotmayalandshead: + name: Cabeza + entities: + - script.headright + - script.headleft + + # Amikoo Maya Lands :: Movement :: Arm Right + + robotmayalandsarmright: + name: Brazo Derecho + entities: + - script.rightup + - script.rightdown + - script.rightfold + - script.rightunfold + + # Amikoo Maya Lands :: Movement :: Arm Left + + robotmayalandsarmleft: + name: Brazo Izquierdo + entities: + - script.leftup + - script.leftdown + - script.leftfold + - script.leftunfold + + # Amikoo Maya Lands :: Movement :: Legs + + robotmayalandslegs: + name: Piernas + entities: + - script.moveright + - script.moveleft + - script.moveforward + - script.movebackward + - script.movestop + + # Amikoo Maya Lands :: Reset + + robotmayalandsreset: + name: Reiniciar + entities: + - script.resetall + + # Central Maya Lowlands: Stations + + centralmayalowlandsstations: + name: Estaciones + entities: + - script.acapulco + - script.cancun + - script.huatulco + - script.mazatlan + - script.puertovallarta + + # Central Maya Lowlands: Questions + + centralmayalowlandsquestions: + name: Conocimiento + entities: + - script.ixtapa + + # Central Maya Lowlands: Sandbox + + centralmayalowlandssandbox: + name: Sandbox + entities: + - script.veracruz + + # Northern Maya Highlands: Stations + + northernmayalowlandsstations: + name: Estaciones + entities: + - script.montesazules + - script.ojodeliebre + - script.lamichilia + - script.elcielo + - script.mapimi + + # Northern Maya Highlands: Stations + + northernmayalowlandsrobot: + name: Robot Dance + entities: + - script.siankaan + + # Northern Maya Highlands: Stations + + northernmayalowlandsstories: + name: Historias + entities: + - script.calakmul + - script.tiburonballena + + # Console Maya Lands: Keypad Yes No + + consolemayalandskeypadyesno: + name: Teclado Sí No + entities: + - script.keypadyes + - script.keypadno + + # Console Maya Lands: Keypad Multiple Choice + + consolemayalandskeypadmultiplechoice: + name: Teclado Opción Multiple + entities: + - script.keypadone + - script.keypadtwo + - script.keypadthree + - script.keypadfour + + # Media Maya Lands: Corporate + + mediamayalandscorporate: + name: Corporativo + entities: + - switch.aak + - switch.aayin + + # Media Maya Lands: Intel Guadalajara + + mediamayalandsintelguadalajara: + name: Intel Guadalajara + entities: + - switch.chakmool + + # Media Maya Lands: Visitors Center + + mediamayalandsvisitorscenter: + name: Centro de Visitantes + entities: + - switch.am + + # Media Maya Lands: Drawing + + mediamayalandsdrawing: + name: Dibujos + entities: + - switch.chiich + + # Media Maya Lands: Memories + + mediamayalandsmemories: + name: Visitas + entities: + - switch.cho + - switch.chuwen + + # Media Maya Lands: Camera + + mediamayalandscamera: + name: Cámara + entities: + - switch.kaab + + # Calendar Maya Lands: Internal Events + + calendarmayalandseventsinternal: + name: Eventos Internos + entities: + - automation.pop + - automation.sip + + calendarmayalandseventsexternal: + name: Eventos Externos + entities: + - automation.wo + + calendarmayalandseventscampaign: + name: Campaña + entities: + - automation.sotz + - script.sotz + + # Tradition Maya Lands :: Navidad + + traditionmayalandsnavidadchromecast: + name: Navidad <> Chromecast + entities: + - automation.familia + - script.familia + + traditionmayalandsnavidadamikoo: + name: Navidad <> Robot + entities: + - automation.campana + - automation.pesebre + - automation.trineo + - script.campana + - script.pesebre + - script.trineo + + traditionmayalandsnavidadnohochtata: + name: Navidad <> Server + entities: + - automation.santaclaus + - script.santaclaus + + # Tradition Maya Lands :: Dia De Muertos + + traditionmayalandsdiademuertoschromecast: + name: Dia De Muertos <> Chromecast + entities: + - automation.veladora + - script.veladora + + traditionmayalandsdiademuertosamikoo: + name: Dia De Muertos <> Robot + entities: + - automation.papelpicado + - automation.mantel + - automation.calaverita + - automation.fotografia + - script.papelpicado + - script.mantel + - script.calaverita + - script.fotografia + + # Tradition Maya Lands :: Intel + + traditionmayalandsintelchromecast: + name: Intel <> Chromecast + entities: + - automation.4004 + - script.4004 + + traditionmayalandsintelamikoo: + name: Intel <> Robot + entities: + - automation.8008 + - automation.8080 + - automation.8086 + - automation.80286 + - script.8008 + - script.8080 + - script.8086 + - script.80286 + + traditionmayalandsintelnohochtata: + name: Intel <> Server + entities: + - automation.i486 + - script.i486 + + # Techie Maya Lands: System Health + + techiemayalandssystemhealth: + name: Verificación del Sistema + entities: + - script.toyota + - script.kodak + + # Techie Maya Lands: System Calendar + + techiemayalandssystemcalendar: + name: Próxima Visita + entities: + - automation.apple + - sensor.imac + - sensor.ipod + #- calendar.hochobvcgmailcom + + # Techie Maya Lands: System Audio + + techiemayalandssystemaudio: + name: Audio del Servidor + entities: + - input_slider.qualcomm + - sensor.qualcomm + #- shell_command.qualcomm + #- automation.snapdragon + #- automation.csr101x + + # Techie Maya Lands: System Monitor + + techiemayalandssystemmonitor: + name: Monitor del Servidor + entities: + - sensor.cpu_use + - sensor.ram_free + - sensor.disk_use_home + #- camera.ffmpeg + + # Techie Maya Lands: System Quote + + techiemayalandssystemquote: + name: Citas del Servidor + entities: + - sensor.bosch + + # Techie Maya Lands: Server Infrastructure + + mayalandsserverinfrastructure: + name: Disponibilidad de Servidores + entities: + - device_tracker.eclipse + - device_tracker.hochob + + # Techie Maya Lands: Sandbox + + techiemayalandssandbox: + name: Sandbox + entities: + - script.visitorsusb + + intelexperiencedaylandsopening: + name: Escenario + entities: + - script.iedone + - script.iedtwo + - script.iedthree + + intelexperiencedaylandsdance: + name: Baile + entities: + - script.ieddance + + intelexperiencedaylandswelcome: + name: Bienvenida + entities: + - script.iedwelcome + - automation.wo From fd04396fb2df36e5c50bc1248053c0613c6506ff Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 27 Nov 2017 20:35:23 -0600 Subject: [PATCH 1393/1653] Update configuration.yaml.adriana --- .../Automation/HomeAssistant/configuration.yaml.adriana | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.adriana b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.adriana index de46ad62..5409d4f7 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.adriana +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.adriana @@ -1745,7 +1745,7 @@ group: - script.ojodeliebre - script.lamichilia - script.elcielo - - script.mapimi + #- script.mapimi # Northern Maya Highlands: Stations From f3dfdb78a38e285a05f068a3d5f603feafb1db2c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 20:38:29 -0600 Subject: [PATCH 1394/1653] Create Loteria.py --- Hochob/Services/Games/Loteria.py | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Hochob/Services/Games/Loteria.py diff --git a/Hochob/Services/Games/Loteria.py b/Hochob/Services/Games/Loteria.py new file mode 100644 index 00000000..3d002466 --- /dev/null +++ b/Hochob/Services/Games/Loteria.py @@ -0,0 +1,7 @@ + +def shuffle(): + with open("teams.txt", mode="r", encoding="utf-8") as myFile: + lines = list(myFile) + random.shuffle(lines) + print(lines) + From 8d07df2b4458b128bbc0a82c82868c74ae11b6e2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 21:04:32 -0600 Subject: [PATCH 1395/1653] Create LasCartas.txt --- Hochob/Services/Games/LasCartas.txt | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Hochob/Services/Games/LasCartas.txt diff --git a/Hochob/Services/Games/LasCartas.txt b/Hochob/Services/Games/LasCartas.txt new file mode 100644 index 00000000..e30026be --- /dev/null +++ b/Hochob/Services/Games/LasCartas.txt @@ -0,0 +1,27 @@ +El que la cantó a San Pedro. El gallo. +Pórtate bien cuatito, si no te lleva el coloradito. El diablito. +Puliendo el paso, por toda la calle real. La dama. +Don Ferruco en la alameda, su bastón quería tirar. El catrín. +Para el sol y para el agua. El paraguas. +Medio cuerpo de señora se divisa en altamar. La sirena. +Súbeme paso a pasito, no quieras pegar brinquitos. La escalera. +La herramienta del borracho. La botella. +Tanto bebió el albañil, que quedó como barril. El barril. +El que a buen árbol se arrima buena sombra le cobija. El árbol. +Me lo das o me lo quitas. El melón. +Por que le corres cobarde, trayendo tan buen puñal. El valiente. +El gorrito que me ponen. El gorrito. +La muerte siriqui siaca. La muerte. +El que espera desespera. La pera. +Verde blanco y colorado, la bandera del soldado. La bandera. +Tocando su bandolón, está el mariachi Simón. El bandolón. +Creciendo se fue hasta el cielo, y como no fue violín, tuvo que ser violoncello. El violoncello. +Al otro lado del río tengo mi banco de arena, donde se sienta mi chata pico de garza morena. La garza. +TEl pájaro chirlo mirlo. El pájaro. +La mano de un criminal. La mano. +Una bota igual que la otra. Bótala si no te sirve. La bota. +El farol de los enamorados. La luna. +Cotorro cotorro saca la pata, y empiézame a platicar. El cotorro. +¡Ah! qué borracho tan necio, ya no lo puedo aguantar. El borracho. +El que se comió el azúcar. El negrito. +No me extrañes corazón, que regresó en el camión. El corazón. From dd531c32f3155d85b9502a684f677cf52896a905 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 21:07:03 -0600 Subject: [PATCH 1396/1653] Update LasCartas.txt --- Hochob/Services/Games/LasCartas.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Hochob/Services/Games/LasCartas.txt b/Hochob/Services/Games/LasCartas.txt index e30026be..46fe2b45 100644 --- a/Hochob/Services/Games/LasCartas.txt +++ b/Hochob/Services/Games/LasCartas.txt @@ -25,3 +25,17 @@ Cotorro cotorro saca la pata, y empiézame a platicar. El cotorro. ¡Ah! qué borracho tan necio, ya no lo puedo aguantar. El borracho. El que se comió el azúcar. El negrito. No me extrañes corazón, que regresó en el camión. El corazón. +La barriga que Juan tenía, era empacho de sandía. La sandía. +No te arrugues cuero viejo, que te quiero pa'tambor. El tambor. +Camarón que se duerme, se lo lleva la corriente. El camarón. +Las jaras del indio Adán, donde pegan, dan. Las jaras. +El músico trompa de hule, ya no me quiere tocar. El músico. +Atarántamela a palos, no me la dejes llegar. La araña. +Uno, dos y tres el soldado p'al cuartel. El soldado. +La guía de los marineros. La estrella. +El caso que te hago es poco. El cazo. +Este mundo es una bola, y nosotros un balón. El mundo. +¡Ah Chihuahua! cuánto apache con pantalón y huarache. El apache. +Al nopal lo van a ver, nomás cuando tiene tunas. El nopal. +El que con la cola pica, le dan una paliza. El alacrán. + From bd81e975d1cb5cdad66f5d6ccb60fd74009fb939 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 21:10:14 -0600 Subject: [PATCH 1397/1653] Update LasCartas.txt --- Hochob/Services/Games/LasCartas.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Games/LasCartas.txt b/Hochob/Services/Games/LasCartas.txt index 46fe2b45..2c6f5234 100644 --- a/Hochob/Services/Games/LasCartas.txt +++ b/Hochob/Services/Games/LasCartas.txt @@ -38,4 +38,17 @@ Este mundo es una bola, y nosotros un balón. El mundo. ¡Ah Chihuahua! cuánto apache con pantalón y huarache. El apache. Al nopal lo van a ver, nomás cuando tiene tunas. El nopal. El que con la cola pica, le dan una paliza. El alacrán. - +Rosita, Rosaura, ven que te quiero ahora. La rosa. +Al pasar por el panteón, me encontré un calaverón. La calavera. +La campana de Dolores. La campana. +Tanto va el cántaro al agua, que se quiebra y te moja las enaguas. El cantarito. +Saltando va buscando, pero no ve nada. El venado. +Solo solo te quedaste, de cobija de los pobres. El sol. +El sombrero de los reyes. La corona. +Rema rema va Lupita, sentada en su chalupita. La chalupa. +Fresco y oloroso, en todo tiempo hermoso. El pino. +El que por la boca muere, aunque mudo fuere. El pescado. +Palmero sube a la palma y bájame un coco real. La palma. +El que nace pa'maceta, no sale del corredor. La maceta. +Arpa vieja de mi suegra, ya no sirves pa'tocar. El arpa. +La rana mujer del sapo. La rana. From e076e33ef813c0a43de9d0ebf8e59e7f124d9cee Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 21:11:45 -0600 Subject: [PATCH 1398/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Games/{ => Loteria}/LasCartas.txt | 0 Hochob/Services/Games/{ => Loteria}/Loteria.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Games/{ => Loteria}/LasCartas.txt (100%) rename Hochob/Services/Games/{ => Loteria}/Loteria.py (100%) diff --git a/Hochob/Services/Games/LasCartas.txt b/Hochob/Services/Games/Loteria/LasCartas.txt similarity index 100% rename from Hochob/Services/Games/LasCartas.txt rename to Hochob/Services/Games/Loteria/LasCartas.txt diff --git a/Hochob/Services/Games/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py similarity index 100% rename from Hochob/Services/Games/Loteria.py rename to Hochob/Services/Games/Loteria/Loteria.py From 6a2841009aff6422c0b1616006469422553643a2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 21:51:42 -0600 Subject: [PATCH 1399/1653] Create LasCartasSimple.txt --- .../Games/Loteria/LasCartasSimple.txt | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Hochob/Services/Games/Loteria/LasCartasSimple.txt diff --git a/Hochob/Services/Games/Loteria/LasCartasSimple.txt b/Hochob/Services/Games/Loteria/LasCartasSimple.txt new file mode 100644 index 00000000..3cc00c41 --- /dev/null +++ b/Hochob/Services/Games/Loteria/LasCartasSimple.txt @@ -0,0 +1,54 @@ +El gallo. +El diablito. +La dama. +El catrín. +El paraguas. +La sirena. +La escalera. +La botella. +El barril. +El árbol. +El melón. +El valiente. +El gorrito. +La muerte. +La pera. +La bandera. +El bandolón. +El violoncello. +La garza. +El pájaro. +La mano. +La bota. +La luna. +El cotorro. +El borracho. +El negrito. +El corazón. +La sandía. +El tambor. +El camarón. +Las jaras. +El músico. +La araña. +El soldado. +La estrella. +El cazo. +El mundo. +El apache. +El nopal. +El alacrán. +La rosa. +La calavera. +La campana. +El cantarito. +El venado. +El sol. +La corona. +La chalupa. +El pino. +El pescado. +La palma. +La maceta. +El arpa. +La rana. From d1b7b6954316311accfb030fc10702beb8fd8489 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 21:55:18 -0600 Subject: [PATCH 1400/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Games/Loteria/Loteria.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 3d002466..fd158f24 100644 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -1,7 +1,22 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- -def shuffle(): - with open("teams.txt", mode="r", encoding="utf-8") as myFile: - lines = list(myFile) +import os +import random +import time + +with open("LasCartasSimple.txt") as f: + lines = f.readlines() random.shuffle(lines) - print(lines) + f.close() +with open("LasCartasSimple.rnd", "w") as f: + f.writelines(lines) + for line in lines: + line = line.rstrip('\r\n') + print line + os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') + time.sleep(3) + f.close() + +os.system('espeak -v es-la -a 100 -p 50 -s 170 -f LasCartasSimple.rnd -w LasCartasSimple.wav') From 74d6f1b4c94c9a6cb96e6ae4ad7400835e86695c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 21:57:37 -0600 Subject: [PATCH 1401/1653] Create Loteria.sh --- Hochob/Services/Games/Loteria/Loteria.sh | 27 ++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 Hochob/Services/Games/Loteria/Loteria.sh diff --git a/Hochob/Services/Games/Loteria/Loteria.sh b/Hochob/Services/Games/Loteria/Loteria.sh new file mode 100644 index 00000000..fd44e911 --- /dev/null +++ b/Hochob/Services/Games/Loteria/Loteria.sh @@ -0,0 +1,27 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export LOTERIA_PID=$$ +export LOTERIA_BASEDIR=$(dirname "$0") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +cd $LOTERIA_BASEDIR +python Loteria.py + +# End of File From 018601b17110c91c5bf0a79ef3522d042eb18e95 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 22:00:29 -0600 Subject: [PATCH 1402/1653] Update Loteria.sh --- Hochob/Services/Games/Loteria/Loteria.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.sh b/Hochob/Services/Games/Loteria/Loteria.sh index fd44e911..8fea0c4b 100644 --- a/Hochob/Services/Games/Loteria/Loteria.sh +++ b/Hochob/Services/Games/Loteria/Loteria.sh @@ -9,7 +9,8 @@ set -x . ~/CodeLabs/Hochob/Main.sh export LOTERIA_PID=$$ -export LOTERIA_BASEDIR=$(dirname "$0") +export LOTERIA_PATH=$(readlink -f "$0") +export LOTERIA_BASEDIR=$(dirname "$SCRIPT") # ============================================================================= # Functions From b191ef2ab3aabc55f7a6333c08af1defdc6dbdf1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 22:03:25 -0600 Subject: [PATCH 1403/1653] Update Loteria.sh --- Hochob/Services/Games/Loteria/Loteria.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Games/Loteria/Loteria.sh b/Hochob/Services/Games/Loteria/Loteria.sh index 8fea0c4b..2fa84d92 100644 --- a/Hochob/Services/Games/Loteria/Loteria.sh +++ b/Hochob/Services/Games/Loteria/Loteria.sh @@ -11,6 +11,7 @@ set -x export LOTERIA_PID=$$ export LOTERIA_PATH=$(readlink -f "$0") export LOTERIA_BASEDIR=$(dirname "$SCRIPT") +export LOTERIA_BASEDIR="$( cd "$(dirname "$0")" ; pwd -P )" # ============================================================================= # Functions From 5cdbdfb4d5e86d7ea228cc4994a06cf4e3d1d97d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 22:05:52 -0600 Subject: [PATCH 1404/1653] Update Loteria.sh --- Hochob/Services/Games/Loteria/Loteria.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.sh b/Hochob/Services/Games/Loteria/Loteria.sh index 2fa84d92..d17527df 100644 --- a/Hochob/Services/Games/Loteria/Loteria.sh +++ b/Hochob/Services/Games/Loteria/Loteria.sh @@ -23,7 +23,7 @@ export LOTERIA_BASEDIR="$( cd "$(dirname "$0")" ; pwd -P )" # Main # ============================================================================= -cd $LOTERIA_BASEDIR +cd $LOTERIA_BASEDIR/Services/Games/Loteria python Loteria.py # End of File From 5e7d4bef185cc944f3c5d5b69fb04471785e792a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 22:06:55 -0600 Subject: [PATCH 1405/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Games/Loteria/Loteria.py | 0 Hochob/Services/Games/Loteria/Loteria.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Games/Loteria/Loteria.py mode change 100644 => 100755 Hochob/Services/Games/Loteria/Loteria.sh diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py old mode 100644 new mode 100755 diff --git a/Hochob/Services/Games/Loteria/Loteria.sh b/Hochob/Services/Games/Loteria/Loteria.sh old mode 100644 new mode 100755 From 08d47cf69c61e358f61360633426e33c597c0a31 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 22:14:00 -0600 Subject: [PATCH 1406/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 6e74c575..ce197f55 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -508,6 +508,12 @@ homeassistant: friendly_name: Hoy digo... icon: mdi:approval + # Games + + script.loteria: + friendly_name: Loteria + icon: mdi:gamepad-variant + # Intel Experience Day script.iedone: @@ -948,6 +954,12 @@ script: sequence: - service: shell_command.keypadfour + # Games + + loteria: + sequence: + - service: shell_command.loteria + # Intel Experience Day iedone: @@ -1111,6 +1123,10 @@ shell_command: qualcomm: amixer -D pulse sset Master '{{ volume_level }}%' visitorsusb: ~/CodeLabs/Hochob/Services/Visitors/Usb.sh & + # Games + + loteria: ~/CodeLabs/Hochob/Services/Games/Loteria/Loteria.sh + # Intel Experience Day iedone: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Hola, bienvenidos al show de baile de Intel" @@ -1572,6 +1588,12 @@ group: - group.techiemayalandsserverinfrastructure - group.techiemayalandssandbox + gameslands: + view: yes + name: Juegos + entities: + - group.games + intelexperiencedaylands: view: yes name: Intel Experience Day @@ -1974,6 +1996,11 @@ group: entities: - script.visitorsusb + games: + name: Mexicanos + entities: + - script.loteria + intelexperiencedaylandsopening: name: Escenario entities: From 7605d2e1462549f51a92bca4d8bb83b3d1240cf5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 22:18:44 -0600 Subject: [PATCH 1407/1653] Update Loteria.sh --- Hochob/Services/Games/Loteria/Loteria.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.sh b/Hochob/Services/Games/Loteria/Loteria.sh index d17527df..2fa84d92 100755 --- a/Hochob/Services/Games/Loteria/Loteria.sh +++ b/Hochob/Services/Games/Loteria/Loteria.sh @@ -23,7 +23,7 @@ export LOTERIA_BASEDIR="$( cd "$(dirname "$0")" ; pwd -P )" # Main # ============================================================================= -cd $LOTERIA_BASEDIR/Services/Games/Loteria +cd $LOTERIA_BASEDIR python Loteria.py # End of File From 2720c38f11dc5febc9e14158b9904f5cf2d98011 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 28 Nov 2017 22:19:03 -0600 Subject: [PATCH 1408/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index fd158f24..ff4d4317 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -14,7 +14,7 @@ for line in lines: line = line.rstrip('\r\n') print line - os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') + os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3) f.close() From bb15c28da8fe3acd93e389ca5143b97b3ad3a8fa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:25:09 -0600 Subject: [PATCH 1409/1653] Update LasCartasSimple.txt --- .../Games/Loteria/LasCartasSimple.txt | 108 +++++++++--------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/Hochob/Services/Games/Loteria/LasCartasSimple.txt b/Hochob/Services/Games/Loteria/LasCartasSimple.txt index 3cc00c41..49191411 100644 --- a/Hochob/Services/Games/Loteria/LasCartasSimple.txt +++ b/Hochob/Services/Games/Loteria/LasCartasSimple.txt @@ -1,54 +1,54 @@ -El gallo. -El diablito. -La dama. -El catrín. -El paraguas. -La sirena. -La escalera. -La botella. -El barril. -El árbol. -El melón. -El valiente. -El gorrito. -La muerte. -La pera. -La bandera. -El bandolón. -El violoncello. -La garza. -El pájaro. -La mano. -La bota. -La luna. -El cotorro. -El borracho. -El negrito. -El corazón. -La sandía. -El tambor. -El camarón. -Las jaras. -El músico. -La araña. -El soldado. -La estrella. -El cazo. -El mundo. -El apache. -El nopal. -El alacrán. -La rosa. -La calavera. -La campana. -El cantarito. -El venado. -El sol. -La corona. -La chalupa. -El pino. -El pescado. -La palma. -La maceta. -El arpa. -La rana. +El Gallo +El Diablito +La Dama +El Catrin +El Paraguas. +La Sirena +La Escalera +La Botella +El Barril +El Arbol +El Melon +El Valiente +El Gorrito +La Muerte +La Pera +La Bandera. +El Bandolon +El Violoncello +La Garza +El Pajaro +La Mano +La Bota +La Luna +El Cotorro +El Borracho +El Negrito +El Corazon +La Sandia +El Tambor +El Camarón +Las Jaras +El Musico +La Arania +El Soldado +La Estrella +El Cazo +El Mundo +El Apache +El Nopal +El Alacran +La Rosa +La Calavera +La Campana +El Cantarito +El Venado +El Sol +La Corona +La Chalupa +El Pino +El Pescado +La Palma +La Maceta +El Arpa +La Rana From 42c3267449087254ff259c157ce913ec5276be1c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:46:46 -0600 Subject: [PATCH 1410/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Games/Loteria/Loteria.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index ff4d4317..5ef48011 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -14,6 +14,8 @@ for line in lines: line = line.rstrip('\r\n') print line + image = line.replace(" ", "") + ".jpg" + print image os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3) f.close() From a623d586767e1057104a6e606b2491eac0f3020f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:47:36 -0600 Subject: [PATCH 1411/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 5ef48011..5d413e80 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -16,7 +16,7 @@ print line image = line.replace(" ", "") + ".jpg" print image - os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') + os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3) f.close() From 95b6958d968eff81de8b15a879cb0eaf00e3130d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:49:26 -0600 Subject: [PATCH 1412/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 5d413e80..e5b89b22 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -4,6 +4,7 @@ import os import random import time +import unidecode with open("LasCartasSimple.txt") as f: lines = f.readlines() @@ -15,6 +16,7 @@ line = line.rstrip('\r\n') print line image = line.replace(" ", "") + ".jpg" + image = unidecode.unidecode(image) print image os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3) From e7717611dcf5f14b9519879a4100a974fda55d2d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:52:06 -0600 Subject: [PATCH 1413/1653] Update LasCartasSimple.txt --- .../Games/Loteria/LasCartasSimple.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Games/Loteria/LasCartasSimple.txt b/Hochob/Services/Games/Loteria/LasCartasSimple.txt index 49191411..943d7463 100644 --- a/Hochob/Services/Games/Loteria/LasCartasSimple.txt +++ b/Hochob/Services/Games/Loteria/LasCartasSimple.txt @@ -1,43 +1,43 @@ El Gallo El Diablito La Dama -El Catrin -El Paraguas. +El Catrín +El Paraguas La Sirena La Escalera La Botella El Barril -El Arbol -El Melon +El Árbol +El Melón El Valiente El Gorrito La Muerte La Pera La Bandera. -El Bandolon +El Bandolón El Violoncello La Garza -El Pajaro +El Pájaro La Mano La Bota La Luna El Cotorro El Borracho El Negrito -El Corazon +El Corazón La Sandia El Tambor El Camarón Las Jaras -El Musico -La Arania +El Músico +La Araña El Soldado La Estrella El Cazo El Mundo El Apache El Nopal -El Alacran +El Alacrán La Rosa La Calavera La Campana From f9796aa4526bda5d5be11f3badaca696e9a19d0c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:53:51 -0600 Subject: [PATCH 1414/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index e5b89b22..09da4c08 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -17,6 +17,7 @@ print line image = line.replace(" ", "") + ".jpg" image = unidecode.unidecode(image) + image = unicodedata.normalize('NFKD', image).encode('ASCII', 'ignore') print image os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3) From 6492ee92d26e06a09966d86ae0d091c90df181e7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:54:23 -0600 Subject: [PATCH 1415/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 09da4c08..7a1cec31 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -5,6 +5,7 @@ import random import time import unidecode +import unicodedata with open("LasCartasSimple.txt") as f: lines = f.readlines() From 313b585fba0b0ee27229cf1e8bb6ebf66fc64143 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:56:14 -0600 Subject: [PATCH 1416/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 7a1cec31..a2b1533c 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -17,7 +17,7 @@ line = line.rstrip('\r\n') print line image = line.replace(" ", "") + ".jpg" - image = unidecode.unidecode(image) + #image = unidecode.unidecode(image) image = unicodedata.normalize('NFKD', image).encode('ASCII', 'ignore') print image os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') From ac57a052b0e0f465df436e833d18f0eb91ab0ff4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 04:56:47 -0600 Subject: [PATCH 1417/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index a2b1533c..65d5b0d3 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -18,6 +18,7 @@ print line image = line.replace(" ", "") + ".jpg" #image = unidecode.unidecode(image) + image = unicode(image,'utf-8') image = unicodedata.normalize('NFKD', image).encode('ASCII', 'ignore') print image os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') From 88724a29e79121008e15c153de173c6a594feb2d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 05:02:39 -0600 Subject: [PATCH 1418/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 65d5b0d3..c40449cb 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -21,9 +21,10 @@ image = unicode(image,'utf-8') image = unicodedata.normalize('NFKD', image).encode('ASCII', 'ignore') print image + os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/tradition/image/decir -m 'Loteria' + '/' + image) os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3) f.close() -os.system('espeak -v es-la -a 100 -p 50 -s 170 -f LasCartasSimple.rnd -w LasCartasSimple.wav') +#os.system('espeak -v es-la -a 100 -p 50 -s 170 -f LasCartasSimple.rnd -w LasCartasSimple.wav') From 4278a96c3b53f3655e938a40e709fd0f5f9ab864 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 05:03:26 -0600 Subject: [PATCH 1419/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index c40449cb..7652c929 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -21,7 +21,7 @@ image = unicode(image,'utf-8') image = unicodedata.normalize('NFKD', image).encode('ASCII', 'ignore') print image - os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/tradition/image/decir -m 'Loteria' + '/' + image) + os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/tradition/image/decir -m Loteria' + '/' + image) os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3) f.close() From 4b4042e113404788c25435d8cb50214d1c568647 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 05:04:03 -0600 Subject: [PATCH 1420/1653] Update LasCartasSimple.txt --- Hochob/Services/Games/Loteria/LasCartasSimple.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/LasCartasSimple.txt b/Hochob/Services/Games/Loteria/LasCartasSimple.txt index 943d7463..d78ee442 100644 --- a/Hochob/Services/Games/Loteria/LasCartasSimple.txt +++ b/Hochob/Services/Games/Loteria/LasCartasSimple.txt @@ -13,7 +13,7 @@ El Valiente El Gorrito La Muerte La Pera -La Bandera. +La Bandera El Bandolón El Violoncello La Garza From 723cd83c3bb3f605f88f70ed6af3126aaeda2a67 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 05:06:16 -0600 Subject: [PATCH 1421/1653] Update LasCartasSimple.txt --- Hochob/Services/Games/Loteria/LasCartasSimple.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/LasCartasSimple.txt b/Hochob/Services/Games/Loteria/LasCartasSimple.txt index d78ee442..603fd3ab 100644 --- a/Hochob/Services/Games/Loteria/LasCartasSimple.txt +++ b/Hochob/Services/Games/Loteria/LasCartasSimple.txt @@ -25,7 +25,7 @@ El Cotorro El Borracho El Negrito El Corazón -La Sandia +La Sandía El Tambor El Camarón Las Jaras From 2029b399f2b7205b9760c5b7d629d747cc608280 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 05:07:10 -0600 Subject: [PATCH 1422/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 7652c929..839330b8 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -21,7 +21,7 @@ image = unicode(image,'utf-8') image = unicodedata.normalize('NFKD', image).encode('ASCII', 'ignore') print image - os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/tradition/image/decir -m Loteria' + '/' + image) + os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/tradition/image -m Loteria' + '/' + image) os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3) f.close() From 2695cc0b002c5e88cf46eddbd026cfe6c7b68b74 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 05:22:00 -0600 Subject: [PATCH 1423/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 839330b8..435d373d 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -23,7 +23,7 @@ print image os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/tradition/image -m Loteria' + '/' + image) os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') - time.sleep(3) + time.sleep(3.5) f.close() #os.system('espeak -v es-la -a 100 -p 50 -s 170 -f LasCartasSimple.rnd -w LasCartasSimple.wav') From 8b7871fd70e9ee1bb02055896b82b669f8ae5731 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 05:23:44 -0600 Subject: [PATCH 1424/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 435d373d..9aa5caad 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -21,8 +21,8 @@ image = unicode(image,'utf-8') image = unicodedata.normalize('NFKD', image).encode('ASCII', 'ignore') print image - os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/tradition/image -m Loteria' + '/' + image) - os.system('mosquitto_pub -h iot.eclipse.org -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') + os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/tradition/image -m Loteria' + '/' + image) + os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(3.5) f.close() From d2079028c48c2833b6c0d3d50c41c4fcc72b6e98 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 29 Nov 2017 08:56:51 -0600 Subject: [PATCH 1425/1653] Update Loteria.py --- Hochob/Services/Games/Loteria/Loteria.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/Loteria/Loteria.py index 9aa5caad..2c321899 100755 --- a/Hochob/Services/Games/Loteria/Loteria.py +++ b/Hochob/Services/Games/Loteria/Loteria.py @@ -23,7 +23,7 @@ print image os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/tradition/image -m Loteria' + '/' + image) os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') - time.sleep(3.5) + time.sleep(5) f.close() #os.system('espeak -v es-la -a 100 -p 50 -s 170 -f LasCartasSimple.rnd -w LasCartasSimple.wav') From eb1f88da584ba78f08bcd872a1d52380a741834e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 21:52:06 -0600 Subject: [PATCH 1426/1653] Update Signed-off-by: Abraham Arce --- .../IntelExperienceDay}/Dance.sh | 0 .../IntelExperienceDay}/Welcome.sh | 0 .../Sotz.sh => CampaignMayaLands/Drones/IntelAero.sh} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename Hochob/Applications/{AmikooMayaLands => CalendarMayaLands/IntelExperienceDay}/Dance.sh (100%) rename Hochob/Applications/{AmikooMayaLands => CalendarMayaLands/IntelExperienceDay}/Welcome.sh (100%) rename Hochob/Applications/{CalendarMayaLands/Sotz.sh => CampaignMayaLands/Drones/IntelAero.sh} (100%) diff --git a/Hochob/Applications/AmikooMayaLands/Dance.sh b/Hochob/Applications/CalendarMayaLands/IntelExperienceDay/Dance.sh similarity index 100% rename from Hochob/Applications/AmikooMayaLands/Dance.sh rename to Hochob/Applications/CalendarMayaLands/IntelExperienceDay/Dance.sh diff --git a/Hochob/Applications/AmikooMayaLands/Welcome.sh b/Hochob/Applications/CalendarMayaLands/IntelExperienceDay/Welcome.sh similarity index 100% rename from Hochob/Applications/AmikooMayaLands/Welcome.sh rename to Hochob/Applications/CalendarMayaLands/IntelExperienceDay/Welcome.sh diff --git a/Hochob/Applications/CalendarMayaLands/Sotz.sh b/Hochob/Applications/CampaignMayaLands/Drones/IntelAero.sh similarity index 100% rename from Hochob/Applications/CalendarMayaLands/Sotz.sh rename to Hochob/Applications/CampaignMayaLands/Drones/IntelAero.sh From 89d673faf68974edb70af586d421b769d2dcdafc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:13:13 -0600 Subject: [PATCH 1427/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 84 ++++++++++++++----- 1 file changed, 62 insertions(+), 22 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index ce197f55..dca2aa19 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -298,7 +298,7 @@ homeassistant: friendly_name: Vista Previa Cámara icon: mdi:camera - # Calendar Maya Lands + # Calendar Maya Lands :: Internal automation.pop: friendly_name: 30 segundos .. Bienvenida Robot @@ -308,16 +308,26 @@ homeassistant: friendly_name: 30 segundos .. Bienvenida Servidor icon: mdi:calendar-clock + # Calendar Maya Lands :: External + automation.wo: friendly_name: 15 segundos .. Bienvenida Robot icon: mdi:calendar-clock - automation.sotz: - friendly_name: 15 segundos .. PoC Campaign Drones + # Calendar Maya Lands :: Photo Booth + + automation.photoboothdonotforget: + friendly_name: 15 segundos .. No Olvides Photo Booth! + icon: mdi:calendar-clock + + # Campaign Maya Lands: Drones + + automation.intelaero: + friendly_name: 15 segundos .. Drones Intel Aero icon: mdi:calendar-clock - script.sotz: - friendly_name: PoC Campaign Drones + script.intelaero: + friendly_name: Drones Intel Aero icon: mdi:drone # Tradition Maya Lands :: Navidad @@ -844,12 +854,6 @@ script: sequence: - service: shell_command.tiburonballena - # Calendar Maya Lands - - sotz: - sequence: - - service: shell_command.sotz - # Tradition Maya Lands :: Navidad familia: @@ -1088,7 +1092,11 @@ shell_command: pop: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Pop.sh & sip: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sip.sh & wo: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Wo.sh & - sotz: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/Sotz.sh & + photoboothdonotforget: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh + + # Campaign Maya Lands :: Drones :: Intel Aero + + intelaero: ~/CodeLabs/Hochob/Applications/CampaignMayaLands/Drones/IntelAero.sh & # Tradition Maya Lands :: Navidad @@ -1132,8 +1140,8 @@ shell_command: iedone: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Hola, bienvenidos al show de baile de Intel" iedtwo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Que es eso" iedthree: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooVoice.sh spanish "Como yo" - ieddance: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Dance.sh - iedwelcome: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Welcome.sh + ieddance: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/IntelExperienceDay/Dance.sh + iedwelcome: ~/CodeLabs/Hochob/Applications/CalendarMayaLands/IntelExperienceDay/Welcome.sh switch: @@ -1245,13 +1253,23 @@ automation: action: - service: shell_command.wo - - alias: sotz + - alias: photoboothdonotforget + initial_state: 'off' + trigger: + platform: time + seconds: '/15' + action: + - service: shell_command.photoboothdonotforget + + # Campaign Maya Lands :: Drones :: Intel Aero + + - alias: intelaero initial_state: 'off' trigger: platform: time seconds: '/30' action: - - service: shell_command.sotz + - service: shell_command.intelaero # Tradition Maya Lands :: Navidad @@ -1556,7 +1574,15 @@ group: entities: - group.calendarmayalandseventsinternal - group.calendarmayalandseventsexternal - - group.calendarmayalandseventscampaign + - group.calendarmayalandsphotobooth + + # Campaign Maya Lands + + campaignmayalands: + view: yes + name: Campañas + entities: + - group.campaignmayalandsdronesintelaero # Tradition Maya Lands @@ -1854,16 +1880,27 @@ group: - automation.pop - automation.sip + # Calendar Maya Lands: External Events + calendarmayalandseventsexternal: name: Eventos Externos entities: - automation.wo - calendarmayalandseventscampaign: - name: Campaña + # Calendar Maya Lands: Photo Booth + + calendarmayalandsphotobooth: + name: Photo Booth entities: - - automation.sotz - - script.sotz + - automation.photoboothdonotforget + + # Campaign Maya Lands: Drones + + campaignmayalandsdronesintelaero: + name: Drones Intel® Aero + entities: + - automation.intelaero + - script.intelaero # Tradition Maya Lands :: Navidad @@ -2000,7 +2037,9 @@ group: name: Mexicanos entities: - script.loteria - + + # Intel Experience Day + intelexperiencedaylandsopening: name: Escenario entities: @@ -2018,3 +2057,4 @@ group: entities: - script.iedwelcome - automation.wo + From b756764c72b67973067c52ad0f5a800408fed0e8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:17:08 -0600 Subject: [PATCH 1428/1653] Update Signed-off-by: Abraham Arce --- .../PhotoBooth/DoNotForget.sh | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100755 Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh diff --git a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh new file mode 100755 index 00000000..ecb1232a --- /dev/null +++ b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh @@ -0,0 +1,92 @@ +#!/bin/bash + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export SOTZ_PID=$$ +export SOTZ_NAME="Sotz" +export SOTZ_PATH=$(readlink -f "$0") +export SOTZ_DIRECTORY=$(dirname "$SOTZ_PATH") + +LOCAL_INSTITUTION_NAME="México" + +LOCAL_EVENT_NAME_ENGLISH="Aerial Technology" +LOCAL_EVENT_NAME_SPANISH="Tecnología Aérea" + +LOCAL_LANGUAGE[0]="english" +LOCAL_LANGUAGE[1]="spanish" + +# ============================================================================= +# Functions +# ============================================================================= + +chooseLanguage() +{ + rand=$[ $RANDOM % 2 ] + LOCAL_LANGUAGE=${LOCAL_LANGUAGE[$rand]} + +} + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $SOTZ_PID $SOTZ_NAME + +LOCAL_LANGUAGE="english" + +AmikooCommunication.sh "Drones" "Image" "IntelAeroReadyToFlyDrone.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "The Airbone Revolution in Drone Innovation, visit our Drone Stands" +sleep 5 + +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Experience the amazing innovation driving the next frontier of flight. \ + Our technology propels everything from commercial inspection, surveying and \ + mapping to world record setting light show spectacles" +sleep 15 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsDronecode.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "The Complete “End-to-End” Open Source UAV Platform. \ + A neutral place where industry and ecosystem developers \ + can work to build the world’s leading open UAV software platform." +sleep 15 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationKaan.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Drone Simulation using Software In The Loop \ + and Ground Control Station" +sleep 5 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Drone Simulation using Mavlink and DroneKit" +sleep 5 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsIntelAeroRTFSpecs.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Intel Aero Ready to Fly Drone is an Unmanned Aerial Vehicle development \ + platform: fully assembled, fully functional quadcopter" +sleep 10 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationIik.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Intel Aero Ready to Fly Drone controlled via Mavlink with Python Programming Language" +sleep 5 + +AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationChakiik.jpg" +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Intel Aero Ready to Fly Drone via Remote Control" +sleep 5 + +AmikooVoice.sh $LOCAL_LANGUAGE \ + "Come and talk to us about your ideas." + +AmikooCommunication.sh "Drones" "Image" "Stop" +# End of File From 9452072b2be3e4431ca0996a4686882d45fa5977 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:27:29 -0600 Subject: [PATCH 1429/1653] Update DoNotForget.sh --- .../PhotoBooth/DoNotForget.sh | 76 ++++--------------- 1 file changed, 16 insertions(+), 60 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh index ecb1232a..29081403 100755 --- a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh +++ b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh @@ -8,15 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export SOTZ_PID=$$ -export SOTZ_NAME="Sotz" -export SOTZ_PATH=$(readlink -f "$0") -export SOTZ_DIRECTORY=$(dirname "$SOTZ_PATH") - -LOCAL_INSTITUTION_NAME="México" - -LOCAL_EVENT_NAME_ENGLISH="Aerial Technology" -LOCAL_EVENT_NAME_SPANISH="Tecnología Aérea" +export DONOTFORGET_PID=$$ +export DONOTFORGET_NAME="Sotz" +export DONOTFORGET_PATH=$(readlink -f "$0") +export DONOTFORGET_DIRECTORY=$(dirname "$DONOTFORGET_PATH") LOCAL_LANGUAGE[0]="english" LOCAL_LANGUAGE[1]="spanish" @@ -29,64 +24,25 @@ chooseLanguage() { rand=$[ $RANDOM % 2 ] LOCAL_LANGUAGE=${LOCAL_LANGUAGE[$rand]} - } # ============================================================================= # Main # ============================================================================= -LogPid.sh $SOTZ_PID $SOTZ_NAME - -LOCAL_LANGUAGE="english" - -AmikooCommunication.sh "Drones" "Image" "IntelAeroReadyToFlyDrone.jpg" -AmikooVoice.sh $LOCAL_LANGUAGE \ - "The Airbone Revolution in Drone Innovation, visit our Drone Stands" -sleep 5 - -AmikooVoice.sh $LOCAL_LANGUAGE \ - "Experience the amazing innovation driving the next frontier of flight. \ - Our technology propels everything from commercial inspection, surveying and \ - mapping to world record setting light show spectacles" -sleep 15 - -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsDronecode.jpg" -AmikooVoice.sh $LOCAL_LANGUAGE \ - "The Complete “End-to-End” Open Source UAV Platform. \ - A neutral place where industry and ecosystem developers \ - can work to build the world’s leading open UAV software platform." -sleep 15 +LogPid.sh $DONOTFORGET_PID $DONOTFORGET_NAME -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationKaan.jpg" -AmikooVoice.sh $LOCAL_LANGUAGE \ - "Drone Simulation using Software In The Loop \ - and Ground Control Station" -sleep 5 - -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationMuuyal.jpg" -AmikooVoice.sh $LOCAL_LANGUAGE \ - "Drone Simulation using Mavlink and DroneKit" -sleep 5 - -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsIntelAeroRTFSpecs.jpg" -AmikooVoice.sh $LOCAL_LANGUAGE \ - "Intel Aero Ready to Fly Drone is an Unmanned Aerial Vehicle development \ - platform: fully assembled, fully functional quadcopter" -sleep 10 - -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationIik.jpg" -AmikooVoice.sh $LOCAL_LANGUAGE \ - "Intel Aero Ready to Fly Drone controlled via Mavlink with Python Programming Language" -sleep 5 - -AmikooCommunication.sh "Drones" "Image" "DroneDemoStandsStationChakiik.jpg" -AmikooVoice.sh $LOCAL_LANGUAGE \ - "Intel Aero Ready to Fly Drone via Remote Control" -sleep 5 - -AmikooVoice.sh $LOCAL_LANGUAGE \ - "Come and talk to us about your ideas." +chooseLanguage +AmikooCommunication.sh "Navidad" "Image" "Random" +if [ "$LOCAL_LANGUAGE" = "english" ]; then + AmikooVoice.sh $LOCAL_LANGUAGE \ + "No olvides tomarte la fotografía en el aula del futuro" +else + AmikooVoice.sh $LOCAL_LANGUAGE \ + "Do not forget our photo booth at the classroom of the future" +fi +sleep 3 AmikooCommunication.sh "Drones" "Image" "Stop" + # End of File From 176d27c00864b9fb5aca51f5c441edfc8d1c5e27 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:28:06 -0600 Subject: [PATCH 1430/1653] Update DoNotForget.sh --- Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh index 29081403..0d64049f 100755 --- a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh +++ b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export DONOTFORGET_PID=$$ -export DONOTFORGET_NAME="Sotz" +export DONOTFORGET_NAME="DoNotForget" export DONOTFORGET_PATH=$(readlink -f "$0") export DONOTFORGET_DIRECTORY=$(dirname "$DONOTFORGET_PATH") From 3cb4233cd787693b57de56707eb5463b202c6164 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:30:40 -0600 Subject: [PATCH 1431/1653] Update DoNotForget.sh --- .../Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh index 0d64049f..2f997500 100755 --- a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh +++ b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh @@ -37,10 +37,10 @@ chooseLanguage AmikooCommunication.sh "Navidad" "Image" "Random" if [ "$LOCAL_LANGUAGE" = "english" ]; then AmikooVoice.sh $LOCAL_LANGUAGE \ - "No olvides tomarte la fotografía en el aula del futuro" + "Do not forget our christmas photo booth at the classroom of the future, check your email for more information" else AmikooVoice.sh $LOCAL_LANGUAGE \ - "Do not forget our photo booth at the classroom of the future" + "No olvides tu fotografía navideña en el aula del futuro, mas información en tu correo electrónico" fi sleep 3 AmikooCommunication.sh "Drones" "Image" "Stop" From 7a96fb7796b4079f426e3175807531e663bcef05 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:31:06 -0600 Subject: [PATCH 1432/1653] Update DoNotForget.sh --- Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh index 2f997500..d63ec111 100755 --- a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh +++ b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh @@ -43,6 +43,6 @@ else "No olvides tu fotografía navideña en el aula del futuro, mas información en tu correo electrónico" fi sleep 3 -AmikooCommunication.sh "Drones" "Image" "Stop" +AmikooCommunication.sh "Navidad" "Image" "Stop" # End of File From c578bbb5e536ca7c847c33975dfa0caff2b2b116 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:39:44 -0600 Subject: [PATCH 1433/1653] Update Main.sh --- Hochob/Main.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 1ed88034..c75c61f1 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -265,6 +265,8 @@ AMIKOO_SKILLS=$AMIKOO/skills AMIKOO_GCVISIONAPI=$AMIKOO/gc/visionapi AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gc/translationapi +AMIKOO_AMAZONALEXA=$AMIKOO/amazon/alexa + # ============================================================================= # Functions # ============================================================================= From 96ca59016e98eae968a0ccb58264f38765d15762 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:47:41 -0600 Subject: [PATCH 1434/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index dca2aa19..ba0f2470 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -133,7 +133,7 @@ homeassistant: friendly_name: Video icon: mdi:file-video - # Amikoo Maya Lands :: Expertise + # Amikoo Maya Lands :: Expertise :: Google Cloud script.amikoogcvisionapi: friendly_name: Google Vision API @@ -142,6 +142,12 @@ homeassistant: friendly_name: Google Translation API icon: mdi:google-translate + # Amikoo Maya Lands :: Expertise :: Amazon + + switch.amikooamazonalexa: + friendly_name: Amazon Alexa + icon: mdi:amazon + # Amikoo Maya Lands :: Knowledge script.sphero: @@ -1153,7 +1159,13 @@ switch: language: command_on: "~/CodeLabs/Hochob/Services/Language/Language.sh spanish &" command_off: "~/CodeLabs/Hochob/Services/Language/Language.sh english &" - + + # Robot Maya Lands :: Expertise :: Amazon + + amikooamazonalexa: + command_on: "~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa start &" + command_off: "~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa stop" + # Media Maya Lands: Corporate aak: @@ -1695,6 +1707,7 @@ group: entities: - script.amikoogcvisionapi - script.amikoogctranslationapi + - switch.amikooamazonalexa # Amikoo Maya Lands: Applications From 30261e239fee7daf043e75574186d040600edb45 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:50:13 -0600 Subject: [PATCH 1435/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index ba0f2470..d9847ebc 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1070,8 +1070,8 @@ shell_command: # Amikoo Maya Lands: Expertise - amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gcvisionapi 1 - amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/Amikoo.sh gctranslationapi 1 + amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh gcvisionapi 1 + amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh gctranslationapi 1 # Amikoo Maya Lands :: Knowledge From 06564420df0a59e69890ab3a813f02e637a36a2d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:50:38 -0600 Subject: [PATCH 1436/1653] Update Signed-off-by: Abraham Arce --- .../Services/Amikoo/Remote/AmikooExpertise.sh | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100755 Hochob/Services/Amikoo/Remote/AmikooExpertise.sh diff --git a/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh b/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh new file mode 100755 index 00000000..94eb57f1 --- /dev/null +++ b/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh @@ -0,0 +1,75 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export AMIKOO_PID=$$ + +LOCAL_COMMAND="$1" +LOCAL_MESSAGE="" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +i=0 +for var in "$@" +do + if [ "$i" -ne 0 ]; then + LOCAL_MESSAGE=$LOCAL_MESSAGE"$var" + echo $LOCAL_MESSAGE + fi + i=`expr $i + 1` +done + +echo $LOCAL_MESSAGE + +# Skills Advanced + +if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then + Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" +elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then + Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" +fi + +# Movement + +Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE + +exit 0 + +# Sandbox + +LOCAL_DEMO=`Demo.sh` +if [ "$LOCAL_DEMO" -eq "1" ]; then + if [ "$LOCAL_MESSAGE" != "1" ] + then + Espeak.sh on spanish "$LOCAL_MESSAGE" + fi +else + Mosquitto.sh $LOCAL_COMMAND "$LOCAL_MESSAGE" +fi + +if [ "$LOCAL_COMMAND" = "lupe/message" ]; then + LOCAL_LANGUAGE=`Language.sh` + if [ "$LOCAL_LANGUAGE" = "english" ]; then + AmikooVoice.sh $LOCAL_LANGUAGE $LOCAL_MESSAGE + else + AmikooVoice.sh $LOCAL_LANGUAGE $LOCAL_MESSAGE + fi +else + Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE +fi + +# End of File From 380e6c634992a27c00a75d30ca20effaec276c4c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:54:00 -0600 Subject: [PATCH 1437/1653] Update AmikooExpertise.sh --- .../Services/Amikoo/Remote/AmikooExpertise.sh | 47 ++----------------- 1 file changed, 3 insertions(+), 44 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh b/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh index 94eb57f1..695410c2 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh @@ -11,7 +11,7 @@ set -x export AMIKOO_PID=$$ LOCAL_COMMAND="$1" -LOCAL_MESSAGE="" +LOCAL_MESSAGE="$2" # ============================================================================= # Functions @@ -23,53 +23,12 @@ LOCAL_MESSAGE="" # Main # ============================================================================= -i=0 -for var in "$@" -do - if [ "$i" -ne 0 ]; then - LOCAL_MESSAGE=$LOCAL_MESSAGE"$var" - echo $LOCAL_MESSAGE - fi - i=`expr $i + 1` -done - -echo $LOCAL_MESSAGE - -# Skills Advanced - if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then Mosquitto.sh $AMIKOO_GCVISIONAPI "Google Cloud Vision API" elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" -fi - -# Movement - -Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE - -exit 0 - -# Sandbox - -LOCAL_DEMO=`Demo.sh` -if [ "$LOCAL_DEMO" -eq "1" ]; then - if [ "$LOCAL_MESSAGE" != "1" ] - then - Espeak.sh on spanish "$LOCAL_MESSAGE" - fi -else - Mosquitto.sh $LOCAL_COMMAND "$LOCAL_MESSAGE" -fi - -if [ "$LOCAL_COMMAND" = "lupe/message" ]; then - LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then - AmikooVoice.sh $LOCAL_LANGUAGE $LOCAL_MESSAGE - else - AmikooVoice.sh $LOCAL_LANGUAGE $LOCAL_MESSAGE - fi -else - Mosquitto.sh $LOCAL_COMMAND $LOCAL_MESSAGE +elif [ "$LOCAL_COMMAND" = "amazonalexa" ]; then + Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI $LOCAL_MESSAGE fi # End of File From 056237863ff9ae5403ad8fe453208e3d79e65aab Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:55:42 -0600 Subject: [PATCH 1438/1653] Update AmikooExpertise.sh --- Hochob/Services/Amikoo/Remote/AmikooExpertise.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh b/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh index 695410c2..555e8e5b 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh @@ -8,7 +8,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export AMIKOO_PID=$$ +export AMIKOOEXPERTISE_PID=$$ LOCAL_COMMAND="$1" LOCAL_MESSAGE="$2" @@ -28,7 +28,7 @@ if [ "$LOCAL_COMMAND" = "gcvisionapi" ]; then elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" elif [ "$LOCAL_COMMAND" = "amazonalexa" ]; then - Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI $LOCAL_MESSAGE + Mosquitto.sh $AMIKOO_AMAZONALEXA $LOCAL_MESSAGE fi # End of File From 489bdaacd70e6438d3f1a04e4bf41fef5e4f7367 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 6 Dec 2017 22:58:27 -0600 Subject: [PATCH 1439/1653] Update DoNotForget.sh --- Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh index d63ec111..ddebfcf1 100755 --- a/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh +++ b/Hochob/Applications/CalendarMayaLands/PhotoBooth/DoNotForget.sh @@ -34,7 +34,7 @@ LogPid.sh $DONOTFORGET_PID $DONOTFORGET_NAME chooseLanguage -AmikooCommunication.sh "Navidad" "Image" "Random" +AmikooCommunication.sh "Navidad" "Image" "PhotoBoothFirst.jpg" if [ "$LOCAL_LANGUAGE" = "english" ]; then AmikooVoice.sh $LOCAL_LANGUAGE \ "Do not forget our christmas photo booth at the classroom of the future, check your email for more information" From b7c252e1d5f96712f34aa0c06da0ef18b8971863 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 8 Dec 2017 15:53:43 -0600 Subject: [PATCH 1440/1653] Create IslasMarias.sh --- .../NorthernMayaLowlands/IslasMarias.sh | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh new file mode 100644 index 00000000..813c4999 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -0,0 +1,99 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export ISLASMARIAS_PID=$$ +export ISLASMARIAS_NAME="IslasMarias" +export ISLASMARIAS_PATH=$(readlink -f "$0") +export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_DEVICE="Eek'" +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` + +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + Puedes decirme que aportaron los Mayas a la tecnología? \ + Uno, Las pirámides. \ + Dos, El cero. \ + Tres, El calendario. \ + Cuatro, El chocolate. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 + +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + Quiénes son los fundadores de Intel? \ + " +StreamText.sh $LOCAL_DEVICE english robot \ + " + Uno, Robert Noyce, Gordon Moore. \ + Dos, Steve Allen. \ + Tres, Elon Musk. \ + Cuatro, Larry Page and Sergey Brin. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 + +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + Cuántos ingenieros erán cuando empezó Intel Guadalajara? + Uno, 60. \ + Dos, 34. \ + Tres, 1200. \ + Cuatro, 15. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 + +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + El microprocesador es el cerebro de la computadora? Sí o no? + " +SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes + +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? + " +SurveyYesNo.sh $LOCAL_DEVICE spanish robot no + +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + Podemos encontrar el microprocesador en? + Uno, Accesorios para las personas. \ + Dos, En la tierra. \ + Tres, En el espacio. \ + Cuatro, En todos los anteriores. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 + +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + En el sistema binario, el cero significa? + Uno, Encendido. \ + Dos, Apagado. \ + Tres, Nada. \ + Cuatro, Todo. + " +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 + +StreamText.sh $LOCAL_DEVICE spanish robot \ + " + Eso es todo. Muchas gracias por tu participacion. + " +# End of File From 02d0264a9657a7468c97d49d85b55c50dccb513b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 09:38:46 -0600 Subject: [PATCH 1441/1653] Update Main.sh --- Hochob/Main.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index c75c61f1..fdb903fe 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -103,6 +103,10 @@ export HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADIT export HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION/DiaDeMuertos export HOCHOB_SERVER_MEDIA_TRADITION_NAVIDAD=$HOCHOB_SERVER_MEDIA_TRADITION/Navidad +export HOCHOB_SERVER_MEDIA_GAMES=$HOCHOB_SERVER_MEDIA/Tradition/ +export HOCHOB_SERVER_MEDIA_GAMES_LOTERIA=$HOCHOB_SERVER_MEDIA_GAMES/Loteria +export HOCHOB_SERVER_MEDIA_GAMES_CARASYGESTOS=$HOCHOB_SERVER_MEDIA_GAMES/CarasYGestos + export HOCHOB_SERVER_MEDIA_VISITORS=$HOCHOB_SERVER_MEDIA/Visitors/ # ----------------------------- # @@ -124,6 +128,9 @@ export TRADITION_VISITORS_CENTER=$HOCHOB_SERVER_MEDIA_TRADITION_VISITORS_CENTER export TRADITION_DIADEMUERTOS=$HOCHOB_SERVER_MEDIA_TRADITION_DIADEMUERTOS export TRADITION_NAVIDAD=$HOCHOB_SERVER_MEDIA_TRADITION_NAVIDAD +export GAMES_LOTERIA=$HOCHOB_SERVER_MEDIA_GAMES_LOTERIA +export GAMES_CARASYGESTOS=$HOCHOB_SERVER_MEDIA_GAMES_CARASYGESTOS + export VISITORS=$HOCHOB_SERVER_MEDIA_VISITORS # -------------------------- # From ecfac177b9e17916a9177b6b03bdfb7eb2c4ca6c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 09:42:50 -0600 Subject: [PATCH 1442/1653] Create CarasYGestos.sh --- .../Games/CarasYGestos/CarasYGestos.sh | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 Hochob/Services/Games/CarasYGestos/CarasYGestos.sh diff --git a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh new file mode 100644 index 00000000..240d1aab --- /dev/null +++ b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export CARASYGESTOS_PID=$$ +export CARASYGESTOS_PATH=$(readlink -f "$0") +export CARASYGESTOS_BASEDIR=$(dirname "$SCRIPT") +export CARASYGESTOS_BASEDIR="$( cd "$(dirname "$0")" ; pwd -P )" + +LOCAL_GAME="CarasYGestos" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LOCAL_IMAGE=`find $GAMES_CARASYGESTOS/Images/ -type f | shuf -n 1` +AmikooCommunication.sh "$LOCAL_GAME" "Image" "$LOCAL_IMAGE" + +# End of File From f7642c9e1883d36166752c4826b444319c142177 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 09:45:17 -0600 Subject: [PATCH 1443/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index d9847ebc..da8ecbbd 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -530,6 +530,10 @@ homeassistant: friendly_name: Loteria icon: mdi:gamepad-variant + script.carasygestos: + friendly_name: Caras Y Gestos + icon: mdi:gamepad-variant + # Intel Experience Day script.iedone: @@ -970,6 +974,10 @@ script: sequence: - service: shell_command.loteria + carasygestos: + sequence: + - service: shell_command.carasygestos + # Intel Experience Day iedone: @@ -1140,6 +1148,7 @@ shell_command: # Games loteria: ~/CodeLabs/Hochob/Services/Games/Loteria/Loteria.sh + carasygestos: ~/CodeLabs/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh # Intel Experience Day @@ -2050,6 +2059,7 @@ group: name: Mexicanos entities: - script.loteria + - script.carasygestos # Intel Experience Day From 55394732ef99e9939fe4a24de700fd503b1ddf63 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 09:46:02 -0600 Subject: [PATCH 1444/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Games/CarasYGestos/CarasYGestos.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Games/CarasYGestos/CarasYGestos.sh diff --git a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh old mode 100644 new mode 100755 From 4920c1506d7a5220f0f16550b4248d7f43aa69e6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 09:51:07 -0600 Subject: [PATCH 1445/1653] Update CarasYGestos.sh --- Hochob/Services/Games/CarasYGestos/CarasYGestos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh index 240d1aab..e576895b 100755 --- a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh +++ b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh @@ -26,6 +26,7 @@ LOCAL_GAME="CarasYGestos" # ============================================================================= LOCAL_IMAGE=`find $GAMES_CARASYGESTOS/Images/ -type f | shuf -n 1` +LOCAL_IMAGE=`echo $LOCAL_IMAGE | rev | cut -d'/' -f-3 | rev` AmikooCommunication.sh "$LOCAL_GAME" "Image" "$LOCAL_IMAGE" # End of File From 75fcf8f5f6fb13e84e25ee2afc6a50199ad8bd76 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 09:51:37 -0600 Subject: [PATCH 1446/1653] Update CarasYGestos.sh --- Hochob/Services/Games/CarasYGestos/CarasYGestos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh index e576895b..f48b5ca8 100755 --- a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh +++ b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh @@ -26,7 +26,7 @@ LOCAL_GAME="CarasYGestos" # ============================================================================= LOCAL_IMAGE=`find $GAMES_CARASYGESTOS/Images/ -type f | shuf -n 1` -LOCAL_IMAGE=`echo $LOCAL_IMAGE | rev | cut -d'/' -f-3 | rev` +LOCAL_IMAGE=`echo $LOCAL_IMAGE | rev | cut -d'/' -f-5 | rev` AmikooCommunication.sh "$LOCAL_GAME" "Image" "$LOCAL_IMAGE" # End of File From 3622cf6855efa68e5385b06861dab3742c73696e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 09:51:58 -0600 Subject: [PATCH 1447/1653] Update CarasYGestos.sh --- Hochob/Services/Games/CarasYGestos/CarasYGestos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh index f48b5ca8..18cd7511 100755 --- a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh +++ b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh @@ -26,7 +26,7 @@ LOCAL_GAME="CarasYGestos" # ============================================================================= LOCAL_IMAGE=`find $GAMES_CARASYGESTOS/Images/ -type f | shuf -n 1` -LOCAL_IMAGE=`echo $LOCAL_IMAGE | rev | cut -d'/' -f-5 | rev` +LOCAL_IMAGE=`echo $LOCAL_IMAGE | rev | cut -d'/' -f-1 | rev` AmikooCommunication.sh "$LOCAL_GAME" "Image" "$LOCAL_IMAGE" # End of File From a4ef13c7716727a5c17ded6e7198b07ead94feaa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 09:54:28 -0600 Subject: [PATCH 1448/1653] Update CarasYGestos.sh --- Hochob/Services/Games/CarasYGestos/CarasYGestos.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh index 18cd7511..91d0040e 100755 --- a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh +++ b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh @@ -27,6 +27,9 @@ LOCAL_GAME="CarasYGestos" LOCAL_IMAGE=`find $GAMES_CARASYGESTOS/Images/ -type f | shuf -n 1` LOCAL_IMAGE=`echo $LOCAL_IMAGE | rev | cut -d'/' -f-1 | rev` + AmikooCommunication.sh "$LOCAL_GAME" "Image" "$LOCAL_IMAGE" +AmikooCommunication.sh "$LOCAL_GAME" "Image" "Stop" + # End of File From 6db6e7eb166cfe633367ffa52ec37c47318c91bf Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 19:54:14 -0600 Subject: [PATCH 1449/1653] Update CarasYGestos.sh --- Hochob/Services/Games/CarasYGestos/CarasYGestos.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh index 91d0040e..4a9db8cb 100755 --- a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh +++ b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh @@ -30,6 +30,4 @@ LOCAL_IMAGE=`echo $LOCAL_IMAGE | rev | cut -d'/' -f-1 | rev` AmikooCommunication.sh "$LOCAL_GAME" "Image" "$LOCAL_IMAGE" -AmikooCommunication.sh "$LOCAL_GAME" "Image" "Stop" - # End of File From e96dd169e5ed70b184f0d09030ad292107bc2b25 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 20:12:54 -0600 Subject: [PATCH 1450/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index da8ecbbd..9f551a3f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -526,8 +526,8 @@ homeassistant: # Games - script.loteria: - friendly_name: Loteria + script.loteriamexicana: + friendly_name: Loteria Mexicana icon: mdi:gamepad-variant script.carasygestos: @@ -970,9 +970,9 @@ script: # Games - loteria: + loteriamexicana: sequence: - - service: shell_command.loteria + - service: shell_command.loteriamexicana carasygestos: sequence: @@ -1147,7 +1147,7 @@ shell_command: # Games - loteria: ~/CodeLabs/Hochob/Services/Games/Loteria/Loteria.sh + loteriamexicana: ~/CodeLabs/Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.sh carasygestos: ~/CodeLabs/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh # Intel Experience Day @@ -1639,7 +1639,8 @@ group: view: yes name: Juegos entities: - - group.games + - group.gamesloteria + - group.gamescarasygestos intelexperiencedaylands: view: yes @@ -2055,10 +2056,14 @@ group: entities: - script.visitorsusb - games: - name: Mexicanos + gamesloteria: + name: Loteria + entities: + - script.loteriamexicana + + gamescarasygestos: + name: Caras Y Gestos entities: - - script.loteria - script.carasygestos # Intel Experience Day From 4d74cb7ede3eaa854d584e3c9b49b8dd846b9578 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 20:14:04 -0600 Subject: [PATCH 1451/1653] Update Signed-off-by: Abraham Arce --- .../Services/Games/{Loteria => LoteriaMexicana}/LasCartas.txt | 0 .../Games/{Loteria => LoteriaMexicana}/LasCartasSimple.txt | 0 .../{Loteria/Loteria.py => LoteriaMexicana/LoteriaMexicana.py} | 0 .../{Loteria/Loteria.sh => LoteriaMexicana/LoteriaMexicana.sh} | 2 +- 4 files changed, 1 insertion(+), 1 deletion(-) rename Hochob/Services/Games/{Loteria => LoteriaMexicana}/LasCartas.txt (100%) rename Hochob/Services/Games/{Loteria => LoteriaMexicana}/LasCartasSimple.txt (100%) rename Hochob/Services/Games/{Loteria/Loteria.py => LoteriaMexicana/LoteriaMexicana.py} (100%) rename Hochob/Services/Games/{Loteria/Loteria.sh => LoteriaMexicana/LoteriaMexicana.sh} (96%) diff --git a/Hochob/Services/Games/Loteria/LasCartas.txt b/Hochob/Services/Games/LoteriaMexicana/LasCartas.txt similarity index 100% rename from Hochob/Services/Games/Loteria/LasCartas.txt rename to Hochob/Services/Games/LoteriaMexicana/LasCartas.txt diff --git a/Hochob/Services/Games/Loteria/LasCartasSimple.txt b/Hochob/Services/Games/LoteriaMexicana/LasCartasSimple.txt similarity index 100% rename from Hochob/Services/Games/Loteria/LasCartasSimple.txt rename to Hochob/Services/Games/LoteriaMexicana/LasCartasSimple.txt diff --git a/Hochob/Services/Games/Loteria/Loteria.py b/Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.py similarity index 100% rename from Hochob/Services/Games/Loteria/Loteria.py rename to Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.py diff --git a/Hochob/Services/Games/Loteria/Loteria.sh b/Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.sh similarity index 96% rename from Hochob/Services/Games/Loteria/Loteria.sh rename to Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.sh index 2fa84d92..22b293a5 100755 --- a/Hochob/Services/Games/Loteria/Loteria.sh +++ b/Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.sh @@ -24,6 +24,6 @@ export LOTERIA_BASEDIR="$( cd "$(dirname "$0")" ; pwd -P )" # ============================================================================= cd $LOTERIA_BASEDIR -python Loteria.py +python LoteriaMexicana.py # End of File From bad7a068952a9e1081cc2d609b48eb9b315d0ac6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 20:26:16 -0600 Subject: [PATCH 1452/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 9f551a3f..0706244f 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -531,7 +531,7 @@ homeassistant: icon: mdi:gamepad-variant script.carasygestos: - friendly_name: Caras Y Gestos + friendly_name: Carta Aleatoria icon: mdi:gamepad-variant # Intel Experience Day From 87f5c8568d5c4911bc264753c4a003f5d18bbf01 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 10 Dec 2017 21:04:22 -0600 Subject: [PATCH 1453/1653] Update LoteriaMexicana.py --- Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.py b/Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.py index 2c321899..3573c771 100755 --- a/Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.py +++ b/Hochob/Services/Games/LoteriaMexicana/LoteriaMexicana.py @@ -21,7 +21,7 @@ image = unicode(image,'utf-8') image = unicodedata.normalize('NFKD', image).encode('ASCII', 'ignore') print image - os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/tradition/image -m Loteria' + '/' + image) + os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/tradition/image -m LoteriaMexicana' + '/' + image) os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') time.sleep(5) f.close() From f1e40e95b106f2d8d6a144c84dedc7cde55c0a35 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 09:18:52 -0600 Subject: [PATCH 1454/1653] Update IslasMarias.sh --- .../NorthernMayaLowlands/IslasMarias.sh | 71 ------------------- 1 file changed, 71 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 813c4999..dd8963f0 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -23,77 +23,6 @@ export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") # Main # ============================================================================= -LOCAL_DEVICE="Eek'" -LOCAL_INSTITUTION=`Name.sh` -LOCAL_LANGUAGE=`Language.sh` -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Puedes decirme que aportaron los Mayas a la tecnología? \ - Uno, Las pirámides. \ - Dos, El cero. \ - Tres, El calendario. \ - Cuatro, El chocolate. \ - " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Quiénes son los fundadores de Intel? \ - " -StreamText.sh $LOCAL_DEVICE english robot \ - " - Uno, Robert Noyce, Gordon Moore. \ - Dos, Steve Allen. \ - Tres, Elon Musk. \ - Cuatro, Larry Page and Sergey Brin. \ - " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Cuántos ingenieros erán cuando empezó Intel Guadalajara? - Uno, 60. \ - Dos, 34. \ - Tres, 1200. \ - Cuatro, 15. - " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - El microprocesador es el cerebro de la computadora? Sí o no? - " -SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? - " -SurveyYesNo.sh $LOCAL_DEVICE spanish robot no - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Podemos encontrar el microprocesador en? - Uno, Accesorios para las personas. \ - Dos, En la tierra. \ - Tres, En el espacio. \ - Cuatro, En todos los anteriores. - " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - En el sistema binario, el cero significa? - Uno, Encendido. \ - Dos, Apagado. \ - Tres, Nada. \ - Cuatro, Todo. - " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Eso es todo. Muchas gracias por tu participacion. - " # End of File From 53bbb403ea252513f54bfc3c7367f485ae0708e0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 09:58:23 -0600 Subject: [PATCH 1455/1653] Update IslasMarias.sh --- .../NorthernMayaLowlands/IslasMarias.sh | 29 +++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index dd8963f0..67d26dab 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -x @@ -13,16 +13,41 @@ export ISLASMARIAS_NAME="IslasMarias" export ISLASMARIAS_PATH=$(readlink -f "$0") export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") +LOCAL_LANGUAGE="spanish" + +LOCAL_QUESTION_SPANISH[0]="Cual fue la aportación de los Mayas?" +LOCAL_QUESTION_SPANISH[1]="Cual es sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" +LOCAL_QUESTION_SPANISH[2]="Con cuantas personas empezó Intel en Gdl?" +LOCAL_QUESTION_SPANISH[3]="Que es lo que hace Intel? +LOCAL_QUESTION_SPANISH[4]="Que otras cosas hace Intel?" +LOCAL_QUESTION_SPANISH[5]="Elemento para la elaboración de los microprocesadores?" +LOCAL_QUESTION_SPANISH[6]="Cuantas veces es más estéril un lab de Intel que un quirófano?" +LOCAL_QUESTION_SPANISH[7]="Como se le llama al atuendo, ropa, traje, que utilizan los ingenieros en los labs?" +LOCAL_QUESTION_SPANISH[8]="Porque creen que es importante la tecnología en estos tiempos?" +LOCAL_QUESTION_SPANISH[9]="Que es la inteligencia artificial?" +LOCAL_QUESTION_SPANISH[10]="En qué áreas creen que la tecnología podría aportar algo y porque?" + # ============================================================================= # Functions # ============================================================================= -# None +chooseQuestion() +{ + LANGUAGE=$1 + rand=$[ $RANDOM % 6 ] + if [ "$LANGUAGE" = "english" ]; then + LOCAL_QUESTION=${LOCAL_QUESTION_ENGLISH[$rand]} + else + LOCAL_QUESTION=${LOCAL_QUESTION_SPANISH[$rand]} + fi +} # ============================================================================= # Main # ============================================================================= +chooseQuestion $LOCAL_LANGUAGE +AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" # End of File From 9752c61fc84cece6478000bcf847ef2a9ebef546 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 13:11:22 -0600 Subject: [PATCH 1456/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0706244f..87cc1f56 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -218,8 +218,12 @@ homeassistant: friendly_name: 4. Los Muones icon: mdi:audiobook + script.islasmarias: + friendly_name: 5. Islas Marías + icon: mdi:audiobook + script.mapimi: - friendly_name: 5. Hasta Pronto + friendly_name: 6. Hasta Pronto icon: mdi:audiobook script.siankaan: @@ -852,6 +856,10 @@ script: sequence: - service: shell_command.mapimi + islasmarias: + sequence: + - service: shell_command.islasmarias + siankaan: sequence: - service: shell_command.siankaan @@ -1033,6 +1041,7 @@ shell_command: lamichilia: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & elcielo: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & + islasmarias: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh & siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh & calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh & @@ -1817,6 +1826,7 @@ group: - script.lamichilia - script.elcielo - script.mapimi + - script.islasmarias # Northern Maya Highlands: Stations From 95ea152c3263f5357be23531f775f6ea9aa1b2f1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 13:12:39 -0600 Subject: [PATCH 1457/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 87cc1f56..04b4f5b6 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -852,14 +852,14 @@ script: sequence: - service: shell_command.elcielo - mapimi: - sequence: - - service: shell_command.mapimi - islasmarias: sequence: - service: shell_command.islasmarias + mapimi: + sequence: + - service: shell_command.mapimi + siankaan: sequence: - service: shell_command.siankaan @@ -1040,8 +1040,8 @@ shell_command: ojodeliebre: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & lamichilia: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & elcielo: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & - mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & islasmarias: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh & + mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh & calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh & @@ -1825,8 +1825,8 @@ group: - script.ojodeliebre - script.lamichilia - script.elcielo - - script.mapimi - script.islasmarias + - script.mapimi # Northern Maya Highlands: Stations From e514e891d132b65668d16a447853377800db8654 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 13:14:42 -0600 Subject: [PATCH 1458/1653] Update SianKaan.sh --- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index a741baf9..f38697a9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -34,14 +34,12 @@ else "Por escribirse, ${LOCAL_INSTITUTION}" fi -#Stream.sh "Eek'" "1.0" "$SPEECH_MP3" - Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & Amikoo.sh amikoo/headright 1 -sleep .6 +sleep .75 Amikoo.sh amikoo/headleft 1 -sleep .6 +sleep .75 #kill -- -$(ps -o pgid=$SIANKAAN_PID | grep -o '[0-9]*') From f6ecab1aa25e6005b1f3eb75b68c5de67db09f8f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 15:12:22 -0600 Subject: [PATCH 1459/1653] Update --- Hochob/Services/Games/CarasYGestos/CarasYGestos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh index 4a9db8cb..a09d72d7 100755 --- a/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh +++ b/Hochob/Services/Games/CarasYGestos/CarasYGestos.sh @@ -25,7 +25,7 @@ LOCAL_GAME="CarasYGestos" # Main # ============================================================================= -LOCAL_IMAGE=`find $GAMES_CARASYGESTOS/Images/ -type f | shuf -n 1` +LOCAL_IMAGE=`find $GAMES_CARASYGESTOS/Image/ -type f | shuf -n 1` LOCAL_IMAGE=`echo $LOCAL_IMAGE | rev | cut -d'/' -f-1 | rev` AmikooCommunication.sh "$LOCAL_GAME" "Image" "$LOCAL_IMAGE" From 0993f250283430defea91883ab18494876ae0794 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 17:34:11 -0600 Subject: [PATCH 1460/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 04b4f5b6..be1a9841 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1182,7 +1182,7 @@ switch: amikooamazonalexa: command_on: "~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa start &" - command_off: "~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa stop" + command_off: "~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa stop &" # Media Maya Lands: Corporate From becb449678b9a82b420c7007ca5030de6bfe8ca3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 17:52:25 -0600 Subject: [PATCH 1461/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 31 +++++++++++++++++-- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index be1a9841..0e919f4a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -148,6 +148,14 @@ homeassistant: friendly_name: Amazon Alexa icon: mdi:amazon + switch.amikooamazonalexastart: + friendly_name: Amazon Alexa Start + icon: mdi:amazon + + switch.amikooamazonalexastop: + friendly_name: Amazon Alexa Stop + icon: mdi:amazon + # Amikoo Maya Lands :: Knowledge script.sphero: @@ -219,7 +227,7 @@ homeassistant: icon: mdi:audiobook script.islasmarias: - friendly_name: 5. Islas Marías + friendly_name: 5. Preguntas Finales icon: mdi:audiobook script.mapimi: @@ -766,7 +774,7 @@ script: sequence: - service: shell_command.amikoocommunicationvideo - # Amikoo Maya Lands :: Expertise + # Amikoo Maya Lands :: Expertise :: Google Cloud amikoogcvisionapi: sequence: @@ -776,6 +784,16 @@ script: sequence: - service: shell_command.amikoogctranslationapi + # Amikoo Maya Lands :: Expertise :: Amazon Alexa + + amikooamazonalexastart: + sequence: + - service: shell_command.amikooamazonalexastart + + amikooamazonalexastop: + sequence: + - service: shell_command.amikooamazonalexastop + # Amikoo Maya Lands :: Knowledge sphero: @@ -1085,11 +1103,16 @@ shell_command: amikoocommunicationimage: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Image Random amikoocommunicationvideo: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooCommunication.sh Amikoo Video Random - # Amikoo Maya Lands: Expertise + # Amikoo Maya Lands :: Expertise :: Google Cloud amikoogcvisionapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh gcvisionapi 1 amikoogctranslationapi: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh gctranslationapi 1 + # Amikoo Maya Lands :: Expertise :: Amazon Alexa + + amikooamazonalexastart: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa start + amikooamazonalexastop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa stop + # Amikoo Maya Lands :: Knowledge sphero: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Sphero.sh & @@ -1727,6 +1750,8 @@ group: - script.amikoogcvisionapi - script.amikoogctranslationapi - switch.amikooamazonalexa + - script.amikooamazonalexastart + - script.amikooamazonalexastop # Amikoo Maya Lands: Applications From eeb1d0469c547579fa0e2023470465213b14692c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 20:41:43 -0600 Subject: [PATCH 1462/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 501771a3..7e7efbe7 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -48,6 +48,7 @@ sudo apt install vlc # Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee +sudo apt install festival festvox-ellpc11k # Hochob Server Services Stream sudo apt install ffmpeg From ef04a4c80b83d3367dc4c539cf7ea355f526ad7e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 21:32:21 -0600 Subject: [PATCH 1463/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 7e7efbe7..98b53763 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -48,7 +48,7 @@ sudo apt install vlc # Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee -sudo apt install festival festvox-ellpc11k +sudo apt install festival festival-doc festvox-kdlpc16k festvox-ellpc11k # Hochob Server Services Stream sudo apt install ffmpeg From 1c155ba74faa8fdb376c64b0ad8054dbbbaf9239 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 21:57:35 -0600 Subject: [PATCH 1464/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 98b53763..19940493 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -49,6 +49,7 @@ sudo apt install vlc # Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee sudo apt install festival festival-doc festvox-kdlpc16k festvox-ellpc11k +sudo apt-get install libttspico0 libttspico-utils libttspico-data # Hochob Server Services Stream sudo apt install ffmpeg From 0c0c1ebe50c50d1c0f783159e5a4e96ef6bbc0fa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:06:18 -0600 Subject: [PATCH 1465/1653] Update Main.sh --- Hochob/Main.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index fdb903fe..1630e2d7 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -160,6 +160,11 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ALLFILES=$HOCHO export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.mp3 +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Pico2Wave/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/*.* +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.mp3 + export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/VoiceRss/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS/*.* export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS/VoiceRssSpeech.wav @@ -196,6 +201,11 @@ export ESPEAK_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEA export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 +export PICO2WAVE_DIRECTORY=HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE +export PICO2WAVE_ALLFILES=HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_ALLFILES +export PICO2WAVE_SPEECH=HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH +export PICO2WAVE_SPEECH_MP3=HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3 + export VOICERSS_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS export VOICERSS_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_ALLFILES export VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH From 24109c1a413303803e7b426cc32bc252e5d2fec0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:08:57 -0600 Subject: [PATCH 1466/1653] Create Pico2Wave.sh --- .../Sound/SpeechSynthetizer/Pico2Wave.sh | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Hochob/Services/Sound/SpeechSynthetizer/Pico2Wave.sh diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Pico2Wave.sh b/Hochob/Services/Sound/SpeechSynthetizer/Pico2Wave.sh new file mode 100644 index 00000000..9dd1daca --- /dev/null +++ b/Hochob/Services/Sound/SpeechSynthetizer/Pico2Wave.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export PICO2WAVE_PID=$$ +export PICO2WAVE_BINARY=pico2wave +export PICO2WAVE_WAVE="-w=" +export PICO2WAVE_LANGUAGE="-l en-US" +export PICO2WAVE_INPUT="No input has been provided" +export PICO2WAVE_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE +export PICO2WAVE_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH + +LOCAL_LANGUAGE="$1" +LOCAL_TEXT="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + if [ "$LOCAL_LANGUAGE" = "english" ]; then + export PICO2WAVE_LANGUAGE="-l en-US" + elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + export PICO2WAVE_LANGUAGE="-l es-ES" + fi + + export PICO2WAVE_INPUT="$LOCAL_TEXT" + + $PICO2WAVE_BINARY $PICO2WAVE_WAVE$PICO2WAVE_SPEECH $PICO2WAVE_LANGUAGE "$PICO2WAVE_INPUT" + + ffmpeg -y -i $PICO2WAVE_SPEECH $PICO2WAVE_SPEECH_MP3 + + cp $PICO2WAVE_SPEECH $SPEECH + cp $PICO2WAVE_SPEECH_MP3 $SPEECH_MP3 + +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From 8b95df1b0364b998de9f89e04525bb44f6ccd323 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:11:24 -0600 Subject: [PATCH 1467/1653] Update Main.sh --- Hochob/Main.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 1630e2d7..03e4e234 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -160,16 +160,16 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_ALLFILES=$HOCHO export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK/EspeakSpeech.mp3 -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Pico2Wave/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/*.* -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.wav -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.mp3 - export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/VoiceRss/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS/*.* export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS/VoiceRssSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS/VoiceRssSpeech.mp3 +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Pico2Wave/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/*.* +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.mp3 + export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/*.mp4 @@ -201,16 +201,16 @@ export ESPEAK_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEA export ESPEAK_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH export ESPEAK_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK_SPEECH_MP3 -export PICO2WAVE_DIRECTORY=HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE -export PICO2WAVE_ALLFILES=HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_ALLFILES -export PICO2WAVE_SPEECH=HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH -export PICO2WAVE_SPEECH_MP3=HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3 - export VOICERSS_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS export VOICERSS_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_ALLFILES export VOICERSS_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH export VOICERSS_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS_SPEECH_MP3 +export PICO2WAVE_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE +export PICO2WAVE_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_ALLFILES +export PICO2WAVE_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH +export PICO2WAVE_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3 + export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES export FFMPEG_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_CAMERA From 9b30436e18befb828a85dd616394445eaa36d3b4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:14:24 -0600 Subject: [PATCH 1468/1653] Update SpeechSynthetizer.sh --- Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh index 08be9265..a83cc211 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -31,6 +31,8 @@ if [ $# -eq 4 ]; then Espeak.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" elif [ "$LOCAL_ENGINE" = "voicerss" ]; then VoiceRss.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" + elif [ "$LOCAL_ENGINE" = "pico2wave" ]; then + Pico2Wave.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" fi if [ "$LOCAL_PLAY" = "on" ]; then From 6faee175a45f0e94b6ff450d8c7d9262c1fc4529 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:17:26 -0600 Subject: [PATCH 1469/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 67d26dab..6d43bc3a 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -48,6 +48,7 @@ chooseQuestion() chooseQuestion $LOCAL_LANGUAGE -AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" +SpeechSynthetizer.sh off espeak spanish "${LOCAL_QUESTION}" +#AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" # End of File From d45b9d6e73a4c24991a7abaa618bedaa6f71d4ac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:18:09 -0600 Subject: [PATCH 1470/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 6d43bc3a..09c61f2d 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -18,7 +18,7 @@ LOCAL_LANGUAGE="spanish" LOCAL_QUESTION_SPANISH[0]="Cual fue la aportación de los Mayas?" LOCAL_QUESTION_SPANISH[1]="Cual es sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" LOCAL_QUESTION_SPANISH[2]="Con cuantas personas empezó Intel en Gdl?" -LOCAL_QUESTION_SPANISH[3]="Que es lo que hace Intel? +LOCAL_QUESTION_SPANISH[3]="Que es lo que hace Intel?" LOCAL_QUESTION_SPANISH[4]="Que otras cosas hace Intel?" LOCAL_QUESTION_SPANISH[5]="Elemento para la elaboración de los microprocesadores?" LOCAL_QUESTION_SPANISH[6]="Cuantas veces es más estéril un lab de Intel que un quirófano?" From 5d4f43c979b0a6d7bfd8599707de53e34e388dcc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:18:28 -0600 Subject: [PATCH 1471/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 09c61f2d..1adc6f5a 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -48,7 +48,7 @@ chooseQuestion() chooseQuestion $LOCAL_LANGUAGE -SpeechSynthetizer.sh off espeak spanish "${LOCAL_QUESTION}" +SpeechSynthetizer.sh on espeak spanish "${LOCAL_QUESTION}" #AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" # End of File From ceb5a00f655497c2fb494564d045027760653028 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:18:49 -0600 Subject: [PATCH 1472/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 1adc6f5a..f1a62568 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -48,7 +48,7 @@ chooseQuestion() chooseQuestion $LOCAL_LANGUAGE -SpeechSynthetizer.sh on espeak spanish "${LOCAL_QUESTION}" +SpeechSynthetizer.sh on pico2wave spanish "${LOCAL_QUESTION}" #AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" # End of File From 9b06d2cce944eb359634f475def9e363e1aed32c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:24:31 -0600 Subject: [PATCH 1473/1653] Update IslasMarias.sh --- .../NorthernMayaLowlands/IslasMarias.sh | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index f1a62568..24d53687 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -15,17 +15,17 @@ export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") LOCAL_LANGUAGE="spanish" -LOCAL_QUESTION_SPANISH[0]="Cual fue la aportación de los Mayas?" -LOCAL_QUESTION_SPANISH[1]="Cual es sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" -LOCAL_QUESTION_SPANISH[2]="Con cuantas personas empezó Intel en Gdl?" -LOCAL_QUESTION_SPANISH[3]="Que es lo que hace Intel?" -LOCAL_QUESTION_SPANISH[4]="Que otras cosas hace Intel?" -LOCAL_QUESTION_SPANISH[5]="Elemento para la elaboración de los microprocesadores?" -LOCAL_QUESTION_SPANISH[6]="Cuantas veces es más estéril un lab de Intel que un quirófano?" -LOCAL_QUESTION_SPANISH[7]="Como se le llama al atuendo, ropa, traje, que utilizan los ingenieros en los labs?" -LOCAL_QUESTION_SPANISH[8]="Porque creen que es importante la tecnología en estos tiempos?" -LOCAL_QUESTION_SPANISH[9]="Que es la inteligencia artificial?" -LOCAL_QUESTION_SPANISH[10]="En qué áreas creen que la tecnología podría aportar algo y porque?" +LOCAL_QUESTION_SPANISH[0]="¿Cual fue la aportación de los Mayas?" +LOCAL_QUESTION_SPANISH[1]="¿Cual es sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" +LOCAL_QUESTION_SPANISH[2]="¿Con cuantas personas empezó Intel en Gdl?" +LOCAL_QUESTION_SPANISH[3]="¿Qué es lo que hace Intel?" +LOCAL_QUESTION_SPANISH[4]="¿Qué otras cosas hace Intel?" +LOCAL_QUESTION_SPANISH[5]="¿Elemento para la elaboración de los microprocesadores?" +LOCAL_QUESTION_SPANISH[6]="¿Cuantas veces es más estéril un lab de Intel que un quirófano?" +LOCAL_QUESTION_SPANISH[7]="¿Como se le llama al atuendo, ropa o traje, que utilizan los ingenieros en los labs?" +LOCAL_QUESTION_SPANISH[8]="¿Porque creen que es importante la tecnología en estos tiempos?" +LOCAL_QUESTION_SPANISH[9]="¿Qué es la inteligencia artificial?" +LOCAL_QUESTION_SPANISH[10]="¿En qué áreas creen que la tecnología podría aportar algo y porque?" # ============================================================================= # Functions @@ -48,7 +48,7 @@ chooseQuestion() chooseQuestion $LOCAL_LANGUAGE +AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" SpeechSynthetizer.sh on pico2wave spanish "${LOCAL_QUESTION}" -#AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" # End of File From 5c1a88e648a2bc5529436d1501ae7488d50ffee6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:25:20 -0600 Subject: [PATCH 1474/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 24d53687..8ac93441 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -48,7 +48,7 @@ chooseQuestion() chooseQuestion $LOCAL_LANGUAGE -AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" SpeechSynthetizer.sh on pico2wave spanish "${LOCAL_QUESTION}" +AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" # End of File From 4f7178ec21b1cb939592774362bb1ea0315111ee Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:26:19 -0600 Subject: [PATCH 1475/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 8ac93441..5634d810 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -16,7 +16,7 @@ export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") LOCAL_LANGUAGE="spanish" LOCAL_QUESTION_SPANISH[0]="¿Cual fue la aportación de los Mayas?" -LOCAL_QUESTION_SPANISH[1]="¿Cual es sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" +LOCAL_QUESTION_SPANISH[1]="¿Cual es el sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" LOCAL_QUESTION_SPANISH[2]="¿Con cuantas personas empezó Intel en Gdl?" LOCAL_QUESTION_SPANISH[3]="¿Qué es lo que hace Intel?" LOCAL_QUESTION_SPANISH[4]="¿Qué otras cosas hace Intel?" From 0980cfa152dd024616d44256346147bda5b9f0f8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 11 Dec 2017 22:26:40 -0600 Subject: [PATCH 1476/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 5634d810..68a37d20 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -17,7 +17,7 @@ LOCAL_LANGUAGE="spanish" LOCAL_QUESTION_SPANISH[0]="¿Cual fue la aportación de los Mayas?" LOCAL_QUESTION_SPANISH[1]="¿Cual es el sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" -LOCAL_QUESTION_SPANISH[2]="¿Con cuantas personas empezó Intel en Gdl?" +LOCAL_QUESTION_SPANISH[2]="¿Con cuantas personas empezó Intel en Guadalajara?" LOCAL_QUESTION_SPANISH[3]="¿Qué es lo que hace Intel?" LOCAL_QUESTION_SPANISH[4]="¿Qué otras cosas hace Intel?" LOCAL_QUESTION_SPANISH[5]="¿Elemento para la elaboración de los microprocesadores?" From 4e293ee1577cfd3cc026a9dd0a813195dd591109 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 08:37:09 -0600 Subject: [PATCH 1477/1653] Update --- Hochob/Main.sh | 1 + Hochob/Services/Sound/SpeechSynthetizer/Pico2Wave.sh | 0 2 files changed, 1 insertion(+) mode change 100644 => 100755 Hochob/Services/Sound/SpeechSynthetizer/Pico2Wave.sh diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 03e4e234..10a10ece 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -243,6 +243,7 @@ AMIKOO=amikoo ## Voice ## AMIKOO_HUMANVOICE=$AMIKOO/sound/speechsynthetizer +AMIKOO_TTS_ENGINE=$AMIKOO/sound/speechsynthetizer/engine AMIKOO_TALK=$AMIKOO_HUMANVOICE/say AMIKOO_HABLAR=$AMIKOO_HUMANVOICE/decir diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Pico2Wave.sh b/Hochob/Services/Sound/SpeechSynthetizer/Pico2Wave.sh old mode 100644 new mode 100755 From 9e04394f6fd844be86bee93b1b4ad2328e91e106 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 08:58:17 -0600 Subject: [PATCH 1478/1653] Update --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 5 +++-- .../Applications/NorthernMayaLowlands/IslasMarias.sh | 6 ++++-- .../Applications/NorthernMayaLowlands/LaMichilia.sh | 6 ++++-- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 5 +++-- .../Applications/NorthernMayaLowlands/MontesAzules.sh | 5 +++-- .../NorthernMayaLowlands/TiburonBallena.sh | 11 ++++++----- Hochob/Services/Stream/StreamText.sh | 4 ++++ 7 files changed, 27 insertions(+), 15 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index fb36a46a..2d9056dd 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -25,12 +25,13 @@ export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ + SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE english \ "To be written" else - SpeechSynthetizer.sh off espeak spanish \ + SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE spanish \ "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ Es observarlo, escucharlo y registrar lo que se aprende. \ Te gustaría entender porqué la Tierra gira alrededor del Sol? \ diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 68a37d20..b6246d3f 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -14,6 +14,7 @@ export ISLASMARIAS_PATH=$(readlink -f "$0") export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") LOCAL_LANGUAGE="spanish" +LOCAL_TTS_ENGINE="pico2wave" LOCAL_QUESTION_SPANISH[0]="¿Cual fue la aportación de los Mayas?" LOCAL_QUESTION_SPANISH[1]="¿Cual es el sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" @@ -48,7 +49,8 @@ chooseQuestion() chooseQuestion $LOCAL_LANGUAGE -SpeechSynthetizer.sh on pico2wave spanish "${LOCAL_QUESTION}" -AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" +SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE "${LOCAL_QUESTION}" +Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +#AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" # End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 06f0848a..1c960545 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -12,6 +12,8 @@ export LAMICHILIA_PID=$$ export LAMICHILIA_PATH=$(readlink -f "$0") export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") +LOCAL_TTS_ENGINE="pico2wave" + # ============================================================================= # Functions # ============================================================================= @@ -26,10 +28,10 @@ export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ + SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE english \ "To be written" else - SpeechSynthetizer.sh off espeak spanish \ + SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE spanish \ "Intel no solo se queda en la tierra, es tal el alcance del Microprocesador que puede \ estar en el universo, por ejemplo, ha trabajado con la NASA para crear cohetes y vehiculos \ no tripulados. Veamos el siguiente video." diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 8d9806c6..5f4e4e19 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -25,15 +25,16 @@ export MAPIMI_DIRECTORY=$(dirname "$MAPIMI_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ + SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE english \ " It was a great pleasure to meet you and have you here at Intel Guadalajara. \ Come back soon future Engineers. " else - SpeechSynthetizer.sh off espeak spanish \ + SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE spanish \ " Me da mucho gusto conocerlos y que hayan venido a Intel Guadalajara. \ Regresen pronto futuras y futuros Ingenieros diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 576ab70f..28985f35 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -24,12 +24,13 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ + SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE english \ "" else - SpeechSynthetizer.sh off espeak spanish \ + SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE spanish \ "Futuras y futuros Matemáticos. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología." fi diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 4ca9d485..a14fb606 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -26,20 +26,21 @@ export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ " Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ Pero donde puedes ver esto y mas? En el planeta marte! Veamos si puedes responder un par de preguntas. " -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ " A Marte se le conoce también como el planeta rojo? que opinas, sí o no?\ " -SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes +SurveyYesNo.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE yes -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ " Cual fue la primer misión que tomó por primera vez fotos de Marte? \ Uno, Curiosity. \ @@ -47,7 +48,7 @@ StreamText.sh $LOCAL_DEVICE spanish robot \ Tres, Sojourner. \ Cuatro, Mariner 4. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE 4 exit 0 diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index 61bf2c91..fdb60590 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -32,10 +32,14 @@ else SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" + elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "pico2wave" ]; then + SpeechSynthetizer.sh off pico2wave english "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" + elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "pico2wave" ]; then + SpeechSynthetizer.sh off pico2wave spanish "${LOCAL_TEXT}" fi Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 From 694f15ba56cf409806fdab9662d8e241be8b3852 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 10:17:28 -0600 Subject: [PATCH 1479/1653] Update Michoacan.sh --- .../SouthernMayaHighlands/Michoacan.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 73cc66f7..d6264c9c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -27,6 +27,7 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME LOCAL_INSTITUTION=`Name.sh` +LOCAL_TTS_ENGINE="pico2wave" #AmikooVoice.sh spanish \ # "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ @@ -36,7 +37,7 @@ LOCAL_INSTITUTION=`Name.sh` # las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ # que aquí trabajamos les deseamos la mejor de las experiencias. \ # Muchas gracias por haber venido." -SpeechSynthetizer.sh on espeak spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ Es un gusto conocerlas y conocerlos. Ya saben mi nombre, soy Lupe, \ tengo 2 años robot y estudio el primer año de primaria robot. \ @@ -55,7 +56,7 @@ sleep 1 #AmikooVoice.sh spanish \ # "Ahora tomaremos una foto para el recuerdo. \ # Primero, me iré a mi lugar preferido, denme unos segundos." -SpeechSynthetizer.sh on espeak spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ "Ahora tomaremos una foto para el recuerdo. \ Primero, me iré a mi lugar preferido, denme unos segundos." @@ -81,10 +82,10 @@ sleep .6 # "Estoy listo! Ahora les toca a ustedes acomodarse. \ # Con mucho cuidado ponganse a ambos lados de mi, \ # viendo hacia la pantalla y sonrían." -SpeechSynthetizer.sh on espeak spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ "Estoy listo! Ahora les toca a ustedes acomodarse. \ Con mucho cuidado ponganse a ambos lados de mi, \ - viendo hacia la pantalla y sonrían." + viendo hacia la pantalLOCAL_TTS_ENGINEla y sonrían." FfmpegCamera.sh 20 & @@ -92,21 +93,21 @@ sleep 15 #AmikooVoice.sh spanish \ # "Están listos ${LOCAL_INSTITUTION}?" -SpeechSynthetizer.sh on espeak spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ "Están listas? listos? ${LOCAL_INSTITUTION}?" sleep 5 #AmikooVoice.sh spanish \ # "Tomemos la foto, a la cuenta de 3." -SpeechSynthetizer.sh on espeak spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ "Tomemos la foto, a la cuenta de 3." sleep 1 #AmikooVoice.sh spanish \ # "1, 2 y 3, Sonrian." -SpeechSynthetizer.sh on espeak spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ "1, 2 y 3, Sonrían." Memories.sh "5" "on" "${MICHOACAN_NAME}" & @@ -117,7 +118,7 @@ Eog.sh "$FSWEBCAM_IMAGE" & #AmikooVoice.sh spanish \ # "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." -SpeechSynthetizer.sh on espeak spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." sleep 5 From 63a61486d33e35db7a69098a77981fbc291e0aa0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 10:22:20 -0600 Subject: [PATCH 1480/1653] Rename Stream.sh to StreamAudio.sh --- Hochob/Services/Stream/{Stream.sh => StreamAudio.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Stream/{Stream.sh => StreamAudio.sh} (100%) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/StreamAudio.sh similarity index 100% rename from Hochob/Services/Stream/Stream.sh rename to Hochob/Services/Stream/StreamAudio.sh From e4bc63b6e7ee5a1bf433db78bc49b063f4c638f9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 16:36:11 +0000 Subject: [PATCH 1481/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Stream/{Stream.sh => StreamAudio.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Hochob/Services/Stream/{Stream.sh => StreamAudio.sh} (100%) diff --git a/Hochob/Services/Stream/Stream.sh b/Hochob/Services/Stream/StreamAudio.sh similarity index 100% rename from Hochob/Services/Stream/Stream.sh rename to Hochob/Services/Stream/StreamAudio.sh From cfe0ebabab751fdd0ff984f464abfde6606bf335 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:09:26 -0600 Subject: [PATCH 1482/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index deead042..be8e0e32 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -24,27 +24,24 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ + StreamText.sh $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour." else - SpeechSynthetizer.sh off espeak spanish \ + StreamText.sh $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ Que disfruten su recorrido." fi -Stream.sh "Triki" "1.0" "$SPEECH_MP3" - -LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" + StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" else - Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi # End of File From 1f37e10110678ed577654053797ce9751adb7d77 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:10:12 -0600 Subject: [PATCH 1483/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index fdb60590..976fc3c3 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -42,7 +42,7 @@ else SpeechSynthetizer.sh off pico2wave spanish "${LOCAL_TEXT}" fi - Stream.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 + StreamAudio.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 fi # End of File From d2cafc4270224a44cb337120aa46db3af6c817b3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:13:14 -0600 Subject: [PATCH 1484/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index be8e0e32..1e8871d2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -24,20 +24,23 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_DEVICE='Triki' +LOCAL_TTS_ENGINE='pico2wave' if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamText.sh $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ + StreamText.sh $LOCAL_DEVICE $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour." else - StreamText.sh $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ + StreamText.sh $LOCAL_DEVICE $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ Que disfruten su recorrido." fi +exit 0 + if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" else From 1547e57aacd171b2474fa5aaf7350f0e1fc6fec4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:15:30 -0600 Subject: [PATCH 1485/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 1e8871d2..f0ee0499 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -28,12 +28,12 @@ LOCAL_DEVICE='Triki' LOCAL_TTS_ENGINE='pico2wave' if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamText.sh $LOCAL_DEVICE $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour." else - StreamText.sh $LOCAL_DEVICE $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ Que disfruten su recorrido." From 2cd8c0e5bda8259cc509150e01c90afb5fd35abc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:18:06 -0600 Subject: [PATCH 1486/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index f0ee0499..43c0a767 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -23,8 +23,8 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` -LOCAL_LANGUAGE=`Language.sh` LOCAL_DEVICE='Triki' +LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE='pico2wave' if [ "$LOCAL_LANGUAGE" = "english" ]; then From aa92a9a0f1757fea41ee868e939b9178f6176ba6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:22:43 -0600 Subject: [PATCH 1487/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 43c0a767..cee92a0e 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -23,7 +23,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE='Triki' +LOCAL_DEVICE='Eek'' LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE='pico2wave' From 05abc5961435891bf3715ee1e4606c7fea316fb2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:23:10 -0600 Subject: [PATCH 1488/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index cee92a0e..6e1c21eb 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -23,7 +23,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE='Eek'' +LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE='pico2wave' From 1f50d210b8cd317ef17e88909bee42dba6942216 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:24:19 -0600 Subject: [PATCH 1489/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 6e1c21eb..c209ea97 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -33,7 +33,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour." else - StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE tt \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ Que disfruten su recorrido." From 8fc9ca7572a200aed416d29286e692cb450b2ad0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:25:05 -0600 Subject: [PATCH 1490/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index c209ea97..8373bc90 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -27,6 +27,8 @@ LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE='pico2wave' +exit 0 + if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ From c4b987f53677b56a5cef0ec66141f43f1d213a09 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:29:13 -0600 Subject: [PATCH 1491/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index 976fc3c3..3f8c7120 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -25,6 +25,11 @@ LOCAL_TEXT="$4" # Main # ============================================================================= +if [ -z "$LOCAL_LANGUAGE" ] +then + LOCAL_LANGUAGE="spanish" +fi + if [ "$LOCAL_DEVICE" = "Amikoo" ]; then AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" else From 02d1fdfb76bb646148fe582fef9b24af9655d487 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:30:41 -0600 Subject: [PATCH 1492/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 8373bc90..c209ea97 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -27,8 +27,6 @@ LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE='pico2wave' -exit 0 - if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ From 54c59e8764a9dc98b40064b0098fb606cb1582b3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:32:21 -0600 Subject: [PATCH 1493/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index c209ea97..c13f6b65 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -25,7 +25,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE='pico2wave' +LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ @@ -33,7 +33,7 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour." else - StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE tt \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ Que disfruten su recorrido." From afa03f1a063c1562d03358d570f16a2007ee3acb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:35:57 -0600 Subject: [PATCH 1494/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index c13f6b65..4a052d77 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -28,12 +28,12 @@ LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ Enjoy your tour." else - StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ Que disfruten su recorrido." From df6d4aa7a44feb49540dd3decfdcdc020f3dcfeb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:37:21 -0600 Subject: [PATCH 1495/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 4a052d77..565042cc 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -27,6 +27,14 @@ LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" + + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ + "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ + Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ + Que disfruten su recorrido." + +exit 0 + if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ From efe3069e4f383640a2c6c72b5814b88f7d83b79c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 11:55:04 -0600 Subject: [PATCH 1496/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 565042cc..4a052d77 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -27,14 +27,6 @@ LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" - - StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ - "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ - Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ - Que disfruten su recorrido." - -exit 0 - if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ From e046cfeeb9a01c57b4af05d209b0f425ed48a57e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 12:10:34 -0600 Subject: [PATCH 1497/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 4a052d77..44667450 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -39,8 +39,6 @@ else Que disfruten su recorrido." fi -exit 0 - if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" else From 80077cf720abca9877f009080f148fd572f5f550 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 13:48:48 -0600 Subject: [PATCH 1498/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 44667450..2dab8a6e 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -23,7 +23,7 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Eek'" +LOCAL_DEVICE="Triki" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" From 0d7801106e5ddc80f98faea640b14e5b69c5f0a4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 13:49:19 -0600 Subject: [PATCH 1499/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index 2d6a48ae..acef3b7c 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -25,9 +25,9 @@ export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" + StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" else - Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" + StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" fi # End of File From 3191a5155b06fee9bba39bdd3640f933a362954a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 13:50:29 -0600 Subject: [PATCH 1500/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index acef3b7c..5cfba045 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -12,6 +12,8 @@ export CANCUN_PID=$$ export CANCUN_PATH=$(readlink -f "$0") export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") +LOCAL_DEVICE="Triki" + # ============================================================================= # Functions # ============================================================================= @@ -25,9 +27,9 @@ export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" else - StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" fi # End of File From 9fc2cb3936f62265984540789bc538eae71195ea Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 13:51:36 -0600 Subject: [PATCH 1501/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index 5cfba045..93094ace 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -12,7 +12,9 @@ export CANCUN_PID=$$ export CANCUN_PATH=$(readlink -f "$0") export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") +LOCAL_LANGUAGE=`Language.sh` LOCAL_DEVICE="Triki" +LOCAL_VOLUME="1.0" # ============================================================================= # Functions @@ -24,12 +26,10 @@ LOCAL_DEVICE="Triki" # Main # ============================================================================= -LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamAudio.sh "$LOCAL_DEVICE" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/CancunEnglish.mp3" else - StreamAudio.sh "$LOCAL_DEVICE" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/Cancun.mp3" fi # End of File From 64d6346c7840a5c91f1923e984119ca5ce2eac37 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 13:53:32 -0600 Subject: [PATCH 1502/1653] Update Acapulco.sh --- .../Applications/CentralMayaLowlands/Acapulco.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 2dab8a6e..4123fb75 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -12,6 +12,12 @@ export ACAPULCO_PID=$$ export ACAPULCO_PATH=$(readlink -f "$0") export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Triki" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" +LOCAL_VOLUME="1.0" + # ============================================================================= # Functions # ============================================================================= @@ -22,11 +28,6 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") # Main # ============================================================================= -LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Triki" -LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" - if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ @@ -40,9 +41,9 @@ else fi if [ "$LOCAL_LANGUAGE" = "english" ]; then - StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/AcapulcoEnglish.mp3" else - StreamAudio.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/Acapulco.mp3" fi # End of File From 79071946cb5f8d839b8de0855020358455ba67ff Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:01:23 -0600 Subject: [PATCH 1503/1653] Update Huatulco.sh --- .../CentralMayaLowlands/Huatulco.sh | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 951193fb..53ffde62 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -12,6 +12,12 @@ export HUATULCO_PID=$$ export HUATULCO_PATH=$(readlink -f "$0") export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Triki" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" +LOCAL_VOLUME="1.0" + # ============================================================================= # Functions # ============================================================================= @@ -22,27 +28,23 @@ export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") # Main # ============================================================================= -LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/HuatulcoEnglish.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/HuatulcoEnglish.mp3" else - Stream.sh "Triki" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/Huatulco.mp3" fi if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ - "${LOCAL_INSTITUTION}, you know more about the Mayans, Intel and Intel Guadalajara Design Center, \ - now let's get into the next hall where we will find information about our Microproccesors, \ - our Fabs and Laboratories. Let's go." + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ + "${LOCAL_INSTITUTION}, you know more about the Mayans, Intel and Intel Guadalajara Design Center, \ + now let's get into the next hall where we will find information about our Microproccesors, \ + our Fabs and Laboratories. Let's go." else - SpeechSynthetizer.sh off espeak spanish \ - "${LOCAL_INSTITUTION}, ahora que saben más acerca de los Mayas, \ - de Intel y del Centro de Diseño de Intel en Guadalajara, podemos pasar a la siguiente seccion \ - en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas \ - y nuestros Laboratorios. Vamos." + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ + "${LOCAL_INSTITUTION}, ahora que saben más acerca de los Mayas, \ + de Intel y del Centro de Diseño de Intel en Guadalajara, podemos pasar a la siguiente seccion \ + en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas \ + y nuestros Laboratorios. Vamos." fi -Stream.sh "Triki" "1.0" "$SPEECH_MP3" - # End of File From 421adf0601eaff9013f7b5512aec39b6576e0cf0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:04:08 -0600 Subject: [PATCH 1504/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 53ffde62..dedd087c 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -14,9 +14,9 @@ export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Triki" +LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" -LOCAL_VOLUME="1.0" # ============================================================================= # Functions From ea30c02a04e99b4373bad1679ae81ef449ce7498 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:04:19 -0600 Subject: [PATCH 1505/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 4123fb75..d32256dc 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -14,9 +14,10 @@ export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Triki" +LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" -LOCAL_VOLUME="1.0" + # ============================================================================= # Functions From 83c78c723471052f447671eaafe14b51a9029b3a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:08:35 -0600 Subject: [PATCH 1506/1653] Update Ixtapa.sh --- .../CentralMayaLowlands/Ixtapa.sh | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index 7f50d622..a1cf56ce 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -13,6 +13,12 @@ export IXTAPA_NAME="Ixtapa" export IXTAPA_PATH=$(readlink -f "$0") export IXTAPA_DIRECTORY=$(dirname "$IXTAPA_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Juum" +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" + # ============================================================================= # Functions # ============================================================================= @@ -23,11 +29,7 @@ export IXTAPA_DIRECTORY=$(dirname "$IXTAPA_PATH") # Main # ============================================================================= -LOCAL_DEVICE="Juum" -LOCAL_INSTITUTION=`Name.sh` -LOCAL_LANGUAGE=`Language.sh` - -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Puedes decirme que aportaron los Mayas a la tecnología? \ Uno, Las pirámides. \ @@ -35,22 +37,24 @@ StreamText.sh $LOCAL_DEVICE spanish robot \ Tres, El calendario. \ Cuatro, El chocolate. \ " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 + +exit 0 -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Quiénes son los fundadores de Intel? \ " -StreamText.sh $LOCAL_DEVICE english robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Uno, Robert Noyce, Gordon Moore. \ Dos, Steve Allen. \ Tres, Elon Musk. \ Cuatro, Larry Page and Sergey Brin. \ " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Cuántos ingenieros erán cuando empezó Intel Guadalajara? Uno, 60. \ @@ -58,21 +62,21 @@ StreamText.sh $LOCAL_DEVICE spanish robot \ Tres, 1200. \ Cuatro, 15. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " El microprocesador es el cerebro de la computadora? Sí o no? " -SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes +SurveyYesNo.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE yes -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? " -SurveyYesNo.sh $LOCAL_DEVICE spanish robot no +SurveyYesNo.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE no -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Podemos encontrar el microprocesador en? Uno, Accesorios para las personas. \ @@ -80,9 +84,9 @@ StreamText.sh $LOCAL_DEVICE spanish robot \ Tres, En el espacio. \ Cuatro, En todos los anteriores. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 4 -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " En el sistema binario, el cero significa? Uno, Encendido. \ @@ -90,9 +94,9 @@ StreamText.sh $LOCAL_DEVICE spanish robot \ Tres, Nada. \ Cuatro, Todo. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Eso es todo. Muchas gracias por tu participacion. " From dd209cd541d644457527a6c2f6add6b80e37a7c1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:10:38 -0600 Subject: [PATCH 1507/1653] Update Ixtapa.sh --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index a1cf56ce..18bc45be 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -39,8 +39,6 @@ StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 -exit 0 - StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Quiénes son los fundadores de Intel? \ @@ -58,7 +56,7 @@ StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Cuántos ingenieros erán cuando empezó Intel Guadalajara? Uno, 60. \ - Dos, 34. \ + Dos, 33. \ Tres, 1200. \ Cuatro, 15. " From 3d0d83ab1cbf8cd5b31503c8dab1f01b766eab4d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:15:00 -0600 Subject: [PATCH 1508/1653] Update Mazatlan.sh --- .../CentralMayaLowlands/Mazatlan.sh | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 078e2db2..dbbe4fbc 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -10,7 +10,13 @@ set -x export MAZATLAN_PID=$$ export MAZATLAN_PATH=$(readlink -f "$0") -export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") +export MAZATLAN_DIRECTORY=$(dirname "$MAZATLAN_PATH") + +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Triki" +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" # ============================================================================= # Functions @@ -22,24 +28,10 @@ export MAZATLAN_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -LOCAL_LANGUAGE=`Language.sh` - -if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" -else - Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" -fi - -exit 0 - if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ - "" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/MazatlanEnglish.mp3" else - SpeechSynthetizer.sh off espeak spanish \ - "" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/Mazatlan.mp3" fi -Stream.sh "Juum" "1.0" "$SPEECH_MP3" - # End of File From a02f58dc3d1e96039780bb5a622199aee4611b69 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:16:38 -0600 Subject: [PATCH 1509/1653] Update PuertoVallarta.sh --- .../CentralMayaLowlands/PuertoVallarta.sh | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index f753bb00..d1489b7f 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -10,7 +10,13 @@ set -x export PUERTOVALLARTA_PID=$$ export PUERTOVALLARTA_PATH=$(readlink -f "$0") -export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") +export PUERTOVALLARTA_DIRECTORY=$(dirname "$PUERTOVALLARTA_PATH") + +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Triki" +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" # ============================================================================= # Functions @@ -22,22 +28,10 @@ export PUERTOVALLARTA_DIRECTORY=$(dirname "$CAMPECHE_PATH") # Main # ============================================================================= -LOCAL_LANGUAGE=`Language.sh` - if [ "$LOCAL_LANGUAGE" = "english" ]; then - Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallartaEnglish.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallartaEnglish.mp3" else - Stream.sh "Juum" "1.0" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" + StreamAudio.sh "$LOCAL_DEVICE" "$LOCAL_VOLUME" "$AREA_CENTRAL_MAYA_LOWLANDS/PuertoVallarta.mp3" fi -if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ - "" -else - SpeechSynthetizer.sh off espeak spanish \ - "" -fi - -Stream.sh "Juum" "1.0" "$SPEECH_MP3" - # End of File From e6e3094334771cd406cf4fe4dba94b1d2ec5172a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:17:57 -0600 Subject: [PATCH 1510/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index d32256dc..6f5ca833 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -18,7 +18,6 @@ LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" - # ============================================================================= # Functions # ============================================================================= From 2b7525474f76387e8108642c3c122c685c66d174 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:20:21 -0600 Subject: [PATCH 1511/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index dedd087c..8c0b75c5 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -42,9 +42,9 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then else StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "${LOCAL_INSTITUTION}, ahora que saben más acerca de los Mayas, \ - de Intel y del Centro de Diseño de Intel en Guadalajara, podemos pasar a la siguiente seccion \ - en la que encontraremos informacion acerca del Microprocesador, nuestras Fabricas \ - y nuestros Laboratorios. Vamos." + de Intel y del Centro de Diseño de Intel en Guadalajara, podemos pasar a la siguiente sección \ + en la que encontraremos información acerca del Microprocesador, nuestras fábricas \ + y nuestros laboratorios. Vamos!" fi # End of File From 7bd91f152209c1f48f0b24c5fd438ee5120ec824 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:22:51 -0600 Subject: [PATCH 1512/1653] Update BajaCaliforniaNorte.sh --- .../Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh index ca84e9f9..e4fb94b4 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaNorte.sh @@ -13,6 +13,8 @@ export BAJACALIFORNIANORTE_NAME="BajaCaliforniaNorte" export BAJACALIFORNIANORTE_PATH=$(readlink -f "$0") export BAJACALIFORNIANORTE_DIRECTORY=$(dirname "$BAJACALIFORNIANORTE_PATH") +LOCAL_LANGUAGE="spanish" + # ============================================================================= # Functions # ============================================================================= @@ -31,7 +33,7 @@ Eog.sh "$TRADITION_VISITORS_CENTER/Image/*" & sleep 2 Vlc.sh "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaNorte.mp3" & sleep 18.8 -AmikooVoice.sh spanish "Nel Pastel" +AmikooVoice.sh $LOCAL_LANGUAGE "Nel Pastel" sleep .6 Amikoo.sh amikoo/headright 1 sleep .6 From c781add4d4f1508cceeba72e35b30b77d8725b38 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:26:03 -0600 Subject: [PATCH 1513/1653] Update BajaCaliforniaSurLocal.sh --- .../BajaCaliforniaSurLocal.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh index f80abc80..c9de63a5 100755 --- a/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh +++ b/Hochob/Applications/SouthernMayaHighlands/BajaCaliforniaSurLocal.sh @@ -13,6 +13,9 @@ export BAJACALIFORNIASUR_NAME="BajaCaliforniaSur" export BAJACALIFORNIASUR_PATH=$(readlink -f "$0") export BAJACALIFORNIASUR_DIRECTORY=$(dirname "$BAJACALIFORNIASUR_PATH") +LOCAL_LANGUAGE="spanish" +LOCAL_TTS_ENGINE="espeak" + # ============================================================================= # Functions # ============================================================================= @@ -28,26 +31,26 @@ LogPid.sh $BAJACALIFORNIASUR_PID $BAJACALIFORNIASUR_NAME Memories.sh "280" "on" "${BAJACALIFORNIASUR_NAME}" & VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur01.mp4" & -SpeechSynthetizer.sh on espeak spanish "Hola a todos" +SpeechSynthetizer.sh on espeak $LOCAL_LANGUAGE "Hola a todos" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur02.mp4" & -sleep 6.45 && SpeechSynthetizer.sh on espeak spanish "Perdon! Lo se!, Es que me emociono!" +sleep 6.45 && SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE "Perdon! Lo se!, Es que me emociono!" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur03.mp4" & -sleep 2.8 && SpeechSynthetizer.sh on espeak spanish "Por supuesto" +sleep 2.8 && SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE "Por supuesto" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur04.mp4" & -sleep 37.6 && SpeechSynthetizer.sh on espeak spanish "En mi caso, mi cerebro esta aqui, en la caja azul!" +sleep 37.6 && SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE "En mi caso, mi cerebro esta aqui, en la caja azul!" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur05.mp4" & -sleep 25.6 && SpeechSynthetizer.sh on espeak spanish "Yo funciono con la plataforma Intel Edison" +sleep 25.6 && SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE "Yo funciono con la plataforma Intel Edison" VlcVideo.sh off "$AREA_SOUTERN_MAYA_HIGHLANDS/BajaCaliforniaSur06.mp4" & LOCAL_INSTITUTION=`Name.sh` -SpeechSynthetizer.sh off espeak spanish \ -"Muchas gracias Futuros Ingenieros del ${LOCAL_INSTITUTION}. -A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita." +SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ + "Muchas gracias Futuros Ingenieros del ${LOCAL_INSTITUTION}. \ + A nombre del Equipo de Intel, deseamos que hayan tenido una gan visita." MemoriesAudio.sh "${BAJACALIFORNIASUR_NAME}" From 189cbe37bc401b60ed78b24dc11ad3f41cdcc408 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:28:59 -0600 Subject: [PATCH 1514/1653] Update Michoacan.sh --- .../SouthernMayaHighlands/Michoacan.sh | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index d6264c9c..d1b00915 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -14,6 +14,10 @@ export MICHOACAN_NAME="Michoacan" export MICHOACAN_PATH=$(readlink -f "$0") export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE="spanish" +LOCAL_TTS_ENGINE="pico2wave" + # ============================================================================= # Functions # ============================================================================= @@ -26,9 +30,6 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME -LOCAL_INSTITUTION=`Name.sh` -LOCAL_TTS_ENGINE="pico2wave" - #AmikooVoice.sh spanish \ # "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ # Es un gusto conocerlos. Ya saben mi nombre, soy Lupe y \ @@ -37,7 +38,7 @@ LOCAL_TTS_ENGINE="pico2wave" # las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ # que aquí trabajamos les deseamos la mejor de las experiencias. \ # Muchas gracias por haber venido." -SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ Es un gusto conocerlas y conocerlos. Ya saben mi nombre, soy Lupe, \ tengo 2 años robot y estudio el primer año de primaria robot. \ @@ -53,10 +54,10 @@ SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ sleep 1 -#AmikooVoice.sh spanish \ +#AmikooVoice.sh $LOCAL_LANGUAGE \ # "Ahora tomaremos una foto para el recuerdo. \ # Primero, me iré a mi lugar preferido, denme unos segundos." -SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Ahora tomaremos una foto para el recuerdo. \ Primero, me iré a mi lugar preferido, denme unos segundos." @@ -78,11 +79,11 @@ sleep 3.6 Amikoo.sh amikoo/movestop 1 sleep .6 -#AmikooVoice.sh spanish \ +#AmikooVoice.sh $LOCAL_LANGUAGE \ # "Estoy listo! Ahora les toca a ustedes acomodarse. \ # Con mucho cuidado ponganse a ambos lados de mi, \ # viendo hacia la pantalla y sonrían." -SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Estoy listo! Ahora les toca a ustedes acomodarse. \ Con mucho cuidado ponganse a ambos lados de mi, \ viendo hacia la pantalLOCAL_TTS_ENGINEla y sonrían." @@ -91,23 +92,23 @@ FfmpegCamera.sh 20 & sleep 15 -#AmikooVoice.sh spanish \ +#AmikooVoice.sh $LOCAL_LANGUAGE \ # "Están listos ${LOCAL_INSTITUTION}?" -SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Están listas? listos? ${LOCAL_INSTITUTION}?" sleep 5 -#AmikooVoice.sh spanish \ +#AmikooVoice.sh $LOCAL_LANGUAGE \ # "Tomemos la foto, a la cuenta de 3." -SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Tomemos la foto, a la cuenta de 3." sleep 1 -#AmikooVoice.sh spanish \ +#AmikooVoice.sh $LOCAL_LANGUAGE \ # "1, 2 y 3, Sonrian." -SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "1, 2 y 3, Sonrían." Memories.sh "5" "on" "${MICHOACAN_NAME}" & @@ -116,9 +117,9 @@ ConvertText.sh "$FSWEBCAM_IMAGE" "Bienvenidos ${LOCAL_INSTITUTION}" wait Eog.sh "$FSWEBCAM_IMAGE" & -#AmikooVoice.sh spanish \ +#AmikooVoice.sh $LOCAL_LANGUAGE \ # "Listo! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." -SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE spanish \ +SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Orale! Tenemos nuestra foto del recuerdo. A iniciar con el recorrido futuras y futuros ingenieros." sleep 5 From 76f50f3c6052abdfbdc2150756b1c3af6e5e6f57 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:30:11 -0600 Subject: [PATCH 1515/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index d1b00915..d35c00f2 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -52,6 +52,7 @@ SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ que aquí trabajamos les deseamos la mejor de las experiencias. \ Muchas gracias por haber venido." +exit 0 sleep 1 #AmikooVoice.sh $LOCAL_LANGUAGE \ From 6295d249d5567f3fe14d3ddbc88d11dbb63be6cb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:34:21 -0600 Subject: [PATCH 1516/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index 3f8c7120..44715e17 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -32,6 +32,8 @@ fi if [ "$LOCAL_DEVICE" = "Amikoo" ]; then AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" +elif [ "$LOCAL_DEVICE" = "NohochTata" ]; then + SpeechSynthetizer.sh on $LOCAL_CHARACTER $LOCAL_LANGUAGE "${LOCAL_TEXT}" else if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" From 7b7caa12e44604713a6c8ec81afa043ae65d3fbe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:35:26 -0600 Subject: [PATCH 1517/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index d35c00f2..473ae5b3 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -15,6 +15,7 @@ export MICHOACAN_PATH=$(readlink -f "$0") export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="NohochTata" LOCAL_LANGUAGE="spanish" LOCAL_TTS_ENGINE="pico2wave" @@ -38,7 +39,7 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME # las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ # que aquí trabajamos les deseamos la mejor de las experiencias. \ # Muchas gracias por haber venido." -SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ +StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ Es un gusto conocerlas y conocerlos. Ya saben mi nombre, soy Lupe, \ tengo 2 años robot y estudio el primer año de primaria robot. \ From ca6297343ebd079395de3290e4bc6941973698fc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:36:39 -0600 Subject: [PATCH 1518/1653] Update Michoacan.sh --- Hochob/Applications/SouthernMayaHighlands/Michoacan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 473ae5b3..3206d37c 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -17,7 +17,7 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="NohochTata" LOCAL_LANGUAGE="spanish" -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="robot" # ============================================================================= # Functions From a96346f4ca80712de7643c6be08ff947625308c3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:40:45 -0600 Subject: [PATCH 1519/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index 44715e17..4c64fe4f 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -30,6 +30,16 @@ then LOCAL_LANGUAGE="spanish" fi +if [ "$LOCAL_DEVICE" = "Amikoo" ]; then + AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" +elif [ "$LOCAL_DEVICE" = "NohochTata" ]; then + SpeechSynthetizer.sh on "$LOCAL_CHARACTER" "$LOCAL_LANGUAGE" "${LOCAL_TEXT}" +else + SpeechSynthetizer.sh off "$LOCAL_CHARACTER" "$LOCAL_LANGUAGE" "${LOCAL_TEXT}" +fi + +exit 0 + if [ "$LOCAL_DEVICE" = "Amikoo" ]; then AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" elif [ "$LOCAL_DEVICE" = "NohochTata" ]; then From 085b27f521716a991c795a88221cb0a51b52f712 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:41:20 -0600 Subject: [PATCH 1520/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index 4c64fe4f..07bc30a8 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -36,6 +36,7 @@ elif [ "$LOCAL_DEVICE" = "NohochTata" ]; then SpeechSynthetizer.sh on "$LOCAL_CHARACTER" "$LOCAL_LANGUAGE" "${LOCAL_TEXT}" else SpeechSynthetizer.sh off "$LOCAL_CHARACTER" "$LOCAL_LANGUAGE" "${LOCAL_TEXT}" + StreamAudio.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 fi exit 0 From 9839be8c4a270ea59dfe459cb96bb74df452a0b4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:43:31 -0600 Subject: [PATCH 1521/1653] Update Mapimi.sh --- .../NorthernMayaLowlands/Mapimi.sh | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 5f4e4e19..b3c9496b 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -13,6 +13,12 @@ export MAPIMI_NAME="Mapimi Application" export MAPIMI_PATH=$(readlink -f "$0") export MAPIMI_DIRECTORY=$(dirname "$MAPIMI_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Eek'" +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" + # ============================================================================= # Functions # ============================================================================= @@ -28,19 +34,13 @@ LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE english \ - " - It was a great pleasure to meet you and have you here at Intel Guadalajara. \ - Come back soon future Engineers. - " + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ + "It was a great pleasure to meet you and have you here at Intel Guadalajara. \ + Come back soon future Engineers." else - SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE spanish \ - " - Me da mucho gusto conocerlos y que hayan venido a Intel Guadalajara. \ - Regresen pronto futuras y futuros Ingenieros - " + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ + "Me da mucho gusto conocerlos y que hayan venido a Intel Guadalajara. \ + Regresen pronto futuras y futuros Ingenieros" fi -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" - # End of File From aad38152bd287ecf76d4e2958807ff21e2bf2d87 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:44:46 -0600 Subject: [PATCH 1522/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index b3c9496b..e11492b2 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="robot" # ============================================================================= # Functions From b24918ef481cc6fb8f3e4fcc89c5cb7f675e37d1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:47:11 -0600 Subject: [PATCH 1523/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index 07bc30a8..14f0b05f 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -36,7 +36,7 @@ elif [ "$LOCAL_DEVICE" = "NohochTata" ]; then SpeechSynthetizer.sh on "$LOCAL_CHARACTER" "$LOCAL_LANGUAGE" "${LOCAL_TEXT}" else SpeechSynthetizer.sh off "$LOCAL_CHARACTER" "$LOCAL_LANGUAGE" "${LOCAL_TEXT}" - StreamAudio.sh $LOCAL_DEVICE 1.0 $SPEECH_MP3 + StreamAudio.sh "$LOCAL_DEVICE" "1.0" $SPEECH_MP3 fi exit 0 From 12fb7bf82a684edadfe0fc2202f227c8847a98ac Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:49:34 -0600 Subject: [PATCH 1524/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 6f5ca833..96c3f531 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -30,14 +30,14 @@ LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ - "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ - Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ - Enjoy your tour." + "Future Engineers from ${LOCAL_INSTITUTION}. Welcome to this first hall! We called it: The Beginning. \ + Here we will remember the Mayans, the history of Intel y this Intel Guadalajara Design Center. \ + Enjoy your tour." else StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ - "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ - Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ - Que disfruten su recorrido." + "Futuros Ingenieros de ${LOCAL_INSTITUTION}. Bienvenidos a esta primer sala, le llamamos: El Inicio. \ + Aquí recordaras a los Mayas, la historia de Intel y de este Centro de Diseño de Intel en Guadalajara. \ + Que disfruten su recorrido." fi if [ "$LOCAL_LANGUAGE" = "english" ]; then From 91a55c33fd970bce1e487ec99641ac526a6c2a4e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 14:58:27 -0600 Subject: [PATCH 1525/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index e11492b2..a05ec27f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="robot" +LOCAL_TTS_ENGINE="espeak" # ============================================================================= # Functions From e9b4ea8c7160f360eae9ac4e524f1456f949d0dc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:01:49 -0600 Subject: [PATCH 1526/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index a05ec27f..276e5381 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="espeak" +LOCAL_TTS_ENGINE="voicerss" # ============================================================================= # Functions From 8911fb032f644063247e2f983722e78c8de7f867 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:03:27 -0600 Subject: [PATCH 1527/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 276e5381..a05ec27f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="voicerss" +LOCAL_TTS_ENGINE="espeak" # ============================================================================= # Functions From 9fd4790facb3573cee8fb90ee5cdfdfcd17f93e4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:05:50 -0600 Subject: [PATCH 1528/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index a05ec27f..f4258e83 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -29,10 +29,6 @@ LOCAL_TTS_ENGINE="espeak" # Main # ============================================================================= -LOCAL_INSTITUTION=`Name.sh` -LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" - if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "It was a great pleasure to meet you and have you here at Intel Guadalajara. \ From d8dcc9b484c785900780f7ea56e6e70766ee8f91 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:06:47 -0600 Subject: [PATCH 1529/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index f4258e83..77427903 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="espeak" +LOCAL_TTS_ENGINE="pico2wave" # ============================================================================= # Functions From 1ccc094e40caafcf6c51c5bc6b5948c8f40250eb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:11:12 -0600 Subject: [PATCH 1530/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 77427903..d763ab0e 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -35,8 +35,9 @@ if [ "$LOCAL_LANGUAGE" = "english" ]; then Come back soon future Engineers." else StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ - "Me da mucho gusto conocerlos y que hayan venido a Intel Guadalajara. \ - Regresen pronto futuras y futuros Ingenieros" + "Nos dio mucho gusto conocerlas, conocerlos y que hayan venido a Intel Guadalajara. \ + Fue un placer recibirlos en nuestras instalaciones y esperamos verlos de nuevo!.\ + " fi # End of File From f4371549bf63354f7950ab20e8ff1f060956ba7d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:13:17 -0600 Subject: [PATCH 1531/1653] Delete Eek.sh --- Hochob/Services/Stream/Eek.sh | 39 ----------------------------------- 1 file changed, 39 deletions(-) delete mode 100755 Hochob/Services/Stream/Eek.sh diff --git a/Hochob/Services/Stream/Eek.sh b/Hochob/Services/Stream/Eek.sh deleted file mode 100755 index c587ec31..00000000 --- a/Hochob/Services/Stream/Eek.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -. ~/CodeLabs/Hochob/Main.sh - -export EEK_PID=$$ - -LOCAL_LANGUAGE="$1" -LOCAL_CHARACTER="$2" -LOCAL_TEXT="$3" - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" -fi - -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" - -# End of File From 4dc813929048895716763322f5bf168f9f0129ed Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:13:25 -0600 Subject: [PATCH 1532/1653] Delete Juum.sh --- Hochob/Services/Stream/Juum.sh | 39 ---------------------------------- 1 file changed, 39 deletions(-) delete mode 100755 Hochob/Services/Stream/Juum.sh diff --git a/Hochob/Services/Stream/Juum.sh b/Hochob/Services/Stream/Juum.sh deleted file mode 100755 index 6bf60b97..00000000 --- a/Hochob/Services/Stream/Juum.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -. ~/CodeLabs/Hochob/Main.sh - -export JUUM_PID=$$ - -LOCAL_LANGUAGE="$1" -LOCAL_CHARACTER="$2" -LOCAL_TEXT="$3" - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" -fi - -Stream.sh "Juum" "1.0" "$SPEECH_MP3" - -# End of File From 435e076d256c8794faf37bd0c824fbb5a4e123e7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:13:32 -0600 Subject: [PATCH 1533/1653] Delete Tran.sh --- Hochob/Services/Stream/Tran.sh | 39 ---------------------------------- 1 file changed, 39 deletions(-) delete mode 100755 Hochob/Services/Stream/Tran.sh diff --git a/Hochob/Services/Stream/Tran.sh b/Hochob/Services/Stream/Tran.sh deleted file mode 100755 index d64255cf..00000000 --- a/Hochob/Services/Stream/Tran.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -. ~/CodeLabs/Hochob/Main.sh - -export NORTHERN_PID=$$ - -LOCAL_LANGUAGE="$1" -LOCAL_CHARACTER="$2" -LOCAL_TEXT="$3" - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" -fi - -Stream.sh "Tran" "1.0" "$SPEECH_MP3" - -# End of File From b4a758fb08e6d619019b9d5b64971ce3222b39b6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:13:42 -0600 Subject: [PATCH 1534/1653] Delete Triki.sh --- Hochob/Services/Stream/Triki.sh | 39 --------------------------------- 1 file changed, 39 deletions(-) delete mode 100755 Hochob/Services/Stream/Triki.sh diff --git a/Hochob/Services/Stream/Triki.sh b/Hochob/Services/Stream/Triki.sh deleted file mode 100755 index e40bda23..00000000 --- a/Hochob/Services/Stream/Triki.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -set -x - -# ============================================================================= -# Variables -# ============================================================================= - -. ~/CodeLabs/Hochob/Main.sh - -export TRIKI_PID=$$ - -LOCAL_LANGUAGE="$1" -LOCAL_CHARACTER="$2" -LOCAL_TEXT="$3" - -# ============================================================================= -# Functions -# ============================================================================= - -# None - -# ============================================================================= -# Main -# ============================================================================= - -if [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "english" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss english "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "robot" ]; then - SpeechSynthetizer.sh off espeak spanish "${LOCAL_TEXT}" -elif [ "$LOCAL_LANGUAGE" = "spanish" ] && [ "$LOCAL_CHARACTER" = "tt" ]; then - SpeechSynthetizer.sh off voicerss spanish "${LOCAL_TEXT}" -fi - -Stream.sh "Triki" "1.0" "$SPEECH_MP3" - -# End of File From d721c9be92ff74eca6d13caf5f9a2a8d16de883f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:17:50 -0600 Subject: [PATCH 1535/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index b6246d3f..2d0423df 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -13,6 +13,7 @@ export ISLASMARIAS_NAME="IslasMarias" export ISLASMARIAS_PATH=$(readlink -f "$0") export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") +LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE="spanish" LOCAL_TTS_ENGINE="pico2wave" @@ -49,8 +50,6 @@ chooseQuestion() chooseQuestion $LOCAL_LANGUAGE -SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE "${LOCAL_QUESTION}" -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" -#AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_QUESTION}" +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE $LOCAL_QUESTION # End of File From 076fb7620ac059bb7b1993253a6affa2d8ddb24b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:20:29 -0600 Subject: [PATCH 1536/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 2d0423df..edd5f043 100644 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -50,6 +50,6 @@ chooseQuestion() chooseQuestion $LOCAL_LANGUAGE -StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE $LOCAL_QUESTION +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE "${LOCAL_QUESTION}" # End of File From 234de4397bf5e56e52004efdb5d5ea0d5b2cf804 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:21:49 -0600 Subject: [PATCH 1537/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0e919f4a..8b0b73d4 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1058,7 +1058,7 @@ shell_command: ojodeliebre: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & lamichilia: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & elcielo: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & - islasmarias: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh & + islasmarias: bash ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh & mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh & calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & From 1fec7c8f5fcf7bb7d3b042d2e8a884ab7c671605 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:26:16 -0600 Subject: [PATCH 1538/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index a14fb606..7f2813fa 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -13,6 +13,11 @@ export TIBURONBALLENA_NAME="Mapimi Application" export TIBURONBALLENA_PATH=$(readlink -f "$0") export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") +LOCAL_DEVICE="Eek'" +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" + # ============================================================================= # Functions # ============================================================================= @@ -23,11 +28,6 @@ export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") # Main # ============================================================================= -LOCAL_DEVICE="Eek'" -LOCAL_INSTITUTION=`Name.sh` -LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" - StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ " Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ @@ -50,8 +50,6 @@ StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ " SurveyMultipleChoice.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE 4 -exit 0 - StreamText.sh $LOCAL_DEVICE english tt \ " Which spacecraft took the first photos of Mars? \ From e6c148e48258e70658282a9fd53292f67a6b01bc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:28:27 -0600 Subject: [PATCH 1539/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 7f2813fa..e2540c1f 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -28,6 +28,8 @@ LOCAL_TTS_ENGINE="pico2wave" # Main # ============================================================================= +StreamAudio.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/TiburonBallena/LiftoffSpaceXFalcon9CRS10Mission.mp4" + StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ " Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ @@ -60,13 +62,4 @@ StreamText.sh $LOCAL_DEVICE english tt \ " SurveyMultipleChoice.sh $LOCAL_DEVICE english tt 4 -if [ "$LOCAL_LANGUAGE" = "english" ]; then - Eek.sh english robot "Hi Lupe, good morning" - Eek.sh english tt "Hi Lupe, good morning" -else - Eek.sh spanish robot "Hola Lupe, muy buenos dias" - Eek.sh spanish tt "Hola Lupe, muy buenos dias" - Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/TiburonBallena/LiftoffSpaceXFalcon9CRS10Mission.mp4" -fi - # End of File From 351de8b0434408922fd96ce685b1efa1d5fc4673 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:33:04 -0600 Subject: [PATCH 1540/1653] Update configuration.yaml.2.0 --- Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 8b0b73d4..0e919f4a 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -1058,7 +1058,7 @@ shell_command: ojodeliebre: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh & lamichilia: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh & elcielo: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh & - islasmarias: bash ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh & + islasmarias: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh & mapimi: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh & siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh & calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & From abce5233b0a35ce1d5744b3d4280feeaf8d4c24a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:35:02 -0600 Subject: [PATCH 1541/1653] Update --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh old mode 100644 new mode 100755 From c484621e4e53e421d9d46ffe0e85b8e41cbaba72 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:41:28 -0600 Subject: [PATCH 1542/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 94e496a3..4218d85b 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -40,7 +40,7 @@ then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ - -transcodeopts '-b:v 500k -b:a 16k' \ + -transcodeopts '-b:v 1000k -b:a 32k' \ $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else From 589cf747821e774cd541ecd6ce2c676c32cf5b49 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:42:39 -0600 Subject: [PATCH 1543/1653] Update Stream2Chromecast.sh --- .../Stream/Stream2Chromecast/Stream2Chromecast.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 4218d85b..bdc0f85b 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -39,9 +39,11 @@ then $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME - $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE $STREAM2CHROMECAST_ARGUMENTS \ - -transcodeopts '-b:v 1000k -b:a 32k' \ - $STREAM2CHROMECAST_TRANSCODER $LOCAL_FILE + $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE \ + #$STREAM2CHROMECAST_ARGUMENTS \ + #-transcodeopts '-b:v 1000k -b:a 32k' \ + $STREAM2CHROMECAST_TRANSCODER \ + $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else echo "Invalid number of arguments, see Documentation" From e19c3d4c6e5b90b17ff71c470ba88c0fd96d08a2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:43:22 -0600 Subject: [PATCH 1544/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index bdc0f85b..77c42011 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -42,7 +42,7 @@ then $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE \ #$STREAM2CHROMECAST_ARGUMENTS \ #-transcodeopts '-b:v 1000k -b:a 32k' \ - $STREAM2CHROMECAST_TRANSCODER \ + #$STREAM2CHROMECAST_TRANSCODER \ $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else From 4387cd78040f96e5e64786661894e803534e2df3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:44:16 -0600 Subject: [PATCH 1545/1653] Update Stream2Chromecast.sh --- .../Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 77c42011..36234e45 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -40,9 +40,9 @@ then killall -9 $STREAM2CHROMECAST_BINARY $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE \ - #$STREAM2CHROMECAST_ARGUMENTS \ - #-transcodeopts '-b:v 1000k -b:a 32k' \ - #$STREAM2CHROMECAST_TRANSCODER \ + $STREAM2CHROMECAST_ARGUMENTS \ + -transcodeopts '-b:v 1000k -b:a 32k' \ + $STREAM2CHROMECAST_TRANSCODER \ $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop else From f26753f671a82e31b9a9dad5687fabc8d4ec8a9d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:46:13 -0600 Subject: [PATCH 1546/1653] Update Stream2Chromecast.sh --- Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh index 36234e45..4d609ddb 100755 --- a/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh +++ b/Hochob/Services/Stream/Stream2Chromecast/Stream2Chromecast.sh @@ -41,7 +41,7 @@ then $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -setvol $LOCAL_VOLUME $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE \ $STREAM2CHROMECAST_ARGUMENTS \ - -transcodeopts '-b:v 1000k -b:a 32k' \ + -transcodeopts '-b:v 1000k -b:a 128k' \ $STREAM2CHROMECAST_TRANSCODER \ $LOCAL_FILE $STREAM2CHROMECAST_BINARY -devicename $LOCAL_DEVICE -stop From bd4c6b82314c993d0fcb76b8095b2e8d8f580d5f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 15:49:17 -0600 Subject: [PATCH 1547/1653] Update Calakmul.sh --- .../NorthernMayaLowlands/Calakmul.sh | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 2d9056dd..c71b0058 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -24,26 +24,25 @@ export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE english \ - "To be written" + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + "To be written" else - SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE spanish \ - "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ - Es observarlo, escucharlo y registrar lo que se aprende. \ - Te gustaría entender porqué la Tierra gira alrededor del Sol? \ - Porqué las cosas caen hacia el suelo? \ - Que hace a los pájaros volar? \ - El científico es una persona que se dedica a entender el mundo y saber como se comporta. \ - Cualquiera puede pensar como un científico, y a ti, te gustaría ser científico? \ - " + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + "La ciencia es muy divertida, es la curiosidad sobre el mundo y cómo se comporta. \ + Es observarlo, escucharlo y registrar lo que se aprende. \ + Te gustaría entender porqué la Tierra gira alrededor del Sol? \ + Porqué las cosas caen hacia el suelo? \ + Que hace a los pájaros volar? \ + El científico es una persona que se dedica a entender el mundo y saber como se comporta. \ + Cualquiera puede pensar como un científico, y a ti, te gustaría ser científico? \ + " fi #Los que aplican los descubrimientos de la ciencia para hacer cosas útiles se llaman Ingenieros. -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" - # End of File From 38780ebdc53ed0873b52dc1f0f4209a10c5992a7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 16:00:30 -0600 Subject: [PATCH 1548/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index d763ab0e..27be07c4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -32,12 +32,13 @@ LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "It was a great pleasure to meet you and have you here at Intel Guadalajara. \ - Come back soon future Engineers." + Come back soon future Engineers. \ + " else StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "Nos dio mucho gusto conocerlas, conocerlos y que hayan venido a Intel Guadalajara. \ - Fue un placer recibirlos en nuestras instalaciones y esperamos verlos de nuevo!.\ - " + Fue un placer recibirlos en nuestras instalaciones y esperamos verlos de nuevo!. \ + " fi # End of File From 255f8fb4f81e8c52cac3332a5eef7f9ed7277b0e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 16:02:19 -0600 Subject: [PATCH 1549/1653] Update Michoacan.sh --- .../SouthernMayaHighlands/Michoacan.sh | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh index 3206d37c..f8e4cfab 100755 --- a/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh +++ b/Hochob/Applications/SouthernMayaHighlands/Michoacan.sh @@ -16,8 +16,9 @@ export MICHOACAN_DIRECTORY=$(dirname "$MICHOACAN_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="NohochTata" -LOCAL_LANGUAGE="spanish" -LOCAL_TTS_ENGINE="robot" +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="espeak" # ============================================================================= # Functions @@ -41,19 +42,19 @@ LogPid.sh $MICHOACAN_PID $MICHOACAN_NAME # Muchas gracias por haber venido." StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ "Bienvenidos ${LOCAL_INSTITUTION} a mi casa, su casa. \ - Es un gusto conocerlas y conocerlos. Ya saben mi nombre, soy Lupe, \ - tengo 2 años robot y estudio el primer año de primaria robot. \ - Mis pasatiempos favoritos son compartir tiempo con mi familia, jugar al aire libre, \ - leer cuentos divertidos, hacer ejercicio y aprender con mis familiares y amigos \ - todo el conocimiento científico y tecnológico que está presente en nuestra vida cotidiana. \ - También soy guia en este emocionante Centro de Visitantes. \ - Hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ - lo interesante que es el mundo de las Ciencias, la Tecnología, \ - las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ - que aquí trabajamos les deseamos la mejor de las experiencias. \ - Muchas gracias por haber venido." - -exit 0 + Es un gusto conocerlas y conocerlos. Ya saben mi nombre, soy Lupe, \ + tengo 2 años robot y estudio el primer año de primaria robot. \ + Mis pasatiempos favoritos son compartir tiempo con mi familia, jugar al aire libre, \ + leer cuentos divertidos, hacer ejercicio y aprender con mis familiares y amigos \ + todo el conocimiento científico y tecnológico que está presente en nuestra vida cotidiana. \ + También soy guia en este emocionante Centro de Visitantes. \ + Hace rato estaba un poco chiviado pero ya estoy listo para mostrarles \ + lo interesante que es el mundo de las Ciencias, la Tecnología, \ + las Ingenierías y las Matemáticas. A nombre de cada uno de los Ingenieros \ + que aquí trabajamos les deseamos la mejor de las experiencias. \ + Muchas gracias por haber venido. \ + " + sleep 1 #AmikooVoice.sh $LOCAL_LANGUAGE \ @@ -61,7 +62,8 @@ sleep 1 # Primero, me iré a mi lugar preferido, denme unos segundos." SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Ahora tomaremos una foto para el recuerdo. \ - Primero, me iré a mi lugar preferido, denme unos segundos." + Primero, me iré a mi lugar preferido, denme unos segundos. \ + " Amikoo.sh amikoo/headright 1 sleep .6 @@ -88,7 +90,8 @@ sleep .6 SpeechSynthetizer.sh on $LOCAL_TTS_ENGINE $LOCAL_LANGUAGE \ "Estoy listo! Ahora les toca a ustedes acomodarse. \ Con mucho cuidado ponganse a ambos lados de mi, \ - viendo hacia la pantalLOCAL_TTS_ENGINEla y sonrían." + viendo hacia la pantalLOCAL_TTS_ENGINEla y sonrían. \ + " FfmpegCamera.sh 20 & From fa26ccc4548c7a1a5b7f08a7bc72938baacca06c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 16:06:42 -0600 Subject: [PATCH 1550/1653] Update Makeblock.sh --- .../Applications/AmikooMayaLands/Makeblock.sh | 124 +++++++++--------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Makeblock.sh b/Hochob/Applications/AmikooMayaLands/Makeblock.sh index e856ecb3..139721df 100755 --- a/Hochob/Applications/AmikooMayaLands/Makeblock.sh +++ b/Hochob/Applications/AmikooMayaLands/Makeblock.sh @@ -13,6 +13,12 @@ export MAKEBLOCK_NAME="Makeblock" export MAKEBLOCK_PATH=$(readlink -f "$0") export MAKEBLOCK_DIRECTORY=$(dirname "$IXTAPA_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Juum" +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" + # ============================================================================= # Functions # ============================================================================= @@ -23,78 +29,72 @@ export MAKEBLOCK_DIRECTORY=$(dirname "$IXTAPA_PATH") # Main # ============================================================================= -LOCAL_DEVICE="Amikoo" -LOCAL_INSTITUTION=`Name.sh` -LOCAL_LANGUAGE=`Language.sh` - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Puedes decirme que aportaron los Mayas a la tecnología? \ - Uno, Las pirámides. \ - Dos, El cero. \ - Tres, El calendario. \ - Cuatro, El chocolate. \ - " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Quiénes son los fundadores de Intel? \ - " -StreamText.sh $LOCAL_DEVICE english robot \ - " - Uno, Robert Noyce, Gordon Moore. \ - Dos, Steve Allen. \ - Tres, Elon Musk. \ - Cuatro, Larry Page and Sergey Brin. \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Puedes decirme que aportaron los Mayas a la tecnología? \ + Uno, Las pirámides. \ + Dos, El cero. \ + Tres, El calendario. \ + Cuatro, El chocolate. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Quiénes son los fundadores de Intel? \ + " +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Uno, Robert Noyce, Gordon Moore. \ + Dos, Steve Allen. \ + Tres, Elon Musk. \ + Cuatro, Larry Page and Sergey Brin. \ " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 1 - -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Cuántos ingenieros erán cuando empezó Intel Guadalajara? - Uno, 60. \ - Dos, 34. \ - Tres, 1200. \ - Cuatro, 15. +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Cuántos ingenieros erán cuando empezó Intel Guadalajara? \ + Uno, 60. \ + Dos, 33. \ + Tres, 1200. \ + Cuatro, 15. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - El microprocesador es el cerebro de la computadora? Sí o no? +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + El microprocesador es el cerebro de la computadora? Sí o no? " -SurveyYesNo.sh $LOCAL_DEVICE spanish robot yes +SurveyYesNo.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE yes -StreamText.sh $LOCAL_DEVICE spanish robot \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? " - Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? - " -SurveyYesNo.sh $LOCAL_DEVICE spanish robot no +SurveyYesNo.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE no -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Podemos encontrar el microprocesador en? - Uno, Accesorios para las personas. \ - Dos, En la tierra. \ - Tres, En el espacio. \ - Cuatro, En todos los anteriores. +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Podemos encontrar el microprocesador en? \ + Uno, Accesorios para las personas. \ + Dos, En la tierra. \ + Tres, En el espacio. \ + Cuatro, En todos los anteriores. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 4 -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - En el sistema binario, el cero significa? - Uno, Encendido. \ - Dos, Apagado. \ - Tres, Nada. \ - Cuatro, Todo. +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + En el sistema binario, el cero significa? \ + Uno, Encendido. \ + Dos, Apagado. \ + Tres, Nada. \ + Cuatro, Todo. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish robot 2 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 -StreamText.sh $LOCAL_DEVICE spanish robot \ - " - Eso es todo. Muchas gracias por tu participacion. - " +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + "Eso es todo. Muchas gracias por tu participacion." # End of File From e5f35761275cf74033696a896efa79549d2b83ea Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 16:06:58 -0600 Subject: [PATCH 1551/1653] Update Makeblock.sh --- Hochob/Applications/AmikooMayaLands/Makeblock.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Makeblock.sh b/Hochob/Applications/AmikooMayaLands/Makeblock.sh index 139721df..eaf656dc 100755 --- a/Hochob/Applications/AmikooMayaLands/Makeblock.sh +++ b/Hochob/Applications/AmikooMayaLands/Makeblock.sh @@ -14,10 +14,10 @@ export MAKEBLOCK_PATH=$(readlink -f "$0") export MAKEBLOCK_DIRECTORY=$(dirname "$IXTAPA_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Juum" +LOCAL_DEVICE="Amikoo" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="espeak" # ============================================================================= # Functions From 3dfa0ecab280f886fc2db0671a93b3bd36007f95 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 16:07:42 -0600 Subject: [PATCH 1552/1653] Update Ixtapa.sh --- .../CentralMayaLowlands/Ixtapa.sh | 75 +++++++++---------- 1 file changed, 37 insertions(+), 38 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index 18bc45be..41f8f8ac 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -30,72 +30,71 @@ LOCAL_TTS_ENGINE="pico2wave" # ============================================================================= StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Puedes decirme que aportaron los Mayas a la tecnología? \ - Uno, Las pirámides. \ - Dos, El cero. \ - Tres, El calendario. \ - Cuatro, El chocolate. \ + " \ + Puedes decirme que aportaron los Mayas a la tecnología? \ + Uno, Las pirámides. \ + Dos, El cero. \ + Tres, El calendario. \ + Cuatro, El chocolate. \ " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Quiénes son los fundadores de Intel? \ + " \ + Quiénes son los fundadores de Intel? \ " StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Uno, Robert Noyce, Gordon Moore. \ - Dos, Steve Allen. \ - Tres, Elon Musk. \ - Cuatro, Larry Page and Sergey Brin. \ + " \ + Uno, Robert Noyce, Gordon Moore. \ + Dos, Steve Allen. \ + Tres, Elon Musk. \ + Cuatro, Larry Page and Sergey Brin. \ " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Cuántos ingenieros erán cuando empezó Intel Guadalajara? - Uno, 60. \ - Dos, 33. \ - Tres, 1200. \ - Cuatro, 15. + " \ + Cuántos ingenieros erán cuando empezó Intel Guadalajara? \ + Uno, 60. \ + Dos, 33. \ + Tres, 1200. \ + Cuatro, 15. " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - El microprocesador es el cerebro de la computadora? Sí o no? + " \ + El microprocesador es el cerebro de la computadora? Sí o no? " SurveyYesNo.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE yes StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? + " \ + Las fábricas de Intel son 200 veces mas limpias que un quirófano? Sí o no? " SurveyYesNo.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE no StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Podemos encontrar el microprocesador en? - Uno, Accesorios para las personas. \ - Dos, En la tierra. \ - Tres, En el espacio. \ - Cuatro, En todos los anteriores. + " \ + Podemos encontrar el microprocesador en? \ + Uno, Accesorios para las personas. \ + Dos, En la tierra. \ + Tres, En el espacio. \ + Cuatro, En todos los anteriores. " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 4 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - En el sistema binario, el cero significa? - Uno, Encendido. \ - Dos, Apagado. \ - Tres, Nada. \ - Cuatro, Todo. + " \ + En el sistema binario, el cero significa? \ + Uno, Encendido. \ + Dos, Apagado. \ + Tres, Nada. \ + Cuatro, Todo. " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Eso es todo. Muchas gracias por tu participacion. - " + "Eso es todo. Muchas gracias por tu participacion." + # End of File From 98fd441cd93a5dd1af844cf60c66dc4b3b19a798 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 16:21:37 -0600 Subject: [PATCH 1553/1653] Update configuration.yaml.2.0 --- .../Services/Automation/HomeAssistant/configuration.yaml.2.0 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 0e919f4a..71eb9321 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -148,11 +148,11 @@ homeassistant: friendly_name: Amazon Alexa icon: mdi:amazon - switch.amikooamazonalexastart: + script.amikooamazonalexastart: friendly_name: Amazon Alexa Start icon: mdi:amazon - switch.amikooamazonalexastop: + script.amikooamazonalexastop: friendly_name: Amazon Alexa Stop icon: mdi:amazon From 4f5be3f3916494d90408d98d8ed46c315ac57eb5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 17:48:52 -0600 Subject: [PATCH 1554/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 71eb9321..b88f275e 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -156,6 +156,17 @@ homeassistant: friendly_name: Amazon Alexa Stop icon: mdi:amazon + + # Amikoo Maya Lands :: Expertise :: Google + + script.amikoogoogleassistantstart: + friendly_name: Google Assistant Start + icon: mdi:google + + script.amikoogoogleassistantstop: + friendly_name: Google Asistant Stop + icon: mdi:google + # Amikoo Maya Lands :: Knowledge script.sphero: @@ -794,6 +805,16 @@ script: sequence: - service: shell_command.amikooamazonalexastop + # Amikoo Maya Lands :: Expertise :: Google Assistant + + amikoogoogleassistantstart: + sequence: + - service: shell_command.amikoogoogleassistantstart + + amikoogoogleassistantstop: + sequence: + - service: shell_command.amikoogoogleassistantstop + # Amikoo Maya Lands :: Knowledge sphero: @@ -1113,6 +1134,11 @@ shell_command: amikooamazonalexastart: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa start amikooamazonalexastop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh amazonalexa stop + # Amikoo Maya Lands :: Expertise :: Google Assistant + + amikoogoogleassistantstart: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh googleassistant start + amikoogoogleassistantstop: ~/CodeLabs/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh googleassistant stop + # Amikoo Maya Lands :: Knowledge sphero: ~/CodeLabs/Hochob/Applications/AmikooMayaLands/Sphero.sh & @@ -1752,6 +1778,8 @@ group: - switch.amikooamazonalexa - script.amikooamazonalexastart - script.amikooamazonalexastop + - script.amikoogoogleassistantstart + - script.amikoogoogleassistantstop # Amikoo Maya Lands: Applications From 835016ae5bd856d9359732eb204c7d157fd33ce9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 18:00:53 -0600 Subject: [PATCH 1555/1653] Update --- Hochob/Applications/TraditionMayaLands/Intel/80286.sh | 4 ++-- Hochob/Main.sh | 2 ++ Hochob/Services/Amikoo/Remote/AmikooExpertise.sh | 2 ++ Hochob/Services/Communications/MqttClient/Mosquitto.sh | 6 +++--- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/TraditionMayaLands/Intel/80286.sh b/Hochob/Applications/TraditionMayaLands/Intel/80286.sh index 9d5e6d27..d5da5bc6 100755 --- a/Hochob/Applications/TraditionMayaLands/Intel/80286.sh +++ b/Hochob/Applications/TraditionMayaLands/Intel/80286.sh @@ -29,13 +29,13 @@ LogPid.sh $i80286_PID $i80286_NAME AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "IntelExperienceWhatsInside.png" AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "IntelBong.mp3" -sleep 2 +sleep 5 AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Stop" AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "IntelChorus.jpg" AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "IntelBongChorus.mp3" -sleep 2 +sleep 5 AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" AmikooCommunication.sh "$LOCAL_TRADITION" "Image" "Stop" diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 10a10ece..f3dee76b 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -285,6 +285,8 @@ AMIKOO_GCTRANSLATIONAPI=$AMIKOO/gc/translationapi AMIKOO_AMAZONALEXA=$AMIKOO/amazon/alexa +AMIKOO_GOOGLEASSISTANT=$AMIKOO/google/assistant + # ============================================================================= # Functions # ============================================================================= diff --git a/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh b/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh index 555e8e5b..d3faf944 100755 --- a/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh +++ b/Hochob/Services/Amikoo/Remote/AmikooExpertise.sh @@ -29,6 +29,8 @@ elif [ "$LOCAL_COMMAND" = "gctranslationapi" ]; then Mosquitto.sh $AMIKOO_GCTRANSLATIONAPI "Google Cloud Translation API" elif [ "$LOCAL_COMMAND" = "amazonalexa" ]; then Mosquitto.sh $AMIKOO_AMAZONALEXA $LOCAL_MESSAGE +elif [ "$LOCAL_COMMAND" = "googleassistant" ]; then + Mosquitto.sh $AMIKOO_GOOGLEASSISTANT $LOCAL_MESSAGE fi # End of File diff --git a/Hochob/Services/Communications/MqttClient/Mosquitto.sh b/Hochob/Services/Communications/MqttClient/Mosquitto.sh index 97c877d0..2d429577 100755 --- a/Hochob/Services/Communications/MqttClient/Mosquitto.sh +++ b/Hochob/Services/Communications/MqttClient/Mosquitto.sh @@ -13,8 +13,8 @@ export MOSQUITTO_PUB_BINARY=mosquitto_pub export MQTT_SERVER_ADDRESS=$MQTT_SERVER_ADDRESS export MQTT_SERVER_PORT=$MQTT_SERVER_PORT -LOCAL_TOPIC="$1" -LOCAL_MESSAGE="$2" +LOCAL_TOPIC="${1}" +LOCAL_MESSAGE="${2}" # ============================================================================= # Functions @@ -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 From 5fd91bce4f6ccda7d0a3ee157da8888bee86eff4 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 20:04:45 -0600 Subject: [PATCH 1556/1653] Create Janos.sh --- .../NorthernMayaLowlands/Janos.sh | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 Hochob/Applications/NorthernMayaLowlands/Janos.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Janos.sh b/Hochob/Applications/NorthernMayaLowlands/Janos.sh new file mode 100644 index 00000000..fca07365 --- /dev/null +++ b/Hochob/Applications/NorthernMayaLowlands/Janos.sh @@ -0,0 +1,98 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export IXTAPA_PID=$$ +export IXTAPA_NAME="Ixtapa" +export IXTAPA_PATH=$(readlink -f "$0") +export IXTAPA_DIRECTORY=$(dirname "$IXTAPA_PATH") + +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Juum" +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="pico2wave" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + En que fecha se celebra el dia Nacional del libro en Mexico? \ + Uno, 20 de Noviembre. \ + Dos, 12 de Noviembre. \ + Tres, 2 de Noviembre. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Personaje que conmemora el dia del libro? \ + " +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Uno, Pancho Villa. \ + Dos, Sor Juana Ines de la Cruz. \ + Tres, Josefa Ortiz de Dominguez. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Desde cuando se utiliza un sistema de correos en Mexico? \ + Uno, Despues de la llegada de los espanoles. \ + Dos, Despues de la Revolucion Mexicana. \ + Tres, Desde antes de la llegada de los Espanoles. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 3 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Quienes eran los encargados de llevar los mensajes en la epoca de los aztecas? \ + Uno, Painani \ + Dos, Teopixque \ + Tres, Teotecuhtli \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Para ti, que es la tolerancia?\ + Uno, El respeto, la aceptacion y el aprecio a la diversidad. \ + Dos, El respeto, la aceptacion y el aprecio a la diversidad. \ + Tres, El respeto, la aceptacion y el aprecio a la diversidad. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Para que nos sirve porner en practica la tolerancia?\ + Uno, Para convivir sanamente. \ + Dos, Para convivir sanamente. \ + Tres, Para convivir sanamente. \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Nombre del presidente que duro mas de 30 anios en el poder?\ + Uno, Porfirio Diaz \ + Dos, Francisco Villa \ + Tres, Venustiano Carranza \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 + +# End of File From c15a5c67aff910ad0a756f50bbee9c763f4d66d2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 20:06:22 -0600 Subject: [PATCH 1557/1653] Update configuration.yaml.2.0 --- .../Automation/HomeAssistant/configuration.yaml.2.0 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index b88f275e..202c77f6 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -257,6 +257,10 @@ homeassistant: friendly_name: Planeta Marte icon: mdi:test-tube + script.janos: + friendly_name: Primaria + icon: mdi:test-tube + # Console Maya Lands : Keypad Yes No script.keypadyes: @@ -911,6 +915,10 @@ script: sequence: - service: shell_command.tiburonballena + janos: + sequence: + - service: shell_command.janos + # Tradition Maya Lands :: Navidad familia: @@ -1084,6 +1092,7 @@ shell_command: siankaan: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh & calakmul: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh & tiburonballena: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh & + janos: ~/CodeLabs/Hochob/Applications/NorthernMayaLowlands/Janos.sh & # Amikoo Maya Lands @@ -1880,6 +1889,7 @@ group: - script.elcielo - script.islasmarias - script.mapimi + - script.janos # Northern Maya Highlands: Stations From 9a471ebed182314075cb668f3a2a293abb8d6469 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 12 Dec 2017 20:06:57 -0600 Subject: [PATCH 1558/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/Janos.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Applications/NorthernMayaLowlands/Janos.sh diff --git a/Hochob/Applications/NorthernMayaLowlands/Janos.sh b/Hochob/Applications/NorthernMayaLowlands/Janos.sh old mode 100644 new mode 100755 From 211a0a88970f2eff31860cdf9b3e9f149000aafe Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 15 Dec 2017 11:35:46 -0600 Subject: [PATCH 1559/1653] Create Festival.sh --- .../Sound/SpeechSynthetizer/Festival.sh | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Hochob/Services/Sound/SpeechSynthetizer/Festival.sh diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh new file mode 100644 index 00000000..068e085f --- /dev/null +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export FESTIVAL_PID=$$ +export FESTIVAL_BINARY=festival +export FESTIVAL_WAVE="-w=" +export FESTIVAL_LANGUAGE="-l en-US" +export FESTIVAL_INPUT="No input has been provided" +export FESTIVAL_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE +export FESTIVAL_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH + +LOCAL_LANGUAGE="$1" +LOCAL_TEXT="$2" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +if [ $# -eq 2 ] +then + if [ "$LOCAL_LANGUAGE" = "english" ]; then + export FESTIVAL_LANGUAGE="-l en-US" + elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + export FESTIVAL_LANGUAGE="-l es-ES" + fi + + export FESTIVAL_INPUT="$LOCAL_TEXT" + + $FESTIVAL_BINARY $FESTIVAL_WAVE$FESTIVAL_SPEECH $FESTIVAL_LANGUAGE "$FESTIVAL_INPUT" + + ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 + + cp $FESTIVAL_SPEECH $SPEECH + cp $FESTIVAL_SPEECH_MP3 $SPEECH_MP3 + +else + echo "Invalid number of arguments, see Documentation" + exit 1 +fi + +# End of File From d943dfe6c2a0f27160632426edc5c480c5258188 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 15 Dec 2017 17:37:01 +0000 Subject: [PATCH 1560/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Hochob/Services/Sound/SpeechSynthetizer/Festival.sh diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh old mode 100644 new mode 100755 From 19c63bd985c44e52fef8f7d0ed47dad271fc4a0f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 15 Dec 2017 12:00:14 -0600 Subject: [PATCH 1561/1653] Update Main.sh --- Hochob/Main.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index f3dee76b..c93ba166 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -170,6 +170,11 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_ALLFILES=$HO export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.mp3 +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Festival/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVALE/*.* +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL/FestivalSpeech.wav +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL/FestivalSpeech.mp3 + export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO=$HOCHOB_SERVER_MEDIA_SOURCE/Video/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO/Ffmpeg/ export HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG/*.mp4 @@ -211,6 +216,11 @@ export PICO2WAVE_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PI export PICO2WAVE_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH export PICO2WAVE_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3 +export FESTIVAL_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL +export FESTIVAL_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_ALLFILES +export FESTIVAL_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_SPEECH +export FESTIVAL_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_SPEECH_MP3 + export FFMPEG_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG export FFMPEG_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_ALLFILES export FFMPEG_CAMERA=$HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG_CAMERA From 8da7254d040f272162ef260155beac01101c8309 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 15 Dec 2017 12:26:31 -0600 Subject: [PATCH 1562/1653] Update Festival.sh --- .../Services/Sound/SpeechSynthetizer/Festival.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 068e085f..8325cd4b 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -10,9 +10,9 @@ set -x export FESTIVAL_PID=$$ export FESTIVAL_BINARY=festival -export FESTIVAL_WAVE="-w=" -export FESTIVAL_LANGUAGE="-l en-US" -export FESTIVAL_INPUT="No input has been provided" +export FESTIVAL_COMMANDLINE="--tts --pipe" +export FESTIVAL_CONVERSION="iconv -f utf-8 -t iso-8859-1" +export FESTIVAL_LANGUAGE="--language" export FESTIVAL_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE export FESTIVAL_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH @@ -31,15 +31,11 @@ LOCAL_TEXT="$2" if [ $# -eq 2 ] then - if [ "$LOCAL_LANGUAGE" = "english" ]; then - export FESTIVAL_LANGUAGE="-l en-US" - elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then - export FESTIVAL_LANGUAGE="-l es-ES" - fi + export FESTIVAL_LANGUAGE="${FESTIVAL_LANGUAGE} ${LOCAL_LANGUAGE}" export FESTIVAL_INPUT="$LOCAL_TEXT" - $FESTIVAL_BINARY $FESTIVAL_WAVE$FESTIVAL_SPEECH $FESTIVAL_LANGUAGE "$FESTIVAL_INPUT" + echo "${FESTIVAL_TEXT}" | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 From b41fc00c36472dda306c73c1f5a9662b4452639e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sat, 16 Dec 2017 09:26:23 -0600 Subject: [PATCH 1563/1653] Update~ Signed-off-by: Abraham Arce --- .../NorthernMayaLowlands/Janos.sh | 83 ++++++++++++++----- 1 file changed, 60 insertions(+), 23 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Janos.sh b/Hochob/Applications/NorthernMayaLowlands/Janos.sh index fca07365..acd17960 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Janos.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Janos.sh @@ -8,10 +8,10 @@ set -x . ~/CodeLabs/Hochob/Main.sh -export IXTAPA_PID=$$ -export IXTAPA_NAME="Ixtapa" -export IXTAPA_PATH=$(readlink -f "$0") -export IXTAPA_DIRECTORY=$(dirname "$IXTAPA_PATH") +export JANOS_PID=$$ +export JANOS_NAME="Janos" +export JANOS_PATH=$(readlink -f "$0") +export JANOS_DIRECTORY=$(dirname "$JANOS_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Juum" @@ -47,7 +47,7 @@ StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ Uno, Pancho Villa. \ Dos, Sor Juana Ines de la Cruz. \ Tres, Josefa Ortiz de Dominguez. \ - " + " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 2 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ @@ -56,43 +56,80 @@ StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ Uno, Despues de la llegada de los espanoles. \ Dos, Despues de la Revolucion Mexicana. \ Tres, Desde antes de la llegada de los Espanoles. \ - " + " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 3 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " \ - Quienes eran los encargados de llevar los mensajes en la epoca de los aztecas? \ - Uno, Painani \ - Dos, Teopixque \ - Tres, Teotecuhtli \ - " + Quienes eran los encargados de llevar los mensajes en la epoca de los aztecas? \ + Uno, Painani \ + Dos, Teopixque \ + Tres, Teotecuhtli \ + " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " \ Para ti, que es la tolerancia?\ - Uno, El respeto, la aceptacion y el aprecio a la diversidad. \ - Dos, El respeto, la aceptacion y el aprecio a la diversidad. \ - Tres, El respeto, la aceptacion y el aprecio a la diversidad. \ - " + Uno, El respeto, la aceptacion y el aprecio a la diversidad. \ + Dos, El respeto, la aceptacion y el aprecio a la diversidad. \ + Tres, El respeto, la aceptacion y el aprecio a la diversidad. \ + " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " \ Para que nos sirve porner en practica la tolerancia?\ - Uno, Para convivir sanamente. \ - Dos, Para convivir sanamente. \ - Tres, Para convivir sanamente. \ - " + Uno, Para convivir sanamente. \ + Dos, Para convivir sanamente. \ + Tres, Para convivir sanamente. \ + " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " \ Nombre del presidente que duro mas de 30 anios en el poder?\ - Uno, Porfirio Diaz \ - Dos, Francisco Villa \ - Tres, Venustiano Carranza \ - " + Uno, Porfirio Diaz \ + Dos, Francisco Villa \ + Tres, Venustiano Carranza \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Triunfo con las elecciones presidenciales de 1911?\ + Uno, Francisco I Madero \ + Dos, Francisco Villa \ + Tres, Venustiano Carranza \ + " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Era conocido como el centauro del norte?\ + Uno, Francisco Villa \ + Dos, Francisco I Madero \ + Tres, Venustiano Carranza \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Era conocido como el baron de cuatro cienegas?\ + Uno, Venustiano Carranza \ + Dos, Francisco Villa \ + Tres, Porfirio Diaz \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 1 + + +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Derecho que tuvimos gracias a la revolucion mexicana?\ + Uno, Francisco y Madero \ + Dos, Francisco Villa \ + Tres, El voto \ + " +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 3 + # End of File From d9b96403e7f76f14c6172ed68272eae8216eefb6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 17:56:00 -0600 Subject: [PATCH 1564/1653] Update Signed-off-by: Abraham Arce --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 8325cd4b..a8e0dcba 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -33,7 +33,7 @@ if [ $# -eq 2 ] then export FESTIVAL_LANGUAGE="${FESTIVAL_LANGUAGE} ${LOCAL_LANGUAGE}" - export FESTIVAL_INPUT="$LOCAL_TEXT" + export FESTIVAL_TEXT="$LOCAL_TEXT" echo "${FESTIVAL_TEXT}" | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE From b0fe36ffd2a9633404e4455ed150fedccbfd348c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:03:24 -0600 Subject: [PATCH 1565/1653] Update HochobServerMediaSource.sh --- Hochob/Setup/HochobServerMediaSource.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Hochob/Setup/HochobServerMediaSource.sh b/Hochob/Setup/HochobServerMediaSource.sh index f63b276c..8aca8640 100755 --- a/Hochob/Setup/HochobServerMediaSource.sh +++ b/Hochob/Setup/HochobServerMediaSource.sh @@ -17,6 +17,8 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/SpeechSynthesizer/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Espeak/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/VoiceRss/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Pico2Wave/ +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Festival/ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON_HALLOWEEN=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND/Season/Halloween @@ -38,6 +40,8 @@ test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SEASON && echo "Directory exists" || m test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_ESPEAK test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_VOICERSS +test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE +test -d $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL test -d $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO test -d $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG && echo "Directory exists" || mkdir $HOCHOB_SERVER_MEDIA_SOURCE_VIDEO_FFMPEG From 247751052796eb3a61f47ea4fadc74009da64943 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:04:30 -0600 Subject: [PATCH 1566/1653] Update SpeechSynthetizer.sh --- Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh index a83cc211..413407b3 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/SpeechSynthetizer.sh @@ -33,6 +33,8 @@ if [ $# -eq 4 ]; then VoiceRss.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" elif [ "$LOCAL_ENGINE" = "pico2wave" ]; then Pico2Wave.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" + elif [ "$LOCAL_ENGINE" = "festival" ]; then + Festival.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" fi if [ "$LOCAL_PLAY" = "on" ]; then From 9e9940ba2ef929461c5b942e9860afc2f950fee8 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:12:47 -0600 Subject: [PATCH 1567/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index a8e0dcba..504673b9 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -35,7 +35,7 @@ then export FESTIVAL_LANGUAGE="${FESTIVAL_LANGUAGE} ${LOCAL_LANGUAGE}" export FESTIVAL_TEXT="$LOCAL_TEXT" - echo "${FESTIVAL_TEXT}" | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE + echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 From ed55a58bfd6b8911d816ce67d2f9d82b5647d442 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:19:33 -0600 Subject: [PATCH 1568/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 504673b9..47b70b00 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -10,7 +10,8 @@ set -x export FESTIVAL_PID=$$ export FESTIVAL_BINARY=festival -export FESTIVAL_COMMANDLINE="--tts --pipe" +#export FESTIVAL_COMMANDLINE="--tts --pipe" +export FESTIVAL_COMMANDLINE="--tts" export FESTIVAL_CONVERSION="iconv -f utf-8 -t iso-8859-1" export FESTIVAL_LANGUAGE="--language" export FESTIVAL_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE @@ -34,8 +35,9 @@ then export FESTIVAL_LANGUAGE="${FESTIVAL_LANGUAGE} ${LOCAL_LANGUAGE}" export FESTIVAL_TEXT="$LOCAL_TEXT" + echo $FESTIVAL_TEXT > $FESTIVAL_FILE - echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE + #echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 From 57459e524464e28a5245a9c72921556639a9d0db Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:20:19 -0600 Subject: [PATCH 1569/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 47b70b00..5dd18ad2 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -37,7 +37,7 @@ then export FESTIVAL_TEXT="$LOCAL_TEXT" echo $FESTIVAL_TEXT > $FESTIVAL_FILE - #echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE + echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 From d0ab279b7116fd39398a8d1c200e395e11fd87f3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:21:31 -0600 Subject: [PATCH 1570/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 5dd18ad2..5ec9c75e 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -14,6 +14,7 @@ export FESTIVAL_BINARY=festival export FESTIVAL_COMMANDLINE="--tts" export FESTIVAL_CONVERSION="iconv -f utf-8 -t iso-8859-1" export FESTIVAL_LANGUAGE="--language" +export FESTIVAL_FILE="/tmp/festival" export FESTIVAL_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE export FESTIVAL_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH @@ -35,9 +36,10 @@ then export FESTIVAL_LANGUAGE="${FESTIVAL_LANGUAGE} ${LOCAL_LANGUAGE}" export FESTIVAL_TEXT="$LOCAL_TEXT" - echo $FESTIVAL_TEXT > $FESTIVAL_FILE + echo "$FESTIVAL_TEXT" > $FESTIVAL_FILE - echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE + #echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE + $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 From 330edeffe173bb712fd9ce2c9469939a9cb9166d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:22:31 -0600 Subject: [PATCH 1571/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 5ec9c75e..ba53f739 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -36,7 +36,7 @@ then export FESTIVAL_LANGUAGE="${FESTIVAL_LANGUAGE} ${LOCAL_LANGUAGE}" export FESTIVAL_TEXT="$LOCAL_TEXT" - echo "$FESTIVAL_TEXT" > $FESTIVAL_FILE + echo "$FESTIVAL_TEXT" | $FESTIVAL_CONVERSION > $FESTIVAL_FILE #echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE From 287d47fb9d28e09e3c9f6a5e3e7cca6e948160ba Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:25:06 -0600 Subject: [PATCH 1572/1653] Update Main.sh --- Hochob/Main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index c93ba166..f55b5554 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -171,7 +171,7 @@ export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH=$HOCH export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE/Pico2WaveSpeech.mp3 export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER/Festival/ -export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVALE/*.* +export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_ALLFILES=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL/*.* export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL/FestivalSpeech.wav export HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL_SPEECH_MP3=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_FESTIVAL/FestivalSpeech.mp3 From 8206f70a01ef3a6a26c12bd675499e3f391492f6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:28:11 -0600 Subject: [PATCH 1573/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index ba53f739..548a06eb 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -15,8 +15,6 @@ export FESTIVAL_COMMANDLINE="--tts" export FESTIVAL_CONVERSION="iconv -f utf-8 -t iso-8859-1" export FESTIVAL_LANGUAGE="--language" export FESTIVAL_FILE="/tmp/festival" -export FESTIVAL_DIRECTORY=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE -export FESTIVAL_SPEECH=$HOCHOB_SERVER_MEDIA_SOURCE_SOUND_SPEECHSYNTHETIZER_PICO2WAVE_SPEECH LOCAL_LANGUAGE="$1" LOCAL_TEXT="$2" From d9214d081cfc75633379669bcf8985707f76ae4e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:31:19 -0600 Subject: [PATCH 1574/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 548a06eb..364fa88a 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -37,7 +37,8 @@ then echo "$FESTIVAL_TEXT" | $FESTIVAL_CONVERSION > $FESTIVAL_FILE #echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE - $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE + #$FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE + cat $FESTIVAL_FILE | text2wave > $FESTIVAL_SPEECH ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 From 738560e60adc4e602e428e3bf22e0d1f948cb0c2 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:32:56 -0600 Subject: [PATCH 1575/1653] Update Janos.sh --- Hochob/Applications/NorthernMayaLowlands/Janos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Janos.sh b/Hochob/Applications/NorthernMayaLowlands/Janos.sh index acd17960..0a689715 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Janos.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Janos.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Juum" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions From a2c37497fd9054731fcf7dc6b3c18527dd5dc7ba Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:34:19 -0600 Subject: [PATCH 1576/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index e2540c1f..5ffe8bbf 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -16,7 +16,7 @@ export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions From dd5cc9a5ba333f8910d0d5140d7bb87f6c290ef1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:35:07 -0600 Subject: [PATCH 1577/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index c71b0058..db487626 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export CALAKMUL_PID=$$ -export CALAKMUL_NAME="Mapimi Application" +export CALAKMUL_NAME="Calakmul" export CALAKMUL_PATH=$(readlink -f "$0") export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") @@ -26,7 +26,7 @@ export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ From ad21d5cd8b8da2c9933f51d37492523fd699c67f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:35:43 -0600 Subject: [PATCH 1578/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index db487626..1ec70204 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -24,7 +24,7 @@ export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Eek'" +LOCAL_DEVICE="Juum" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="festival" From 1a513b08858931bfc238bcc020ad5af192c7182b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:36:22 -0600 Subject: [PATCH 1579/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index 1ec70204..cf4a7a58 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -24,7 +24,7 @@ export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Juum" +LOCAL_DEVICE="Eek" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="festival" From 27c4eefd7bf3ad6bebf0a5e0ad40ddb3da3d91cb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:39:56 -0600 Subject: [PATCH 1580/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index cf4a7a58..db487626 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -24,7 +24,7 @@ export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Eek" +LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="festival" From fe9bc26d6066544049a9421dca9cc88588e8b217 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:40:39 -0600 Subject: [PATCH 1581/1653] Update Makeblock.sh --- Hochob/Applications/AmikooMayaLands/Makeblock.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Makeblock.sh b/Hochob/Applications/AmikooMayaLands/Makeblock.sh index eaf656dc..1ac0953f 100755 --- a/Hochob/Applications/AmikooMayaLands/Makeblock.sh +++ b/Hochob/Applications/AmikooMayaLands/Makeblock.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Amikoo" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="espeak" +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions From 37f0383ebe52d2c9ad994bd4b2a52208e7bab29b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:41:10 -0600 Subject: [PATCH 1582/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 96c3f531..371bc2da 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -16,7 +16,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Triki" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions From 25fe751fba45f97e3ce24c4865e2bb5aba20bf48 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:41:26 -0600 Subject: [PATCH 1583/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 8c0b75c5..9b75cbd4 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -16,7 +16,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Triki" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions From 43aecec673ad442d84a257d827bfa283598bec72 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:42:18 -0600 Subject: [PATCH 1584/1653] Update Ixtapa.sh --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index 41f8f8ac..28f1f6ea 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Juum" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions From dfc6061b2203a8c7eb43d25f123637873fb08026 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:42:33 -0600 Subject: [PATCH 1585/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index dbbe4fbc..c66e1922 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -16,7 +16,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Triki" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions From 762df30447864c650fd66c76f5bc55b893a53684 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:42:54 -0600 Subject: [PATCH 1586/1653] Update PuertoVallarta.sh --- Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index d1489b7f..f7ea3c67 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -16,7 +16,6 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Triki" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" # ============================================================================= # Functions From 20116327bd767f85b54d878591b4df065d54b8ce Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:43:06 -0600 Subject: [PATCH 1587/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index c66e1922..027e66a2 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -16,7 +16,6 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Triki" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions From 671c70dae62b55d339597044fb79ee3064a71d04 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:43:44 -0600 Subject: [PATCH 1588/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index edd5f043..22b97e27 100755 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -15,7 +15,7 @@ export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") LOCAL_DEVICE="Eek'" LOCAL_LANGUAGE="spanish" -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" LOCAL_QUESTION_SPANISH[0]="¿Cual fue la aportación de los Mayas?" LOCAL_QUESTION_SPANISH[1]="¿Cual es el sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" From a894e9bb4133dedeed407b5af0cb878dc0001b1b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:45:32 -0600 Subject: [PATCH 1589/1653] Update Janos.sh --- Hochob/Applications/NorthernMayaLowlands/Janos.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Janos.sh b/Hochob/Applications/NorthernMayaLowlands/Janos.sh index 0a689715..f7a72c42 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Janos.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Janos.sh @@ -14,7 +14,7 @@ export JANOS_PATH=$(readlink -f "$0") export JANOS_DIRECTORY=$(dirname "$JANOS_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Juum" +LOCAL_DEVICE="Eek'" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="festival" From 8bc96c1f31edc58e8e6f10f652634e3491f3831c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:46:42 -0600 Subject: [PATCH 1590/1653] Update LaMichilia.sh --- .../NorthernMayaLowlands/LaMichilia.sh | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 1c960545..417b25ed 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -12,7 +12,11 @@ export LAMICHILIA_PID=$$ export LAMICHILIA_PATH=$(readlink -f "$0") export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Eek'" +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions @@ -28,17 +32,18 @@ LOCAL_TTS_ENGINE="pico2wave" LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE english \ - "To be written" + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + " else - SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE spanish \ - "Intel no solo se queda en la tierra, es tal el alcance del Microprocesador que puede \ + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Intel no solo se queda en la tierra, es tal el alcance del Microprocesador que puede \ estar en el universo, por ejemplo, ha trabajado con la NASA para crear cohetes y vehiculos \ - no tripulados. Veamos el siguiente video." + no tripulados. Veamos el siguiente video. \ + " fi -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" - #kill -- -$(ps -o pgid=$LAMICHILIA_PID | grep -o '[0-9]*') # End of File From d2e1ddc5bbae5d0be9e2484fafd7950936618291 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:47:36 -0600 Subject: [PATCH 1591/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 27be07c4..2d48c8e7 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -17,7 +17,7 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" +LOCAL_TTS_ENGINE="festival" # ============================================================================= # Functions @@ -31,12 +31,14 @@ LOCAL_TTS_ENGINE="pico2wave" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ - "It was a great pleasure to meet you and have you here at Intel Guadalajara. \ + " \ + It was a great pleasure to meet you and have you here at Intel Guadalajara. \ Come back soon future Engineers. \ " else StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ - "Nos dio mucho gusto conocerlas, conocerlos y que hayan venido a Intel Guadalajara. \ + " \ + Nos dio mucho gusto conocerlas, conocerlos y que hayan venido a Intel Guadalajara. \ Fue un placer recibirlos en nuestras instalaciones y esperamos verlos de nuevo!. \ " fi From e305df3b671b52f69c75ddd689acf93dd0c311db Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:52:36 -0600 Subject: [PATCH 1592/1653] Update MontesAzules.sh --- .../NorthernMayaLowlands/MontesAzules.sh | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 28985f35..8b26d9d6 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -12,6 +12,12 @@ export MONTESAZULES_PID=$$ export MONTESAZULES_PATH=$(readlink -f "$0") export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE="Eek'" +LOCAL_INSTITUTION=`Name.sh` +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE="festival" + # ============================================================================= # Functions # ============================================================================= @@ -22,21 +28,18 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") # Main # ============================================================================= -LOCAL_INSTITUTION=`Name.sh` -LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="pico2wave" - if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE english \ - "" + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + " else - SpeechSynthetizer.sh off $LOCAL_TTS_ENGINE spanish \ - "Futuras y futuros Matemáticos. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ - Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología." + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Futuras y futuros Matemáticos. Ya vimos la importancia de nuestras Fábricas y Laboratorios. \ + Ahora entraremos a una sección que nos permite jugar y conocer de cerca la tecnología. \ + " fi -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" - if [ "$LOCAL_LANGUAGE" = "english" ]; then echo "Tbd" else From ac477b1913bc6e4926e5f4fae7cd6eed9f51fb99 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:52:42 -0600 Subject: [PATCH 1593/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 5ffe8bbf..5c2abde9 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -30,19 +30,19 @@ LOCAL_TTS_ENGINE="festival" StreamAudio.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/TiburonBallena/LiftoffSpaceXFalcon9CRS10Mission.mp4" -StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ Pero donde puedes ver esto y mas? En el planeta marte! Veamos si puedes responder un par de preguntas. " -StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " A Marte se le conoce también como el planeta rojo? que opinas, sí o no?\ " -SurveyYesNo.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE yes +SurveyYesNo.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE yes -StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Cual fue la primer misión que tomó por primera vez fotos de Marte? \ Uno, Curiosity. \ @@ -50,9 +50,9 @@ StreamText.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE \ Tres, Sojourner. \ Cuatro, Mariner 4. " -SurveyMultipleChoice.sh $LOCAL_DEVICE spanish $LOCAL_TTS_ENGINE 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 4 -StreamText.sh $LOCAL_DEVICE english tt \ +StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " Which spacecraft took the first photos of Mars? \ One, Curiosity. \ @@ -60,6 +60,6 @@ StreamText.sh $LOCAL_DEVICE english tt \ Three, Sojourner. \ Four, Mariner 4. " -SurveyMultipleChoice.sh $LOCAL_DEVICE english tt 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 4 # End of File From cba2c867b91d66a1c6739cfd3c3b199366ef6cc7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:54:52 -0600 Subject: [PATCH 1594/1653] Update TiburonBallena.sh --- .../NorthernMayaLowlands/TiburonBallena.sh | 42 ++++++++++--------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 5c2abde9..1e2d45d4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -9,7 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export TIBURONBALLENA_PID=$$ -export TIBURONBALLENA_NAME="Mapimi Application" +export TIBURONBALLENA_NAME="TiburonBallena" export TIBURONBALLENA_PATH=$(readlink -f "$0") export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") @@ -31,35 +31,39 @@ LOCAL_TTS_ENGINE="festival" StreamAudio.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/TiburonBallena/LiftoffSpaceXFalcon9CRS10Mission.mp4" StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ - Pero donde puedes ver esto y mas? En el planeta marte! Veamos si puedes responder un par de preguntas. + " \ + Imagina esto, cielo rosa, atardeceres naranjas, mucho desierto y acantilados. \ + Pero donde puedes ver esto y mas? En el planeta marte! Veamos si puedes responder un par de preguntas. " StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - A Marte se le conoce también como el planeta rojo? que opinas, sí o no?\ + " \ + A Marte se le conoce también como el planeta rojo? que opinas, sí o no? \ " SurveyYesNo.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE yes StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Cual fue la primer misión que tomó por primera vez fotos de Marte? \ " - Cual fue la primer misión que tomó por primera vez fotos de Marte? \ - Uno, Curiosity. \ - Dos, Spirit. \ - Tres, Sojourner. \ - Cuatro, Mariner 4. + +StreamText.sh $LOCAL_DEVICE english $LOCAL_TTS_ENGINE \ + " \ + Uno, Curiosity. \ + Dos, Spirit. \ + Tres, Sojourner. \ + Cuatro, Mariner 4. " SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 4 -StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ - " - Which spacecraft took the first photos of Mars? \ - One, Curiosity. \ - Two, Spirit. \ - Three, Sojourner. \ - Four, Mariner 4. +StreamText.sh $LOCAL_DEVICE english $LOCAL_TTS_ENGINE \ + " \ + Which spacecraft took the first photos of Mars? \ + One, Curiosity. \ + Two, Spirit. \ + Three, Sojourner. \ + Four, Mariner 4. " -SurveyMultipleChoice.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE 4 +SurveyMultipleChoice.sh $LOCAL_DEVICE english $LOCAL_TTS_ENGINE 4 # End of File From 4de98976359dabdb2e058e0df3ca2a4bcea7fdbc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 18:58:22 -0600 Subject: [PATCH 1595/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 8b26d9d6..0373482b 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -9,6 +9,7 @@ set -x . ~/CodeLabs/Hochob/Main.sh export MONTESAZULES_PID=$$ +export MONTESAZULES_NAME="MontesAzules" export MONTESAZULES_PATH=$(readlink -f "$0") export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") @@ -31,6 +32,8 @@ LOCAL_TTS_ENGINE="festival" if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " \ + Future Mathematicians. We have seen the importance of our Fabs and Labs. \ + Now, we will get into a section where we can play and understand closely the technology. " else StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ From 3c2bea49d0f20bfb66555c2c2c2c88bbe14467c3 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:00:15 -0600 Subject: [PATCH 1596/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 1e2d45d4..de186937 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -13,7 +13,7 @@ export TIBURONBALLENA_NAME="TiburonBallena" export TIBURONBALLENA_PATH=$(readlink -f "$0") export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") -LOCAL_DEVICE="Eek'" +LOCAL_DEVICE="NohochTata" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="festival" From 96e411f2ceed991ab53f72c8a7080f95b22685df Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:03:18 -0600 Subject: [PATCH 1597/1653] Update StreamText.sh --- Hochob/Services/Stream/StreamText.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Hochob/Services/Stream/StreamText.sh b/Hochob/Services/Stream/StreamText.sh index 14f0b05f..cbd88789 100755 --- a/Hochob/Services/Stream/StreamText.sh +++ b/Hochob/Services/Stream/StreamText.sh @@ -25,10 +25,10 @@ LOCAL_TEXT="$4" # Main # ============================================================================= -if [ -z "$LOCAL_LANGUAGE" ] -then - LOCAL_LANGUAGE="spanish" -fi +#if [ -z "$LOCAL_LANGUAGE" ] +#then +# LOCAL_LANGUAGE="spanish" +#fi if [ "$LOCAL_DEVICE" = "Amikoo" ]; then AmikooVoice.sh $LOCAL_LANGUAGE "${LOCAL_TEXT}" From d0f1870eebb5bd6436e3c277453088f1eb99eae9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:09:05 -0600 Subject: [PATCH 1598/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 364fa88a..8233b54f 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -38,6 +38,12 @@ then #echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE #$FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE + if [ "$LOCAL_LANGUAGE" = "english" ]; then + echo "(set! voice_default kal_diphone)" > ~/.festivalrc + elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + echo "(set! voice_default voice_JuntaDeAndalucia_es_pa_diphone)" > ~/.festivalrc + fi + cat $FESTIVAL_FILE | text2wave > $FESTIVAL_SPEECH ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 From fb4735fa0ec99df71b10f10dfc8c05b7741aadf7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:15:24 -0600 Subject: [PATCH 1599/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index 8233b54f..e2700240 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -39,7 +39,7 @@ then #echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE #$FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE if [ "$LOCAL_LANGUAGE" = "english" ]; then - echo "(set! voice_default kal_diphone)" > ~/.festivalrc + echo "(set! voice_default voice_ked_diphone)" > ~/.festivalrc elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then echo "(set! voice_default voice_JuntaDeAndalucia_es_pa_diphone)" > ~/.festivalrc fi From d15bfbaaba3e40f3ef5ae58a89ec132f4c93c5ce Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:22:26 -0600 Subject: [PATCH 1600/1653] Update Festival.sh --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index e2700240..b55b6aa1 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -36,10 +36,12 @@ then export FESTIVAL_TEXT="$LOCAL_TEXT" echo "$FESTIVAL_TEXT" | $FESTIVAL_CONVERSION > $FESTIVAL_FILE - #echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE - #$FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE + # echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE + # $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE + if [ "$LOCAL_LANGUAGE" = "english" ]; then - echo "(set! voice_default voice_ked_diphone)" > ~/.festivalrc + # echo "(set! voice_default voice_ked_diphone)" > ~/.festivalrc + echo "(set! voice_default voice_rab_diphone)" > ~/.festivalrc elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then echo "(set! voice_default voice_JuntaDeAndalucia_es_pa_diphone)" > ~/.festivalrc fi From d0bd63ca9c4a1abd6f0755f31a9be59ac42a9267 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:23:49 -0600 Subject: [PATCH 1601/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index de186937..1e2d45d4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -13,7 +13,7 @@ export TIBURONBALLENA_NAME="TiburonBallena" export TIBURONBALLENA_PATH=$(readlink -f "$0") export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") -LOCAL_DEVICE="NohochTata" +LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="festival" From 8615fd18760d5547daa0aef13eaaea4af9d07bf0 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:24:12 -0600 Subject: [PATCH 1602/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 0373482b..4a1d8676 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -15,6 +15,7 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" +LOCAL_DEVICE="NohochTata" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="festival" From be8bd96305d022f7114e8fba295fc5aca46de9c1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:26:07 -0600 Subject: [PATCH 1603/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 4a1d8676..2c1da3b0 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -47,7 +47,7 @@ fi if [ "$LOCAL_LANGUAGE" = "english" ]; then echo "Tbd" else - Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" + StreamAudio.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/MontesAzules.mp3" fi #kill -- -$(ps -o pgid=$MONTESAZULES_PID | grep -o '[0-9]*') From 3bf3db15e760666d6ee81b5643742bcac43f1aab Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:35:08 -0600 Subject: [PATCH 1604/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 2c1da3b0..10f708f7 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -15,7 +15,6 @@ export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") LOCAL_INSTITUTION=`Name.sh` LOCAL_DEVICE="Eek'" -LOCAL_DEVICE="NohochTata" LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` LOCAL_TTS_ENGINE="festival" From 3bdbcaa11d456f29257688834b0698634789b146 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Sun, 17 Dec 2017 19:36:18 -0600 Subject: [PATCH 1605/1653] Update Packages.sh --- Hochob/Setup/Packages.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Setup/Packages.sh b/Hochob/Setup/Packages.sh index 19940493..e094ddaa 100755 --- a/Hochob/Setup/Packages.sh +++ b/Hochob/Setup/Packages.sh @@ -49,7 +49,8 @@ sudo apt install vlc # Hochob Server Services Sound Speech Synthetizer sudo apt install espeak tee sudo apt install festival festival-doc festvox-kdlpc16k festvox-ellpc11k -sudo apt-get install libttspico0 libttspico-utils libttspico-data +sudo apt install festvox-don festvox-rablpc16k festvox-kallpc16k festvox-kdlpc16k +sudo apt install libttspico0 libttspico-utils libttspico-data # Hochob Server Services Stream sudo apt install ffmpeg From 8dee24d77dac2ed2e63ed031f58389ce9351d768 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 09:24:14 -0600 Subject: [PATCH 1606/1653] Update --- Hochob/Services/Sound/SpeechSynthetizer/Festival.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh index b55b6aa1..aae5237b 100755 --- a/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh +++ b/Hochob/Services/Sound/SpeechSynthetizer/Festival.sh @@ -38,14 +38,15 @@ then # echo "${FESTIVAL_TEXT}" | $FESTIVAL_CONVERSION | $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_LANGUAGE # $FESTIVAL_BINARY $FESTIVAL_COMMANDLINE $FESTIVAL_FILE - + if [ "$LOCAL_LANGUAGE" = "english" ]; then # echo "(set! voice_default voice_ked_diphone)" > ~/.festivalrc echo "(set! voice_default voice_rab_diphone)" > ~/.festivalrc elif [ "$LOCAL_LANGUAGE" = "spanish" ]; then + echo "(set! voice_default voice_JuntaDeAndalucia_es_sf_diphone)" > ~/.festivalrc echo "(set! voice_default voice_JuntaDeAndalucia_es_pa_diphone)" > ~/.festivalrc fi - + cat $FESTIVAL_FILE | text2wave > $FESTIVAL_SPEECH ffmpeg -y -i $FESTIVAL_SPEECH $FESTIVAL_SPEECH_MP3 From ee0af107350852b80437bba02af9773aba9a78ff Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 09:59:56 -0600 Subject: [PATCH 1607/1653] Update TiburonBallena.sh --- Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh index 1e2d45d4..e1b639e4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh +++ b/Hochob/Applications/NorthernMayaLowlands/TiburonBallena.sh @@ -13,10 +13,11 @@ export TIBURONBALLENA_NAME="TiburonBallena" export TIBURONBALLENA_PATH=$(readlink -f "$0") export TIBURONBALLENA_DIRECTORY=$(dirname "$TIBURONBALLENA_PATH") -LOCAL_DEVICE="Eek'" LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE # ============================================================================= # Functions @@ -28,7 +29,7 @@ LOCAL_TTS_ENGINE="festival" # Main # ============================================================================= -StreamAudio.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/TiburonBallena/LiftoffSpaceXFalcon9CRS10Mission.mp4" +StreamAudio.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/TiburonBallena/LiftoffSpaceXFalcon9CRS10Mission.mp4" StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ " \ From 169c9b6473523e49432995bb36c281eb5050858e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:00 -0600 Subject: [PATCH 1608/1653] Update SianKaan.sh --- .../NorthernMayaLowlands/SianKaan.sh | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index f38697a9..4a2dd5d3 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -13,6 +13,13 @@ export SIANKAAN_NAME="Mapimi Application" export SIANKAAN_PATH=$(readlink -f "$0") export SIANKAAN_DIRECTORY=$(dirname "$SIANKAAN_PATH") + +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE + # ============================================================================= # Functions # ============================================================================= @@ -27,14 +34,18 @@ LOCAL_INSTITUTION=`Name.sh` LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ - "To be written" + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + To be written, ${LOCAL_INSTITUTION} \ + " else - SpeechSynthetizer.sh off espeak spanish \ - "Por escribirse, ${LOCAL_INSTITUTION}" + StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ + " \ + Por escribirse, ${LOCAL_INSTITUTION} \ + " fi -Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & +Stream.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & Amikoo.sh amikoo/headright 1 sleep .75 From 6ccfed518f353e031c3425ffff8d0e462df0d653 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:05 -0600 Subject: [PATCH 1609/1653] Update OjoDeLiebre.sh --- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 8fb01716..6b848e4d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -12,6 +12,12 @@ export OJODELIEBRE_PID=$$ export OJODELIEBRE_PATH=$(readlink -f "$0") export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE + # ============================================================================= # Functions # ============================================================================= @@ -22,6 +28,6 @@ export OJODELIEBRE_DIRECTORY=$(dirname "$OJODELIEBRE_PATH") # Main # ============================================================================= -Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" +Stream.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" # End of File From 4865734cb70edefefda49061875bb7821767b870 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:08 -0600 Subject: [PATCH 1610/1653] Update MontesAzules.sh --- Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh index 10f708f7..2a080cb6 100755 --- a/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh +++ b/Hochob/Applications/NorthernMayaLowlands/MontesAzules.sh @@ -14,10 +14,10 @@ export MONTESAZULES_PATH=$(readlink -f "$0") export MONTESAZULES_DIRECTORY=$(dirname "$MONTESAZULES_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Eek'" -LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE # ============================================================================= # Functions From 97aa5965c2b6e7f7733e0ee7d15dc0ae5ede322a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:11 -0600 Subject: [PATCH 1611/1653] Update Mapimi.sh --- Hochob/Applications/NorthernMayaLowlands/Mapimi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh index 2d48c8e7..04031892 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Mapimi.sh @@ -14,10 +14,10 @@ export MAPIMI_PATH=$(readlink -f "$0") export MAPIMI_DIRECTORY=$(dirname "$MAPIMI_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Eek'" -LOCAL_VOLUME="1.0" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE # ============================================================================= # Functions From 13aba9f5d4776ffd40d0764f947a629d8488d0d5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:14 -0600 Subject: [PATCH 1612/1653] Update LaMichilia.sh --- Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 417b25ed..3e6f8cd1 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -13,10 +13,10 @@ export LAMICHILIA_PATH=$(readlink -f "$0") export LAMICHILIA_DIRECTORY=$(dirname "$LAMICHILIA_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Eek'" -LOCAL_VOLUME="1.0" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE # ============================================================================= # Functions From 9c93b7e6537acb23dd77f7d56d185e438b761bfb Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:18 -0600 Subject: [PATCH 1613/1653] Update Janos.sh --- Hochob/Applications/NorthernMayaLowlands/Janos.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Janos.sh b/Hochob/Applications/NorthernMayaLowlands/Janos.sh index f7a72c42..a94416d6 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Janos.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Janos.sh @@ -14,10 +14,10 @@ export JANOS_PATH=$(readlink -f "$0") export JANOS_DIRECTORY=$(dirname "$JANOS_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Eek'" -LOCAL_VOLUME="1.0" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE # ============================================================================= # Functions From 0db6473feec36dc0d2501394aa078cbdcbcef9df Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:22 -0600 Subject: [PATCH 1614/1653] Update IslasMarias.sh --- Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh index 22b97e27..09cdae40 100755 --- a/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh +++ b/Hochob/Applications/NorthernMayaLowlands/IslasMarias.sh @@ -13,9 +13,9 @@ export ISLASMARIAS_NAME="IslasMarias" export ISLASMARIAS_PATH=$(readlink -f "$0") export ISLASMARIAS_DIRECTORY=$(dirname "$ISLASMARIAS_PATH") -LOCAL_DEVICE="Eek'" -LOCAL_LANGUAGE="spanish" -LOCAL_TTS_ENGINE="festival" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE LOCAL_QUESTION_SPANISH[0]="¿Cual fue la aportación de los Mayas?" LOCAL_QUESTION_SPANISH[1]="¿Cual es el sistema de numeración en el que los números se representan utilizando solamente dos cifras? cero y uno" From 4bd9dd3f1526b1b5358e5bc5e85aca30ff04eb1a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:24 -0600 Subject: [PATCH 1615/1653] Update ElCielo.sh --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index 30cf4a3c..5d9d3ba4 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -12,6 +12,9 @@ export ELCIELO_PID=$$ export ELCIELO_PATH=$(readlink -f "$0") export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE +LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME + # ============================================================================= # Functions # ============================================================================= @@ -22,7 +25,7 @@ export ELCIELO_DIRECTORY=$(dirname "$ELCIELO_PATH") # Main # ============================================================================= -Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" +Stream.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" #kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') From 034c7e76727ffbfaf66cd44af73fd933594389a6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:00:27 -0600 Subject: [PATCH 1616/1653] Update Calakmul.sh --- Hochob/Applications/NorthernMayaLowlands/Calakmul.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh index db487626..b6fcda5d 100755 --- a/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh +++ b/Hochob/Applications/NorthernMayaLowlands/Calakmul.sh @@ -24,9 +24,9 @@ export CALAKMUL_DIRECTORY=$(dirname "$CALAKMUL_PATH") # ============================================================================= LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Eek'" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE if [ "$LOCAL_LANGUAGE" = "english" ]; then StreamText.sh $LOCAL_DEVICE $LOCAL_LANGUAGE $LOCAL_TTS_ENGINE \ From b9112711f62fe966735669af9de49d8891fe8ff9 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 10:02:30 -0600 Subject: [PATCH 1617/1653] Update Main.sh --- Hochob/Main.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index f55b5554..f90fb4f8 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -25,6 +25,25 @@ export HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE=$HOCHOB_SERVER_CONFIGURATION/ cd ~/CodeLabs/Hochob/ export HOCHOB_ROOT=`pwd` +# ------------------- # +# Hochob Applications # +# ------------------- # + +HOCHOB_SERVER_APPLICATIONS_SOUTHERN_MAYA_HIGHLANDS_TTS_ENGINE="espeak" +HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_TTS_ENGINE="festival" +HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_TTS_ENGINE="festival" +HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE="festival" + +HOCHOB_SERVER_APPLICATIONS_SOUTHERN_MAYA_HIGHLANDS_DEVICE="NohochTata" +HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_DEVICE="Juum" +HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_DEVICE="Triki" +HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE="Eek'" + +HOCHOB_SERVER_APPLICATIONS_SOUTHERN_MAYA_HIGHLANDS_DEVICE_VOLUME="1.0" +HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_DEVICE_VOLUME="1.0" +HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_DEVICE_VOLUME="1.0" +HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME="1.0" + # ---------------------- # # Hochob Server Services # # ---------------------- # From 8d8f3db4dded0467b85ffe3beaf62f034daab6ad Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 12:22:15 -0600 Subject: [PATCH 1618/1653] Update Veracruz.sh --- .../CentralMayaLowlands/Veracruz.sh | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh index f0ac8d53..baa8c0f4 100755 --- a/Hochob/Applications/CentralMayaLowlands/Veracruz.sh +++ b/Hochob/Applications/CentralMayaLowlands/Veracruz.sh @@ -12,6 +12,12 @@ export VERACRUZ_PID=$$ export VERACRUZ_PATH=$(readlink -f "$0") export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") +LOCAL_INSTITUTION=`Name.sh` +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_DEVICE +LOCAL_VOLUME="1.0" +LOCAL_LANGUAGE=`Language.sh` +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_TTS_ENGINE + # ============================================================================= # Functions # ============================================================================= @@ -24,15 +30,17 @@ export VERACRUZ_DIRECTORY=$(dirname "$VERACRUZ_PATH") LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then - SpeechSynthetizer.sh off espeak english \ - "Hi There" + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ + " \ + Hi There!. \ + " else - SpeechSynthetizer.sh off espeak spanish \ - "Hola a todos" + StreamText.sh "$LOCAL_DEVICE" "$LOCAL_LANGUAGE" "$LOCAL_TTS_ENGINE" \ + " \ + Hola a todos!. \ + " fi -Stream.sh "Juum" "1.0" "$SPEECH_MP3" - # kill -- -$(ps -o pgid=$VERACRUZ_PID | grep -o '[0-9]*') # End of File From 93c6ad880a77ebd44661aad05d00ae49e852d2a6 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 12:22:17 -0600 Subject: [PATCH 1619/1653] Update PuertoVallarta.sh --- Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh index f7ea3c67..b75b3afe 100755 --- a/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh +++ b/Hochob/Applications/CentralMayaLowlands/PuertoVallarta.sh @@ -13,7 +13,7 @@ export PUERTOVALLARTA_PATH=$(readlink -f "$0") export PUERTOVALLARTA_DIRECTORY=$(dirname "$PUERTOVALLARTA_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Triki" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_DEVICE LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` From 881354ef6930d042c784a6cfe11cde7058e2ff9b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 12:22:20 -0600 Subject: [PATCH 1620/1653] Update Mazatlan.sh --- Hochob/Applications/CentralMayaLowlands/Mazatlan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh index 027e66a2..d6910bcb 100755 --- a/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh +++ b/Hochob/Applications/CentralMayaLowlands/Mazatlan.sh @@ -13,7 +13,7 @@ export MAZATLAN_PATH=$(readlink -f "$0") export MAZATLAN_DIRECTORY=$(dirname "$MAZATLAN_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Triki" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_DEVICE LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` From 3aea43fcdd29a5e4379457b68fc3b4610d1ab7f1 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 12:22:24 -0600 Subject: [PATCH 1621/1653] Update Ixtapa.sh --- Hochob/Applications/CentralMayaLowlands/Ixtapa.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh index 28f1f6ea..50103435 100755 --- a/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh +++ b/Hochob/Applications/CentralMayaLowlands/Ixtapa.sh @@ -14,10 +14,10 @@ export IXTAPA_PATH=$(readlink -f "$0") export IXTAPA_DIRECTORY=$(dirname "$IXTAPA_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Juum" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_DEVICE LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_TTS_ENGINE # ============================================================================= # Functions From 0c4827323c100e551c7547db741384298aff5903 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 12:22:26 -0600 Subject: [PATCH 1622/1653] Update Huatulco.sh --- Hochob/Applications/CentralMayaLowlands/Huatulco.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh index 9b75cbd4..072efe06 100755 --- a/Hochob/Applications/CentralMayaLowlands/Huatulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Huatulco.sh @@ -13,10 +13,10 @@ export HUATULCO_PATH=$(readlink -f "$0") export HUATULCO_DIRECTORY=$(dirname "$HUATULCO_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Triki" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_DEVICE LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_TTS_ENGINE # ============================================================================= # Functions From 299ecb37db2e47dd92f682c639ed9bd218774419 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 12:22:28 -0600 Subject: [PATCH 1623/1653] Update Cancun.sh --- Hochob/Applications/CentralMayaLowlands/Cancun.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Cancun.sh b/Hochob/Applications/CentralMayaLowlands/Cancun.sh index 93094ace..79916767 100755 --- a/Hochob/Applications/CentralMayaLowlands/Cancun.sh +++ b/Hochob/Applications/CentralMayaLowlands/Cancun.sh @@ -13,7 +13,7 @@ export CANCUN_PATH=$(readlink -f "$0") export CANCUN_DIRECTORY=$(dirname "$CANCUN_PATH") LOCAL_LANGUAGE=`Language.sh` -LOCAL_DEVICE="Triki" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_DEVICE LOCAL_VOLUME="1.0" # ============================================================================= From f311eec8d4ba6a8b20644d81e759b91c36cf9727 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 12:22:30 -0600 Subject: [PATCH 1624/1653] Update Acapulco.sh --- Hochob/Applications/CentralMayaLowlands/Acapulco.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh index 371bc2da..ceb8da51 100755 --- a/Hochob/Applications/CentralMayaLowlands/Acapulco.sh +++ b/Hochob/Applications/CentralMayaLowlands/Acapulco.sh @@ -13,10 +13,10 @@ export ACAPULCO_PATH=$(readlink -f "$0") export ACAPULCO_DIRECTORY=$(dirname "$ACAPULCO_PATH") LOCAL_INSTITUTION=`Name.sh` -LOCAL_DEVICE="Triki" +LOCAL_DEVICE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_DEVICE LOCAL_VOLUME="1.0" LOCAL_LANGUAGE=`Language.sh` -LOCAL_TTS_ENGINE="festival" +LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_TTS_ENGINE # ============================================================================= # Functions From 9ca09602b4ac57120a60de5eaa3da53eb3ef437e Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 12:27:09 -0600 Subject: [PATCH 1625/1653] Update Main.sh --- Hochob/Main.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index f90fb4f8..1f380364 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -35,8 +35,8 @@ HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_TTS_ENGINE="festival" HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE="festival" HOCHOB_SERVER_APPLICATIONS_SOUTHERN_MAYA_HIGHLANDS_DEVICE="NohochTata" -HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_DEVICE="Juum" -HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_DEVICE="Triki" +HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_DEVICE="Triki" +HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_HIGHLANDS_DEVICE="Juum" HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE="Eek'" HOCHOB_SERVER_APPLICATIONS_SOUTHERN_MAYA_HIGHLANDS_DEVICE_VOLUME="1.0" From 88995daf5b5fb6543d4116d1084c328c4137b702 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Mon, 18 Dec 2017 13:11:09 -0600 Subject: [PATCH 1626/1653] Update Main.sh --- Hochob/Main.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Hochob/Main.sh b/Hochob/Main.sh index 1f380364..e5a8c10a 100755 --- a/Hochob/Main.sh +++ b/Hochob/Main.sh @@ -25,9 +25,9 @@ export HOCHOB_SERVER_CONFIGURATION_AMIKOOAVAILABLE=$HOCHOB_SERVER_CONFIGURATION/ cd ~/CodeLabs/Hochob/ export HOCHOB_ROOT=`pwd` -# ------------------- # -# Hochob Applications # -# ------------------- # +# -------------------------- # +# Hochob Server Applications # +# -------------------------- # HOCHOB_SERVER_APPLICATIONS_SOUTHERN_MAYA_HIGHLANDS_TTS_ENGINE="espeak" HOCHOB_SERVER_APPLICATIONS_CENTRAL_MAYA_LOWLANDS_TTS_ENGINE="festival" From b77c1a7358564682b64a27ec340adf21abafac56 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 22 Dec 2017 20:33:28 -0600 Subject: [PATCH 1627/1653] Update Signed-off-by: Abraham Arce --- Coba/{ => Embedded/IntelEdison}/Makefile | 0 Coba/{ => Embedded/IntelEdison}/main.c | 0 Coba/{setup => Embedded/IntelEdison}/setup.sh | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename Coba/{ => Embedded/IntelEdison}/Makefile (100%) rename Coba/{ => Embedded/IntelEdison}/main.c (100%) rename Coba/{setup => Embedded/IntelEdison}/setup.sh (100%) diff --git a/Coba/Makefile b/Coba/Embedded/IntelEdison/Makefile similarity index 100% rename from Coba/Makefile rename to Coba/Embedded/IntelEdison/Makefile diff --git a/Coba/main.c b/Coba/Embedded/IntelEdison/main.c similarity index 100% rename from Coba/main.c rename to Coba/Embedded/IntelEdison/main.c diff --git a/Coba/setup/setup.sh b/Coba/Embedded/IntelEdison/setup.sh similarity index 100% rename from Coba/setup/setup.sh rename to Coba/Embedded/IntelEdison/setup.sh From 20cc216613807ffb5f48f58ded0dee6d1f4d7f91 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 23 Jan 2018 17:04:27 -0600 Subject: [PATCH 1628/1653] Update Toyota.sh --- Hochob/Applications/TechieMayaLands/Toyota.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index 4c2f8920..24fab5c6 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -28,7 +28,7 @@ LogPid.sh $TOYOTA_PID $TOYOTA_NAME SpeechSynthetizer.sh on espeak spanish \ "Hola Mundo! Uno, Dos, Tres, Probando!" -Stream.sh "Triki" "1.0" "$SPEECH_MP3" +StreamAudio.sh "Triki" "1.0" "$SPEECH_MP3" echo $? Amikoo.sh amikoo/inicial 1 @@ -37,14 +37,14 @@ Amikoo.sh amikoo/porsupuesto 1 Amikoo.sh amikoo/cerebro 1 Amikoo.sh amikoo/inteledison 1 -Stream.sh "Tran" "1.0" "$SPEECH_MP3" +StreamAudio.sh "Tran" "1.0" "$SPEECH_MP3" echo $? -Stream.sh "Juum" "1.0" "$SPEECH_MP3" +StreamAudio.sh "Juum" "1.0" "$SPEECH_MP3" echo $? -Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +StreamAudio.sh "Eek'" "1.0" "$SPEECH_MP3" echo $? -Memories.sh "5" "on" "${ZACATECAS_NAME}" & +Memories.sh "5" "on" "${TOYOTA_NAME}" & sleep 2 ConvertText.sh "$FSWEBCAM_IMAGE" "System Health" wait From c390e207c118d291588c352d4602d4d86ecb44ab Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 23 Jan 2018 17:09:04 -0600 Subject: [PATCH 1629/1653] Update ElCielo.sh --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index 5d9d3ba4..1f146188 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -25,7 +25,7 @@ LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME # Main # ============================================================================= -Stream.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" +StreamAudio.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" #kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') From 55609733555565412c6463752a17892333e8d1e7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 23 Jan 2018 17:13:29 -0600 Subject: [PATCH 1630/1653] Update Signed-off-by: Abraham Arce --- Hochob/Applications/NorthernMayaLowlands/ElCielo.sh | 2 +- Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh | 2 +- Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh | 2 +- Hochob/Applications/NorthernMayaLowlands/SianKaan.sh | 2 +- Hochob/Applications/TechieMayaLands/Apple.sh | 8 ++++---- .../TraditionMayaLands/DiaDeMuertos/Veladora.sh | 2 +- Hochob/Applications/TraditionMayaLands/Intel/4004.sh | 2 +- Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh index 5d9d3ba4..1f146188 100755 --- a/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh +++ b/Hochob/Applications/NorthernMayaLowlands/ElCielo.sh @@ -25,7 +25,7 @@ LOCAL_VOLUME=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_DEVICE_VOLUME # Main # ============================================================================= -Stream.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" +StreamAudio.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/ElCielo.mp3" #kill -- -$(ps -o pgid=$ELCIELO_PID | grep -o '[0-9]*') diff --git a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh index 3e6f8cd1..e0dfc0e5 100755 --- a/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh +++ b/Hochob/Applications/NorthernMayaLowlands/LaMichilia.sh @@ -28,7 +28,7 @@ LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE # Main # ============================================================================= -#Stream.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/LaMichilia.mp3" +StreamAudio.sh "Eek'" "1.0" "$AREA_NORTHERN_MAYA_LOWLANDS/LaMichilia.mp3" LOCAL_LANGUAGE=`Language.sh` if [ "$LOCAL_LANGUAGE" = "english" ]; then diff --git a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh index 6b848e4d..54b71654 100755 --- a/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh +++ b/Hochob/Applications/NorthernMayaLowlands/OjoDeLiebre.sh @@ -28,6 +28,6 @@ LOCAL_TTS_ENGINE=$HOCHOB_SERVER_APPLICATIONS_NORTHERN_MAYA_LOWLANDS_TTS_ENGINE # Main # ============================================================================= -Stream.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" +StreamAudio.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/OjoDeLiebre.mp3" # End of File diff --git a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh index 4a2dd5d3..3cb030d3 100755 --- a/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh +++ b/Hochob/Applications/NorthernMayaLowlands/SianKaan.sh @@ -45,7 +45,7 @@ else " fi -Stream.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & +StreamAudio.sh $LOCAL_DEVICE $LOCAL_VOLUME "$AREA_NORTHERN_MAYA_LOWLANDS/SianKaan.mp3" & Amikoo.sh amikoo/headright 1 sleep .75 diff --git a/Hochob/Applications/TechieMayaLands/Apple.sh b/Hochob/Applications/TechieMayaLands/Apple.sh index 1c4a5bfb..60d61d8f 100755 --- a/Hochob/Applications/TechieMayaLands/Apple.sh +++ b/Hochob/Applications/TechieMayaLands/Apple.sh @@ -44,9 +44,9 @@ else "Proxima Visita, ${LOCAL_INSTITUTION_NAME}" fi -#Stream.sh "Triki" "1.0" "$SPEECH_MP3" -#Stream.sh "Tran" "1.0" "$SPEECH_MP3" -#Stream.sh "Juum" "1.0" "$SPEECH_MP3" -#Stream.sh "Eek'" "1.0" "$SPEECH_MP3" +#StreamAudio.sh "Triki" "1.0" "$SPEECH_MP3" +#StreamAudio.sh "Tran" "1.0" "$SPEECH_MP3" +#StreamAudio.sh "Juum" "1.0" "$SPEECH_MP3" +#StreamAudio.sh "Eek'" "1.0" "$SPEECH_MP3" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh index 9ee33e48..17f11619 100755 --- a/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh +++ b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Veladora.sh @@ -28,6 +28,6 @@ LOCAL_DEVICE="Triki" LogPid.sh $VELADORA_PID $VELADORA_NAME LOCAL_SOUND=`find $TRADITION_DIADEMUERTOS/Sound/ -type f | shuf -n 1` -Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" +StreamAudio.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/Intel/4004.sh b/Hochob/Applications/TraditionMayaLands/Intel/4004.sh index a0ac1fda..b5c52fb8 100755 --- a/Hochob/Applications/TraditionMayaLands/Intel/4004.sh +++ b/Hochob/Applications/TraditionMayaLands/Intel/4004.sh @@ -29,6 +29,6 @@ LOCAL_DEVICE="Triki" LogPid.sh $i4004_PID $i4004_NAME LOCAL_SOUND=`find $TRADITION_INTEL/Sound/ -type f | shuf -n 1` -Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" +StreamAudio.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" # End of File diff --git a/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh b/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh index e8e08d39..5f864223 100755 --- a/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh +++ b/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh @@ -28,4 +28,4 @@ LOCAL_DEVICE="Triki" LogPid.sh $FAMILIA_PID $FAMILIA_NAME LOCAL_SOUND=`find $TRADITION_NAVIDAD/Sound/ -type f | shuf -n 1` -Stream.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" +StreamAudio.sh "$LOCAL_DEVICE" "1.0" "$LOCAL_SOUND" From 6ed5c46bc7279b87baaebfa30cb001f0b9dcf85c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 23 Jan 2018 17:25:45 -0600 Subject: [PATCH 1631/1653] Update Signed-off-by: Abraham Arce --- .../Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh index 4c7a33ca..3b1a551d 100755 --- a/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh +++ b/Hochob/Applications/TraditionMayaLands/DiaDeMuertos/Fotografia.sh @@ -38,7 +38,7 @@ else fi AmikooSense.sh "Sight" "Picture" -sleep 2 +sleep 7 AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Witch.mp3" sleep 3 AmikooCommunication.sh "$LOCAL_TRADITION" "Audio" "Stop" From f8688e748f83ccb00e6b686245c1aef0b8e8a865 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 23 Jan 2018 17:49:55 -0600 Subject: [PATCH 1632/1653] Update Signed-off-by: Abraham Arce --- .../Games/SopaDeLetras/SopaDeLetras.py | 22 ++++++++++++++ .../Games/SopaDeLetras/SopaDeLetras.sh | 29 +++++++++++++++++++ .../Games/SopaDeLetras/SopaDeLetras.txt | 16 ++++++++++ 3 files changed, 67 insertions(+) create mode 100755 Hochob/Services/Games/SopaDeLetras/SopaDeLetras.py create mode 100755 Hochob/Services/Games/SopaDeLetras/SopaDeLetras.sh create mode 100644 Hochob/Services/Games/SopaDeLetras/SopaDeLetras.txt diff --git a/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.py b/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.py new file mode 100755 index 00000000..15764e36 --- /dev/null +++ b/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import os +import random +import time +import unidecode +import unicodedata + +with open("SopaDeLetras.txt") as f: + lines = f.readlines() + random.shuffle(lines) + f.close() +with open("SopaDeLetras.rnd", "w") as f: + f.writelines(lines) + for line in lines: + line = line.rstrip('\r\n') + print line + os.system('mosquitto_pub -h 10.215.56.158 -p 1883 -q 2 -t amikoo/sound/speechsynthetizer/decir -m "' + line + '"') + time.sleep(10) + f.close() + diff --git a/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.sh b/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.sh new file mode 100755 index 00000000..f7ed0041 --- /dev/null +++ b/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.sh @@ -0,0 +1,29 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export SOPADELETRAS_PID=$$ +export SOPADELETRAS_PATH=$(readlink -f "$0") +export SOPADELETRAS_BASEDIR=$(dirname "$SCRIPT") +export SOPADELETRAS_BASEDIR="$( cd "$(dirname "$0")" ; pwd -P )" + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +cd $SOPADELETRAS_BASEDIR +python SopaDeLetras.py + +# End of File diff --git a/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.txt b/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.txt new file mode 100644 index 00000000..f9dca6a4 --- /dev/null +++ b/Hochob/Services/Games/SopaDeLetras/SopaDeLetras.txt @@ -0,0 +1,16 @@ +Cual es mi nombre? +Lenguage de las Computadoras? +Intel es una empresa de? +Material en un Microprocesador? +Cuando se corta el lingote obtenemos? +Lugar donde se fabrica un Microprocesador? +Asistente Virtual? +Equipo para escuchar muones? +Aportaron el 0? +Unidad de medicion en los microprocesadores? +Una de las tantas soluciones de Intel? +Intel empezo actividades con 33? +El silicio proviene de? +Que parte de nuestro cuerpo simula un microprocesador? +Me gustaria trabajar en? +Nombre de particulas que entran a la tierra? From 081795a7131891737ad4a8645628aafcb1790755 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 30 Jan 2018 11:27:39 -0600 Subject: [PATCH 1633/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 202c77f6..59eb4099 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -363,6 +363,40 @@ homeassistant: friendly_name: Drones Intel Aero icon: mdi:drone + # Tradition Maya Lands :: San Valentin + + automation.corazon: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.corazon: + friendly_name: Sonidos + icon: mdi:speaker + + automation.cupido: + friendly_name: 10 minutos .. Sonidos + icon: mdi:calendar-clock + + script.cupido: + friendly_name: Sonidos + icon: mdi:speaker + + automation.flores: + friendly_name: 10 minutos .. Imágenes + icon: mdi:calendar-clock + + script.flores: + friendly_name: Imágenes + icon: mdi:file-image + + automation.chocolates: + friendly_name: 10 minutos .. Video + icon: mdi:calendar-clock + + script.chocolates: + friendly_name: Video + icon: mdi:file-video + # Tradition Maya Lands :: Navidad automation.familia: @@ -921,6 +955,24 @@ script: # Tradition Maya Lands :: Navidad + corazon: + sequence: + - service: shell_command.corazon + + cupido: + sequence: + - service: shell_command.cupido + + flores: + sequence: + - service: shell_command.flores + + chocolates: + sequence: + - service: shell_command.chocolates + + # Tradition Maya Lands :: Navidad + familia: sequence: - service: shell_command.familia @@ -1181,6 +1233,13 @@ shell_command: # Tradition Maya Lands :: Navidad + corazon: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Corazon.sh & + cupido: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Cupido.sh & + flores: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Flores.sh & + chocolates: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Chocolates.sh & + + # Tradition Maya Lands :: Navidad + familia: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Familia.sh & campana: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Campana.sh & pesebre: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/Navidad/Pesebre.sh & From b2ff5451901f6453d48fdb9759f945bf0921743a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 30 Jan 2018 11:49:26 -0600 Subject: [PATCH 1634/1653] Update configuration.yaml.2.0 --- .../HomeAssistant/configuration.yaml.2.0 | 127 ++++++++++++++++-- 1 file changed, 117 insertions(+), 10 deletions(-) diff --git a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 index 59eb4099..360988c1 100644 --- a/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 +++ b/Hochob/Services/Automation/HomeAssistant/configuration.yaml.2.0 @@ -397,6 +397,14 @@ homeassistant: friendly_name: Video icon: mdi:file-video + automation.amistad: + friendly_name: 10 minutos .. Feliz Dia San Valentin + icon: mdi:calendar-clock + + script.amistad: + friendly_name: Feliz Dia San Valentin + icon: mdi:file-video + # Tradition Maya Lands :: Navidad automation.familia: @@ -431,6 +439,14 @@ homeassistant: friendly_name: Video icon: mdi:file-video + automation.santaclaus: + friendly_name: 10 minutos .. Feliz Navidad + icon: mdi:calendar-clock + + script.santaclaus: + friendly_name: Feliz Navidad + icon: mdi:face-profile + # Tradition Maya Lands :: Dia De Muertos automation.veladora: @@ -473,14 +489,6 @@ homeassistant: friendly_name: Fotógrafo icon: mdi:camera - automation.santaclaus: - friendly_name: 10 minutos .. Feliz Navidad - icon: mdi:calendar-clock - - script.santaclaus: - friendly_name: Feliz Navidad - icon: mdi:face-profile - # Tradition Maya Lands :: Intel automation.4004: @@ -953,7 +961,7 @@ script: sequence: - service: shell_command.janos - # Tradition Maya Lands :: Navidad + # Tradition Maya Lands :: San Valentin corazon: sequence: @@ -971,6 +979,10 @@ script: sequence: - service: shell_command.chocolates + amistad: + sequence: + - service: shell_command.amistad + # Tradition Maya Lands :: Navidad familia: @@ -1231,12 +1243,13 @@ shell_command: intelaero: ~/CodeLabs/Hochob/Applications/CampaignMayaLands/Drones/IntelAero.sh & - # Tradition Maya Lands :: Navidad + # Tradition Maya Lands :: San Valentin corazon: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Corazon.sh & cupido: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Cupido.sh & flores: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Flores.sh & chocolates: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Chocolates.sh & + amistad: ~/CodeLabs/Hochob/Applications/TraditionMayaLands/SanValentin/Amistad.sh & # Tradition Maya Lands :: Navidad @@ -1418,6 +1431,73 @@ automation: action: - service: shell_command.intelaero + # Tradition Maya Lands :: San Valentin + + - alias: Corazon + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.corazon + + - alias: Cupido + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.cupido + + - alias: Flores + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.flores + + - alias: Chocolates + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.chocolates + + - alias: Amistad + initial_state: 'off' + trigger: + platform: time + minutes: '/10' + seconds: 00 + condition: + condition: time + after: '07:00:00' + before: '21:00:00' + action: + - service: shell_command.amistad + # Tradition Maya Lands :: Navidad - alias: Familia @@ -1737,6 +1817,9 @@ group: view: yes name: Tradición entities: + - group.traditionmayalandssanvalentinchromecast + - group.traditionmayalandssanvalentinamikoo + - group.traditionmayalandssanvalentinnohochtata - group.traditionmayalandsnavidadchromecast - group.traditionmayalandsnavidadamikoo - group.traditionmayalandsnavidadnohochtata @@ -2057,6 +2140,30 @@ group: - automation.intelaero - script.intelaero + # Tradition Maya Lands :: San Valentin + + traditionmayalandssanvalentinchromecast: + name: San Valentin <> Chromecast + entities: + - automation.corazon + - script.corazon + + traditionmayalandssanvalentinamikoo: + name: San Valentin <> Robot + entities: + - automation.cupido + - automation.flores + - automation.chocolates + - script.cupido + - script.flores + - script.chocolates + + traditionmayalandssanvalentinnohochtata: + name: San Valentin <> Server + entities: + - automation.amistad + - script.amistad + # Tradition Maya Lands :: Navidad traditionmayalandsnavidadchromecast: From d6b0e4f651eba4f6728ed7a6b8a590b062e32b8b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Feb 2018 15:10:04 -0600 Subject: [PATCH 1635/1653] Update Aayin.sh --- Hochob/Applications/MediaMayaLands/Aayin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/MediaMayaLands/Aayin.sh b/Hochob/Applications/MediaMayaLands/Aayin.sh index 0c84f510..66078320 100755 --- a/Hochob/Applications/MediaMayaLands/Aayin.sh +++ b/Hochob/Applications/MediaMayaLands/Aayin.sh @@ -25,6 +25,6 @@ export AAYIN_DIRECTORY=$(dirname "$AAYIN_PATH") LogPid.sh $AAYIN_PID $AAYIN_NAME -VlcVideo.sh "on" "$TRADITION_INTEL/Video/*" +VlcVideo.sh "on" "$TRADITION_INTEL/Video/Output.mp4" # End of File From f6b9c6fece6f7707d858841c1f181e13f937d90f Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Feb 2018 15:49:29 -0600 Subject: [PATCH 1636/1653] Update Aayin.sh --- Hochob/Applications/MediaMayaLands/Aayin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/MediaMayaLands/Aayin.sh b/Hochob/Applications/MediaMayaLands/Aayin.sh index 66078320..001abd7a 100755 --- a/Hochob/Applications/MediaMayaLands/Aayin.sh +++ b/Hochob/Applications/MediaMayaLands/Aayin.sh @@ -25,6 +25,6 @@ export AAYIN_DIRECTORY=$(dirname "$AAYIN_PATH") LogPid.sh $AAYIN_PID $AAYIN_NAME -VlcVideo.sh "on" "$TRADITION_INTEL/Video/Output.mp4" +VlcVideo.sh "on" "$TRADITION_INTEL/Video/IntelSolutions.mp4" # End of File From 0adf6d80f10d61c0d57945ce302afa8385a139aa Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Wed, 21 Feb 2018 19:03:06 -0600 Subject: [PATCH 1637/1653] Update Toyota.sh --- Hochob/Applications/TechieMayaLands/Toyota.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Hochob/Applications/TechieMayaLands/Toyota.sh b/Hochob/Applications/TechieMayaLands/Toyota.sh index 24fab5c6..bad76c6f 100755 --- a/Hochob/Applications/TechieMayaLands/Toyota.sh +++ b/Hochob/Applications/TechieMayaLands/Toyota.sh @@ -25,6 +25,8 @@ export TOYOTA_DIRECTORY=$(dirname "$TOYOTA_PATH") LogPid.sh $TOYOTA_PID $TOYOTA_NAME +echo spanish > /tmp/hochob/language + SpeechSynthetizer.sh on espeak spanish \ "Hola Mundo! Uno, Dos, Tres, Probando!" From f5aedf2e77e8228d398b2e338c1687d76ee30ebc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:08:20 -0500 Subject: [PATCH 1638/1653] Create Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 Hochob/Applications/AmikooMayaLands/Papirolas.sh diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -0,0 +1 @@ + From fb38b8e25af3eabd5655f7c534c37f21f3b25111 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:10:51 -0500 Subject: [PATCH 1639/1653] Update Papirolas.sh --- .../Applications/AmikooMayaLands/Papirolas.sh | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index 8b137891..b0ed783b 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -1 +1,52 @@ +#!/bin/sh + +set -x + +# ============================================================================= +# Variables +# ============================================================================= + +. ~/CodeLabs/Hochob/Main.sh + +export MECCANOID_PID=$$ +export MECCANOID_NAME="Meccanoid" +export MECCANOID_PATH=$(readlink -f "$0") +export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") + +# ============================================================================= +# Functions +# ============================================================================= + +# None + +# ============================================================================= +# Main +# ============================================================================= + +LogPid.sh $MECCANOID_PID $MECCANOID_NAME + +Amikoo.sh amikoo/headright && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 +Amikoo.sh amikoo/rightup && sleep .6 +Amikoo.sh amikoo/leftup && sleep .6 +Amikoo.sh amikoo/rightfold && sleep .6 +Amikoo.sh amikoo/leftfold && sleep .6 +Amikoo.sh amikoo/moveright && sleep .6 +Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/moveleft && sleep .6 +Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/moveleft && sleep .6 +Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/moveleft && sleep .6 +Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/leftfold && sleep .6 +Amikoo.sh amikoo/rightfold && sleep .6 +Amikoo.sh amikoo/leftup && sleep .6 +Amikoo.sh amikoo/rightup && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 +Amikoo.sh amikoo/headright && sleep .6 + +AmikooVoice.sh $LOCAL_LANGUAGE "Vamos a bailar" + +# End of File From dcdf24fca698846077b4c70406899ed897da2860 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:17:00 -0500 Subject: [PATCH 1640/1653] Update Papirolas.sh --- .../Applications/AmikooMayaLands/Papirolas.sh | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index b0ed783b..644fb48c 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -25,28 +25,12 @@ export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME -Amikoo.sh amikoo/headright && sleep .6 -Amikoo.sh amikoo/headleft && sleep .6 -Amikoo.sh amikoo/rightup && sleep .6 -Amikoo.sh amikoo/leftup && sleep .6 -Amikoo.sh amikoo/rightfold && sleep .6 -Amikoo.sh amikoo/leftfold && sleep .6 -Amikoo.sh amikoo/moveright && sleep .6 -Amikoo.sh amikoo/movestop && sleep .6 -Amikoo.sh amikoo/moveleft && sleep .6 -Amikoo.sh amikoo/movestop && sleep .6 -Amikoo.sh amikoo/moveleft && sleep .6 +Amikoo.sh amikoo/movesforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 -Amikoo.sh amikoo/moveleft && sleep .6 -Amikoo.sh amikoo/movestop && sleep .6 -Amikoo.sh amikoo/leftfold && sleep .6 -Amikoo.sh amikoo/rightfold && sleep .6 -Amikoo.sh amikoo/leftup && sleep .6 -Amikoo.sh amikoo/rightup && sleep .6 -Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 -AmikooVoice.sh $LOCAL_LANGUAGE "Vamos a bailar" +AmikooVoice.sh $LOCAL_LANGUAGE "eah eah uh uh" # End of File From 1e36d98d942ff57a4196c9db9463603bd34780ad Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:18:19 -0500 Subject: [PATCH 1641/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index 644fb48c..c14eab34 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -30,7 +30,7 @@ Amikoo.sh amikoo/movestop && sleep .6 Amikoo.sh amikoo/headright && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 -AmikooVoice.sh $LOCAL_LANGUAGE "eah eah uh uh" +AmikooVoice.sh spanish "eah eah uh uh" # End of File From bd7c83a6157755c24877a3745531e62e2a9feb2d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:18:54 -0500 Subject: [PATCH 1642/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index c14eab34..31831b45 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -25,7 +25,9 @@ export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME -Amikoo.sh amikoo/movesforward && sleep 2 +AmikooCommunication.sh "Amikoo" "Audio" "TakePictureEllie.mp3" + +Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 Amikoo.sh amikoo/headright && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 From 0a074d2821497e288d0bd5dd7dad09287b9a8f9b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:22:18 -0500 Subject: [PATCH 1643/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index 31831b45..84eed2a6 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -25,14 +25,12 @@ export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME -AmikooCommunication.sh "Amikoo" "Audio" "TakePictureEllie.mp3" - Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 Amikoo.sh amikoo/headright && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 -AmikooVoice.sh spanish "eah eah uh uh" +AmikooCommunication.sh "Amikoo" "Audio" "RobotMachineSoundBibleCom.mp3" # End of File From e5f441f93bab56921a73c820ee2b43a4f12ee2dc Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:23:14 -0500 Subject: [PATCH 1644/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index 84eed2a6..3ab697ff 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -25,12 +25,13 @@ export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME +AmikooCommunication.sh "Amikoo" "Audio" "RobotMachineSoundBibleCom.mp3" + Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 -AmikooCommunication.sh "Amikoo" "Audio" "RobotMachineSoundBibleCom.mp3" - # End of File From 85f45079fcfcb71a7d38e4abe3f2778a4f9c77b7 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:23:55 -0500 Subject: [PATCH 1645/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index 3ab697ff..9a9e84c3 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -29,7 +29,7 @@ AmikooCommunication.sh "Amikoo" "Audio" "RobotMachineSoundBibleCom.mp3" Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 -Amikoo.sh amikoo/headleft && sleep .6 +#Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 From bccb08b52c4ca98903ef054e6acff7e32d456d9a Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:24:18 -0500 Subject: [PATCH 1646/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index 9a9e84c3..94847396 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -31,7 +31,7 @@ Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 #Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 -Amikoo.sh amikoo/headleft && sleep .6 +#Amikoo.sh amikoo/headleft && sleep .6 # End of File From 08ebea082f5bba9cc44cef8298d02c6e7a260414 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:25:02 -0500 Subject: [PATCH 1647/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index 94847396..f9146477 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -29,9 +29,8 @@ AmikooCommunication.sh "Amikoo" "Audio" "RobotMachineSoundBibleCom.mp3" Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 -#Amikoo.sh amikoo/headleft && sleep .6 +Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 -#Amikoo.sh amikoo/headleft && sleep .6 # End of File From 8c4391346628d288167e401cd2f59d34949fb687 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:26:00 -0500 Subject: [PATCH 1648/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index f9146477..b0389c2f 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -32,5 +32,10 @@ Amikoo.sh amikoo/movestop && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 +sleep 23 + +Amikoo.sh amikoo/headleft && sleep .6 +Amikoo.sh amikoo/headright && sleep .6 + # End of File From 20ef00b9e0b57b62ed00d264c8e8c52fd3a07c67 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:28:57 -0500 Subject: [PATCH 1649/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index b0389c2f..d4ffae5b 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -32,7 +32,7 @@ Amikoo.sh amikoo/movestop && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 -sleep 23 +sleep 25 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 From e26ae02cc6f11400446f6adfc2347eeb9942259c Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:29:30 -0500 Subject: [PATCH 1650/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index d4ffae5b..9453b1c1 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -25,7 +25,7 @@ export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME -AmikooCommunication.sh "Amikoo" "Audio" "RobotMachineSoundBibleCom.mp3" +AmikooCommunication.sh "Amikoo" "Audio" "R2D2AgainSoundBibleCom.mp3" Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 From b6196a43071078bba9620cb661fb910ae9b40a3b Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:36:22 -0500 Subject: [PATCH 1651/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index 9453b1c1..fa69f0af 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -25,7 +25,8 @@ export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME -AmikooCommunication.sh "Amikoo" "Audio" "R2D2AgainSoundBibleCom.mp3" +#AmikooCommunication.sh "Amikoo" "Audio" "R2D2AgainSoundBibleCom.mp3" +Vlc.sh ~/HochobServerMedia/Tradition/Amikoo/Sound/R2D2AgainSoundBibleCom.mp3 Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 From ebe01336abd452dc5c242fc341dedb01469c0f3d Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:38:38 -0500 Subject: [PATCH 1652/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index fa69f0af..d95d5f9e 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -26,14 +26,16 @@ export MECCANOID_DIRECTORY=$(dirname "$MECCANOID_PATH") LogPid.sh $MECCANOID_PID $MECCANOID_NAME #AmikooCommunication.sh "Amikoo" "Audio" "R2D2AgainSoundBibleCom.mp3" -Vlc.sh ~/HochobServerMedia/Tradition/Amikoo/Sound/R2D2AgainSoundBibleCom.mp3 +Vlc.sh ~/HochobServerMedia/Tradition/Amikoo/Sound/R2D2AgainSoundBibleCom.mp3 & + +sleep 1 Amikoo.sh amikoo/moveforward && sleep 2 Amikoo.sh amikoo/movestop && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 -sleep 25 +sleep 26 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 From 621c812880d3d32ca4dffdbc8234d3cd210b9ff5 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Tue, 24 Apr 2018 16:39:38 -0500 Subject: [PATCH 1653/1653] Update Papirolas.sh --- Hochob/Applications/AmikooMayaLands/Papirolas.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Hochob/Applications/AmikooMayaLands/Papirolas.sh b/Hochob/Applications/AmikooMayaLands/Papirolas.sh index d95d5f9e..6f3e0f9d 100644 --- a/Hochob/Applications/AmikooMayaLands/Papirolas.sh +++ b/Hochob/Applications/AmikooMayaLands/Papirolas.sh @@ -35,7 +35,7 @@ Amikoo.sh amikoo/movestop && sleep .6 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6 -sleep 26 +sleep 25 Amikoo.sh amikoo/headleft && sleep .6 Amikoo.sh amikoo/headright && sleep .6