Skip to content

Commit a399c29

Browse files
committed
fix: Add actuator constants for newly introduced actuators and check existing ones for consistency
1 parent e4f4248 commit a399c29

File tree

2 files changed

+399
-75
lines changed

2 files changed

+399
-75
lines changed

bindings/myactuator_rmd.cpp

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,10 @@ namespace myactuator_rmd {
5353
void declareActuator(pybind11::module& m, std::string const& class_name) {
5454
pybind11::class_<T>(m, class_name.c_str())
5555
.def_readonly_static("reducer_ratio", &T::reducer_ratio)
56-
.def_readonly_static("speed_constant", &T::speed_constant)
56+
.def_readonly_static("rated_speed", &T::rated_speed)
57+
.def_readonly_static("rated_current", &T::rated_current)
58+
.def_readonly_static("rated_power", &T::rated_power)
59+
.def_readonly_static("rated_torque", &T::rated_torque)
5760
.def_readonly_static("torque_constant", &T::torque_constant)
5861
.def_readonly_static("rotor_inertia", &T::rotor_inertia);
5962
return;
@@ -211,17 +214,30 @@ PYBIND11_MODULE(myactuator_rmd_py, m) {
211214
pybind11::register_exception<myactuator_rmd::can::ControllerRestartedError>(m_can, "ControllerRestartedError");
212215

213216
auto m_actuator_constants = m.def_submodule("actuator_constants", "Submodule for actuator constants");
214-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X10S2V3>(m_actuator_constants, "X10S2V3");
215-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X4V3>(m_actuator_constants, "X4V3");
216-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6V3>(m_actuator_constants, "X6V3");
217-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8ProV2>(m_actuator_constants, "X8ProV2");
218-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8S2V3>(m_actuator_constants, "X8S2V3");
219-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6V2>(m_actuator_constants, "X6V2");
220-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8V2>(m_actuator_constants, "X8V2");
221-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X10V3>(m_actuator_constants, "X10V3");
222-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X4V2>(m_actuator_constants, "X4V2");
223-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6S2V2>(m_actuator_constants, "X6S2V2");
224-
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8HV3>(m_actuator_constants, "X8HV3");
217+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X4V2>(m_actuator_constants, "X4V2");
218+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X4V3>(m_actuator_constants, "X4V3");
219+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X4_3>(m_actuator_constants, "X4_3");
220+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X4_24>(m_actuator_constants, "X4_24");
221+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6V2>(m_actuator_constants, "X6V2");
222+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6S2V2>(m_actuator_constants, "X6S2V2");
223+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6V3>(m_actuator_constants, "X6V3");
224+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6_7>(m_actuator_constants, "X6_7");
225+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6_8>(m_actuator_constants, "X6_8");
226+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X6_40>(m_actuator_constants, "X6_40");
227+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8V2>(m_actuator_constants, "X8V2");
228+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8ProV2>(m_actuator_constants, "X8ProV2");
229+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8S2V3>(m_actuator_constants, "X8S2V3");
230+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8HV3>(m_actuator_constants, "X8HV3");
225231
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8ProHV3>(m_actuator_constants, "X8ProHV3");
232+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8_20>(m_actuator_constants, "X8_20");
233+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8_25>(m_actuator_constants, "X8_25");
234+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8_60>(m_actuator_constants, "X8_60");
235+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X8_90>(m_actuator_constants, "X8_90");
236+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X10V3>(m_actuator_constants, "X10V3");
237+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X10S2V3>(m_actuator_constants, "X10S2V3");
238+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X10_40>(m_actuator_constants, "X10_40");
239+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X10_100>(m_actuator_constants, "X10_100");
240+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X12_150>(m_actuator_constants, "X12_150");
241+
myactuator_rmd::bindings::declareActuator<myactuator_rmd::X15_400>(m_actuator_constants, "X15_400");
226242

227243
}

0 commit comments

Comments
 (0)