Merge remote-tracking branch 'origin/main'

This commit is contained in:
ackimixs
2024-05-10 10:33:01 +02:00
3 changed files with 60 additions and 0 deletions

1
.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
.idea

View File

@@ -90,6 +90,16 @@ monitor_all() {
kill -SIGKILL $screen_pid 2>/dev/null
continue
fi
# Si le programme est 'connectors', envoyer SIGINT au lieu de SIGKILL
if ps -p $other_pid -o comm= | grep -q "connectors"; then
kill -SIGINT $other_pid 2>/dev/null
continue
fi
# Si le programme est 'lidar', envoyer SIGINT au lieu de SIGKILL
if ps -p $other_pid -o comm= | grep -q "lidar"; then
kill -SIGINT $other_pid 2>/dev/null
continue
fi
kill -SIGKILL $other_pid 2>/dev/null
fi
done

49
update_all_repo.sh Normal file
View File

@@ -0,0 +1,49 @@
#!/bin/bash
# Update of the TCP server
echo "Updating the TCP server"
cd /home/modelec/Serge/TCPSocketServer && git pull && cd build && cmake .. && make
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
echo "TCP client updated"
# Update of the connectors
echo "Updating the connectors"
cd /home/modelec/Serge/connectors && git pull && cd build && cmake .. && make
echo "Connectors updated"
# Update of the detection adversaire
echo "Updating the detection adversaire"
cd /home/modelec/Serge/detection_adversaire && git pull && cd build && cmake .. && make
echo "Detection adversaire updated"
# Update of the detection pot
echo "Updating the detection pot"
cd /home/modelec/Serge/detection_pot && git pull && cd build && cmake .. && make
echo "Detection pot updated"
# Update of the emergency stop
echo "Updating the emergency stop"
cd /home/modelec/Serge/emergency && git pull && cd build && cmake .. && make
echo "Emergency stop updated"
# Update of the IHM
echo "Updating the IHM"
cd /home/modelec/Serge/ihm && git pull && cd build && cmake .. && make
echo "IHM updated"
# Update of the servo moteur
echo "Updating the servo moteur"
cd /home/modelec/Serge/servo_moteurs && git pull && cd build && cmake .. && make
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
echo "Tirette updated"
echo "All repositories have been updated, Please check the logs for any errors"
echo "Please update Initialisation manually using git pull"