bool set(T v) { if(v==pending) return false; pending = v; ++serial; return true; }
bool commit(unsigned short s) { if(s!=serial) return false; current = pending; return true; }
+ void rollback() { pending = current; ++serial; }
operator T() const { return current; }
};
unsigned address;
unsigned bits;
ControlledVariable<unsigned> state;
+ unsigned uncertain;
unsigned target;
Msp::Time::TimeDelta active_time;
public:
void push(const T &);
bool pop(T &);
+ bool empty() const;
};
class Task
virtual void main();
void init_baud_rate();
bool get_work(PendingCommand &);
- unsigned do_command(const PendingCommand &);
+ unsigned do_command(const PendingCommand &, const Msp::Time::TimeDelta &);
unsigned process_reply(const char *, unsigned);
+ void set_power(bool);
};
typedef std::map<unsigned, Locomotive> LocomotiveMap;
Msp::FS::Path state_file;
ControlledVariable<bool> power;
+ bool halted;
LocomotiveMap locomotives;
MfxInfoArray mfx_info;
SensorMap sensors;
- Msp::Mutex mutex;
+ Msp::Time::TimeDelta command_timeout;
Queue<PendingCommand> command_queue;
Queue<Tag> completed_commands;
RefreshTask refresh;
virtual void set_power(bool);
virtual bool get_power() const { return power; }
virtual void halt(bool);
- virtual bool is_halted() const { return false; }
+ virtual bool is_halted() const { return halted; }
virtual const char *enumerate_protocols(unsigned) const;
private: