-/* $Id$
-
-This file is part of R²C²
-Copyright © 2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
#ifndef LIBR2C2_INTELLIBOX_H_
#define LIBR2C2_INTELLIBOX_H_
#include <map>
+#include <msp/io/serial.h>
#include <msp/time/timestamp.h>
#include "driver.h"
ERR_NO_I2C_SPACE,
ERR_LOW_TURNOUT_SPACE=0x40,
ERR_LOK_HALTED,
- ERR_LOK_POWER_OFF,
+ ERR_LOK_POWER_OFF
};
enum Protocol
{
+ NONE,
MM,
MM_27
};
struct Locomotive
{
Protocol protocol;
+ bool ext_func;
unsigned speed;
bool reverse;
unsigned funcs;
Locomotive();
};
+ // These are used for signals as well, but Intellibox calls them turnouts.
struct Turnout
{
- bool state;
+ unsigned bits;
+ unsigned state;
bool active;
- bool pending;
+ bool synced;
+ unsigned pending;
Msp::Time::TimeStamp off_timeout;
+ bool signal;
Turnout();
};
unsigned length;
};
- int serial_fd;
+ Msp::IO::Serial serial;
bool power;
bool halted;
std::map<unsigned, Locomotive> locos;
virtual const char *enumerate_protocols(unsigned) const;
virtual unsigned get_protocol_speed_steps(const std::string &) const;
- virtual void add_loco(unsigned, const std::string &);
+ virtual DetectedLocomotive *enumerate_detected_locos(unsigned) const { return 0; }
+ virtual unsigned add_loco(unsigned, const std::string &, const VehicleType &);
+ virtual void remove_loco(unsigned);
virtual void set_loco_speed(unsigned, unsigned);
virtual void set_loco_reverse(unsigned, bool);
virtual void set_loco_function(unsigned, unsigned, bool);
- virtual void add_turnout(unsigned);
- virtual void set_turnout(unsigned, bool);
- virtual bool get_turnout(unsigned) const;
+ virtual unsigned add_turnout(unsigned, const TrackType &);
+ virtual void remove_turnout(unsigned);
+private:
+ unsigned add_turnout(unsigned, unsigned, bool);
+ void turnout_state_changed(unsigned, const Turnout &) const;
+public:
+ virtual void set_turnout(unsigned, unsigned);
+ virtual unsigned get_turnout(unsigned) const;
- virtual void add_sensor(unsigned);
+ virtual unsigned add_signal(unsigned, const SignalType &);
+ virtual void remove_signal(unsigned);
+ virtual void set_signal(unsigned, unsigned);
+ virtual unsigned get_signal(unsigned) const;
+
+public:
+ virtual unsigned add_sensor(unsigned);
+ virtual void remove_sensor(unsigned);
virtual void set_sensor(unsigned, bool) { }
virtual bool get_sensor(unsigned) const;
void command(Command);
void command(Command, const unsigned char *, unsigned);
void command(Command, unsigned, const unsigned char *, unsigned);
- void loco_command(unsigned, unsigned, bool, unsigned);
+ void loco_command(unsigned, unsigned, bool, unsigned, bool);
void turnout_command(unsigned, bool, bool);
void process_reply(const Msp::Time::TimeStamp &);
unsigned read_all(unsigned char *, unsigned);