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

merged with maqster, added odd/even HACT shift for parallel sensors

parents a2528fa9 74db0472

.settings/com.elphel.vdt.VivadoBitstream.prefs

+1 −1
Original line number Diff line number Diff line 
VivadoBitstream_@_PreBitstreamTCL=set_property BITSTREAM.STARTUP.MATCH_CYCLE NoWait [current_design]<-@\#\#@->

VivadoBitstream_@_force=true

VivadoBitstream_@_rawfile=x393_hispi

VivadoBitstream_@_rawfile=x393_parallel

com.elphel.store.context.VivadoBitstream=VivadoBitstream_@_rawfile<-@\#\#@->VivadoBitstream_@_force<-@\#\#@->VivadoBitstream_@_PreBitstreamTCL<-@\#\#@->

eclipse.preferences.version=1

fpga_version.vh

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

 * with at least one of the Free Software programs.

 */

        parameter FPGA_VERSION =          32'h039300bd;      //hispi,  trying the same -0.173/36, 80.95%

        parameter FPGA_VERSION =          32'h039300be;      //parallel - adding odd/even pixels shift -0.066/12, 80.26%

//      parameter FPGA_VERSION =          32'h039300bd;      //hispi,  trying the same -0.173/36, 80.95%

//      parameter FPGA_VERSION =          32'h039300bc;      //parallel, 100kHz min i2c speed -0.076/8, 79.69%

//      parameter FPGA_VERSION =          32'h039300bb;      //parallel, adding i2c almost full. -0.101/8, 79.37%

//      parameter FPGA_VERSION =          32'h039300ba;      //parallel, fixing introduced by debug bug in sens_parallel12.v: met, 80.03%

includes/x393_parameters.vh

+4 −3
Original line number Diff line number Diff line
@@ -481,8 +481,9 @@ 
        parameter SENS_CTRL_GP1=      14,  // 15:14

//`else

        parameter SENS_CTRL_QUADRANTS =      12,  // 17:12, enable - 20

        parameter SENS_CTRL_QUADRANTS_WIDTH = 6,

        parameter SENS_CTRL_QUADRANTS_EN =   20,  // 17:12, enable - 20 (2 bits reserved)

        parameter SENS_CTRL_QUADRANTS_WIDTH = 7, // 6,

        parameter SENS_CTRL_ODD =             6, //

        parameter SENS_CTRL_QUADRANTS_EN =   20,  // 18:12, enable - 20 (1 bits reserved)

//`endif

      parameter SENSIO_STATUS =         'h1,

      parameter SENSIO_JTAG =           'h2,

py393/x393_export_c.py

+1 −1
Original line number Diff line number Diff line
@@ -2015,7 +2015,7 @@ class X393ExportC(object): 
        dw.append(("ext_clk",      vrlg.SENS_CTRL_EXT_CLK,      1,   0,  "MMCM clock input: 0: clock to the sensor, 1 - clock from the sensor"))

        dw.append(("ext_clk_set",  vrlg.SENS_CTRL_EXT_CLK + 1,  1,   0,  "Set MMCM clock input to 'ext_clk' field"))

        dw.append(("set_dly",      vrlg.SENS_CTRL_LD_DLY,       1,   0,  "Set all pre-programmed delays to the sensor port input delays"))

        dw.append(("quadrants",    vrlg.SENS_CTRL_QUADRANTS,  vrlg. SENS_CTRL_QUADRANTS_WIDTH, 1, "90-degree shifts for data [1:0], hact [3:2] and vact [5:4]"))

        dw.append(("quadrants",    vrlg.SENS_CTRL_QUADRANTS,  vrlg. SENS_CTRL_QUADRANTS_WIDTH, 1, "90-degree shifts for data [1:0], hact [3:2] and vact [5:4], [6] - extra period delay for hact"))

        dw.append(("quadrants_set",vrlg.SENS_CTRL_QUADRANTS_EN, 1,   0,  "Set 'quadrants' values"))

        return dw

    def _enc_sensio_ctrl_hispi(self):

py393/x393_sensor.py

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ class X393Sensor(object): 
        @param mmcm_rst - True - activate MMCM reset, False - deactivate MMCM reset, None - no change (needed after clock change/interruption)

        @param clk_sel - True - use pixel clock from the sensor, False - use internal clock (provided to the sensor), None - no chnage

        @param set_delays - (self-clearing) load all pre-programmed delays for the sensor pad inputs 

        @param quadrants -  90-degree shifts for data [1:0], hact [3:2] and vact [5:4] (6'h01), None - no change

        @param quadrants -  90-degree shifts for data [1:0], hact [3:2] and vact [5:4] [6] - extra hact delay by 1 pixel (7'h01), None - no change

        @return sensor i/o control word

        """

        rslt = 0