Merge pull request #10 from common/fix/17_cycle_shift_signed

robert-burger · GitHub Enterprise · commit c0ee5df9ed1d · 2024-04-23T13:51:47.000+02:00
fix: making cycle_shift unsigned
diff --git a/include/libethercat/slave.h b/include/libethercat/slave.h
@@ -529,7 +529,7 @@ void ec_slave_add_init_cmd(ec_t *pec, osal_uint16_t slave, ec_init_cmd_t *cmd);
  */
 void ec_slave_set_dc_config(struct ec *pec, osal_uint16_t slave, 
         int use_dc, int type, osal_uint32_t cycle_time_0, 
-        osal_uint32_t cycle_time_1, osal_uint32_t cycle_shift);
+        osal_uint32_t cycle_time_1, osal_int32_t cycle_shift);
 
 //! Adds master EoE settings.
 /*!
diff --git a/src/slave.c b/src/slave.c
@@ -201,7 +201,7 @@ void ec_slave_add_init_cmd(ec_t *pec, osal_uint16_t slave, ec_init_cmd_t *cmd)
 // Set Distributed Clocks config to slave
 void ec_slave_set_dc_config(struct ec *pec, osal_uint16_t slave, 
         int use_dc, int type, osal_uint32_t cycle_time_0, 
-        osal_uint32_t cycle_time_1, osal_uint32_t cycle_shift) 
+        osal_uint32_t cycle_time_1, osal_int32_t cycle_shift) 
 {
     assert(pec != NULL);
     assert(slave < pec->slave_cnt);

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ void ec_slave_add_init_cmd(ec_t pec, osal_uint16_t slave, ec_init_cmd_t cmd)`
`201`	`201`	`// Set Distributed Clocks config to slave`
`202`	`202`	`void ec_slave_set_dc_config(struct ec *pec, osal_uint16_t slave,`
`203`	`203`	`int use_dc, int type, osal_uint32_t cycle_time_0,`
`204`		`- osal_uint32_t cycle_time_1, osal_uint32_t cycle_shift)`
	`204`	`+ osal_uint32_t cycle_time_1, osal_int32_t cycle_shift)`
`205`	`205`	`{`
`206`	`206`	`assert(pec != NULL);`
`207`	`207`	`assert(slave < pec->slave_cnt);`