From aa2b1465610b1681b328ae81509bfc8c38395431 Mon Sep 17 00:00:00 2001 From: leo Date: Tue, 10 Oct 2023 10:09:15 +0200 Subject: [PATCH] fix --- ReceptionTrame_lib/receptionTrame_com.vhd | 100 ++++++++++++---------- 1 file changed, 55 insertions(+), 45 deletions(-) diff --git a/ReceptionTrame_lib/receptionTrame_com.vhd b/ReceptionTrame_lib/receptionTrame_com.vhd index 74d2f58..070e234 100644 --- a/ReceptionTrame_lib/receptionTrame_com.vhd +++ b/ReceptionTrame_lib/receptionTrame_com.vhd @@ -14,18 +14,18 @@ ENTITY receptionTrame_com IS n_LOAD: OUT std_logic; n_EN: OUT std_logic; - nbBit_SELECT: OUT std_logic; - nbBit_LOAD: OUT std_logic; - nbBit_EN: OUT std_logic; + BitNb_SELECT: OUT std_logic; + BitNb_LOAD: OUT std_logic; + BitNb_EN: OUT std_logic; - identifier_EN: OUT std_logic; + IdentifierField_EN: OUT std_logic; nbData_LOAD: OUT std_logic; nbData_EN: OUT std_logic; n_0: IN std_logic; - nbBit_0: IN std_logic; - nbData_0: IN std_logic + BitNb_0: IN std_logic; + DataNb_0: IN std_logic ); END receptionTrame_com; @@ -51,7 +51,7 @@ BEGIN END IF; END process stateUpd; -nStateUpd : PROCESS(LinSynchro, cState, n_0, nbBit_0) +nStateUpd : PROCESS(LinSynchro, cState, n_0, BitNb_0) BEGIN nState <= cState; CASE cState IS @@ -62,7 +62,7 @@ CASE cState IS WHEN syncBreak0 => if(LinSynchro = '1') THEN - if(nbBit_0 = '1') THEN + if(BitNb_0 = '1') THEN nState <= syncBreak1; else nState <= waiting; @@ -93,7 +93,7 @@ CASE cState IS end if; WHEN syncFieldData => - if(nbBit_0 = '1') THEN + if(BitNb_0 = '1') THEN nState <= syncFieldStop; END IF; @@ -121,7 +121,7 @@ CASE cState IS end if; WHEN idFieldData => - if(nbBit_0 = '1') then + if(BitNb_0 = '1') then nState <= idFieldStop; end if; @@ -149,14 +149,14 @@ CASE cState IS end if; WHEN dataFieldData => - if(nbBit_0 = '1') then + if(BitNb_0 = '1') then nState <= dataFieldStop; end if; WHEN dataFieldStop => if(n_0 = '1') then if(LinSynchro = '1') then - if(nbData_0 = '1') then + if(DataNb_0 = '1') then nState <= checksumFieldWait; else nState <= dataFieldWait; @@ -181,7 +181,7 @@ CASE cState IS end if; WHEN checksumFieldData => - if(nbBit_0 = '1') then + if(BitNb_0 = '1') then nState <= checksumFieldStop; end if; @@ -195,34 +195,37 @@ END PROCESS nStateUpd; RCS : PROCESS(cState, LinSynchro, n_0) BEGIN + BitNb_EN <= '0'; + nbData_EN <= '0'; CASE cState IS WHEN waiting => if(LinSynchro = '0') THEN n_LOAD <= '1'; + BitNb_EN <= '1'; n_SELECT <= '1'; - nbBit_LOAD <= '1'; - nbBit_SELECT <= '0'; + BitNb_LOAD <= '1'; + BitNb_SELECT <= '0'; end IF; WHEN syncBreak0 => if(LinSynchro = '1') then - if(nbBit_0 = '1') then + if(BitNb_0 = '1') then n_LOAD <= '1'; n_SELECT <= '0'; else errs.ErrorSync <= '1'; end if; else - if(n_0 = '1') then + if(n_0 = '1' AND BitNb_0 = '0') then n_select <= '0'; n_LOAD <= '1'; - nbBit_EN <= '1'; + BitNb_EN <= '1'; else n_LOAD <= '0'; - nbBit_EN <= '0'; + BitNb_EN <= '0'; end if; n_EN <= '1'; - nbBit_LOAD <= '0'; + BitNb_LOAD <= '0'; end if; WHEN syncBreak1 => @@ -246,8 +249,9 @@ BEGIN if(LinSynchro = '0') then n_SELECT <= '0'; n_LOAD <= '1'; - nbBit_SELECT <= '1'; - nbBit_LOAD <= '1'; + BitNb_SELECT <= '1'; + BitNb_LOAD <= '1'; + BitNb_EN <= '1'; else errs.ErrorStartBit <= '1'; end if; @@ -257,7 +261,7 @@ BEGIN end if; WHEN syncFieldData => - if(nbBit_0 = '1') then + if(BitNb_0 = '1') then n_SELECT <= '0'; n_LOAD <= '1'; octetRecu_EN <= '0'; @@ -265,20 +269,20 @@ BEGIN if(n_0 = '1') then n_LOAD <= '1'; n_SELECT <= '0'; - nbBit_EN <= '1'; + BitNb_EN <= '1'; octetRecu_EN <= '1'; else n_LOAD <= '0'; - nbBit_EN <= '0'; + BitNb_EN <= '0'; octetRecu_EN <= '0'; end if; - nbBit_LOAD <= '0'; + BitNb_LOAD <= '0'; end if; WHEN syncFieldStop => if(n_0 = '1') then if(LinSynchro = '1') then - + else errs.ErrorStopBit <= '1'; end if; @@ -297,15 +301,16 @@ BEGIN if(n_0 = '1') then n_SELECT <= '0'; n_LOAD <= '1'; - nbBit_SELECT <= '1'; - nbBit_LOAD <= '1'; + BitNb_SELECT <= '1'; + BitNb_LOAD <= '1'; + BitNb_EN <= '1'; else n_LOAD <= '0'; n_EN <= '1'; end if; WHEN idFieldData => - if(nbBit_0 = '1') then + if(BitNb_0 = '1') then n_SELECT <= '0'; n_LOAD <= '1'; octetRecu_EN <= '0'; @@ -313,14 +318,14 @@ BEGIN if(n_0 = '1') then n_LOAD <= '1'; n_SELECT <= '0'; - nbBit_EN <= '1'; + BitNb_EN <= '1'; octetRecu_EN <= '1'; else n_LOAD <= '0'; - nbBIt_EN <= '0'; + BitNb_EN <= '0'; octetRecu_EN <= '0'; end if; - nbBit_LOAD <= '0'; + BitNb_LOAD <= '0'; n_EN <= '1'; end if; @@ -328,6 +333,8 @@ BEGIN if(n_0 = '1') then if(LinSynchro = '1') then nbData_LOAD <= '1'; + nbData_EN <= '1'; + IdentifierField_EN <= '1'; else errs.ErrorStopBit <= '1'; end if; @@ -343,21 +350,23 @@ BEGIN else nbData_EN <= '0'; nbData_LOAD <= '0'; + IdentifierField_EN <= '0'; end if; WHEN dataFieldStart => if(n_0 = '1') then n_SELECT <= '0'; n_LOAD <= '1'; - nbBit_SELECT <= '1'; - nbBit_LOAD <= '1'; + BitNb_SELECT <= '1'; + BitNb_LOAD <= '1'; + BitNb_EN <= '1'; else n_LOAD <= '0'; n_EN <= '1'; end if; WHEN dataFieldData => - if(nbBit_0 = '1') then + if(BitNb_0 = '1') then n_SELECT <= '0'; n_LOAD <= '1'; octetRecu_EN <= '0'; @@ -365,14 +374,14 @@ BEGIN if(n_0 = '1') then n_LOAD <= '1'; n_SELECT <= '0'; - nbBit_EN <= '1'; + BitNb_EN <= '1'; octetRecu_EN <= '1'; else n_LOAD <= '0'; - nbBIt_EN <= '0'; + BitNb_EN <= '0'; octetRecu_EN <= '0'; end if; - nbBit_LOAD <= '0'; + BitNb_LOAD <= '0'; n_EN <= '1'; end if; @@ -398,15 +407,16 @@ BEGIN if(n_0 = '1') then n_SELECT <= '0'; n_LOAD <= '1'; - nbBit_SELECT <= '1'; - nbBit_LOAD <= '1'; + BitNb_SELECT <= '1'; + BitNb_LOAD <= '1'; + BitNb_EN <= '1'; else n_LOAD <= '0'; n_EN <= '1'; end if; WHEN checksumFieldData => - if(nbBit_0 = '1') then + if(BitNb_0 = '1') then n_SELECT <= '0'; n_LOAD <= '1'; octetRecu_EN <= '0'; @@ -414,14 +424,14 @@ BEGIN if(n_0 = '1') then n_LOAD <= '1'; n_SELECT <= '0'; - nbBit_EN <= '1'; + BitNb_EN <= '1'; octetRecu_EN <= '1'; else n_LOAD <= '0'; - nbBIt_EN <= '0'; + BitNb_EN <= '0'; octetRecu_EN <= '0'; end if; - nbBit_LOAD <= '0'; + BitNb_LOAD <= '0'; n_EN <= '1'; end if;