From bb68ed9f8b643f304ba4389fc1d45773a8e17851 Mon Sep 17 00:00:00 2001
From: Jacob Potter <jdpotter@andrew.cmu.edu>
Date: Sat, 23 Apr 2011 05:06:28 -0400
Subject: [PATCH] ucf and makefile fixes

---
 Makefile    | 5 ++++-
 POSLink.ucf | 2 +-
 POSLink.v   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 7763ba5..aab7d17 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ BITGEN_OPTS = \
 	-g DonePipe:No \
 	-g DriveDone:No
 
-fpga_target: $(TARGET).vm6
+fpga_target: $(TARGET).jed
 
 $(TARGET).ngc: $(TARGET).xst $(VLOGS_ALL)
 	@mkdir -p xst/projnav.tmp
@@ -44,6 +44,9 @@ $(TARGET).ngd: $(TARGET).ngc $(TARGET).ucf
 $(TARGET).vm6: $(TARGET).ngd
 	cpldfit -p $(CHIP) -power std $(TARGET).ngd -inputs 10 
 
+$(TARGET).jed: $(TARGET).vm6
+	hprep6 -i $(TARGET).vm6
+
 $(TARGET)_map.ncd: $(TARGET).ngd
 	map -p $(CHIP) -cm area -pr off -k 4 -c 100 -o $(TARGET)_map.ncd $(TARGET).ngd $(TARGET).pcf
 
diff --git a/POSLink.ucf b/POSLink.ucf
index 6ac74b3..b9f3ece 100644
--- a/POSLink.ucf
+++ b/POSLink.ucf
@@ -6,7 +6,7 @@ NET "tos_inputs_e2<1>" LOC="P39";
 NET "tos_inputs_e2<2>" LOC="P32";
 NET "tos_inputs_e2<3>" LOC="P31";
 NET "tos_output"       LOC="P30";
-NET "data_output"      LOC="P5";
+NET "data_output"      LOC="P3";
 NET "serial_e2"        LOC="P2";
 NET "anode<0>"         LOC="P29";
 NET "anode<1>"         LOC="P28";
diff --git a/POSLink.v b/POSLink.v
index 323e0d4..ce96bd0 100644
--- a/POSLink.v
+++ b/POSLink.v
@@ -49,7 +49,7 @@ wire [4:0] edge_counter;
 		tos_select = data[11:10];
 	end
 
-	wire [5:0] output_stuff = { buttons, tos_good };
+	wire [7:0] output_stuff = { 2'b0, buttons, tos_good };
 
 	always @(*)
 		data_output = output_stuff[current_bit[2:0]];
-- 
2.39.2