HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r533:c48ab309a6b7

add HK debug

pellion -

r533:c48ab309a6b7 (LFR-EM) WFP_MS_1-1-60 JC

parent child

Context file:

r533:c48ab309a6b7

Collapse all files

designs/LFR-em-WFP_MS/LFR-em.vhd +1 -1

                   pirq_ms                => 6,
                   pirq_wfp               => 14,
                   hindex                 => 2,
-                  top_lfr_version        => X"01013B")  -- aa.bb.cc version
+                  top_lfr_version        => X"01013C")  -- aa.bb.cc version
                                                         -- AA : BOARD NUMBER
                                                         --      0 => MINI_LFR
                                                         --      1 => EM

lib/lpp/lfr_management/apb_lfr_management.vhd +30 -6

               SIGNAL DAC_CFG       : STD_LOGIC_VECTOR(3 DOWNTO 0);
               SIGNAL DAC_CAL_EN_s  : STD_LOGIC;
+              SIGNAL HK_debug_mode : STD_LOGIC;
+              SIGNAL HK_sel_debug  : STD_LOGIC_VECTOR(1 DOWNTO 0);
             BEGIN
               LFR_soft_rstn <= NOT r.LFR_soft_reset;
                         Rdata(0)           <= r.ctrl;
                         Rdata(1)           <= r.soft_reset;
                         Rdata(2)           <= r.LFR_soft_reset;
-                        Rdata(31 DOWNTO 3) <= (OTHERS => '0');
+                        Rdata(3)           <= HK_debug_mode;
+                        Rdata(5 DOWNTO 4)  <= HK_sel_debug;
+                        Rdata(31 DOWNTO 6) <= (OTHERS => '0');
                       WHEN ADDR_LFR_MANAGMENT_TIME_LOAD =>
                         Rdata(30 DOWNTO 0) <= r.coarse_time_load(30 DOWNTO 0);
                       WHEN ADDR_LFR_MANAGMENT_TIME_COARSE =>
                           r.ctrl           <= apbi.pwdata(0);
                           r.soft_reset     <= apbi.pwdata(1);
                           r.LFR_soft_reset <= apbi.pwdata(2);
+                          HK_debug_mode    <= apbi.pwdata(3);
+                          HK_sel_debug     <= apbi.pwdata(5 DOWNTO 4);
                         WHEN ADDR_LFR_MANAGMENT_TIME_LOAD =>
                           r.coarse_time_load     <= apbi.pwdata(30 DOWNTO 0);
                           coarsetime_reg_updated <= '1';
                                                                 -- for 14, the update frequency is
                                                                 -- 4Hz and update for each
                                                                 -- HK is 1.33Hz
               BEGIN  -- PROCESS
                 IF resetn = '0' THEN                -- asynchronous reset (active low)
                     IF previous_fine_time_bit = NOT(fine_time_s(BIT_FREQUENCY_UPDATE)) THEN
                       previous_fine_time_bit <= fine_time_s(BIT_FREQUENCY_UPDATE);
                       CASE HK_sel_s IS
-                        WHEN "00"   => r.HK_temp_0 <= HK_sample; HK_sel_s <= "01";
+                        WHEN "00" =>
-                        WHEN "01"   => r.HK_temp_1 <= HK_sample; HK_sel_s <= "10";
+                          r.HK_temp_0 <= HK_sample;
-                        WHEN "10"   => r.HK_temp_2 <= HK_sample; HK_sel_s <= "00";
+                          IF HK_debug_mode = '1' THEN
+                            HK_sel_s <= HK_sel_debug;
+                          ELSE
+                            HK_sel_s <= "01";
+                          END IF;
+                        WHEN "01" =>
+                          r.HK_temp_1 <= HK_sample;
+                          IF HK_debug_mode = '1' THEN
+                            HK_sel_s <= HK_sel_debug;
+                          ELSE
+                            HK_sel_s <= "10";
+                          END IF;
+                        WHEN "10" =>
+                          r.HK_temp_2 <= HK_sample;
+                          IF HK_debug_mode = '1' THEN
+                            HK_sel_s <= HK_sel_debug;
+                          ELSE
+                            HK_sel_s <= "00";
+                          END IF;
                         WHEN OTHERS => NULL;
                       END CASE;
                     END IF;
                   );
               DAC_CAL_EN <= DAC_CAL_EN_s;
-            END Behavioral;
  No newline at end of file
+            END Behavioral;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages