Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
canbus
CTU CAN FD IP Core
Commits
654ec857
Commit
654ec857
authored
Sep 02, 2018
by
Ille, Ondrej, Ing.
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug-fix of first bit reception after integration has finished.
parent
6a6ae866
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
src/CAN_Core/protocolControl.vhd
src/CAN_Core/protocolControl.vhd
+12
-7
No files found.
src/CAN_Core/protocolControl.vhd
View file @
654ec857
...
...
@@ -234,6 +234,9 @@
-- is inserted by Bit Stuffing and discarded by Bit Destuffing
-- automatically upon detection of 0 -> 1 transition on
-- "fixed_stuff" / "fixed_destuff" signals.
-- 2.9.2018 1. Change from "off" to "idle" directly to "interm_idle", to
-- avoid interpretation of SOF as Overload flag direclty
-- after integration!
--------------------------------------------------------------------------------
Library
ieee
;
...
...
@@ -2734,16 +2737,14 @@ begin
data_tx_r
<=
RECESSIVE
;
end
if
;
if
(
OP_State
/=
integrating
)
then
sync_control_r
<=
HARD_SYNC
;
end
if
;
if
(
hard_sync_edge
=
'1'
and
(
OP_State
/=
integrating
))
then
sync_control_r
<=
HARD_SYNC
;
if
(
hard_sync_edge
=
'1'
)
then
PC_State
<=
sof
;
crc_enable_r
<=
'1'
;
FSM_preset
<=
'1'
;
elsif
(
rec_trig
=
'1'
and
(
OP_State
/=
integrating
)
)
then
elsif
(
rec_trig
=
'1'
)
then
-- If any frame is available here for transmission
-- we lock it already here. If we moved to SOF and
...
...
@@ -3179,7 +3180,11 @@ begin
when
off
=>
if
(
drv_ena
=
ENABLED
)
then
if
(
error_state
/=
bus_off
and
OP_State
/=
integrating
)
then
FSM_Preset
<=
'1'
;
-- Note that here we don't want to execute FSM_Preset! We want
-- to go directly to "interm_idle", thus we don't think of
-- SOF bit as of Overload flag!
FSM_Preset
<=
'0'
;
PC_State
<=
interframe
;
interm_state
<=
interm_idle
;
end
if
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment