Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 19:07:45 +08:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

replace fprintf(stderr with PX4_{INFO/WARN}

Browse Source
This commit is contained in:
Beat Küng
2019-04-04 14:24:18 +02:00
committed by Julian Oes
parent d947818654
commit 08b8ee4831
4 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/drivers/lights/blinkm/blinkm.cpp
+3 -3
View File
@@ -1046,7 +1046,7 @@ blinkm_main(int argc, char *argv[])
if (g_blinkm == nullptr) { if (g_blinkm == nullptr) {
fprintf(stderr, "not started\n"); PX4_ERR("not started");
blinkm_usage(); blinkm_usage();
return 0; return 0;
} }
@@ -1064,10 +1064,10 @@ blinkm_main(int argc, char *argv[])
if (!strcmp(argv[1], "list")) { if (!strcmp(argv[1], "list")) {
for (unsigned i = 0; BlinkM::script_names[i] != nullptr; i++) { for (unsigned i = 0; BlinkM::script_names[i] != nullptr; i++) {
fprintf(stderr, " %s\n", BlinkM::script_names[i]); PX4_ERR(" %s", BlinkM::script_names[i]);
} }
fprintf(stderr, " <html color number>\n"); PX4_ERR(" <html color number>");
return 0; return 0;
} }
src/drivers/md25/md25_main.cpp
+3 -2
View File
@@ -45,6 +45,7 @@
*/ */
#include <px4_config.h> #include <px4_config.h>
#include <px4_log.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -79,10 +80,10 @@ static void
usage(const char *reason) usage(const char *reason)
{ {
if (reason) { if (reason) {
fprintf(stderr, "%s\n", reason); PX4_WARN("%s", reason);
} }
fprintf(stderr, "usage: md25 {start|stop|read|status|search|test|change_address}\n\n"); PX4_INFO("usage: md25 {start|stop|read|status|search|test|change_address}");
exit(1); exit(1);
} }
src/drivers/mkblctrl/mkblctrl.cpp
+29 -30
View File
@@ -341,14 +341,14 @@ void
MK::set_rc_min_value(unsigned value) MK::set_rc_min_value(unsigned value)
{ {
_rc_min_value = value; _rc_min_value = value;
fprintf(stderr, "[mkblctrl] rc_min = %i\n", _rc_min_value); PX4_INFO("rc_min = %i", _rc_min_value);
} }
void void
MK::set_rc_max_value(unsigned value) MK::set_rc_max_value(unsigned value)
{ {
_rc_max_value = value; _rc_max_value = value;
fprintf(stderr, "[mkblctrl] rc_max = %i\n", _rc_max_value); PX4_INFO("rc_max = %i", _rc_max_value);
} }
int int
@@ -360,10 +360,10 @@ MK::set_motor_count(unsigned count)
if (_px4mode == MAPPING_MK) { if (_px4mode == MAPPING_MK) {
if (_frametype == FRAME_PLUS) { if (_frametype == FRAME_PLUS) {
fprintf(stderr, "[mkblctrl] Mikrokopter ESC addressing. Frame: +\n"); PX4_INFO("Mikrokopter ESC addressing. Frame: +");
} else if (_frametype == FRAME_X) { } else if (_frametype == FRAME_X) {
fprintf(stderr, "[mkblctrl] Mikrokopter ESC addressing. Frame: X\n"); PX4_INFO("Mikrokopter ESC addressing. Frame: X");
} }
if (_num_outputs == 4) { if (_num_outputs == 4) {
@@ -392,18 +392,18 @@ MK::set_motor_count(unsigned count)
} }
} else { } else {
fprintf(stderr, "[mkblctrl] PX4 ESC addressing.\n"); PX4_INFO("PX4 ESC addressing.");
memcpy(&addrTranslator, &blctrlAddr_px4, sizeof(blctrlAddr_px4)); memcpy(&addrTranslator, &blctrlAddr_px4, sizeof(blctrlAddr_px4));
} }
if (_num_outputs == 4) { if (_num_outputs == 4) {
fprintf(stderr, "[mkblctrl] 4 ESCs = Quadrocopter\n"); PX4_INFO("4 ESCs = Quadrocopter");
} else if (_num_outputs == 6) { } else if (_num_outputs == 6) {
fprintf(stderr, "[mkblctrl] 6 ESCs = Hexacopter\n"); PX4_INFO("6 ESCs = Hexacopter");
} else if (_num_outputs == 8) { } else if (_num_outputs == 8) {
fprintf(stderr, "[mkblctrl] 8 ESCs = Octocopter\n"); PX4_INFO("8 ESCs = Octocopter");
} }
return OK; return OK;
@@ -726,11 +726,11 @@ MK::mk_check_for_blctrl(unsigned int count, bool showOutput, bool initI2C)
} }
if (showOutput) { if (showOutput) {
fprintf(stderr, "[mkblctrl] MotorsFound: %i\n", foundMotorCount); PX4_INFO("MotorsFound: %i", foundMotorCount);
for (unsigned i = 0; i < foundMotorCount; i++) { for (unsigned i = 0; i < foundMotorCount; i++) {
fprintf(stderr, "[mkblctrl] blctrl[%i] : found=%i\tversion=%i\tcurrent=%i\tmaxpwm=%i\ttemperature=%i\n", i, PX4_INFO("blctrl[%i] : found=%i\tversion=%i\tcurrent=%i\tmaxpwm=%i\ttemperature=%i", i,
Motor[i].State, Motor[i].Version, Motor[i].Current, Motor[i].MaxPWM, Motor[i].Temperature); Motor[i].State, Motor[i].Version, Motor[i].Current, Motor[i].MaxPWM, Motor[i].Temperature);
} }
@@ -841,12 +841,12 @@ MK::mk_servo_set(unsigned int chan, short val)
for (unsigned int i = 0; i < _num_outputs; i++) { for (unsigned int i = 0; i < _num_outputs; i++) {
if (Motor[i].State & MOTOR_STATE_PRESENT_MASK) { if (Motor[i].State & MOTOR_STATE_PRESENT_MASK) {
fprintf(stderr, "[mkblctrl] #%i:\tVer: %i\tVal: %i\tCurr: %i\tMaxPWM: %i\tTemp: %i\tState: %i\n", i, Motor[i].Version, PX4_INFO("#%i:\tVer: %i\tVal: %i\tCurr: %i\tMaxPWM: %i\tTemp: %i\tState: %i", i, Motor[i].Version,
Motor[i].SetPoint, Motor[i].Current, Motor[i].MaxPWM, Motor[i].Temperature, Motor[i].State); Motor[i].SetPoint, Motor[i].Current, Motor[i].MaxPWM, Motor[i].Temperature, Motor[i].State);
} }
} }
fprintf(stderr, "\n"); PX4_INFO("\n");
} }
} }
@@ -868,13 +868,13 @@ MK::mk_servo_test(unsigned int chan)
_motor++; _motor++;
if (_motor < _num_outputs) { if (_motor < _num_outputs) {
fprintf(stderr, "[mkblctrl] Motortest - #%i:\tspinup\n", _motor); PX4_INFO("Motortest - #%i:\tspinup", _motor);
} }
if (_motor >= _num_outputs) { if (_motor >= _num_outputs) {
_motor = -1; _motor = -1;
_motortest = false; _motortest = false;
fprintf(stderr, "[mkblctrl] Motortest finished...\n"); PX4_INFO("Motortest finished...");
} }
} }
@@ -938,7 +938,7 @@ MK::mk_servo_locate()
chan++; chan++;
if (chan <= _num_outputs) { if (chan <= _num_outputs) {
fprintf(stderr, "[mkblctrl] ESC Locate - #%i:\tgreen\n", chan); PX4_INFO("ESC Locate - #%i:\tgreen", chan);
play_beep(chan); play_beep(chan);
} }
@@ -1388,19 +1388,18 @@ mkblctrl_main(int argc, char *argv[])
} }
if (showHelp) { if (showHelp) {
fprintf(stderr, "mkblctrl: help:\n"); PX4_INFO("mkblctrl: help:");
fprintf(stderr, " [-mkmode {+/x}] [-b i2c_bus_number] [-d devicename] [--override-security-checks] [-h / --help]\n\n"); PX4_INFO(" [-mkmode {+/x}] [-b i2c_bus_number] [-d devicename] [--override-security-checks] [-h / --help]");
fprintf(stderr, "\t -mkmode {+/x} \t\t Type of frame, if Mikrokopter motor order is used.\n"); PX4_INFO("\t -mkmode {+/x} \t\t Type of frame, if Mikrokopter motor order is used.");
fprintf(stderr, "\t -d {devicepath & name}\t\t Create alternate pwm device.\n"); PX4_INFO("\t -d {devicepath & name}\t\t Create alternate pwm device.");
fprintf(stderr, PX4_INFO("\t --override-security-checks \t\t Disable all security checks (arming and number of ESCs). Used to test single Motors etc. (DANGER !!!)");
"\t --override-security-checks \t\t Disable all security checks (arming and number of ESCs). Used to test single Motors etc. (DANGER !!!)\n"); PX4_INFO("\t -rcmin {pwn-value}\t\t Set RC_MIN Value.");
fprintf(stderr, "\t -rcmin {pwn-value}\t\t Set RC_MIN Value.\n"); PX4_INFO("\t -rcmax {pwn-value}\t\t Set RC_MAX Value.");
fprintf(stderr, "\t -rcmax {pwn-value}\t\t Set RC_MAX Value.\n"); PX4_INFO("\n");
fprintf(stderr, "\n"); PX4_INFO("Motortest:");
fprintf(stderr, "Motortest:\n"); PX4_INFO("First you have to start mkblctrl, the you can enter Motortest Mode with:");
fprintf(stderr, "First you have to start mkblctrl, the you can enter Motortest Mode with:\n"); PX4_INFO("mkblctrl -t");
fprintf(stderr, "mkblctrl -t\n"); PX4_INFO("This will spin up once every motor in order of motoraddress. (DANGER !!!)");
fprintf(stderr, "This will spin up once every motor in order of motoraddress. (DANGER !!!)\n");
exit(1); exit(1);
} }
src/drivers/roboclaw/roboclaw_main.cpp
+2 -2
View File
@@ -44,6 +44,7 @@
*/ */
#include <px4_config.h> #include <px4_config.h>
#include <px4_log.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -76,8 +77,7 @@ static void usage();
static void usage() static void usage()
{ {
fprintf(stderr, "usage: roboclaw " PX4_INFO("usage: roboclaw {start|stop|status|test}");
"{start|stop|status|test}\n\n");
} }
/** /**