Commit cb75953f authored by Andrey Filippov's avatar Andrey Filippov
Browse files

merged with master

parents d6956f19 78fb822a

cocotb/x393_cocotb_03.sav

+10 −12
Original line number Diff line number Diff line 
[*]

[*] GTKWave Analyzer v3.3.78 (w)1999-2016 BSI

[*] Thu Mar 28 02:06:10 2019

[*] Fri Mar 29 19:57:39 2019

[*]

[dumpfile] "/data_ssd/nc393/elphel393/fpga-elphel/x393/simulation/x393_dut-20190327185524057.fst"

[dumpfile_mtime] "Thu Mar 28 02:04:11 2019"

[dumpfile_size] 520738951

[dumpfile] "/data_ssd/nc393/elphel393/fpga-elphel/x393/simulation/x393_dut-20190329122246325.fst"

[dumpfile_mtime] "Fri Mar 29 19:57:08 2019"

[dumpfile_size] 183493612

[savefile] "/data_ssd/nc393/elphel393/fpga-elphel/x393/cocotb/x393_cocotb_03.sav"

[timestart] 379540790

[timestart] 0

[size] 1804 1171

[pos] -1 -1

*-14.159636 379618470 212597388 212637388 379925000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1

*-23.795546 65139070 212597388 212637388 379925000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1

[treeopen] x393_dut.

[treeopen] x393_dut.simul_sensor12bits_2_i.

[treeopen] x393_dut.simul_sensor12bits_3_i.
@@ -23,15 +23,12 @@ 
[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[0].jp_channel_i.cmprs_raw_buf_iface_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[0].jp_channel_i.huffman_stuffer_meta_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[0].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_metadata_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[1].

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[1].jp_channel_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[1].jp_channel_i.cmprs_frame_sync_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[2].

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[2].jp_channel_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[2].jp_channel_i.cmprs_frame_sync_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[2].jp_channel_i.huffman_stuffer_meta_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[2].jp_channel_i.huffman_stuffer_meta_i.bit_stuffer_27_32_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.cmprs_frame_sync_i.

[treeopen] x393_dut.x393_i.compressor393_i.cmprs_channel_block[3].jp_channel_i.huffman_stuffer_meta_i.
@@ -71,7 +68,7 @@ 
[treeopen] x393_dut.x393_i.timing393_i.camsync393_i.

[treeopen] x393_dut.x393_i.timing393_i.camsync393_i.i_frsync_pclk0.

[sst_width] 309

[signals_width] 333

[signals_width] 409

[sst_expanded] 1

[sst_vpaned_height] 486

@820
@@ -3028,6 +3025,9 @@ x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c 
-i2c_seq_0

@800200

-sensor_channel0

@29

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.bit16

@800200

-buf

@28

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_membuf_i.px_valid
@@ -3864,10 +3864,8 @@ x393_dut.x393_i.mcntrl393_i.sens_comp_block[0].mcntrl_tiled_rd_compressor_i.xfer 
x393_dut.x393_i.mcntrl393_i.sens_comp_block[0].mcntrl_tiled_rd_compressor_i.pending_xfers[1:0]

@28

x393_dut.x393_i.mcntrl393_i.sens_comp_block[0].mcntrl_tiled_rd_compressor_i.frame_done

@29

[color] 2

x393_dut.x393_i.mcntrl393_i.sens_comp_block[0].mcntrl_tiled_rd_compressor_i.busy_r

@28

x393_dut.x393_i.compressor393_i.cmprs_channel_block[0].jp_channel_i.cmprs_en_mclk

x393_dut.x393_i.compressor393_i.cmprs_channel_block[0].jp_channel_i.cmprs_run_mclk

@22

py393/x393_sens_cmprs.py

+4 −1
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ class X393SensCmprs(object): 
                              histogram_top =             None, # 0,

                              histogram_width_m1 =        None, # 2559, #0,

                              histogram_height_m1 =       None, # 1935, #0,

                              bits16 =                    False,

                              verbose =                   1

                              ):

        """
@@ -863,7 +864,7 @@ class X393SensCmprs(object): 
            hist_en =    1, # bitmask, only first subchannel

            hist_nrst =  1, # bitmask, only first subchannel

            chn_en =     True,

            bits16 =     False)

            bits16 =     bits16) #False)



        if verbose >0 :

            print ("===================== CMPRS_EN_ARBIT =========================")
@@ -1435,6 +1436,7 @@ class X393SensCmprs(object): 
                              histogram_height_m1 =       None, # 799, #0,

                              circbuf_chn_size=           0x4000000, # 64 Mib - all 4 channels?

                              reset_afi =                 False, # reset AFI multiplexer

                              bits16 =                    False,

                              verbose =                   1):

        """

        Setup one sensor+compressor channel (for one sub-channel only)
@@ -1691,6 +1693,7 @@ class X393SensCmprs(object): 
                          histogram_top =           histogram_top,

                          histogram_width_m1 =      histogram_width_m1,

                          histogram_height_m1 =     histogram_height_m1,

                          bits16 =                  bits16,

                          verbose =                 verbose)

                if not rslt : return False

                if exit_step == 20: return False