diff options
Diffstat (limited to 'pb_APP_log_comb.srcs/sources_1')
| -rw-r--r-- | pb_APP_log_comb.srcs/sources_1/imports/src/AppCombi_top.vhd | 28 | ||||
| -rw-r--r-- | pb_APP_log_comb.srcs/sources_1/new/Mux.vhd | 2 |
2 files changed, 15 insertions, 15 deletions
diff --git a/pb_APP_log_comb.srcs/sources_1/imports/src/AppCombi_top.vhd b/pb_APP_log_comb.srcs/sources_1/imports/src/AppCombi_top.vhd index fb35789..e9ff92e 100644 --- a/pb_APP_log_comb.srcs/sources_1/imports/src/AppCombi_top.vhd +++ b/pb_APP_log_comb.srcs/sources_1/imports/src/AppCombi_top.vhd @@ -194,23 +194,23 @@ begin manageBCD : Bin2DualBCD port map (
ADCBin => ADCBin,
Dizaines => Dizaines,
- Unite_ns => d_AFF1,
- Code_signe => d_AFF0,
+ Unite_ns => Unite_ns,
+ Code_signe => Code_signe,
Unite_s => Unite_s
);
- --mux_avant_7_segments : Mux port map (
- -- ADCbin => ADCBin,
- -- Dizaines => Dizaines,
- -- Unites_ns => Unite_ns,
- -- Code_signe => Code_signe,
- -- Unite_s => Unite_s,
- -- BTN => i_btn(1 downto 0),
- -- erreur => error,
- -- S2 => S2,
- -- DAFF0 => d_AFF0,
- -- DAFF1 => d_AFF1
- --);
+ mux_avant_7_segments : Mux port map (
+ ADCbin => ADCBin,
+ Dizaines => Dizaines,
+ Unites_ns => Unite_ns,
+ Code_signe => Code_signe,
+ Unite_s => Unite_s,
+ BTN => i_btn(1 downto 0),
+ erreur => error,
+ S2 => S2,
+ DAFF0 => d_AFF0,
+ DAFF1 => d_AFF1
+ );
inst_aff : septSegments_Top port map (
clk => clk_5MHz,
diff --git a/pb_APP_log_comb.srcs/sources_1/new/Mux.vhd b/pb_APP_log_comb.srcs/sources_1/new/Mux.vhd index ee7674b..1cb40ff 100644 --- a/pb_APP_log_comb.srcs/sources_1/new/Mux.vhd +++ b/pb_APP_log_comb.srcs/sources_1/new/Mux.vhd @@ -61,7 +61,7 @@ architecture Behavioral of Mux is begin - decide : process + decide : process(ADCBin, Dizaines, Unites_ns, BTN, erreur, S2, Code_signe, Unite_s) begin -- HANDLE SWITCH {{{ if ( (S2 = pressed) or (erreur = '1')) then |