Commit 8c52d4ff authored by Matthieu Cattin's avatar Matthieu Cattin

Replace gateware binary by release v1.0

parent 308db744
......@@ -218,8 +218,7 @@ if __name__ == "__main__":
# Load firmware to FPGA
default_directory = '.'
path_fpga_loader = '../../../gnurabbit/user/fpga_loader';
#path_firmware = '../firmwares/spec_fmcadc100m14b4cha_test.bin';
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
print firmware_loader + ' ' + bitstream
......
......@@ -34,7 +34,7 @@ def main (default_directory='.'):
# Constants declaration
TEST_NB = 0
#FMC_ADC_ADDR = '1a39:0004/1a39:0004@000B:0000'
FMC_ADC_BITSTREAM = '../firmwares/spec_fmcadc100m14b4cha.bin'
FMC_ADC_BITSTREAM = '../firmwares/spec-fmc-adc-v1.0.bin'
FMC_ADC_BITSTREAM = os.path.join(default_directory, FMC_ADC_BITSTREAM)
EXPECTED_BITSTREAM_TYPE = 0x1
......
......@@ -51,7 +51,7 @@ DMA_LENGTH = 4096 # DMA length in bytes
def load_firmware(default_directory):
print('Load firmware to FPGA')
path_fpga_loader = '../../../gnurabbit/user/fpga_loader';
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
......@@ -152,7 +152,7 @@ def main (default_directory='.'):
"""
# Load firmware to FPGA
path_fpga_loader = '../../../gnurabbit/user/fpga_loader';
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
......
......@@ -135,7 +135,7 @@ def main (default_directory='.'):
# Constants declaration
TEST_NB = 12
FMC_ADC_BITSTREAM = '../firmwares/spec_fmcadc100m14b4cha.bin'
FMC_ADC_BITSTREAM = '../firmwares/spec-fmc-adc-v1.0.bin'
FMC_ADC_BITSTREAM = os.path.join(default_directory, FMC_ADC_BITSTREAM)
EXPECTED_BITSTREAM_TYPE = 0x1
......
......@@ -31,7 +31,7 @@ FAMILY_CODE = 0x28
def load_firmware(default_directory):
print('Load firmware to FPGA')
path_fpga_loader = '../../../gnurabbit/user/fpga_loader';
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
print firmware_loader + ' ' + bitstream
......
......@@ -51,7 +51,7 @@ DMA_LENGTH = 4096 # DMA length in bytes
def load_firmware(default_directory):
print('Load firmware to FPGA')
path_fpga_loader = '../../../gnurabbit/user/fpga_loader';
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
......@@ -141,7 +141,7 @@ def main (default_directory='.'):
if('y' == raw_input('Test firmware? [y,n]')):
path_firmware = '../firmwares/spec_fmcadc100m14b4cha_test.bin';
else:
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
......
......@@ -63,7 +63,7 @@ DAC_FS = 10 # DAC full scale range is 10V
def load_firmware(default_directory):
print "Load firmware to FPGA"
path_fpga_loader = '../../../gnurabbit/user/fpga_loader';
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
print firmware_loader + ' ' + bitstream
......@@ -184,7 +184,7 @@ def main (default_directory='.'):
if('y' == raw_input('Test firmware? [y,n]')):
path_firmware = '../firmwares/spec_fmcadc100m14b4cha_test.bin';
else:
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
print firmware_loader + ' ' + bitstream
......
......@@ -60,7 +60,7 @@ STEP_FREQ = 500E3
def load_firmware(default_directory):
print('Load firmware to FPGA')
path_fpga_loader = '../../../gnurabbit/user/fpga_loader';
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
......
......@@ -134,7 +134,7 @@ def main (default_directory='.'):
# Constants declaration
TEST_NB = 22
FMC_ADC_BITSTREAM = '../firmwares/spec_fmcadc100m14b4cha.bin'
FMC_ADC_BITSTREAM = '../firmwares/spec-fmc-adc-v1.0.bin'
FMC_ADC_BITSTREAM = os.path.join(default_directory, FMC_ADC_BITSTREAM)
EXPECTED_BITSTREAM_TYPE = 0x1
......
......@@ -49,7 +49,7 @@ def main (default_directory='.'):
# Old way of loading the firmware
"""
path_fpga_loader = '../../../gnurabbit/user/fpga_loader';
path_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin';
path_firmware = '../firmwares/spec-fmc-adc-v1.0.bin';
firmware_loader = os.path.join(default_directory, path_fpga_loader)
bitstream = os.path.join(default_directory, path_firmware)
......@@ -60,7 +60,7 @@ def main (default_directory='.'):
"""
fmc_adc_addr = '1a39:0004/1a39:0004@000b:0000'
fmc_adc_firmware = '../firmwares/spec_fmcadc100m14b4cha.bin'
fmc_adc_firmware = '../firmwares/spec-fmc-adc-v1.0.bin'
# SPEC object declaration
spec = rr.Gennum()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment