diff --git a/mapping.txt b/mapping.txt new file mode 100644 index 0000000..c60e36e --- /dev/null +++ b/mapping.txt @@ -0,0 +1,6 @@ +JA4 ext_clk +JA1 sync_pulse [NOTE: If pin is left floating, it will register as a pulse] +SW7 standby +LED7 standy_status +BTNC reset +BTNU reset_debug \ No newline at end of file diff --git a/src/xillybus_link.vhd b/src/xillybus_link.vhd index 03cc58c..99463dc 100644 --- a/src/xillybus_link.vhd +++ b/src/xillybus_link.vhd @@ -113,7 +113,7 @@ begin rd_clk => fpga_clk, rd_addr => config_addr, wr_addr => mem_addr(CONFIG_MEM_ADDR_WIDTH downto 1), - wen => mem_wen and (not mem_addr(0)), -- Only even adresses + wen => mem_wen and (mem_addr(0)), -- Only odd adresses ren => config_ren, wr_data => mem_wr_data, rd_data => config_data(CONFIG_DATA_WIDTH-1 downto CONFIG_MEM_DATA_WIDTH) @@ -129,7 +129,7 @@ begin rd_clk => fpga_clk, rd_addr => config_addr, wr_addr => mem_addr(CONFIG_MEM_ADDR_WIDTH downto 1), - wen => mem_wen and (mem_addr(0)), -- Only odd adresses + wen => mem_wen and (not mem_addr(0)), -- Only even adresses ren => config_ren, wr_data => mem_wr_data, rd_data => config_data(CONFIG_MEM_DATA_WIDTH-1 downto 0) diff --git a/sw/read_debug.c b/sw/read_debug.c index 49252b6..0421c4a 100644 --- a/sw/read_debug.c +++ b/sw/read_debug.c @@ -62,9 +62,7 @@ int main(int argc, char *argv[]){ data = buffer; - printf("\nADC_DATA2_MAX: %u\nADC_DATA1_MAX: %u\nSCALER_MAX: %u\nDAC_MAX: %u\n", data[0], data[1], data[2], data[3]); -/* uint64_t* test = buffer;*/ -/* printf("DATA: %llX\n", test[0]);*/ + printf("\nADC_DATA1_MAX: %u\nADC_DATA2_MAX: %u\nSCALER_MAX: %u\nDAC_MAX: %u\n", data[0], data[1], data[3], data[2]); } //Never Reached