Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
corr_matrixpi
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
DG
FOFB
corr_matrixpi
Commits
2cce8d21
Commit
2cce8d21
authored
1 year ago
by
BRONES Romain
Browse files
Options
Downloads
Patches
Plain Diff
fix: Fix conditionnal generate statement and typo
parent
37724a60
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hdl/corr_ll.vhd
+5
-3
5 additions, 3 deletions
hdl/corr_ll.vhd
hdl/top_corr_matrix.vhd
+2
-2
2 additions, 2 deletions
hdl/top_corr_matrix.vhd
with
7 additions
and
5 deletions
hdl/corr_ll.vhd
+
5
−
3
View file @
2cce8d21
...
...
@@ -101,21 +101,23 @@ begin
begin
-- Signal mux for X/Y coef and enable/reset, based on PSCID number
if
I
<
51
then
gen_x_sigmux
:
if
I
<
51
generate
coef_a
<=
coef_a_x
;
coef_b
<=
coef_b_x
;
coef_ic
<=
coef_ic_x
;
coef_d
<=
coef_d_x
;
enable_corr
<=
enable_corr_x
;
reset_corr
<=
reset_corr_x
;
else
end
generate
;
gen_y_sigmux
:
if
I
>
50
generate
coef_a
<=
coef_a_y
;
coef_b
<=
coef_b_y
;
coef_ic
<=
coef_ic_y
;
coef_d
<=
coef_d_y
;
enable_corr
<=
enable_corr_y
;
reset_corr
<=
reset_corr_y
;
end
if
;
end
generate
;
p_main
:
process
(
clk
,
rst_n
)
begin
...
...
This diff is collapsed.
Click to expand it.
hdl/top_corr_matrix.vhd
+
2
−
2
View file @
2cce8d21
...
...
@@ -240,9 +240,9 @@ begin
coef_ic_y
=>
signed
(
mm_a2l
.
CORR_K1IC_Y
.
data
.
data
),
coef_d_y
=>
signed
(
mm_a2l
.
CORR_K1D_Y
.
data
.
data
),
reset_corr_x
=>
mm_a2l
.
CONTROL
.
RST_CORR
.
data
(
0
),
reset_corr_x
=>
mm_a2l
.
CONTROL
_X
.
RST_CORR
.
data
(
0
),
enable_corr_x
=>
enable_corr_x
,
reset_corr_y
=>
mm_a2l
.
CONTROL
.
RST_CORR
.
data
(
0
),
reset_corr_y
=>
mm_a2l
.
CONTROL
_Y
.
RST_CORR
.
data
(
0
),
enable_corr_y
=>
enable_corr_y
,
-- Corr output
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment