MFX_SPEED_FUNCS8 = 0x29,
MFX_SPEED_FUNCS16 = 0x2A,
S88_READ = 0x30,
+ SET_BAUD_RATE = 0x70,
COMMAND_OK = 0x80,
RECEIVE_OVERRUN = 0x81,
FRAMING_ERROR = 0x82,
LENGTH_ERROR = 0x84,
INVALID_VALUE = 0x85,
OVERCURRENT = 0xA0,
+ BAUD_CHANGE_FAILED = 0xA1,
TRACK_CURRENT = 0xC0,
INPUT_VOLTAGE = 0xC1,
POWER_STATE = 0xC2,
S88_DATA = 0xD0,
- MFX_FEEDBACK = 0xD1
+ MFX_SEARCH_FEEDBACK = 0xD1,
+ MFX_PING_FEEDBACK = 0xD2
};
struct Tag
enum GeneralCommand
{
- POWER
+ POWER,
+ NEW_LOCO
};
enum Protocol
unsigned create_speed_func_command(unsigned, char *) const;
};
+ struct MfxInfo: public DetectedLocomotive
+ {
+ unsigned id;
+ };
+
struct Accessory
{
enum Kind
PendingCommand(Accessory &, Accessory::Command, unsigned = 0);
};
+ template<typename T>
+ class Queue
+ {
+ private:
+ std::list<T> items;
+ Msp::Mutex mutex;
+
+ public:
+ void push(const T &);
+ bool pop(T &);
+ };
+
class Task
{
protected:
Msp::Time::TimeStamp next;
unsigned size;
unsigned bits;
- bool pending;
+ unsigned misses;
+ Queue<MfxInfo> queue;
public:
MfxSearchTask(ArduControl &);
virtual bool get_work(PendingCommand &);
virtual void process_reply(const char *, unsigned);
+
+ bool pop_info(MfxInfo &);
};
class ControlThread: public Msp::Thread
void exit();
private:
virtual void main();
+ void init_baud_rate();
bool get_work(PendingCommand &);
unsigned do_command(const PendingCommand &);
unsigned process_reply(const char *, unsigned);
};
typedef std::map<unsigned, Locomotive> LocomotiveMap;
+ typedef std::vector<MfxInfo> MfxInfoArray;
typedef std::map<unsigned, Accessory> AccessoryMap;
typedef std::list<Accessory *> AccessoryPtrList;
typedef std::map<unsigned, Sensor> SensorMap;
ControlledVariable<bool> power;
LocomotiveMap locomotives;
+ MfxInfoArray mfx_info;
AccessoryMap accessories;
AccessoryPtrList accessory_queue;
Accessory *active_accessory;
Msp::Time::TimeStamp off_timeout;
- std::list<PendingCommand> command_queue;
- std::list<Tag> completed_commands;
SensorMap sensors;
Msp::Mutex mutex;
+ Queue<PendingCommand> command_queue;
+ Queue<Tag> completed_commands;
RefreshTask refresh;
S88Task s88;
MfxAnnounceTask mfx_announce;
public:
virtual unsigned get_protocol_speed_steps(const std::string &) const;
+ virtual const DetectedLocomotive *enumerate_detected_locos(unsigned) const;
virtual unsigned add_loco(unsigned, const std::string &, const VehicleType &);
virtual void remove_loco(unsigned);
virtual void set_loco_speed(unsigned, unsigned);
virtual void tick();
virtual void flush();
-
-private:
- void push_command(const PendingCommand &);
- bool pop_command(PendingCommand &);
- void push_completed_tag(const Tag &);
- Tag pop_completed_tag();
};
} // namespace R2C2