Library update, excessive struct params remove

[pes-rpp/rpp-test-sw.git] / rpp-test-sw / commands / cmd_can.c

diff --git a/rpp-test-sw/commands/cmd_can.c b/rpp-test-sw/commands/cmd_can.c
index 756f9b19ad6a078c44dd0c26440a5bdcb5e49857..5d1572e60fd7ca4f6f01ca360c17a33efc4eca1c 100644 (file)
--- a/rpp-test-sw/commands/cmd_can.c
+++ b/rpp-test-sw/commands/cmd_can.c
@@ -214,33 +214,24 @@ static int can_inited = 0;
 static struct rpp_can_timing_cfg can_timing[] = {
        {
                .brp = 10,
-               .error = 0,
                .phase_seg1 = 5,
                .phase_seg2 = 2,
                .prop_seg = 8,
-               .sampl_pt = 875,
-               .sjw = 1,
-               .tq = 125
+               .sjw = 1
        },
        {
                .brp = 10,
-               .error = 0,
                .phase_seg1 = 5,
                .phase_seg2 = 2,
                .prop_seg = 8,
-               .sampl_pt = 875,
-               .sjw = 1,
-               .tq = 125
+               .sjw = 1
        },
        {
                .brp = 10,
-               .error = 0,
                .phase_seg1 = 5,
                .phase_seg2 = 2,
                .prop_seg = 8,
-               .sampl_pt = 875,
-               .sjw = 1,
-               .tq = 125
+               .sjw = 1
        },
 };
 
@@ -514,20 +505,17 @@ int cmd_do_can_change_timing(cmd_io_t *cmd_io, const struct cmd_des *des, char *
                        return -CMDERR_BADPAR;
 
                if (can_config.ctrl[controller_id-1].timing_config != NULL) {
-                       rpp_sci_printf("brp: %u\r\nprop_seg: %u tQ\r\nphase_seg1: %u tQ\r\nphase_seg2: %u tQ\r\nsjw: %u tQ\r\nsample_pt: %u ns\r\nerror: %u\r\n tQ: %u ns\r\n",
+                       rpp_sci_printf("brp: %u\r\nprop_seg: %u tQ\r\nphase_seg1: %u tQ\r\nphase_seg2: %u tQ\r\nsjw: %u tQ\r\n",
                                        can_config.ctrl[controller_id-1].timing_config->brp,
                                        can_config.ctrl[controller_id-1].timing_config->prop_seg,
                                        can_config.ctrl[controller_id-1].timing_config->phase_seg1,
                                        can_config.ctrl[controller_id-1].timing_config->phase_seg2,
-                                       can_config.ctrl[controller_id-1].timing_config->sjw,
-                                       can_config.ctrl[controller_id-1].timing_config->sampl_pt,
-                                       can_config.ctrl[controller_id-1].timing_config->error,
-                                       can_config.ctrl[controller_id-1].timing_config->tq
+                                       can_config.ctrl[controller_id-1].timing_config->sjw
                        );
 
                }
                else {
-                       rpp_sci_printf("CAN timing has not yet been manualy specified.\r\n");
+                       rpp_sci_printf("CAN timing has not yet been manually specified.\r\n");
                }
        }