Commit 9145e396 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

merged with framepars

parents b02bac09 cf5bee66

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ COMMAND_FILES = py393/hargs \ 
				  py393/hargs-auto \

				  py393/hargs-after \

				  py393/hargs-eyesis \

				  py393/hargs-post-par12 \

				  py393/hargs-power_par12 \

				  py393/hargs-power-eyesis \

				  py393/includes \

				  py393/startup5 \

				  py393/startup14

cocotb/x393_cocotb_03.sav

+118 −14
Original line number Diff line number Diff line 
[*]

[*] GTKWave Analyzer v3.3.66 (w)1999-2015 BSI

[*] Thu Oct 27 01:40:51 2016

[*] Mon Nov  7 00:04:33 2016

[*]

[dumpfile] "/home/eyesis/git/x393-neon/simulation/x393_dut-20161026180017757.fst"

[dumpfile_mtime] "Thu Oct 27 01:39:08 2016"

[dumpfile_size] 418439836

[dumpfile] "/home/eyesis/git/x393-neon/simulation/x393_dut-20161106163115099.fst"

[dumpfile_mtime] "Mon Nov  7 00:03:53 2016"

[dumpfile_size] 125174737

[savefile] "/home/eyesis/git/x393-neon/cocotb/x393_cocotb_03.sav"

[timestart] 0

[size] 1814 1171

[pos] 0 0

*-27.006804 350100000 53094051 136169617 216213845 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1

*-25.890059 103100000 -1 -1 -1 -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.
@@ -25,15 +25,20 @@ 
[treeopen] x393_dut.x393_i.event_logger_i.i_logger_arbiter.

[treeopen] x393_dut.x393_i.event_logger_i.i_nmea_decoder.

[treeopen] x393_dut.x393_i.event_logger_i.i_rs232_rcv.

[treeopen] x393_dut.x393_i.frame_sequencer_block[0].

[treeopen] x393_dut.x393_i.frame_sequencer_block[0].cmd_frame_sequencer_i.

[treeopen] x393_dut.x393_i.mult_saxi_wr_i.mult_saxi_wr_pointers_i.

[treeopen] x393_dut.x393_i.sensors393_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[0].

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

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sens_sync_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[1].

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.sens_sync_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[2].

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[2].sensor_channel_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[2].sensor_channel_i.sens_parallel12_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[2].sensor_channel_i.sens_sync_i.

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[3].

