Make snap tut2 work -- now using new memory map

casper-astro · Aug 8, 2019 · b00ed90 · b00ed90
1 parent 697c58e
commit b00ed90
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/casperfpga b/casperfpga
diff --git a/snap/mlib_devel b/snap/mlib_devel
diff --git a/snap/tut_tge/snap_tut_tge.py b/snap/tut_tge/snap_tut_tge.py
@@ -65,9 +65,9 @@ def exit_clean():
         fpgfile = opts.fpg
 
 # DO NOT CHANGE THESE THREE VALUES!!!
-mac_location = 0x00
-ip_location = 0x10
-port_location = 0x8
+mac_location = 0x0c
+ip_location = 0x14
+port_location = 0x30
 
 try:
     #lh = corr.log_handlers.DebugLogHandler()
@@ -127,7 +127,7 @@ def exit_clean():
     fpga.write(rx_core_name, gbe_rx.mac.packed(), mac_location)
     fpga.write(rx_core_name, gbe_rx.ip_address.packed(), ip_location)
     value = (fpga.read_int(rx_core_name, word_offset = port_location) & 0xffff0000) | (gbe_rx.port & 0xffff)
-    fpga.write_int(rx_core_name, value, word_offset = port_location)
+    fpga.write_int(rx_core_name, value, word_offset = port_location//4)
     gbe_rx.fabric_enable()
     print 'done'
 
@@ -140,7 +140,7 @@ def exit_clean():
     fpga.write(tx_core_name, gbe_tx.mac.packed(), mac_location)
     fpga.write(tx_core_name, gbe_tx.ip_address.packed(), ip_location)
     value = (fpga.read_int(tx_core_name, word_offset = port_location) & 0xffff0000) | (gbe_tx.port & 0xffff)
-    fpga.write_int(tx_core_name, value, word_offset = port_location)
+    fpga.write_int(tx_core_name, value, word_offset = port_location//4)
     gbe_tx.fabric_enable()
     print 'done'
 
@@ -244,10 +244,7 @@ def exit_clean():
 except KeyboardInterrupt:
     exit_clean()
 except Exception as inst:
-    print type(inst)
-    print inst.args
-    print inst
-    exit_fail()
+    raise
 
 exit_clean()