Skip to content

Commit f99a7cf

Browse files
committed
update serial lib with new func
1 parent 625bd14 commit f99a7cf

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

include/epmc_serial.hpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -180,26 +180,29 @@ class EPMCSerialClient
180180

181181
// Encoder
182182
void setPPR(float ppr, uint8_t motor){ write_data1(SET_PPR, ppr, motor); }
183-
std::tuple<bool, float> getPPR(uint8_t motor=0){ return read_data1(GET_PPR, motor); }
183+
std::tuple<bool, float> getPPR(uint8_t motor){ return read_data1(GET_PPR, motor); }
184184

185185
// Velocity limits
186-
void setMaxVel(float v, uint8_t motor){ write_data1(SET_MAX_VEL, v, motor); }
187-
std::tuple<bool, float> getMaxVel(uint8_t motor=0){ return read_data1(GET_MAX_VEL, motor); }
186+
void setMaxVel(float max_vel, uint8_t motor){ write_data1(SET_MAX_VEL, max_vel, motor); }
187+
std::tuple<bool, float> getMaxVel(uint8_t motor){ return read_data1(GET_MAX_VEL, motor); }
188188

189189
// Direction & filters
190-
void setRDir(float v, uint8_t motor){ write_data1(SET_RDIR, v, motor); }
191-
std::tuple<bool, float> getReverseDir(uint8_t motor=0){ return read_data1(GET_RDIR, motor); }
190+
void setRDir(int rdir, uint8_t motor){ write_data1(SET_RDIR, (float)rdir, motor); }
191+
std::tuple<bool, float> getRDir(uint8_t motor){ return read_data1(GET_RDIR, motor); }
192192

193193
void setCutoffFreq(float f, uint8_t motor){ write_data1(SET_CUT_FREQ, f, motor); }
194-
std::tuple<bool, float> getCutoffFreq(uint8_t motor=0){ return read_data1(GET_CUT_FREQ, motor); }
194+
std::tuple<bool, float> getCutoffFreq(uint8_t motor){ return read_data1(GET_CUT_FREQ, motor); }
195195

196196
// Modes & system
197-
void setPidMode(float mode){ write_data1(SET_PID_MODE, mode); }
197+
void setPidMode(int mode){ write_data1(SET_PID_MODE, (float)mode); }
198198
std::tuple<bool, float> getPidMode(){ return read_data1(GET_PID_MODE); }
199199

200-
void setCmdTimeout(float t){ write_data1(SET_CMD_TIMEOUT, t); }
200+
void setCmdTimeout(int t){ write_data1(SET_CMD_TIMEOUT, (float)t); }
201201
std::tuple<bool, float> getCmdTimeout(){ return read_data1(GET_CMD_TIMEOUT); }
202202

203+
void setI2cAddress(int address) { write_data1(SET_I2C_ADDR, (float)address); }
204+
std::tuple<bool, float> getI2cAddress(){ return read_data1(GET_I2C_ADDR); }
205+
203206
bool resetParams(){
204207
bool success;
205208
std::tie(success, std::ignore) = read_data1(RESET_PARAMS);

0 commit comments

Comments
 (0)