X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Fturnout.h;h=c7a603c78e53db9224b75951aa3474d107c62338;hb=02c9a9779954d993cb73fe5f7a72b0847e87f633;hp=616a7fedb3bcabddef78cd9dc52c56ea0a6185b1;hpb=7839b7c3d782abb5c98a24d51cae109407068c02;p=r2c2.git

diff --git a/source/libmarklin/turnout.h b/source/libmarklin/turnout.h
index 616a7fe..c7a603c 100644
--- a/source/libmarklin/turnout.h
+++ b/source/libmarklin/turnout.h
@@ -21,25 +21,29 @@ class Reply;
 
 class Turnout
 {
+public:
+	sigc::signal<void, unsigned> signal_path_changing;
+	sigc::signal<void, unsigned> signal_path_changed;
+
 private:
-	Control  &control;
+	Control &control;
 	unsigned addr;
-	unsigned route;
-	bool     dual;
+	unsigned char path;
+	unsigned char pending_path;
+	unsigned char pending_cmds;
+	bool dual;
+	bool on;
 
 public:
-	sigc::signal<void, unsigned> signal_route_changing;
-	sigc::signal<void, unsigned> signal_route_changed;
-
 	Turnout(Control &, unsigned, bool =false);
 
-	void     set_route(unsigned);
+	void set_path(unsigned char);
 	unsigned get_address() const { return addr; }
-	unsigned get_route() const   { return route; }
+	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);
 };