From 8e06e04f0a42d2777d34df8bc2b78606e4447686 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Thu, 28 Mar 2013 23:35:34 +0100 Subject: digital/io-hub/src/apbirthday: move candle member down This is a software component, initialise after any hardware. --- digital/io-hub/src/apbirthday/robot.cc | 4 ++-- digital/io-hub/src/apbirthday/robot.hh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'digital/io-hub/src/apbirthday') diff --git a/digital/io-hub/src/apbirthday/robot.cc b/digital/io-hub/src/apbirthday/robot.cc index dffd954e..6e63b96a 100644 --- a/digital/io-hub/src/apbirthday/robot.cc +++ b/digital/io-hub/src/apbirthday/robot.cc @@ -31,13 +31,13 @@ Robot *robot; Robot::Robot () - : candles (1), - main_i2c_queue_ (hardware.main_i2c), + : main_i2c_queue_ (hardware.main_i2c), asserv (main_i2c_queue_, BOT_SCALE), dev_proto (*this, hardware.dev_uart), zb_proto (*this, hardware.zb_uart), usb_proto (*this, hardware.usb), chrono (90000 - 1000), + candles (1), fsm_debug_state_ (FSM_DEBUG_RUN), outputs_set_ (outputs_, lengthof (outputs_)), stats_proto_ (0), diff --git a/digital/io-hub/src/apbirthday/robot.hh b/digital/io-hub/src/apbirthday/robot.hh index 11ab416a..c447953e 100644 --- a/digital/io-hub/src/apbirthday/robot.hh +++ b/digital/io-hub/src/apbirthday/robot.hh @@ -46,8 +46,6 @@ class Robot : public ucoo::Proto::Handler void proto_handle (ucoo::Proto &proto, char cmd, const uint8_t *args, int size); /// Send stats. void proto_stats (); - /// Candles. - Candles candles; public: /// Public access to hardware class. Hardware hardware; @@ -65,6 +63,8 @@ class Robot : public ucoo::Proto::Handler FsmQueue fsm_queue; /// Public access to chrono. Chrono chrono; + /// Candles. + Candles candles; private: /// FSM debug mode. enum FsmDebugState -- cgit v1.2.3