From 4b5cca26d81dbcf06d957b44166a29d78005d63c Mon Sep 17 00:00:00 2001 From: trotFunky Date: Mon, 7 May 2018 18:16:39 +0200 Subject: [PATCH] =?UTF-8?q?Ajout=20de=20la=20d=C3=A9tection=20avanc=C3=A9e?= =?UTF-8?q?=20Match=5Fbegin=20fonctionnel=20(DUH)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Perso/MATCH_BEGIN.sh | 8 ++++---- Perso/auto_config.sh | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Perso/MATCH_BEGIN.sh b/Perso/MATCH_BEGIN.sh index 65e238f..cb74df0 100755 --- a/Perso/MATCH_BEGIN.sh +++ b/Perso/MATCH_BEGIN.sh @@ -1,13 +1,13 @@ #! /bin/bash -x-term -e "~/Documents/TechTheTown-HighLevel/config/auto_config.sh" +xterm -e "/home/pi/Documents/TechTheTown-HighLevel/config/auto_config.sh" -couleur=$(grep $configFile -e "^COULEUR" | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 2) +couleur=$(grep "/home/pi/Documents/TechTheTown-HighLevel/config/config.txt" -e "^COULEUR" | head -n 1 | cut -d "=" -f 2 | cut -d " " -f 2) -if [ couleur = "orange" ]; then +if [ $couleur = "orange" ]; then xterm -e "python ~/Documents/TechTheTown-HighLevel/src/patternRecognition/setPatternPosition/SetPatternPositionOrange.py;exit" else xterm -e "python ~/Documents/TechTheTown-HighLevel/src/patternRecognition/setPatternPosition/SetPatternPositionGreen.py;exit" fi -xterm -e "cd ~/Documents/TechTheTown-HighLevel; java -jar techthetown-highlevel.jar;cd - " \ No newline at end of file +xterm -e "cd ~/Documents/TechTheTown-HighLevel; java -jar techthetown-highlevel.jar;cd - " diff --git a/Perso/auto_config.sh b/Perso/auto_config.sh index 729b4df..99f4266 100755 --- a/Perso/auto_config.sh +++ b/Perso/auto_config.sh @@ -202,6 +202,7 @@ echo "" parameterTest "SIMULATION" "true" "false" parameterTest "ATTENTE_JUMPER" "false" "true" parameterTest "BASIC_DETECTION" "false" "true" +parameterTest "ADVANCED_DETECTION" "false" "true" # On refait la même pour la version du match