X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fturnout.h;h=c7a603c78e53db9224b75951aa3474d107c62338;hb=e179208d1c8370f87ce6ec87f649e5e99eb5724f;hp=01d37377dd8603a695c16e8151b94562ea77aa88;hpb=6dc18b0e518407bd2a86602bae1e9bbae05da7c8;p=r2c2.git diff --git a/source/libmarklin/turnout.h b/source/libmarklin/turnout.h index 01d3737..c7a603c 100644 --- a/source/libmarklin/turnout.h +++ b/source/libmarklin/turnout.h @@ -28,19 +28,22 @@ public: private: Control &control; unsigned addr; - unsigned path; + unsigned char path; + unsigned char pending_path; + unsigned char pending_cmds; bool dual; + bool on; public: Turnout(Control &, unsigned, bool =false); - void set_path(unsigned); + void set_path(unsigned char); unsigned get_address() const { return addr; } - unsigned get_path() const { return path; } + unsigned char get_path() const { return path; } private: - void command(bool); - void status_reply(const Reply &, bool); - bool switch_timeout(); + void command(unsigned char); + void command_reply(const Reply &, unsigned char); + void status_reply(const Reply &, unsigned char); void turnout_event(unsigned, bool); };