summaryrefslogtreecommitdiff
path: root/digital/io-hub/src/apbirthday
diff options
context:
space:
mode:
authorNicolas Schodet2013-04-24 22:44:30 +0200
committerNicolas Schodet2013-04-24 22:46:05 +0200
commit78d2f3d295c56e976c13b187b7723670411e4101 (patch)
tree4e973bbe34a6c67008429ad5d1a7771b351e5481 /digital/io-hub/src/apbirthday
parente506888ef09a23440d71b3f59067afbe84259c40 (diff)
digital/io-hub/src/apbirthday, host/simu: add cherries cannon simulationHEADmaster
Diffstat (limited to 'digital/io-hub/src/apbirthday')
-rw-r--r--digital/io-hub/src/apbirthday/Makefile2
-rw-r--r--digital/io-hub/src/apbirthday/robot.cc4
-rw-r--r--digital/io-hub/src/apbirthday/robot.hh10
3 files changed, 14 insertions, 2 deletions
diff --git a/digital/io-hub/src/apbirthday/Makefile b/digital/io-hub/src/apbirthday/Makefile
index 19296e0f..c07574bd 100644
--- a/digital/io-hub/src/apbirthday/Makefile
+++ b/digital/io-hub/src/apbirthday/Makefile
@@ -5,7 +5,7 @@ PROGS = apbirthday
apbirthday_SOURCES = main.cc robot.cc hardware.host.cc hardware.stm32.cc \
simu_report.host.cc zb_avrisp.stm32.cc \
i2c_queue.cc asserv.cc mimot.cc beacon.cc \
- potentiometer.cc \
+ potentiometer.host.cc potentiometer.stm32.cc \
pressure.cc chrono.host.cc chrono.stm32.cc debounce.cc \
radar.cc radar_2013.cc obstacles.cc path.cc strat.cc \
outputs.cc \
diff --git a/digital/io-hub/src/apbirthday/robot.cc b/digital/io-hub/src/apbirthday/robot.cc
index 7137ea3e..e5910d74 100644
--- a/digital/io-hub/src/apbirthday/robot.cc
+++ b/digital/io-hub/src/apbirthday/robot.cc
@@ -35,7 +35,11 @@ Robot::Robot ()
: main_i2c_queue_ (hardware.main_i2c), zb_i2c_queue_ (hardware.zb_i2c),
asserv (main_i2c_queue_, BOT_SCALE),
mimot (main_i2c_queue_),
+#ifdef TARGET_host
+ pot_regul (hardware.host),
+#else
pot_regul (main_i2c_queue_, 0x7),
+#endif
beacon (zb_i2c_queue_),
dev_proto (*this, hardware.dev_uart),
zb_proto (*this, hardware.zb_uart),
diff --git a/digital/io-hub/src/apbirthday/robot.hh b/digital/io-hub/src/apbirthday/robot.hh
index 556e29eb..3d9a62ce 100644
--- a/digital/io-hub/src/apbirthday/robot.hh
+++ b/digital/io-hub/src/apbirthday/robot.hh
@@ -26,7 +26,11 @@
#include "hardware.hh"
#include "asserv.hh"
#include "beacon.hh"
-#include "potentiometer.hh"
+#ifdef TARGET_host
+# include "potentiometer.host.hh"
+#else
+# include "potentiometer.stm32.hh"
+#endif
#include "fsm_queue.hh"
#include "chrono.hh"
#include "pressure.hh"
@@ -72,7 +76,11 @@ class Robot : public ucoo::Proto::Handler
/// Public access to mimot class.
Mimot mimot;
/// Public access to potentiometer class.
+#ifdef TARGET_host
+ PotentiometerHost pot_regul;
+#else
Potentiometer pot_regul;
+#endif
/// Public access to beacon class.
Beacon beacon;
private: