Commit 38a3ef4f authored by Andrey Filippov's avatar Andrey Filippov
Browse files

merged with framepars branch

parents 4e9d0458 ea0f8823

fpga_version.vh

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

 * with at least one of the Free Software programs.

 */

        parameter FPGA_VERSION =          32'h039300b9;      //parallel, correcting RTC (it was 25/24 faster) -0.038/29, 79.64%

        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%

//      parameter FPGA_VERSION =          32'h039300b9;      //parallel, correcting RTC (it was 25/24 faster) -0.038/29, 79.64%

//      parameter FPGA_VERSION =          32'h039300b8;      //parallel, working on camsync -0.330/99, 80.52% -> -0.143 /40, 79.88% 

//      parameter FPGA_VERSION =          32'h039300b7;      //parallel, matching histograms Bayer to gamma bayer -0.011/9, 79.92%

//      parameter FPGA_VERSION =          32'h039300b6;      //parallel, working on histograms odd colors bug -0.207 /58,  79.68%

py393/hargs-after

+0 −1
Original line number Diff line number Diff line
@@ -5,5 +5,4 @@ 
-p PICKLE="/usr/local/verilog/x393_mcntrl.pickle

-c bitstream_set_path /usr/local/verilog/x393_parallel.bit

-c specify_phys_memory

-c specify_window

-i

py393/hargs-eyesis

0 → 100644
+10 −0
Original line number Diff line number Diff line 
-d TARGET_MODE=1

-f /usr/local/verilog/system_defines.vh

-f /usr/local/verilog/x393_parameters.vh   /usr/local/verilog/x393_cur_params_target.vh /usr/local/verilog/x393_localparams.vh

-l /usr/local/verilog/x393_cur_params_target.vh

-p PICKLE="/usr/local/verilog/x393_mcntrl.pickle

-c bitstream_set_path /usr/local/verilog/x393_parallel.bit

-c setupEyesisPower 50 100

-c measure_all "*DI"

-c setSensorClock 24.0 "2V5_LVDS"

-c set_rtc

py393/x393_export_c.py

+1 −1
Original line number Diff line number Diff line
@@ -1826,7 +1826,7 @@ class X393ExportC(object): 
        dw.append(("i2c_fifo_nempty",        8, 1,0,  "I2C read FIFO has data"))

        dw.append(("i2c_fifo_lsb",           9, 1,0,  "I2C FIFO byte counter (odd/even bytes)"))

        dw.append(("busy",                  10, 1,0,  "I2C sequencer busy"))

        dw.append(("alive_fs",              11, 1,0,  "Sensor generated frame sync since last status update"))

        dw.append(("wr_full",               11, 1,0,  "Write buffer almost full (1/4..3/4 in ASAP mode)"))

        dw.append(("frame_num",             12, 4,0,  "I2C sequencer frame number"))

        dw.append(("req_clr",               16, 1,0,  "Request for clearing fifo_wp (delay frame sync if previous is not yet sent out)"))

        dw.append(("reset_on",              17, 1,0,  "Reset in progress"))

py393/x393_jpeg.py

+7 −3
Original line number Diff line number Diff line
@@ -1072,6 +1072,8 @@ camsync_setup 0xf # sensor mask - use local timestamps) 
jpeg_write  "img.jpeg" 0 80



####### Parallel - setup sensor 1 (sensor 0 is set by drivers) ##############

cd /usr/local/verilog/; test_mcntrl.py @hargs-after



setup_all_sensors True None 0x2 # sensor 1

set_sensor_io_ctl  1 None None 1 # Set ARO low - check if it is still needed?

#set quadrants
@@ -1099,6 +1101,8 @@ jpeg_write "img.jpeg" 1 80 




################## Parallel ##################

cd /usr/local/verilog/; test_mcntrl.py @hargs-after



cd /usr/local/verilog/; test_mcntrl.py @tpargs -x
@@ -1903,8 +1907,8 @@ set_gpio_ports 1 1 # enable software gpio pins and porta (camsync) 
set_gpio_pins 0 1 # pin 0 low, pin 1 - high



set_camsync_period 31 # set bit duration

set_camsync_period 7500 # 75 usec

set_camsync_delay 0 0

set_camsync_period  8000 # 80 usec

set_camsync_delay 0 400

set_camsync_delay 1 100

set_camsync_delay 2 200

set_camsync_delay 3 300
@@ -2014,7 +2018,7 @@ jpeg_sim_multi 4 
#set_camsync_mode  <en=None>  <en_snd=None>  <en_ts_external=None>  <triggered_mode=None>  <master_chn=None>  <chn_en=None> 

set_camsync_mode     None        None            None                      0

jpeg_sim_multi 4

jpeg_sim_multi 4

jpeg_sim_multi 8