leo/linreceiver-vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
leo 2023-11-01 17:28:41 +01:00
commit 038fe3c51a
Signed by: leo
GPG Key ID: 0DD993BFB2B307DB
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ReceptionTrame_lib/receptionTrame_com.vhd
View File

@ -32,6 +32,7 @@ ENTITY Command_Unit IS
ErrorSet: OUT std_logic_vector(3 downto 1); ErrorSet: OUT std_logic_vector(3 downto 1);
MsgRcv_SET: OUT std_logic MsgRcv_SET: OUT std_logic
DataNb_0: IN std_logic
); );
END Command_Unit; END Command_Unit;
@ -203,9 +204,12 @@ RCS : PROCESS(cState, LinSynchro, n_0)
BEGIN BEGIN
BitNb_EN <= '0'; BitNb_EN <= '0';
nbData_EN <= '0'; nbData_EN <= '0';
<<<<<<< HEAD
RecByte_WR <= '0'; RecByte_WR <= '0';
MsgRcv_SET <= '0'; MsgRcv_SET <= '0';
=======
>>>>>>> refs/remotes/origin/master
CASE cState IS CASE cState IS
WHEN waiting => WHEN waiting =>
if(LinSynchro = '0') THEN if(LinSynchro = '0') THEN
@ -291,7 +295,11 @@ BEGIN
WHEN syncFieldStop => WHEN syncFieldStop =>
if(n_0 = '1') then if(n_0 = '1') then
if(LinSynchro = '1') then if(LinSynchro = '1') then
<<<<<<< HEAD
RecByte_WR <= '1'; RecByte_WR <= '1';
=======
>>>>>>> refs/remotes/origin/master
else else
errs.ErrorStopBit <= '1'; errs.ErrorStopBit <= '1';
end if; end if;
@ -344,7 +352,10 @@ BEGIN
nbData_LOAD <= '1'; nbData_LOAD <= '1';
nbData_EN <= '1'; nbData_EN <= '1';
IdentifierField_EN <= '1'; IdentifierField_EN <= '1';
<<<<<<< HEAD
RecByte_WR <= '1'; RecByte_WR <= '1';
=======
>>>>>>> refs/remotes/origin/master
else else
errs.ErrorStopBit <= '1'; errs.ErrorStopBit <= '1';
end if; end if;
@ -463,4 +474,4 @@ BEGIN
end CASE; end CASE;
END PROCESS RCS; END PROCESS RCS;
END ARCHITECTURE arch; END ARCHITECTURE arch;