diff --git a/utils/scripts/actions-pipeline/open_minicom.sh b/utils/scripts/actions-pipeline/open_minicom.sh new file mode 100755 index 0000000000..9b8b880cd2 --- /dev/null +++ b/utils/scripts/actions-pipeline/open_minicom.sh @@ -0,0 +1,8 @@ +#!/bin/bash +cd "$HOME/esp/socs/xilinx-vc707-xc7vx485t" + +socat pty,link=ttyV0,waitslave,mode=777 tcp:goliah.cs.columbia.edu:4332 & +sleep 1 +VIRTUAL_DEVICE=$(readlink ttyV0) + +exec minicom -p "$VIRTUAL_DEVICE" -C "minicom_finalll.log" \ No newline at end of file diff --git a/utils/scripts/actions-pipeline/run_esp-config.sh b/utils/scripts/actions-pipeline/run_esp-config.sh index c7b144db0e..516f1a7a6e 100755 --- a/utils/scripts/actions-pipeline/run_esp-config.sh +++ b/utils/scripts/actions-pipeline/run_esp-config.sh @@ -12,8 +12,7 @@ source "get_hls_accelerators.sh" defconfig="$HOME/esp/socs/defconfig/esp_xilinx-vc707-xc7vx485t_defconfig" esp_config="$HOME/esp/socs/xilinx-vc707-xc7vx485t/socgen/esp/.esp_config" -# FPGA run -fpga_run="$HOME/esp/utils/scripts/actions-pipeline/./run_fpga_program.sh" +open_minicom="$HOME/esp/utils/scripts/actions-pipeline/./open_minicom.sh" for accelerator in "${!dma[@]}"; do accelerator_upper=$(echo "$accelerator" | tr '[:lower:]' '[:upper:]') @@ -70,23 +69,20 @@ for accelerator in "${!dma[@]}"; do fi # Open Minicom in the foreground - socat pty,link=ttyV0,waitslave,mode=777 tcp:goliah.cs.columbia.edu:4332 & - socat_pid=$! - sleep 5 - VIRTUAL_DEVICE=$(readlink ttyV0) - # # # Run fpga program in the background # # "$fpga_run" > "$run" 2>&1 & # # fpga_run_pid=$! - nohup minicom -p "$VIRTUAL_DEVICE" & + "$open_minicom" & + minicom=$! + make fpga-run > "$run" 2>&1 - make fpga-run + sleep 2 echo "continued" - kill -9 "$socat_pid" - + kill -9 "$minicom" + ! killall -9 minicom # make fpga-run > "$run" 2>&1 # kill -9 "$socat_pid"