Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Software for White Rabbit PTP Core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
32
Issues
32
List
Board
Labels
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Software for White Rabbit PTP Core
Commits
7549107f
Commit
7549107f
authored
Jun 08, 2020
by
Peter Jansweijer
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'remotes/origin/peter_direct_dmtd' into peter_clbv3_ref_design_abscal
parents
27a29906
b7056fd8
Pipeline
#238
passed with stages
in 32 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
spll_helper.c
softpll/spll_helper.c
+1
-1
spll_main.c
softpll/spll_main.c
+1
-1
No files found.
softpll/spll_helper.c
View file @
7549107f
...
@@ -18,7 +18,7 @@ void helper_init(struct spll_helper_state *s, int ref_channel)
...
@@ -18,7 +18,7 @@ void helper_init(struct spll_helper_state *s, int ref_channel)
s
->
pi
.
y_min
=
5
;
s
->
pi
.
y_min
=
5
;
s
->
pi
.
y_max
=
(
1
<<
DAC_BITS
)
-
5
;
s
->
pi
.
y_max
=
(
1
<<
DAC_BITS
)
-
5
;
#if defined(CONFIG_WR_NODE)
#if defined(CONFIG_WR_NODE)
s
->
pi
.
kp
=
-
1
50
;
//(int)(0.3 * 32.0 * 16.0); // / 2;
s
->
pi
.
kp
=
-
7
50
;
//(int)(0.3 * 32.0 * 16.0); // / 2;
s
->
pi
.
ki
=
-
2
;
//(int)(0.03 * 32.0 * 3.0); // / 2;
s
->
pi
.
ki
=
-
2
;
//(int)(0.03 * 32.0 * 3.0); // / 2;
#else
#else
s
->
pi
.
kp
=
150
;
s
->
pi
.
kp
=
150
;
...
...
softpll/spll_main.c
View file @
7549107f
...
@@ -39,7 +39,7 @@ void mpll_init(struct spll_main_state *s, int id_ref,
...
@@ -39,7 +39,7 @@ void mpll_init(struct spll_main_state *s, int id_ref,
s
->
pi
.
ki
=
30
;
// / 2;
s
->
pi
.
ki
=
30
;
// / 2;
}
}
#elif defined(CONFIG_WR_NODE)
#elif defined(CONFIG_WR_NODE)
s
->
pi
.
kp
=
-
11
00
;
// / 2;
s
->
pi
.
kp
=
-
55
00
;
// / 2;
s
->
pi
.
ki
=
-
30
;
// / 2;
s
->
pi
.
ki
=
-
30
;
// / 2;
#else
#else
#error "Please set CONFIG for wr switch or wr node"
#error "Please set CONFIG for wr switch or wr node"
...
...
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