From 3f9114e2887f4b8136453db13438449f21fec0c5 Mon Sep 17 00:00:00 2001
From: Matthijs van der Burgh <MatthijsBurgh@outlook.com>
Date: Mon, 15 Jul 2024 10:58:02 +0200
Subject: [PATCH] Revert "[hero1-common][temp] tournament mode"

This reverts commit afbbee0273691cf2bd3cf4d35958def9871c84fa.
---
 hero1-common/setup | 52 ----------------------------------------------
 1 file changed, 52 deletions(-)

diff --git a/hero1-common/setup b/hero1-common/setup
index df4a439e3..9db74e0e6 100644
--- a/hero1-common/setup
+++ b/hero1-common/setup
@@ -8,61 +8,9 @@ done < /etc/opt/tmc/robot/version
 
 alias hero-sync-ubuntu-ntp="sudo ntpdate ntp.ubuntu.com"
 
-<<<<<<< Updated upstream
 if [[ "${TUE_ROS_USE_IP}" == "true" ]]
 then
     unset ROS_HOSTNAME
     export ROS_IP=192.168.44.51
     export ROS_MASTER_URI=http://192.168.44.51:11311
 fi
-=======
-function _vbox_sleep
-{
-    sleep 1;
-    local i
-    i=0
-    while [[ $i -lt 30 ]]
-    do
-        if ! lsmod | grep -q vbox
-        then
-            echo "All vbox modules stopped"
-            return 0
-        fi
-        sleep 0.5
-        i=$((i+1))
-    done
-    echo "Not all vbox modules stopped"
-}
-
-function _stop_vbox_services
-{
-    sudo systemctl stop hero1-speech5-windows-speech.service 2>/dev/null
-    sudo systemctl stop hero1-speech4-vboxweb-service.service 2>/dev/null
-    sudo systemctl stop hero1-speech3-vboxdrv.service 2>/dev/null
-    sudo systemctl stop hero1-speech2-vboxballoonctrl-service.service 2>/dev/null
-    sudo systemctl stop hero1-speech1-vboxautostart-service.service 2>/dev/null
-    sudo systemctl stop hero1-demo-speech5-windows-speech.service 2>/dev/null
-    sudo systemctl stop hero1-demo-speech4-vboxweb-service.service 2>/dev/null
-    sudo systemctl stop hero1-demo-speech3-vboxdrv.service 2>/dev/null
-    sudo systemctl stop hero1-demo-speech2-vboxballoonctrl-service.service 2>/dev/null
-    sudo systemctl stop hero1-demo-speech1-vboxautostart-service.service 2>/dev/null
-}
-
-function hero-reboot
-{
-    _stop_vbox_services
-    _vbox_sleep
-    sudo reboot
-}
-
-function hero-shutdown
-{
-    _stop_vbox_services
-    _vbox_sleep
-    sudo shutdown -h -t 0
-}
-
-unset ROS_HOSTNAME
-export ROS_IP=192.168.44.51
-export ROS_MASTER_URI=http://192.168.44.51:11311
->>>>>>> Stashed changes