fix kill console when FPGA run is interrupted; move define in CycloneV Makefile

hardware/fpga/fpga.mk

@@ -76,9 +76,13 @@ queue-out:
 	sed '/$(JOB)/d' $(QUEUE_FILE) > queue; cat queue > $(QUEUE_FILE); rm queue
 
 queue-out-remote:
-	ssh $(BOARD_USER)@$(BOARD_SERVER) \
-	"make -C $(REMOTE_ROOT_DIR)/hardware/fpga/$(TOOL)/$(BOARD) queue-out;\
-	kill -9 $$(ps aux | grep $(BOARD_USER) | grep console | grep python3 | grep -v grep | awk '{print $$2}')"
+ifeq ($(BOARD_SERVER),)
+	make queue-out
+	@if [ "`ps aux | grep $(USER) | grep console | grep python3 | grep -v grep`" ]; then \
+	kill -9 $$(ps aux | grep $(USER) | grep console | grep python3 | grep -v grep | awk '{print $$2}'); fi
+else
+	ssh $(BOARD_USER)@$(BOARD_SERVER) 'make -C $(REMOTE_ROOT_DIR)/hardware/fpga/$(TOOL)/$(BOARD) $@'
+endif
 
 #
 # Testing

hardware/fpga/quartus/CYCLONEV-GT-DK/Makefile

@@ -1,11 +1,12 @@
 ROOT_DIR:=../../../..
-DEFINE+=$(defmacro)IS_CYCLONEV=1
 
 BOARD_SERVER=$(CYC5_SERVER)
 BOARD_USER=$(CYC5_USER)
 
 DEVICE=5CGTFD9E5F35C7
 
+#DEFINES
+DEFINE+=$(defmacro)IS_CYCLONEV
 
 #specify any conditions that prevent running this FPGA
 NORUN = $(USE_DDR)

hardware/simulation/verilator/system_tb.cpp

@@ -18,7 +18,7 @@
 // other macros
 #define FREQ 100000000
 #define BAUD 5000000
-#define CLK_PERIOD 10000 // 20 ns
+#define CLK_PERIOD 10000 // 10 ns
 
 vluint64_t main_time = 0;
 VerilatedVcdC* tfp = NULL;