[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[3].sensor_channel_i.
@@ -41,7 +46,7 @@ 
[treeopen] x393_dut.x393_i.sensors393_i.sensor_channel_block[3].sensor_channel_i.sens_sync_i.

[treeopen] x393_dut.x393_i.timing393_i.

[treeopen] x393_dut.x393_i.timing393_i.camsync393_i.

[sst_width] 282

[sst_width] 440

[signals_width] 319

[sst_expanded] 1

[sst_vpaned_height] 486
@@ -771,13 +776,13 @@ x393_dut.x393_i.axiwr_wen 
x393_dut.x393_i.axiwr_wdata[31:0]

@1401200

- cmd

@800200

@c00200

-i2c

@22

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.rpointer[5:0]

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.wpage0[3:0]

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.page_r[3:0]

@1000200

@1401200

-i2c

@c00200

-gpio
@@ -1838,7 +1843,7 @@ x393_dut.IMU_SDA 
x393_dut.IMU_TAPS[5:1]

@1401200

-IMU_

@800200

@c00200

-camsync_ext_int

@800022

x393_dut.x393_i.timing393_i.camsync393_i.gpio_in[9:0]
@@ -1907,9 +1912,9 @@ x393_dut.x393_i.timing393_i.camsync393_i.trigger_condition 
x393_dut.x393_i.timing393_i.camsync393_i.trigger_condition_filtered

@22

x393_dut.x393_i.timing393_i.camsync393_i.input_pattern[9:0]

@c00023

@c00022

x393_dut.x393_i.timing393_i.camsync393_i.input_use[9:0]

@29

@28

(0)x393_dut.x393_i.timing393_i.camsync393_i.input_use[9:0]

(1)x393_dut.x393_i.timing393_i.camsync393_i.input_use[9:0]

(2)x393_dut.x393_i.timing393_i.camsync393_i.input_use[9:0]
@@ -1920,15 +1925,114 @@ x393_dut.x393_i.timing393_i.camsync393_i.input_use[9:0] 
(7)x393_dut.x393_i.timing393_i.camsync393_i.input_use[9:0]

(8)x393_dut.x393_i.timing393_i.camsync393_i.input_use[9:0]

(9)x393_dut.x393_i.timing393_i.camsync393_i.input_use[9:0]

@1401201

@1401200

-group_end

@1001200

-group_end

-group_end

-group_end

@1401200

-camsync_ext_int

@800200

-sequencers_0

-cmd_frame_seq0

@28

x393_dut.x393_i.frame_sequencer_block[0].cmd_frame_sequencer_i.frame_sync

@22

x393_dut.x393_i.frame_sequencer_block[0].cmd_frame_sequencer_i.frame_no[3:0]

@1000200

-cmd_frame_seq0

@800200

-i2c_seq_0

@28

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.frame_sync

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.req_clr

@c00028

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.wpage0_inc[1:0]

@28

(0)x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.wpage0_inc[1:0]

(1)x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.wpage0_inc[1:0]

@1401200

-group_end

@28

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.sync_to_seq

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.sync_to_eof

@22

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.frame_num_seq[3:0]

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.frame_num[3:0]

@28

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.eof_mclk

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sensor_i2c_io_i.sensor_i2c_i.use_eof

@1000200

-i2c_seq_0

@800200

-sensor_channel0

@28

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

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

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

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

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

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

@22

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.frame_num_seq[3:0]

@800200

-sesns_sync

@28

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sens_sync_i.sof_out

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sens_sync_i.sof_late

x393_dut.x393_i.sensors393_i.sensor_channel_block[0].sensor_channel_i.sens_sync_i.sof_out_pclk

@200

-

@1000200

-camsync_ext_int

-sesns_sync

-sensor_channel0

-sequencers_0

@800200

-sensor_channel_a

@28

x393_dut.simul_sensor12bits_2_i.MRST

x393_dut.simul_sensor12bits_2_i.HACT

x393_dut.simul_sensor12bits_2_i.VACT

x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.sof_out_mclk

x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.en_mclk

x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.en_pclk

@22

x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.frame_num_seq[3:0]

@28

x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.sens_sync_i.sof_out

x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.sens_sync_i.sof_out_pclk

x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.sens_sync_i.sof_late

@22

x393_dut.x393_i.sensors393_i.sensor_channel_block[1].sensor_channel_i.frame_num_seq[3:0]

@200

-chn2

@28

x393_dut.simul_sensor12bits_3_i.MRST

x393_dut.simul_sensor12bits_3_i.HACT

x393_dut.simul_sensor12bits_3_i.VACT

x393_dut.x393_i.sensors393_i.sensor_channel_block[2].sensor_channel_i.en_mclk

x393_dut.x393_i.sensors393_i.sensor_channel_block[2].sensor_channel_i.en_pclk

x393_dut.x393_i.sensors393_i.sensor_channel_block[2].sensor_channel_i.sof_out_mclk

@29

x393_dut.x393_i.sensors393_i.sensor_channel_block[2].sensor_channel_i.eof_mclk

@22

x393_dut.x393_i.sensors393_i.sensor_channel_block[2].sensor_channel_i.frame_num_seq[3:0]

@800200

-sens_sync2

@200

-

@1000200

-sens_sync2

-sensor_channel_a

@800022

x393_dut.x393_i.sof_out_mclk[3:0]

@28

(0)x393_dut.x393_i.sof_out_mclk[3:0]

(1)x393_dut.x393_i.sof_out_mclk[3:0]

(2)x393_dut.x393_i.sof_out_mclk[3:0]

(3)x393_dut.x393_i.sof_out_mclk[3:0]

@1001200

-group_end

[pattern_trace] 1

[pattern_trace] 0

cocotb/x393_dut.v

+1 −1
Original line number Diff line number Diff line
@@ -1613,7 +1613,7 @@ simul_axi_hp_wr #( 
        .new_bayer (0) //SENSOR12BITS_NEW_BAYER) was 1

    ) simul_sensor12bits_2_i (

        .MCLK  (PX2_MCLK), // input 

        .MRST  (PX2_MRST), // input 

        .MRST  (PX2_MRST & 0), // input // force reset !!! 

        .ARO   (PX2_ARO),  // input 

        .ARST  (PX2_ARST), // input 

        .OE    (1'b0),     // input output enable active low

fpga_version.vh

+6 −2
Original line number Diff line number Diff line
@@ -35,7 +35,11 @@ 
 * contains all the components and scripts required to completely simulate it

 * with at least one of the Free Software programs.

 */

        parameter FPGA_VERSION =          32'h039300c3;      //parallel - fixing timestamps

        parameter FPGA_VERSION =          32'h039300c7;      //parallel - disable SoF when channel disabled

//      parameter FPGA_VERSION =          32'h039300c6;      //parallel - same -0.132 /31, 80.73%

//      parameter FPGA_VERSION =          32'h039300c5;      //parallel - made i2c ahead of system frame number for eof -0.027/12 , 82.08%

//      parameter FPGA_VERSION =          32'h039300c4;      //parallel - option to use EOF for i2c sequencer timing met, 79.66%

//      parameter FPGA_VERSION =          32'h039300c3;      //parallel - fixing timestamps -0.209/47, 79.86%

//      parameter FPGA_VERSION =          32'h039300c2;      //parallel - external sync for Eyesis -0.160/71 79.84%

//      parameter FPGA_VERSION =          32'h039300c1;      //parallel - modified after troubleshooting simulation -0.069/41, 79.90 %

//      parameter FPGA_VERSION =          32'h039300c0;      //parallel - changing LOGGER_PAGE_IMU 3->0 (how it was in 353) -0.044/16, 79.59%

includes/x393_parameters.vh

+1 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ 
        parameter SENSI2C_CMD_RUN =         13, // [13:12]3 - run i2c, 2 - stop i2c (needed before software i2c), 1,0 - no change to run state

        parameter SENSI2C_CMD_RUN_PBITS =    1,

        

        parameter SENSI2C_CMD_USE_EOF =      8, // [9:8] - 0: advance sequencer at SOF, 1 - advance sequencer at EOF 

        parameter SENSI2C_CMD_SOFT_SDA =     6, // [7:6] - SDA software control: 0 - nop, 1 - low, 2 - active high, 3 - float

        parameter SENSI2C_CMD_SOFT_SCL =     4, // [5:4] - SCL software control: 0 - nop, 1 - low, 2 - active high, 3 - float