Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-24 00:35:34 +03:00
Code Issues Wiki Activity

Remove trailing ';' from box definitions

Browse source 
Instead, write it after each box name in serializeBoxNamesReply()
This commit is contained in:
Alberto García Hierro 2018-02-14 15:57:05 +00:00
parent fd5938aa26
commit b4bc76ffd5
1 changed files with 38 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

73
src/main/fc/fc_msp_box.c
View file

@ -35,41 +35,43 @@
#include "telemetry/telemetry.h" #include "telemetry/telemetry.h"
// FIXME remove ;'s #define BOX_SUFFIX ';'
#define BOX_SUFFIX_LEN 1
static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = { static const box_t boxes[CHECKBOX_ITEM_COUNT + 1] = {
{ BOXARM, "ARM;", 0 }, { BOXARM, "ARM", 0 },
{ BOXANGLE, "ANGLE;", 1 }, { BOXANGLE, "ANGLE", 1 },
{ BOXHORIZON, "HORIZON;", 2 }, { BOXHORIZON, "HORIZON", 2 },
{ BOXNAVALTHOLD, "NAV ALTHOLD;", 3 }, // old BARO { BOXNAVALTHOLD, "NAV ALTHOLD", 3 }, // old BARO
{ BOXHEADINGHOLD, "HEADING HOLD;", 5 }, { BOXHEADINGHOLD, "HEADING HOLD", 5 },
{ BOXHEADFREE, "HEADFREE;", 6 }, { BOXHEADFREE, "HEADFREE", 6 },
{ BOXHEADADJ, "HEADADJ;", 7 }, { BOXHEADADJ, "HEADADJ", 7 },
{ BOXCAMSTAB, "CAMSTAB;", 8 }, { BOXCAMSTAB, "CAMSTAB", 8 },
{ BOXNAVRTH, "NAV RTH;", 10 }, // old GPS HOME { BOXNAVRTH, "NAV RTH", 10 }, // old GPS HOME
{ BOXNAVPOSHOLD, "NAV POSHOLD;", 11 }, // old GPS HOLD { BOXNAVPOSHOLD, "NAV POSHOLD", 11 }, // old GPS HOLD
{ BOXMANUAL, "MANUAL;", 12 }, { BOXMANUAL, "MANUAL", 12 },
{ BOXBEEPERON, "BEEPER;", 13 }, { BOXBEEPERON, "BEEPER", 13 },
{ BOXLEDLOW, "LEDLOW;", 15 }, { BOXLEDLOW, "LEDLOW", 15 },
{ BOXLIGHTS, "LIGHTS;", 16 }, { BOXLIGHTS, "LIGHTS", 16 },
{ BOXOSD, "OSD SW;", 19 }, { BOXOSD, "OSD SW", 19 },
{ BOXTELEMETRY, "TELEMETRY;", 20 }, { BOXTELEMETRY, "TELEMETRY", 20 },
{ BOXAUTOTUNE, "AUTO TUNE;", 21 }, { BOXAUTOTUNE, "AUTO TUNE", 21 },
{ BOXBLACKBOX, "BLACKBOX;", 26 }, { BOXBLACKBOX, "BLACKBOX", 26 },
{ BOXFAILSAFE, "FAILSAFE;", 27 }, { BOXFAILSAFE, "FAILSAFE", 27 },
{ BOXNAVWP, "NAV WP;", 28 }, { BOXNAVWP, "NAV WP", 28 },
{ BOXAIRMODE, "AIR MODE;", 29 }, { BOXAIRMODE, "AIR MODE", 29 },
{ BOXHOMERESET, "HOME RESET;", 30 }, { BOXHOMERESET, "HOME RESET", 30 },
{ BOXGCSNAV, "GCS NAV;", 31 }, { BOXGCSNAV, "GCS NAV", 31 },
//{ BOXHEADINGLOCK, "HEADING LOCK;", 32 }, //{ BOXHEADINGLOCK, "HEADING LOCK", 32 },
{ BOXSURFACE, "SURFACE;", 33 }, { BOXSURFACE, "SURFACE", 33 },
{ BOXFLAPERON, "FLAPERON;", 34 }, { BOXFLAPERON, "FLAPERON", 34 },
{ BOXTURNASSIST, "TURN ASSIST;", 35 }, { BOXTURNASSIST, "TURN ASSIST", 35 },
{ BOXNAVLAUNCH, "NAV LAUNCH;", 36 }, { BOXNAVLAUNCH, "NAV LAUNCH", 36 },
{ BOXAUTOTRIM, "SERVO AUTOTRIM;", 37 }, { BOXAUTOTRIM, "SERVO AUTOTRIM", 37 },
{ BOXKILLSWITCH, "KILLSWITCH;", 38 }, { BOXKILLSWITCH, "KILLSWITCH", 38 },
{ BOXCAMERA1, "CAMERA CONTROL 1;", 39 }, { BOXCAMERA1, "CAMERA CONTROL 1", 39 },
{ BOXCAMERA2, "CAMERA CONTROL 2;", 40 }, { BOXCAMERA2, "CAMERA CONTROL 2", 40 },
{ BOXCAMERA3, "CAMERA CONTROL 3;", 41 }, { BOXCAMERA3, "CAMERA CONTROL 3", 41 },
{ CHECKBOX_ITEM_COUNT, NULL, 0xFF } { CHECKBOX_ITEM_COUNT, NULL, 0xFF }
}; };
@ -107,7 +109,7 @@ bool serializeBoxNamesReply(sbuf_t *dst)
for (int i = 0; i < activeBoxIdCount; i++) { for (int i = 0; i < activeBoxIdCount; i++) {
const box_t *box = findBoxByActiveBoxId(activeBoxIds[i]); const box_t *box = findBoxByActiveBoxId(activeBoxIds[i]);
if (box) { if (box) {
replyLengthTotal += strlen(box->boxName); replyLengthTotal += strlen(box->boxName) + BOX_SUFFIX_LEN;
} }
} }
@ -122,6 +124,7 @@ bool serializeBoxNamesReply(sbuf_t *dst)
if (box) { if (box) {
const int len = strlen(box->boxName); const int len = strlen(box->boxName);
sbufWriteData(dst, box->boxName, len); sbufWriteData(dst, box->boxName, len);
sbufWriteU8(dst, BOX_SUFFIX);
} }
} }