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:
unsigned size;
unsigned bits;
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
};
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 { return 0; }
+ 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