Commit 77fa59b6 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

merged with framepars

parents 69a5a370 b197095f

.eclipse_project_setup/.project

+0 −47
Original line number Diff line number Diff line
@@ -48,51 +48,4 @@ 
		<nature>com.elphel.vdt.veditor.HdlNature</nature>

		<nature>org.python.pydev.pythonNature</nature>

	</natures>

	<linkedResources>

		<link>

			<name>vivado_logs/VivadoBitstream.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_logs/VivadoBitstream-20160713221922665.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoOpt.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_logs/VivadoOpt-20160713221922665.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoOptPhys.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_logs/VivadoOptPhys-20160713221922665.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoOptPower.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_logs/VivadoOptPower-20160713221922665.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoPlace.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_logs/VivadoPlace-20160713221922665.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoRoute.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_logs/VivadoRoute-20160713221922665.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoSynthesis.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_logs/VivadoSynthesis-20160713221027219.log</location>

		</link>

		<link>

			<name>vivado_logs/VivadoTimimgSummaryReportImplemented.log</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_logs/VivadoTimimgSummaryReportImplemented-20160713221922665.log</location>

		</link>

		<link>

			<name>vivado_state/x393-synth.dcp</name>

			<type>1</type>

			<location>/home/andrey/git/x393-neon/vivado_state/x393-synth-20160713203728437.dcp</location>

		</link>

	</linkedResources>

</projectDescription>

.eclipse_project_setup/.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

.eclipse_project_setup/.settings/com.elphel.vdt.cocotb.prefs

+1 −1
Original line number Diff line number Diff line 
cocotb_@_COCOTB_DEBUG=true

cocotb_@_COCOTB_DEBUG=false

cocotb_@_CocotbDutTopFile=cocotb/x393_dut.v

cocotb_@_CocotbExtraFiles=glbl.v<-@\#\#@->

cocotb_@_CocotbIncludeDir=${verilog_project_loc}/includes<-@\#\#@->${verilog_project_loc}/ddr3<-@\#\#@->${verilog_project_loc}/x393_sata<-@\#\#@->${verilog_project_loc}/x393_sata/host<-@\#\#@->

.eclipse_project_setup/.settings/org.eclipse.core.resources.prefs

+1 −0
Original line number Diff line number Diff line 
eclipse.preferences.version=1

encoding//attic/gen_hist_test.py=utf-8

encoding//helpers/convert_data_to_params.py=utf-8

encoding//helpers/convert_pass_init_params.py=utf-8

encoding//helpers/convert_zigzag_rom.py=utf-8

py393/x393_jpeg.py

+129 −0
Original line number Diff line number Diff line
@@ -2030,6 +2030,135 @@ set_camsync_mode None None None 0 
jpeg_sim_multi 4

jpeg_sim_multi 8



################## Simulate Parallel 10 - external trigger ####################

./py393/test_mcntrl.py @py393/cocoargs  --simulated=localhost:7777

measure_all "*DI"

setup_all_sensors True None 0xf

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

#just testing

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  8000 # 80 usec

set_camsync_delay 0 400

set_camsync_delay 1 100

set_camsync_delay 2 200

set_camsync_delay 3 300

#set_camsync_inout  <is_out>  <bit_number>  <active_positive>

set_camsync_inout  1  8  0

#set_camsync_inout  0  7  0

reset_camsync_inout  0 # start with internal trigger





#set_camsync_mode  <en=None>  <en_snd=None>  <en_ts_external=None>  <triggered_mode=None>  <master_chn=None>  <chn_en=None> 

set_camsync_mode  1 1 1 1 0 0xf

 







set_sensor_histogram_window  0  0  4  4  25 21

set_sensor_histogram_window  1  0  4  4  41 21

set_sensor_histogram_window  2  0  4  4  25 41

set_sensor_histogram_window  3  0  4  4  41 41









r

read_control_register 0x430

read_control_register 0x431

write_cmd_frame_sequencer  0  1  2  0x600  0x48   # compressor q page = 1 // too late for frame 2

set_qtables 0 0 80

set_qtables 0 1 70



#irq coming, image not changing - yes

write_cmd_frame_sequencer  0  1  1 0x686 0x280005 #save 4 more lines than sensor has                                                                                                                                    

