From 702bd857b0ae25c07e4316666fe977f90cb8e5be Mon Sep 17 00:00:00 2001 From: ackimixs Date: Sun, 19 May 2024 11:30:45 +0200 Subject: [PATCH] argument parser --- gc_startup.sh | 19 ++++++++----------- startup.sh | 19 ++++++++----------- update_all_repo.sh | 4 ++-- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/gc_startup.sh b/gc_startup.sh index 8f7793a..89c2a67 100644 --- a/gc_startup.sh +++ b/gc_startup.sh @@ -16,7 +16,7 @@ fi # Démarrer le serveur TCP echo "Starting the TCP server GC" -/home/modelec/Serge/TCPSocketServerGC/build/socketServer "$port" & +/home/modelec/Serge/TCPSocketServerGC/build/socketServer --port "$port" & echo "TCP server pid" $! > /home/modelec/Serge/TCP_GC_pid.txt pidserver+=($!) sleep 1 @@ -24,7 +24,7 @@ sleep 1 # Démarrer le Lidar echo "Starting the Lidar" rm /home/modelec/Serge/Logs/lidar.log -screen -L -Logfile /home/modelec/Serge/Logs/lidar.log -dmS lidar /home/modelec/Serge/detection_adversaire/build/lidar "$port" +screen -L -Logfile /home/modelec/Serge/Logs/lidar.log -dmS lidar /home/modelec/Serge/detection_adversaire/build/lidar --port "$port" pidLidar=$(screen -ls | grep -o '[0-9]*\.lidar' | grep -o '[0-9]*') echo "Lidar pid" $pidLidar > /home/modelec/Serge/Lidar_pid.txt pids+=($pidLidar) @@ -33,7 +33,7 @@ sleep 1 # Démarrer l'IHM echo "Starting the IHM" rm /home/modelec/Serge/Logs/ihm_robot.log -/home/modelec/Serge/ihm/build/ihm_robot fullscreen "$port" > /home/modelec/Serge/Logs/ihm_robot.log & +/home/modelec/Serge/ihm/build/ihm_robot --window_mode fullscreen --port "$port" > /home/modelec/Serge/Logs/ihm_robot.log & echo "IHM pid" $! > /home/modelec/Serge/IHM_pid.txt pids+=($!) sleep 1 @@ -41,7 +41,7 @@ sleep 1 # Démarrer le programme d'interconnexion raspi -> arduino echo "Starting the interconnection program" rm /home/modelec/Serge/Logs/connectos.log -screen -L -Logfile /home/modelec/Serge/Logs/connectos.log -dmS connectors /home/modelec/Serge/connectors/build/connectors "$port" +screen -L -Logfile /home/modelec/Serge/Logs/connectos.log -dmS connectors /home/modelec/Serge/connectors/build/connectors --port "$port" pid=$(screen -ls | grep -o '[0-9]*\.connectors' | grep -o '[0-9]*') echo "Interconnection pid" $pid > /home/modelec/Serge/Interconnection_pid.txt pids+=($pid) @@ -50,7 +50,7 @@ sleep 1 # Démarrer le programme de contrôle des servomoteurs echo "Starting the servomotor control program" rm /home/modelec/Serge/Logs/servo_motor.log -screen -L -Logfile /home/modelec/Serge/Logs/servo_motor.log -dmS servo_motor /home/modelec/Serge/servo_moteurs/build/servo_motor "$port" +screen -L -Logfile /home/modelec/Serge/Logs/servo_motor.log -dmS servo_motor /home/modelec/Serge/servo_moteurs/build/servo_motor --port "$port" pid=$(screen -ls | grep -o '[0-9]*\.servo_motor' | grep -o '[0-9]*') echo "Servomotor pid" $pid > /home/modelec/Serge/Servomotor_pid.txt pids+=($pid) @@ -59,7 +59,7 @@ sleep 1 # Démarrer le programme de contrôle des servomoteurs echo "Starting the GameController" rm /home/modelec/Serge/Logs/gc.log -screen -L -Logfile /home/modelec/Serge/Logs/gc.log -dmS gc /home/modelec/Serge/GameController/build/GameController "$port" +screen -L -Logfile /home/modelec/Serge/Logs/gc.log -dmS gc /home/modelec/Serge/GameController/build/GameController --port "$port" pid=$(screen -ls | grep -o '[0-9]*\.gc' | grep -o '[0-9]*') echo "Servomotor pid" $pid > /home/modelec/Serge/GC.txt pids+=($pid) @@ -67,11 +67,8 @@ sleep 1 echo "Starting the client logger program" rm /home/modelec/Serge/Logs/client.log -# while true; do - echo "$(date +'%Y-%m-%d %H:%M:%S') - Starting the client logger program" >> /home/modelec/Serge/Logs/client.log - /home/modelec/Serge/TCPSocketClient/example/build/client "$port" logger >> /home/modelec/Serge/Logs/client.log 2>&1 & - sleep 1 -# done +echo "$(date +'%Y-%m-%d %H:%M:%S') - Starting the client logger program" >> /home/modelec/Serge/Logs/client.log +/home/modelec/Serge/cpp-lib/example/build/client --port "$port" --logger >> /home/modelec/Serge/Logs/client.log 2>&1 & echo "Client Logger pid" $! > /home/modelec/Serge/client_pid.txt pids+=($!) sleep 1 diff --git a/startup.sh b/startup.sh index 3ce7219..849ff62 100644 --- a/startup.sh +++ b/startup.sh @@ -16,7 +16,7 @@ fi # Démarrer le serveur TCP echo "Starting the TCP server" -/home/modelec/Serge/TCPSocketServer/build/socketServer "$port" & +/home/modelec/Serge/TCPSocketServer/build/socketServer --port "$port" & echo "TCP server pid" $! > /home/modelec/Serge/TCP_pid.txt pidserver+=($!) sleep 1 @@ -24,7 +24,7 @@ sleep 1 # Démarrer le Lidar echo "Starting the Lidar" rm /home/modelec/Serge/Logs/lidar.log -screen -L -Logfile /home/modelec/Serge/Logs/lidar.log -dmS lidar /home/modelec/Serge/detection_adversaire/build/lidar "$port" +screen -L -Logfile /home/modelec/Serge/Logs/lidar.log -dmS lidar /home/modelec/Serge/detection_adversaire/build/lidar --port "$port" pidLidar=$(screen -ls | grep -o '[0-9]*\.lidar' | grep -o '[0-9]*') echo "Lidar pid" $pidLidar > /home/modelec/Serge/Lidar_pid.txt pids+=($pidLidar) @@ -33,7 +33,7 @@ sleep 1 # Démarrer l'IHM echo "Starting the IHM" rm /home/modelec/Serge/Logs/ihm_robot.log -/home/modelec/Serge/ihm/build/ihm_robot fullscreen "$port" > /home/modelec/Serge/Logs/ihm_robot.log & +/home/modelec/Serge/ihm/build/ihm_robot --window_mode fullscreen --port "$port" > /home/modelec/Serge/Logs/ihm_robot.log & echo "IHM pid" $! > /home/modelec/Serge/IHM_pid.txt pids+=($!) sleep 1 @@ -41,7 +41,7 @@ sleep 1 # Démarrer le programme d'interconnexion raspi -> arduino echo "Starting the interconnection program" rm /home/modelec/Serge/Logs/connectos.log -screen -L -Logfile /home/modelec/Serge/Logs/connectos.log -dmS connectors /home/modelec/Serge/connectors/build/connectors "$port" +screen -L -Logfile /home/modelec/Serge/Logs/connectos.log -dmS connectors /home/modelec/Serge/connectors/build/connectors --port "$port" pid=$(screen -ls | grep -o '[0-9]*\.connectors' | grep -o '[0-9]*') echo "Interconnection pid" $pid > /home/modelec/Serge/Interconnection_pid.txt pids+=($pid) @@ -50,7 +50,7 @@ sleep 1 # Démarrer le programme de contrôle des servomoteurs echo "Starting the servomotor control program" rm /home/modelec/Serge/Logs/servo_motor.log -screen -L -Logfile /home/modelec/Serge/Logs/servo_motor.log -dmS servo_motor /home/modelec/Serge/servo_moteurs/build/servo_motor "$port" +screen -L -Logfile /home/modelec/Serge/Logs/servo_motor.log -dmS servo_motor /home/modelec/Serge/servo_moteurs/build/servo_motor --port "$port" pid=$(screen -ls | grep -o '[0-9]*\.servo_motor' | grep -o '[0-9]*') echo "Servomotor pid" $pid > /home/modelec/Serge/Servomotor_pid.txt pids+=($pid) @@ -59,7 +59,7 @@ sleep 1 # Démarrer le programme de la tirette echo "Starting the tirette program" rm /home/modelec/Serge/Logs/tirette.log -screen -L -Logfile /home/modelec/Serge/Logs/tirette.log -dmS tirette /home/modelec/Serge/tirette/tirette "$port" +screen -L -Logfile /home/modelec/Serge/Logs/tirette.log -dmS tirette /home/modelec/Serge/tirette/tirette --port "$port" pid=$(screen -ls | grep -o '[0-9]*\.tirette' | grep -o '[0-9]*') echo "Tirette pid" $pid > /home/modelec/Serge/Tirette_pid.txt pids+=($pid) @@ -67,11 +67,8 @@ sleep 1 echo "Starting the client logger program" rm /home/modelec/Serge/Logs/client.log -# while true; do - echo "$(date +'%Y-%m-%d %H:%M:%S') - Starting the client logger program" >> /home/modelec/Serge/Logs/client.log - /home/modelec/Serge/TCPSocketClient/example/build/client "$port" logger >> /home/modelec/Serge/Logs/client.log 2>&1 & - sleep 1 -# done +echo "$(date +'%Y-%m-%d %H:%M:%S') - Starting the client logger program" >> /home/modelec/Serge/Logs/client.log +/home/modelec/Serge/TCPSocketClient/example/build/client --port "$port" --logger >> /home/modelec/Serge/Logs/client.log 2>&1 & echo "Client Logger pid" $! > /home/modelec/Serge/client_pid.txt pids+=($!) sleep 1 diff --git a/update_all_repo.sh b/update_all_repo.sh index 346cc56..83ccc40 100644 --- a/update_all_repo.sh +++ b/update_all_repo.sh @@ -7,7 +7,7 @@ echo "TCP server updated" # Update of the TCP Client echo "Updating the TCP client" -cd /home/modelec/Serge/TCPSocketClient && git pull && cd build && cmake .. && sudo make install +cd /home/modelec/Serge/cpp-lib && git pull && cd build && cmake .. && sudo make && sudo make install echo "TCP client updated" # Update of the connectors @@ -42,7 +42,7 @@ echo "Servo moteur updated" # Update of the tirette echo "Updating the tirette" -cd /home/modelec/Serge/tirette && git pull && g++ main.cpp MyClient.cpp MyClient.h -o tirette -l wiringPi -l TCPSocket +cd /home/modelec/Serge/tirette && git pull && g++ main.cpp MyClient.cpp MyClient.h -o tirette -l wiringPi -l Modelec echo "Tirette updated" echo "All repositories have been updated, Please check the logs for any errors"