From 6006fee7b9eddd71dee20b6b39b233f7e4088db9 Mon Sep 17 00:00:00 2001 From: schodet Date: Thu, 13 May 2004 23:10:37 +0000 Subject: Virure de Erreur --- 2004/i/nono/src/io/Makefile.defs | 4 ++-- 2004/i/nono/src/io/io_cmd.cc | 27 ++------------------------- 2004/i/nono/src/io/io_cmd.h | 3 +-- 2004/i/nono/src/io/test_io.cc | 6 ++++-- 4 files changed, 9 insertions(+), 31 deletions(-) (limited to '2004/i/nono/src/io') diff --git a/2004/i/nono/src/io/Makefile.defs b/2004/i/nono/src/io/Makefile.defs index b6bb88d..efc1ad0 100644 --- a/2004/i/nono/src/io/Makefile.defs +++ b/2004/i/nono/src/io/Makefile.defs @@ -1,7 +1,7 @@ TARGETS += test_io test_gpio_concat LIBS += io.a -test_io_SOURCES = test_io.cc io_cmd.cc io.a date.a serial.a motor.a logger.a \ - utils.a config.a erreur.a +test_io_SOURCES = test_io.cc io_cmd.cc servo_cmd.cc io.a date.a serial.a \ + motor.a logger.a utils.a config.a test_gpio_concat_SOURCES = test_gpio_concat.cc io_cmd.cc io.a date.a serial.a io_a_SOURCES = gpio.cc gpio_servo_pp.cc gpio_concat.cc gpio_asserv.cc diff --git a/2004/i/nono/src/io/io_cmd.cc b/2004/i/nono/src/io/io_cmd.cc index 1177f8b..d64928f 100644 --- a/2004/i/nono/src/io/io_cmd.cc +++ b/2004/i/nono/src/io/io_cmd.cc @@ -24,7 +24,6 @@ // }}} #include "io_cmd.h" #include "gpio.h" -#include "servo.h" #include #include @@ -32,12 +31,10 @@ const char ioHelp[] = " o set des sorties.\n" " i get des entrées.\n" - " d dir des entrées/sorties.\n" - " m déplace le servo n de diff.\n" - " M déplace le servo n en pos.\n"; + " d dir des entrées/sorties.\n"; bool -ioCmd (int argc, char **argv, int &i, Gpio &io, Servo &servo) +ioCmd (int argc, char **argv, int &i, Gpio &io) { int n, bits, nb; switch (argv[i][0]) @@ -77,26 +74,6 @@ ioCmd (int argc, char **argv, int &i, Gpio &io, Servo &servo) std::dec << ' ' << nb << std::endl; io.dir (n, bits, nb); break; - case 'm': - i++; - int diff; - if (i >= argc) break; - n = atoi (argv[i++]); - if (i >= argc) break; - diff = atoi (argv[i++]); - std::cout << "test: servo move " << n << ' ' << diff << std::endl; - servo.move (n, diff); - break; - case 'M': - i++; - int pos; - if (i >= argc) break; - n = atoi (argv[i++]); - if (i >= argc) break; - pos = atoi (argv[i++]); - std::cout << "test: servo moveTo " << n << ' ' << pos << std::endl; - servo.moveTo (n, pos); - break; default: return false; } diff --git a/2004/i/nono/src/io/io_cmd.h b/2004/i/nono/src/io/io_cmd.h index b199a9f..a7d6e8a 100644 --- a/2004/i/nono/src/io/io_cmd.h +++ b/2004/i/nono/src/io/io_cmd.h @@ -26,11 +26,10 @@ // }}} class Gpio; -class Servo; extern const char ioHelp[]; bool -ioCmd (int argc, char **argv, int &i, Gpio &io, Servo &servo); +ioCmd (int argc, char **argv, int &i, Gpio &io); #endif // io_cmd_h diff --git a/2004/i/nono/src/io/test_io.cc b/2004/i/nono/src/io/test_io.cc index 3834893..999549e 100644 --- a/2004/i/nono/src/io/test_io.cc +++ b/2004/i/nono/src/io/test_io.cc @@ -29,6 +29,7 @@ #include "date/date.h" #include "motor/asserv.h" #include "io_cmd.h" +#include "servo_cmd.h" #include #include @@ -38,7 +39,7 @@ syntax (void) { std::cout << "test_io - teste les entrées/sorties.\n" - << ioHelp << + << ioHelp << servoHelp << " attend\n" " ? cet ecran d'aide" << std::endl; } @@ -57,7 +58,8 @@ main (int argc, char **argv) int i = 1; while (i < argc) { - if (!ioCmd (argc, argv, i, gc, gspp)) + if (!ioCmd (argc, argv, i, gc) + && !servoCmd (argc, argv, i, gspp)) { switch (argv[i][0]) { -- cgit v1.2.3