##// END OF EJS Templates
MINI-LFR 0.1.16
pellion -
r379:5f9dbde02e9a JC
parent child
Show More
@@ -172,6 +172,8 ARCHITECTURE beh OF MINI_LFR_top IS
172 172 SIGNAL bias_fail_sw_sig : STD_LOGIC;
173 173
174 174 SIGNAL observation_reg : STD_LOGIC_VECTOR(31 DOWNTO 0);
175 SIGNAL observation_vector_0: STD_LOGIC_VECTOR(11 DOWNTO 0);
176 SIGNAL observation_vector_1: STD_LOGIC_VECTOR(11 DOWNTO 0);
175 177 -----------------------------------------------------------------------------
176 178
177 179 BEGIN -- beh
@@ -440,6 +442,8 BEGIN -- beh
440 442 coarse_time => coarse_time,
441 443 fine_time => fine_time,
442 444 data_shaping_BW => bias_fail_sw_sig,
445 observation_vector_0=> observation_vector_0,
446 observation_vector_1 => observation_vector_1,
443 447 observation_reg => observation_reg);
444 448
445 449 all_sample: FOR I IN 7 DOWNTO 0 GENERATE
@@ -525,8 +529,8 BEGIN -- beh
525 529 IO10 <= '0';
526 530 IO11 <= '0';
527 531 ELSIF clk_25'event AND clk_25 = '1' THEN -- rising clock edge
528 CASE gpioo.dout(1 DOWNTO 0) IS
529 WHEN "00" =>
532 CASE gpioo.dout(2 DOWNTO 0) IS
533 WHEN "000" =>
530 534 IO0 <= observation_reg(0 );
531 535 IO1 <= observation_reg(1 );
532 536 IO2 <= observation_reg(2 );
@@ -539,7 +543,7 BEGIN -- beh
539 543 IO9 <= observation_reg(9 );
540 544 IO10 <= observation_reg(10);
541 545 IO11 <= observation_reg(11);
542 WHEN "01" =>
546 WHEN "001" =>
543 547 IO0 <= observation_reg(0 + 12);
544 548 IO1 <= observation_reg(1 + 12);
545 549 IO2 <= observation_reg(2 + 12);
@@ -552,7 +556,7 BEGIN -- beh
552 556 IO9 <= observation_reg(9 + 12);
553 557 IO10 <= observation_reg(10 + 12);
554 558 IO11 <= observation_reg(11 + 12);
555 WHEN "10" =>
559 WHEN "010" =>
556 560 IO0 <= observation_reg(0 + 12 + 12);
557 561 IO1 <= observation_reg(1 + 12 + 12);
558 562 IO2 <= observation_reg(2 + 12 + 12);
@@ -565,19 +569,32 BEGIN -- beh
565 569 IO9 <= '0';
566 570 IO10 <= '0';
567 571 IO11 <= '0';
568 WHEN "11" =>
569 IO0 <= '0';
570 IO1 <= '0';
571 IO2 <= '0';
572 IO3 <= '0';
573 IO4 <= '0';
574 IO5 <= '0';
575 IO6 <= '0';
576 IO7 <= '0';
577 IO8 <= '0';
578 IO9 <= '0';
579 IO10 <= '0';
580 IO11 <= '0';
572 WHEN "011" =>
573 IO0 <= observation_vector_0(0 );
574 IO1 <= observation_vector_0(1 );
575 IO2 <= observation_vector_0(2 );
576 IO3 <= observation_vector_0(3 );
577 IO4 <= observation_vector_0(4 );
578 IO5 <= observation_vector_0(5 );
579 IO6 <= observation_vector_0(6 );
580 IO7 <= observation_vector_0(7 );
581 IO8 <= observation_vector_0(8 );
582 IO9 <= observation_vector_0(9 );
583 IO10 <= observation_vector_0(10);
584 IO11 <= observation_vector_0(11);
585 WHEN "100" =>
586 IO0 <= observation_vector_1(0 );
587 IO1 <= observation_vector_1(1 );
588 IO2 <= observation_vector_1(2 );
589 IO3 <= observation_vector_1(3 );
590 IO4 <= observation_vector_1(4 );
591 IO5 <= observation_vector_1(5 );
592 IO6 <= observation_vector_1(6 );
593 IO7 <= observation_vector_1(7 );
594 IO8 <= observation_vector_1(8 );
595 IO9 <= observation_vector_1(9 );
596 IO10 <= observation_vector_1(10);
597 IO11 <= observation_vector_1(11);
581 598 WHEN OTHERS => NULL;
582 599 END CASE;
583 600
@@ -1,22 +1,24
1 1 onerror {resume}
2 2 quietly WaveActivateNextPane {} 0
3 add wave -noupdate -expand -group debug -expand -group FSM_MS_DMA_state /tb/lpp_lfr_ms_1/debug_reg(0)
4 add wave -noupdate -expand -group debug -expand -group FSM_MS_DMA_state /tb/lpp_lfr_ms_1/debug_reg(1)
5 add wave -noupdate -expand -group debug -expand -group FSM_MS_DMA_state /tb/lpp_lfr_ms_1/debug_reg(2)
6 add wave -noupdate -expand -group debug -expand -group status_ready_matrix /tb/lpp_lfr_ms_1/debug_reg(5)
7 add wave -noupdate -expand -group debug -expand -group status_ready_matrix /tb/lpp_lfr_ms_1/debug_reg(4)
8 add wave -noupdate -expand -group debug -expand -group status_ready_matrix /tb/lpp_lfr_ms_1/debug_reg(3)
9 add wave -noupdate -expand -group debug -expand -group matrix_ready /tb/lpp_lfr_ms_1/debug_reg(8)
10 add wave -noupdate -expand -group debug -expand -group matrix_ready /tb/lpp_lfr_ms_1/debug_reg(7)
11 add wave -noupdate -expand -group debug -expand -group matrix_ready /tb/lpp_lfr_ms_1/debug_reg(6)
12 add wave -noupdate -expand -group debug -expand /tb/lpp_lfr_ms_1/debug_reg
13 add wave -noupdate -expand -group debug /tb/lpp_lfr_apbreg_1/apbi
14 add wave -noupdate -expand -group debug -subitemconfig {/tb/lpp_lfr_apbreg_1/apbo.pirq {-height 15 -radix hexadecimal}} /tb/lpp_lfr_apbreg_1/apbo
15 add wave -noupdate -expand -group debug /tb/ready_reg
16 add wave -noupdate -expand -group Logic /tb/lpp_lfr_ms_1/debug_reg(0)
17 add wave -noupdate -expand -group Logic /tb/lpp_lfr_ms_1/debug_reg(1)
18 add wave -noupdate -expand -group Logic /tb/lpp_lfr_ms_1/debug_reg(2)
3 add wave -noupdate -group debug -expand -group FSM_MS_DMA_state /tb/lpp_lfr_ms_1/debug_reg(0)
4 add wave -noupdate -group debug -expand -group FSM_MS_DMA_state /tb/lpp_lfr_ms_1/debug_reg(1)
5 add wave -noupdate -group debug -expand -group FSM_MS_DMA_state /tb/lpp_lfr_ms_1/debug_reg(2)
6 add wave -noupdate -group debug -expand -group status_ready_matrix /tb/lpp_lfr_ms_1/debug_reg(5)
7 add wave -noupdate -group debug -expand -group status_ready_matrix /tb/lpp_lfr_ms_1/debug_reg(4)
8 add wave -noupdate -group debug -expand -group status_ready_matrix /tb/lpp_lfr_ms_1/debug_reg(3)
9 add wave -noupdate -group debug -expand -group matrix_ready /tb/lpp_lfr_ms_1/debug_reg(8)
10 add wave -noupdate -group debug -expand -group matrix_ready /tb/lpp_lfr_ms_1/debug_reg(7)
11 add wave -noupdate -group debug -expand -group matrix_ready /tb/lpp_lfr_ms_1/debug_reg(6)
12 add wave -noupdate -group debug /tb/lpp_lfr_ms_1/debug_reg
13 add wave -noupdate -group debug /tb/lpp_lfr_apbreg_1/apbi
14 add wave -noupdate -group debug /tb/lpp_lfr_apbreg_1/apbo
15 add wave -noupdate -group debug /tb/ready_reg
16 add wave -noupdate -group Logic /tb/lpp_lfr_ms_1/debug_reg(0)
17 add wave -noupdate -group Logic /tb/lpp_lfr_ms_1/debug_reg(1)
18 add wave -noupdate -group Logic /tb/lpp_lfr_ms_1/debug_reg(2)
19 19 add wave -noupdate -expand /tb/lpp_lfr_apbreg_1/debug_signal
20 add wave -noupdate -expand /tb/lpp_lfr_ms_1/observation_vector_0
21 add wave -noupdate -expand /tb/lpp_lfr_ms_1/observation_vector_1
20 22 add wave -noupdate -divider {New Divider}
21 23 add wave -noupdate /tb/lpp_lfr_ms_1/sample_f0_wen
22 24 add wave -noupdate -radix hexadecimal /tb/lpp_lfr_ms_1/sample_f0_wdata
@@ -210,7 +212,7 add wave -noupdate /tb/lpp_lfr_apbreg_1/
210 212 add wave -noupdate /tb/lpp_lfr_apbreg_1/lpp_apbreg_ms_pointer_f0/matrix_time
211 213 add wave -noupdate /tb/lpp_lfr_apbreg_1/lpp_apbreg_ms_pointer_f0/current_reg
212 214 TreeUpdate [SetDefaultTree]
213 WaveRestoreCursors {{Cursor 1} {123239471127 ps} 0}
215 WaveRestoreCursors {{Cursor 1} {137412164208 ps} 0}
214 216 configure wave -namecolwidth 486
215 217 configure wave -valuecolwidth 112
216 218 configure wave -justifyvalue left
@@ -225,6 +227,6 configure wave -griddelta 40
225 227 configure wave -timeline 0
226 228 configure wave -timelineunits ps
227 229 update
228 WaveRestoreZoom {124629370639 ps} {125891337681 ps}
230 WaveRestoreZoom {0 ps} {787501102500 ps}
229 231 bookmark add wave bookmark0 {{61745287067 ps} {63754655343 ps}} 0
230 232 bookmark add wave bookmark1 {{61745287067 ps} {63754655343 ps}} 0
@@ -676,6 +676,18 BEGIN
676 676 almost_full => OPEN);
677 677
678 678 -----------------------------------------------------------------------------
679
680 observation_vector_1(11 DOWNTO 0) <= "0000" &
681 SM_correlation_start & --7
682 status_MS_input(1 DOWNTO 0)& --6..5
683 MEM_IN_SM_locked(4 DOWNTO 0); --4..0
684
685 observation_vector_0(11 DOWNTO 6) <= MEM_IN_SM_locked(0) &
686 SM_correlation_done & --4
687 SM_correlation_auto & --3
688 SM_correlation_start & --2
689 status_component(5 DOWNTO 4); --1..0
690 -----------------------------------------------------------------------------
679 691 MS_control_1 : MS_control
680 692 PORT MAP (
681 693 clk => clk,
General Comments 0
You need to be logged in to leave comments. Login now