Browse Source

Improved hardpoint command handling

sbg
Pavel Kirienko 9 years ago committed by Lorenz Meier
parent
commit
1ac88ec034
  1. 13
      src/modules/uavcan/uavcan_main.cpp

13
src/modules/uavcan/uavcan_main.cpp

@ -1385,19 +1385,16 @@ int uavcan_main(int argc, char *argv[])
const int command = atoi(argv[4]); const int command = atoi(argv[4]);
// Sanity check - weed out negative values, check against maximums // Sanity check - weed out negative values, check against maximums
if (hardpoint_id >= 0 && if (hardpoint_id >= 0 && hardpoint_id < 256 &&
hardpoint_id < 256 && command >= 0 && command < 65536) {
command >= 0 &&
command < 65536) {
inst->hardpoint_controller_set((uint8_t) hardpoint_id, (uint16_t) command); inst->hardpoint_controller_set((uint8_t) hardpoint_id, (uint16_t) command);
} else { } else {
errx(1, "Are you nuts?"); errx(1, "Invalid argument");
} }
} else { } else {
errx(1, "Are you nuts?"); errx(1, "Invalid hardpoint command");
} }
::exit(0);
} }
if (!std::strcmp(argv[1], "stop")) { if (!std::strcmp(argv[1], "stop")) {

Loading…
Cancel
Save