write_cmd_frame_sequencer  0  1  1 0x680 0x5507 #enable abort

#write_cmd_frame_sequencer  0  1  1 0x6c6 0x300006 #save 4 more lines that compressor has                                                                                                                                    



write_cmd_frame_sequencer  0  1  2  0x600  0x5    #stop    compressor           `      

write_cmd_frame_sequencer  0  1  2  0x680  0x5405 # stop  sensor memory         (+0) // sensor memory should be controlled first, (9 commands

write_cmd_frame_sequencer  0  1  2  0x6c0  0x5c49 # stop compressor memory      (+0)



write_cmd_frame_sequencer  0  1  3 0x686 0x240005 # correct lines                                                                                                   

write_cmd_frame_sequencer  0  1  3  0x680  0x5507 # run sensor memory           (+1) Can not be 0



write_cmd_frame_sequencer  0  1  4 0x686 0x280005 #save 4 more lines than sensor has                                                                                                                                    

write_cmd_frame_sequencer  0  1  4 0x6c6 0x300006 #save more lines than compressor needs (sensor provides)                                                                                                                                    

write_cmd_frame_sequencer  0  1  4  0x6c0  0x7d4b # run compressor memory       (+2)

write_cmd_frame_sequencer  0  1  4  0x600  0x7    # run compressor              (+0)



write_cmd_frame_sequencer  0  1  1  0x600  0x48   # compressor q page = 1

write_cmd_frame_sequencer  0  1  4  0x600  0x40   # compressor q page = 0



read_control_register 0x431

read_control_register 0x430



#testing histograms

write_control_register 0x409 0xc0





#sequencer test

#ctrl_cmd_frame_sequencer  <num_sensor>  <reset=False>  <start=False>  <stop=False>

ctrl_cmd_frame_sequencer   0  0  1  0

write_cmd_frame_sequencer  0  1  1  0x700  0x6

write_cmd_frame_sequencer  0  1  1  0x700  0x9

write_cmd_frame_sequencer  0  1  1  0x700  0xa0

write_cmd_frame_sequencer  0  1  1  0x700  0x50

#write_cmd_frame_sequencer  0  0  3  0x700  0xa000

write_cmd_frame_sequencer  0  1  0  0x700  0x90

#write_cmd_frame_sequencer  0  0  2  0x700  0xe00

write_cmd_frame_sequencer  0  0  3  0x700  0xa

write_cmd_frame_sequencer  0  0  2  0x700  0x6

write_cmd_frame_sequencer  0  0  2  0x700  0x9

write_cmd_frame_sequencer  0  0  2  0x700  0x60

write_cmd_frame_sequencer  0  0  2  0x700  0x90

#write_cmd_frame_sequencer  0  0  2  0x700  0x600

#write_cmd_frame_sequencer  0  0  2  0x700  0x900

r

read_status 0x21

r

#set_sensor_io_dly_hispi all 0x48 0x68 0x68 0x68 0x68

#set_sensor_io_ctl all None None None None None 1 None # load all delays?

compressor_control  all  None  None  None None None  2

compressor_interrupt_control all clr

compressor_interrupt_control all en

compressor_control  all  3

r

read_status 0x21

r

jpeg_sim_multi 4

r

read_status 0x21

r

jpeg_sim_multi 3

r

read_status 0x21

r



write_cmd_frame_sequencer  0  1  1 0x686 0x240005 # correct lines                                                                                                   

write_cmd_frame_sequencer  0  1  1 0x6c6 0x200006 # correct lines                                                                                                                                    

write_cmd_frame_sequencer  0  1  1  0x680  0x5507 # run sensor memory, update frame#, reset buffers

write_cmd_frame_sequencer  0  1  1  0x6c0  0x7d4b # run compressor memory

write_cmd_frame_sequencer  0  1  1  0x600  0x7    # run compressor



#switch to external (wired) trigger

set_camsync_inout  0  7  0



jpeg_sim_multi 4



###switch to external (wired) trigger

##set_camsync_inout  0  7  0



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> 



#keeping external trigger mode (#9 was switching to internal)

#set_camsync_mode     None        None            None                      0

jpeg_sim_multi 4

jpeg_sim_multi 8







################## Serial ####################