Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_PiccoloCAN: expand servo status logging

This commit is contained in:
Andrew Tridgell 2022-12-02 14:17:00 +11:00
parent 1897411b9d
commit 8a5867e3d9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/AP_PiccoloCAN/AP_PiccoloCAN.cpp
View File

@ -382,14 +382,24 @@ void AP_PiccoloCAN::update()
CBSServo_Info_t &servo = _servo_info[ii]; CBSServo_Info_t &servo = _servo_info[ii];
if (servo.newTelemetry) { if (servo.newTelemetry) {
union {
Servo_ErrorBits_t ebits;
uint8_t errors;
} err;
err.ebits = servo.statusA.errors;
logger->Write_ServoStatus( logger->Write_ServoStatus(
timestamp, timestamp,
ii, ii,
(float) servo.statusA.position, // Servo position (represented in microsecond units) (float) servo.statusA.position, // Servo position (represented in microsecond units)
(float) servo.statusB.current * 0.01f, // Servo force (actually servo current, 0.01A per bit) (float) servo.statusB.current * 0.01f, // Servo force (actually servo current, 0.01A per bit)
(float) servo.statusB.speed, // Servo speed (degrees per second) (float) servo.statusB.speed, // Servo speed (degrees per second)
(uint8_t) abs(servo.statusB.dutyCycle) // Servo duty cycle (absolute value as it can be +/- 100%) (uint8_t) abs(servo.statusB.dutyCycle), // Servo duty cycle (absolute value as it can be +/- 100%)
servo.statusA.command,
servo.statusB.voltage*0.01,
servo.statusB.current*0.01,
servo.statusB.temperature,
servo.statusB.temperature,
err.errors
); );
servo.newTelemetry = false; servo.newTelemetry = false;