merged in master

SpiNNakerManchester · Jan 11, 2024 · 72c4390 · 72c4390
2 parents d0a7d24 + ebab00b
commit 72c4390
Showing 1 changed file with 5 additions and 14 deletions.
diff --git a/actions/configure-spynnaker/mkcfg.bash b/actions/configure-spynnaker/mkcfg.bash
@@ -18,10 +18,11 @@ cfg=~/.spynnaker.cfg
 
 echo '[Machine]' > $cfg
 
-if [ "x$M_ADDR}" = "x" ]; then
-	echo "machineName = None" >> $cfg
-	echo "version = None" >> $cfg
-
+if [ "x$V_TYPE" = "xtrue" ]; then
+	echo "virtual_board = True" >> $cfg
+	echo "width = $V_WIDTH" >> $cfg
+	echo "height = $V_HEIGHT" >> $cfg
+elif [ "x$M_ADDR}" = "x" ]; then
 	echo "spalloc_server = $S_HOST" >> $cfg
 	echo "spalloc_port = $S_PORT" >> $cfg
 	echo "spalloc_user = $S_USER" >> $cfg
@@ -30,16 +31,6 @@ else
 	echo "version = $M_VERSION" >> $cfg
 fi
 
-if [ "x$V_TYPE" = "xtrue" ]; then
-	echo "virtual_board = True" >> $cfg
-	echo "width = $V_WIDTH" >> $cfg
-	echo "height = $V_HEIGHT" >> $cfg
-else
-	echo "virtual_board = False" >> $cfg
-	echo "width = None" >> $cfg
-	echo "height = None" >> $cfg
-fi
-
 echo "time_scale_factor = $M_TSF" >> $cfg
 
 echo '[Database]' >> $cfg