HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/PELLION/VHD_Lib Commit - r502:c71ce0e554fc

(MINI-LFR) 0.1.44...

pellion -

parent child

Context file:

r502:c71ce0e554fc

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"01012D")  -- aa.bb.cc version
+                  top_lfr_version        => X"01012F")  -- aa.bb.cc version
                                                         -- AA : BOARD NUMBER
                                                         --      0 => MINI_LFR
                                                         --      1 => EM

designs/MINI-LFR_WFP_MS/MINI_LFR_top.vhd +28 -2

               --
               SIGNAL SRAM_CE_s : STD_LOGIC_VECTOR(1 DOWNTO 0);
+              --
+              SIGNAL sample_hk : STD_LOGIC_VECTOR(15 DOWNTO 0);
+              SIGNAL HK_SEL    : STD_LOGIC_VECTOR( 1 DOWNTO 0);
             BEGIN  -- beh
               -----------------------------------------------------------------------------
                   pirq_ms                => 6,
                   pirq_wfp               => 14,
                   hindex                 => 2,
-                  top_lfr_version        => X"00012C")  -- aa.bb.cc version
+                  top_lfr_version        => X"00012E")  -- aa.bb.cc version
                 PORT MAP (
                   clk             => clk_25,
                   rstn            => LFR_rstn,
               ADC_CLK     <= ADC_CLK_sig;
               ADC_SDO_sig <= ADC_SDO;
+              lpp_lfr_hk_1: lpp_lfr_hk
+                GENERIC MAP (
+                  pindex => 7,
+                  paddr  => 7,
+                  pmask  => 16#fff#)
+                PORT MAP (
+                  clk        => clk_25,
+                  rstn       => rstn_25,
+                  apbi       => apbi_ext,
+                  apbo       => apbo_ext(7),
+                  sample_val => sample_val,
+                  sample     => sample_hk,
+                  HK_SEL     => HK_SEL);
+              sample_hk <= "0001000100010001" WHEN HK_SEL = "00" ELSE
+                           "0010001000100010" WHEN HK_SEL = "10" ELSE
+                           "0100010001000100" WHEN HK_SEL = "10" ELSE
+                           (OTHERS => '0');
             ----------------------------------------------------------------------
             ---  GPIO  -----------------------------------------------------------
             ----------------------------------------------------------------------
               --
               -----------------------------------------------------------------------------
               all_apbo_ext : FOR I IN NB_APB_SLAVE-1+5 DOWNTO 5 GENERATE
-                apbo_ext_not_used : IF I /= 5 AND I /= 6 AND I /= 11 AND I /= 15 GENERATE
+                apbo_ext_not_used : IF I /= 5 AND I /= 6 AND I /= 7 AND I /= 11 AND I /= 15 GENERATE
                   apbo_ext(I) <= apb_none;
                 END GENERATE apbo_ext_not_used;
               END GENERATE all_apbo_ext;

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