Skip to content

Commit 962149b

Browse files
committed
Pull request #2: PRCUN-2855 libfranka integrate accelerometers data stream
Merge in MOCTRL/libfranka-common from PRCUN-2855-libfranka-integrate-accelerometers-data-stream to master * commit 'e5f5f1ba7210fe068ebdc456528893b8193e409d': refactor: combine x,y,z accelerometers into size 3 arrays fix: joint 7 does not have accelerometer, therefore reduce size to 6 feat: added accelerometer data
2 parents 1480aa4 + e5f5f1b commit 962149b

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* chore: Remove unused model library
66
* fix: null pointer fix
77
* feat: Added the async motion generator mode
8+
* feat: Added the accelerometer data
89

910
# 1.0.0
1011
* Added support to transmit the arm URDF to libfranka

include/research_interface/robot/rbk_types.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ struct RobotState {
125125
floatarray<6> O_ddP_EE_c;
126126
floatarray<7> theta;
127127
floatarray<7> dtheta;
128+
std::array<std::array<float, 3>, 6> accelerometer_top;
129+
std::array<std::array<float, 3>, 6> accelerometer_bottom;
128130
MotionGeneratorMode motion_generator_mode;
129131
ControllerMode controller_mode;
130132
std::array<bool, 41> errors;

0 commit comments

Comments
 (0)