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
30
Issues
30
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
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
794ef617
Commit
794ef617
authored
Aug 03, 2020
by
Peter Jansweijer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
define vcxo specific kp, ki parameters
parent
32e6a5f2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
spll_helper.c
softpll/spll_helper.c
+6
-1
spll_main.c
softpll/spll_main.c
+5
-1
No files found.
softpll/spll_helper.c
View file @
794ef617
...
...
@@ -10,6 +10,7 @@
/* spll_helper.c - implmentation of the Helper PLL servo algorithm. */
#include "softpll_ng.h"
#include "wrc-debug.h"
void
helper_init
(
struct
spll_helper_state
*
s
,
int
ref_channel
)
{
...
...
@@ -17,9 +18,12 @@ void helper_init(struct spll_helper_state *s, int ref_channel)
/* Phase branch PI controller */
s
->
pi
.
y_min
=
5
;
s
->
pi
.
y_max
=
(
1
<<
DAC_BITS
)
-
5
;
#if defined(CONFIG_WR_NODE)
#if defined(CONFIG_WR_NODE)
&& !defined(HELPER_CRYSTEK_CVPD922)
s
->
pi
.
kp
=
-
150
;
//(int)(0.3 * 32.0 * 16.0); // / 2;
s
->
pi
.
ki
=
-
2
;
//(int)(0.03 * 32.0 * 3.0); // / 2;
#elif defined(CONFIG_WR_NODE) && defined(HELPER_CRYSTEK_CVPD922)
s
->
pi
.
kp
=
-
750
;
// / 2;
s
->
pi
.
ki
=
-
2
;
// / 2;
#else
s
->
pi
.
kp
=
150
;
s
->
pi
.
ki
=
2
;
...
...
@@ -32,6 +36,7 @@ void helper_init(struct spll_helper_state *s, int ref_channel)
s
->
ld
.
lock_samples
=
10000
;
s
->
ld
.
delock_samples
=
100
;
s
->
ref_src
=
ref_channel
;
board_dbg
(
"Helper PLL PI Values: Kp %i
\t
Ki%i
\n
"
,
s
->
pi
.
kp
,
s
->
pi
.
ki
);
}
int
helper_update
(
struct
spll_helper_state
*
s
,
int
tag
,
...
...
softpll/spll_main.c
View file @
794ef617
...
...
@@ -42,9 +42,12 @@ void mpll_init(struct spll_main_state *s, int id_ref,
s
->
pi
.
kp
=
1100
;
// / 2;
s
->
pi
.
ki
=
30
;
// / 2;
}
#elif defined(CONFIG_WR_NODE)
#elif defined(CONFIG_WR_NODE)
&& !defined(MAIN_CRYSTEK_CVPD922)
s
->
pi
.
kp
=
-
1100
;
// / 2;
s
->
pi
.
ki
=
-
30
;
// / 2;
#elif defined(CONFIG_WR_NODE) && defined(MAIN_CRYSTEK_CVPD922)
s
->
pi
.
kp
=
-
5500
;
// / 2;
s
->
pi
.
ki
=
-
30
;
// / 2;
#else
#error "Please set CONFIG for wr switch or wr node"
#endif
...
...
@@ -57,6 +60,7 @@ void mpll_init(struct spll_main_state *s, int id_ref,
s
->
id_ref
=
id_ref
;
s
->
id_out
=
id_out
;
s
->
dac_index
=
id_out
-
spll_n_chan_ref
;
board_dbg
(
"Main PLL PI Values: Kp %i
\t
Ki%i
\n
"
,
s
->
pi
.
kp
,
s
->
pi
.
ki
);
if
(
s
->
gain_sched
)
{
...
...
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