rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

LP-291 Fixed alert severity translation to MSP alarm levels.

Browse Source
This commit is contained in:
Vladimir Zidar 2016-04-26 11:54:47 +02:00
parent 7925f115df
commit 2a668d0615
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flight/modules/UAVOMSPBridge/UAVOMSPBridge.c
View File

@ -785,14 +785,21 @@ static void msp_send_alarms(__attribute__((unused)) struct msp_bridge *m)
data.alarm.state = ALARM_OK;
int32_t len = AlarmString(&alarm, data.alarm.msg,
sizeof(data.alarm.msg), SYSTEMALARMS_ALARM_CRITICAL, &state); // Include only CRITICAL and ERROR
// NOTE: LP alarm severity levels and MSP levels do not match. ERROR and CRITICAL are swapped.
// So far, MW-OSD code (MSP consumer) does not make difference between ALARM_ERROR and ALARM_CRITICAL.
// ALARM_WARN should be blinking if thats the highest severity level at the moment.
// There might be other types of MSP consumers.
switch (state) {
case SYSTEMALARMS_ALARM_WARNING:
data.alarm.state = ALARM_WARN;
break;
case SYSTEMALARMS_ALARM_ERROR:
data.alarm.state = ALARM_CRIT;
break;
case SYSTEMALARMS_ALARM_CRITICAL:
data.alarm.state = ALARM_CRIT;;
data.alarm.state = ALARM_ERROR;
}
msp_send(m, MSP_ALARMS, data.buf, len + 1);