Skip to content

dronecan: log cumulative bus-off count to blackbox slow frame #11729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daijoubu wants to merge 1 commit into
base: maintenance-10.x
Choose a base branch
from
+17 −1
Open

dronecan: log cumulative bus-off count to blackbox slow frame #11729

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/main/blackbox/blackbox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@
#include "sensors/esc_sensor.h"
#include "flight/wind_estimator.h"
#include "sensors/temperature.h"

#ifdef USE_DRONECAN
#include "drivers/dronecan/dronecan.h"
#endif

#if defined(ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT)
#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH
Expand Down Expand Up @@ -470,6 +472,9 @@ static const blackboxSimpleFieldDefinition_t blackboxSlowFields[] = {
{"escRPM", -1, UNSIGNED, PREDICT(0), ENCODING(UNSIGNED_VB)},
{"escTemperature", -1, SIGNED, PREDICT(PREVIOUS), ENCODING(SIGNED_VB)},
#endif
#ifdef USE_DRONECAN
{"droneCANBusOffCount", -1, UNSIGNED, PREDICT(0), ENCODING(UNSIGNED_VB)},
Comment thread
qodo-free-for-open-source-projects[bot] marked this conversation as resolved.
#endif
};

#define BLACKBOX_FIRST_HEADER_SENDING_STATE BLACKBOX_STATE_SEND_HEADER
Expand Down Expand Up @@ -579,6 +584,9 @@ typedef struct blackboxSlowState_s {
#endif
uint16_t rxUpdateRate;
uint8_t activeWpNumber;
#ifdef USE_DRONECAN
uint32_t droneCANBusOffCount;
#endif
} __attribute__((__packed__)) blackboxSlowState_t; // We pack this struct so that padding doesn't interfere with memcmp()

//From rc_controls.c
Expand Down Expand Up @@ -1365,6 +1373,10 @@ static void writeSlowFrame(void)
blackboxWriteSignedVB(slowHistory.escTemperature);
#endif

#ifdef USE_DRONECAN
blackboxWriteUnsignedVB(slowHistory.droneCANBusOffCount);
#endif

blackboxSlowFrameIterationTimer = 0;
}

Expand Down Expand Up @@ -1439,6 +1451,10 @@ static void loadSlowState(blackboxSlowState_t *slow)
slow->escRPM = escSensor->rpm;
slow->escTemperature = escSensor->temperature;
#endif

#ifdef USE_DRONECAN
slow->droneCANBusOffCount = dronecanGetBusOffCount();
#endif
}

/**
Expand Down
Loading