Skip to content

P
PPSi
Commit cf7b4b6b authored by Tristan Gingold's avatar Tristan Gingold
Browse files
Options

minor indentation

parent 2e89059b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
include/ppsi/pp-instance.h
View file @ cf7b4b6b
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
* Runtime options. Default values can be overridden by command line. * Runtime options. Default values can be overridden by command line.
*/ */
struct pp_runtime_opts { struct pp_runtime_opts {
uint32_t updated_fields_mask; uint32_t updated_fields_mask;
int clock_quality_clockClass; // ClockQuality.clockClass int clock_quality_clockClass; // ClockQuality.clockClass
int clock_quality_clockAccuracy; // ClockQuality.clockAccuracy int clock_quality_clockAccuracy; // ClockQuality.clockAccuracy
int clock_quality_offsetScaledLogVariance; // ClockQuality.offsetScaledLogVariance int clock_quality_offsetScaledLogVariance; // ClockQuality.offsetScaledLogVariance
......
proto-ext-l1sync/l1e-hooks.c
View file @ cf7b4b6b
...@@ -237,9 +237,11 @@ static int l1e_is_correction_field_compliant (struct pp_instance *ppi) { ...@@ -237,9 +237,11 @@ static int l1e_is_correction_field_compliant (struct pp_instance *ppi) {
static int l1e_extension_state_changed( struct pp_instance * ppi) static int l1e_extension_state_changed( struct pp_instance * ppi)
{ {
if ( ppi->extState!=PP_EXSTATE_ACTIVE && L1E_DSPOR(ppi)->basic.L1SyncState!=L1SYNC_DISABLED ) { if (ppi->extState == PP_EXSTATE_ACTIVE) {
l1e_servo_init(ppi);
} else if (L1E_DSPOR(ppi)->basic.L1SyncState != L1SYNC_DISABLED) {
// Extension disabled : Force L1SYNC_DISABLED disable state // Extension disabled : Force L1SYNC_DISABLED disable state
L1E_DSPOR(ppi)->basic.next_state=L1SYNC_DISABLED; /* Force L1Sync DISABLE state */ L1E_DSPOR(ppi)->basic.next_state = L1SYNC_DISABLED;
l1e_run_state_machine(ppi,NULL,0); l1e_run_state_machine(ppi,NULL,0);
} }
return 0; return 0;
......
proto-standard/state-slave.c
View file @ cf7b4b6b
...@@ -278,7 +278,7 @@ int pp_slave(struct pp_instance *ppi, void *buf, int len) ...@@ -278,7 +278,7 @@ int pp_slave(struct pp_instance *ppi, void *buf, int len)
/* when entering uncalibrated init servo */ /* when entering uncalibrated init servo */
if (uncalibrated && ppi->is_new_state) { if (uncalibrated && ppi->is_new_state) {
memset(&ppi->t1, 0, sizeof(ppi->t1)); memset(&ppi->t1, 0, sizeof(ppi->t1));
pp_diag(ppi, bmc, 2, "Entered to uncalibrated, reset servo\n"); pp_diag(ppi, servo, 2, "Entered to uncalibrated, reset servo\n");
pp_servo_init(ppi); pp_servo_init(ppi);
if (is_ext_hook_available(ppi,new_slave)) if (is_ext_hook_available(ppi,new_slave))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment