diff --git a/userspace/ppsi b/userspace/ppsi index 25d7dbe4fb2b735c4c9c1f4102950bd78e9e9f7e..d040a2070c57e7863ab528393667e3e5d8e3fd55 160000 --- a/userspace/ppsi +++ b/userspace/ppsi @@ -1 +1 @@ -Subproject commit 25d7dbe4fb2b735c4c9c1f4102950bd78e9e9f7e +Subproject commit d040a2070c57e7863ab528393667e3e5d8e3fd55 diff --git a/userspace/tools/wrs_dump_shmem.c b/userspace/tools/wrs_dump_shmem.c index 4ca202645aaf2580613c86eb2a0eab5b2f4c5ab3..415a4dbf08cca65acc2bf3618777ddc5ede21a42 100644 --- a/userspace/tools/wrs_dump_shmem.c +++ b/userspace/tools/wrs_dump_shmem.c @@ -636,6 +636,8 @@ struct dump_info servo_state_info [] = { DUMP_FIELD(TimeInternal, t2), DUMP_FIELD(TimeInternal, t3), DUMP_FIELD(TimeInternal, t4), + DUMP_FIELD(TimeInternal, t5), + DUMP_FIELD(TimeInternal, t6), DUMP_FIELD(Integer32, delta_ms_prev), DUMP_FIELD(int, missed_iters), DUMP_FIELD(TimeInternal, mu), /* half of the RTT */ @@ -664,8 +666,8 @@ struct dump_info ppi_info [] = { DUMP_FIELD(pointer, ext_data), DUMP_FIELD(unsigned_long, d_flags), DUMP_FIELD(unsigned_char, flags), - DUMP_FIELD(unsigned_char, role), - DUMP_FIELD(unsigned_char, proto), + DUMP_FIELD(int, role), + DUMP_FIELD(int, proto), DUMP_FIELD(pointer, glbs), DUMP_FIELD(pointer, n_ops), DUMP_FIELD(pointer, t_ops), @@ -698,6 +700,10 @@ struct dump_info ppi_info [] = { DUMP_FIELD(TimeInternal, t2), DUMP_FIELD(TimeInternal, t3), DUMP_FIELD(TimeInternal, t4), + DUMP_FIELD(TimeInternal, t5), + DUMP_FIELD(TimeInternal, t6), + DUMP_FIELD(Integer32, t4_cf), + DUMP_FIELD(Integer32, t6_cf), DUMP_FIELD(TimeInternal, cField), DUMP_FIELD(TimeInternal, last_rcv_time), DUMP_FIELD(TimeInternal, last_snt_time), @@ -707,7 +713,6 @@ struct dump_info ppi_info [] = { DUMP_FIELD(pointer, portDS), //DUMP_FIELD(unsigned long timeouts[__PP_TO_ARRAY_SIZE]), DUMP_FIELD(UInteger16, recv_sync_sequence_id), - DUMP_FIELD(Integer8, log_min_delay_req_interval), //DUMP_FIELD(UInteger16 sent_seq[__PP_NR_MESSAGES_TYPES]), DUMP_FIELD_SIZE(bina, received_ptp_header, sizeof(MsgHeader)), //DUMP_FIELD(pointer, iface_name),