summaryrefslogtreecommitdiff
path: root/2004/i
diff options
context:
space:
mode:
authorschodet2004-05-12 22:34:00 +0000
committerschodet2004-05-12 22:34:00 +0000
commit49078b4978a9395e11b0752c5d8146b4f154c63e (patch)
tree3c950d17be4b7fd74c543912e53707d330a4e028 /2004/i
parent0d23e95e643ffffd7e2f3788449c34de200e9ff9 (diff)
Passage g++-3.0.
input gpio_servo_pp.
Diffstat (limited to '2004/i')
-rw-r--r--2004/i/nono/src/io/gpio_servo_pp.cc10
-rw-r--r--2004/i/nono/src/io/test_io.cc2
2 files changed, 10 insertions, 2 deletions
diff --git a/2004/i/nono/src/io/gpio_servo_pp.cc b/2004/i/nono/src/io/gpio_servo_pp.cc
index 1e1036d..5edab20 100644
--- a/2004/i/nono/src/io/gpio_servo_pp.cc
+++ b/2004/i/nono/src/io/gpio_servo_pp.cc
@@ -109,7 +109,15 @@ GpioServoPp::update (void)
{
log_ (Log::debug) << "recv " << std::hex << c << std::dec <<
std::endl;
- inputs_ = c;
+ switch (inputs_ & 0x0f)
+ {
+ case 0x0:
+ inputs_ |= c >> 4;
+ break;
+ case 0x7:
+ inputs_ |= c & 0xf0;
+ break;
+ }
}
}
diff --git a/2004/i/nono/src/io/test_io.cc b/2004/i/nono/src/io/test_io.cc
index 11c86e8..3834893 100644
--- a/2004/i/nono/src/io/test_io.cc
+++ b/2004/i/nono/src/io/test_io.cc
@@ -72,7 +72,7 @@ main (int argc, char **argv)
syntax ();
return 1;
}
- cout << "test: sleep " << s << endl;
+ std::cout << "test: sleep " << s << std::endl;
Date::wait (s * 1000);
break;
}