From 40d391c94d2f47a634da11b196f0bf33ae105cf2 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Thu, 25 Aug 2016 17:04:33 +0200 Subject: [PATCH] Few minor changes to combiner --- combiner/combiner.lpf | 2 +- combiner/combiner.vhd | 25 +++++++++++++++---------- pinout/combiner.lpf | 4 ++-- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/combiner/combiner.lpf b/combiner/combiner.lpf index 2045055..7272085 100644 --- a/combiner/combiner.lpf +++ b/combiner/combiner.lpf @@ -21,7 +21,7 @@ LOCATE COMP "THE_MEDIA_4_DOWN_D/THE_SERDES/PCSD_INST" SITE "PCSD" ; -REGION "MEDIA_DOWN1" "R95C30D" 20 140; +REGION "MEDIA_DOWN1" "R93C10D" 22 160; LOCATE UGROUP "THE_MEDIA_4_DOWN_A/media_interface_group" REGION "MEDIA_DOWN1" ; LOCATE UGROUP "THE_MEDIA_4_DOWN_B/media_interface_group" REGION "MEDIA_DOWN1" ; LOCATE UGROUP "THE_MEDIA_4_DOWN_D/media_interface_group" REGION "MEDIA_DOWN1" ; diff --git a/combiner/combiner.vhd b/combiner/combiner.vhd index f5e7773..6e4f725 100644 --- a/combiner/combiner.vhd +++ b/combiner/combiner.vhd @@ -386,7 +386,12 @@ THE_HUB : trb_net16_hub_base INIT_ENDPOINT_ID => x"0000", INIT_ADDRESS => INIT_ADDRESS, USE_VAR_ENDPOINT_ID => c_NO, - BROADCAST_SPECIAL_ADDR => BROADCAST_SPECIAL_ADDR + BROADCAST_SPECIAL_ADDR => BROADCAST_SPECIAL_ADDR, + INIT_CTRL_REGS => x"00000000_00000000_00000000_00000000" & + x"00000000_00000000_00000000_00000000" & + x"00000000_00000000_000040FF_00000000" & + x"FFFFFFFF_FFFFFFFF_FFFFFFFF_FFFFFFFF", + RESET_IOBUF_AT_TIMEOUT => c_YES ) port map ( CLK => clk_sys, @@ -549,19 +554,19 @@ end generate; TRIGGER_SEL_OUT <= trigger_select_i; - BACK_LDO_EN <= enable_ldo_i; - BACK_SPARE <= (others => '1'); --this is programn on dirich! + BACK_LDO_EN <= not enable_ldo_i; + BACK_SPARE <= (others => 'Z'); --this is programn on dirich! --------------------------------------------------------------------------- -- LCD Data to display --------------------------------------------------------------------------- - lcd_data(15 downto 0) <= timer.network_address; - lcd_data(47 downto 16) <= timer.microsecond; - lcd_data(79 downto 48) <= std_logic_vector(to_unsigned(VERSION_NUMBER_TIME,32)); - lcd_data(91 downto 80) <= timer.temperature; - lcd_data(95 downto 92) <= x"0"; - lcd_data(159 downto 96) <= timer.uid; - lcd_data(511 downto 160) <= (others => '0'); +-- lcd_data(15 downto 0) <= timer.network_address; +-- lcd_data(47 downto 16) <= timer.microsecond; +-- lcd_data(79 downto 48) <= std_logic_vector(to_unsigned(VERSION_NUMBER_TIME,32)); +-- lcd_data(91 downto 80) <= timer.temperature; +-- lcd_data(95 downto 92) <= x"0"; +-- lcd_data(159 downto 96) <= timer.uid; +-- lcd_data(511 downto 160) <= (others => '0'); --------------------------------------------------------------------------- -- Monitoring & Trigger diff --git a/pinout/combiner.lpf b/pinout/combiner.lpf index 78d57ce..4f433a2 100644 --- a/pinout/combiner.lpf +++ b/pinout/combiner.lpf @@ -216,9 +216,9 @@ LOCATE COMP "BACK_SPARE_12" SITE "AC33"; #"PMT6_C2_SIG5" DEFINE PORT GROUP "BACK_LDO_EN_group" "BACK_LDO_EN*" ; IOBUF GROUP "BACK_LDO_EN_group" IO_TYPE=LVCMOS25 PULLMODE=UP DRIVE=4; DEFINE PORT GROUP "BACK_MASTER_group" "BACK_MASTER*" ; -IOBUF GROUP "BACK_MASTER_group" IO_TYPE=LVCMOS25 PULLMODE=UP DRIVE=4; +IOBUF GROUP "BACK_MASTER_group" IO_TYPE=LVCMOS25 PULLMODE=DOWN DRIVE=4; DEFINE PORT GROUP "BACK_SLAVE_group" "BACK_SLAVE*" ; -IOBUF GROUP "BACK_SLAVE_group" IO_TYPE=LVCMOS25 PULLMODE=UP ; +IOBUF GROUP "BACK_SLAVE_group" IO_TYPE=LVCMOS25 PULLMODE=DOWN ; DEFINE PORT GROUP "BACK_TRIG_group" "BACK_TRIG*" ; IOBUF GROUP "BACK_TRIG_group" IO_TYPE=LVCMOS25 PULLMODE=UP ; DEFINE PORT GROUP "BACK_SPARE_group" "BACK_SPARE*" ; -- 2.43.0