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

Listen to all consoles plus some more small fixes

Browse Source
This commit is contained in:
Julian Oes
2013-09-22 17:07:02 +02:00
parent 30b151b9a8
commit bdfc7b9f69
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/esc_calib/esc_calib.c
+21 -18
View File
@@ -46,6 +46,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <poll.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h> #include <sys/stat.h>
@@ -83,22 +84,26 @@ usage(const char *reason)
int int
esc_calib_main(int argc, char *argv[]) esc_calib_main(int argc, char *argv[])
{ {
const char *dev = PWM_OUTPUT_DEVICE_PATH; char *dev = PWM_OUTPUT_DEVICE_PATH;
char *ep; char *ep;
bool channels_selected[MAX_CHANNELS] = {false}; bool channels_selected[MAX_CHANNELS] = {false};
int ch; int ch;
int ret; int ret;
char c; char c;
struct pollfd fds;
fds.fd = 0; /* stdin */
fds.events = POLLIN;
if (argc < 2) if (argc < 2)
usage(NULL); usage(NULL);
while ((ch = getopt(argc, argv, "d:")) != EOF) { while ((ch = getopt(argc-1, argv, "d:")) != EOF) {
switch (ch) { switch (ch) {
case 'd': case 'd':
dev = optarg; dev = optarg;
argc=-2; argc-=2;
break; break;
default: default:
@@ -106,7 +111,7 @@ esc_calib_main(int argc, char *argv[])
} }
} }
if(argc < 1) { if(argc < 2) {
usage("no channels provided"); usage("no channels provided");
} }
@@ -124,11 +129,6 @@ esc_calib_main(int argc, char *argv[])
} }
} }
/* Wait for confirmation */
int console = open("/dev/ttyACM0", O_NONBLOCK | O_RDONLY | O_NOCTTY);
if (!console)
err(1, "failed opening console");
printf("\nATTENTION, please remove or fix propellers before starting calibration!\n" printf("\nATTENTION, please remove or fix propellers before starting calibration!\n"
"\n" "\n"
"Make sure\n" "Make sure\n"
@@ -141,21 +141,21 @@ esc_calib_main(int argc, char *argv[])
/* wait for user input */ /* wait for user input */
while (1) { while (1) {
if (read(console, &c, 1) == 1) { ret = poll(&fds, 1, 0);
if (ret > 0) {
read(0, &c, 1);
if (c == 'y' || c == 'Y') { if (c == 'y' || c == 'Y') {
break; break;
} else if (c == 0x03 || c == 0x63 || c == 'q') { } else if (c == 0x03 || c == 0x63 || c == 'q') {
printf("ESC calibration exited\n"); printf("ESC calibration exited\n");
close(console);
exit(0); exit(0);
} else if (c == 'n' || c == 'N') { } else if (c == 'n' || c == 'N') {
printf("ESC calibration aborted\n"); printf("ESC calibration aborted\n");
close(console);
exit(0); exit(0);
} else { } else {
printf("Unknown input, ESC calibration aborted\n"); printf("Unknown input, ESC calibration aborted\n");
close(console);
exit(0); exit(0);
} }
} }
@@ -187,13 +187,15 @@ esc_calib_main(int argc, char *argv[])
} }
} }
if (read(console, &c, 1) == 1) { ret = poll(&fds, 1, 0);
if (ret > 0) {
read(0, &c, 1);
if (c == 13) { if (c == 13) {
break; break;
} else if (c == 0x03 || c == 0x63 || c == 'q') { } else if (c == 0x03 || c == 0x63 || c == 'q') {
warnx("ESC calibration exited"); warnx("ESC calibration exited");
close(console);
exit(0); exit(0);
} }
} }
@@ -218,13 +220,15 @@ esc_calib_main(int argc, char *argv[])
} }
} }
if (read(console, &c, 1) == 1) { ret = poll(&fds, 1, 0);
if (ret > 0) {
read(0, &c, 1);
if (c == 13) { if (c == 13) {
break; break;
} else if (c == 0x03 || c == 0x63 || c == 'q') { } else if (c == 0x03 || c == 0x63 || c == 'q') {
printf("ESC calibration exited\n"); printf("ESC calibration exited\n");
close(console);
exit(0); exit(0);
} }
} }
@@ -234,7 +238,6 @@ esc_calib_main(int argc, char *argv[])
printf("ESC calibration finished\n"); printf("ESC calibration finished\n");
close(console);
exit(0); exit(0);
} }