Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
P
PPSi
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
50
Issues
50
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
PPSi
Commits
41bccf4e
Commit
41bccf4e
authored
May 10, 2022
by
Omar Gabella
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
KM3NET BROADCAST : We need to use the fixed Tx and Rx deltas.
parent
2d3f7618
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
19 deletions
+4
-19
wrpc-calibration.c
arch-wrpc/wrpc-calibration.c
+2
-10
wr-servo.c
proto-ext-whiterabbit/wr-servo.c
+2
-9
No files found.
arch-wrpc/wrpc-calibration.c
View file @
41bccf4e
...
...
@@ -29,15 +29,7 @@ int wrpc_read_calibration_data(struct pp_instance *ppi,
if
(
clock_period
)
*
clock_period
=
state
.
clock_period
;
#ifdef BROADCAST
/* Fixed delays are irrelevant in broadcast but their
* settings should remain fixed.
*
* NB : I'm not sure if this point is relevant due to the rest of
* the modifications for the broadcast version. */
*
deltaTx
=
0
;
*
deltaRx
=
0
;
#else
/* check if tx is calibrated,
* if so read data */
if
(
state
.
calib
.
tx_calibrated
)
{
...
...
@@ -57,7 +49,7 @@ int wrpc_read_calibration_data(struct pp_instance *ppi,
+
state
.
calib
.
delta_rx_board
;
}
else
return
WR_HW_CALIB_NOT_FOUND
;
#endif
return
WR_HW_CALIB_OK
;
}
...
...
proto-ext-whiterabbit/wr-servo.c
View file @
41bccf4e
...
...
@@ -207,19 +207,12 @@ int wr_servo_init(struct pp_instance *ppi)
wrp
->
ops
->
adjust_phase
(
s
->
cur_setpoint
);
s
->
missed_iters
=
0
;
s
->
state
=
WR_UNINITIALIZED
;
#ifdef BROADCAST
/* Fixed delays are irrelevant in broadcast but
* their settings should remain fixed. */
s
->
delta_tx_m
=
0
;
s
->
delta_rx_m
=
0
;
s
->
delta_tx_s
=
0
;
s
->
delta_rx_s
=
0
;
#else
s
->
delta_tx_m
=
delta_to_ps
(
wrp
->
otherNodeDeltaTx
);
s
->
delta_rx_m
=
delta_to_ps
(
wrp
->
otherNodeDeltaRx
);
s
->
delta_tx_s
=
delta_to_ps
(
wrp
->
deltaTx
);
s
->
delta_rx_s
=
delta_to_ps
(
wrp
->
deltaRx
);
#endif
strcpy
(
s
->
servo_state_name
,
"Uninitialized"
);
s
->
flags
|=
WR_FLAG_VALID
;
...
...
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