Rewrite command/reply system

[r2c2.git] / source / libmarklin / turnout.cpp

diff --git a/source/libmarklin/turnout.cpp b/source/libmarklin/turnout.cpp
index ace7976ed6aa808adf72dc053fc5ff49739029de..30793fcff5727a6aed56e9aa697b02a4bbff0823 100644 (file)
--- a/source/libmarklin/turnout.cpp
+++ b/source/libmarklin/turnout.cpp
@@ -10,6 +10,7 @@ Distributed under the GPL
 #include <msp/time/units.h>
 #include "command.h"
 #include "control.h"
+#include "reply.h"
 #include "turnout.h"
 
 using namespace std;
@@ -26,11 +27,10 @@ Turnout::Turnout(Control &c, unsigned a):
 
        control.signal_turnout_event.connect(sigc::mem_fun(this, &Turnout::turnout_event));
 
-       char cmd[3];
-       cmd[0]=CMD_TURNOUT_STATUS;
-       cmd[1]=addr&0xFF;
-       cmd[2]=(addr>>8)&0xFF;
-       control.command(string(cmd, 3)).signal_done.connect(sigc::mem_fun(this, &Turnout::status_reply));
+       unsigned char data[2];
+       data[0]=addr&0xFF;
+       data[1]=(addr>>8)&0xFF;
+       control.command(CMD_TURNOUT_STATUS, data, 2).signal_done.connect(sigc::mem_fun(this, &Turnout::status_reply));
 }
 
 void Turnout::set_route(unsigned r)
@@ -45,22 +45,17 @@ void Turnout::set_route(unsigned r)
 
 void Turnout::command(bool on)
 {
-       char cmd[3];
-       cmd[0]=CMD_TURNOUT;
-       cmd[1]=addr&0xFF;
-       cmd[2]=((addr>>8)&0x7);
-       if(on)
-               cmd[2]|=0x40;
-       if(route==0)
-               cmd[2]|=0x80;
-       control.command(string(cmd, 3));
+       unsigned char data[2];
+       data[0]=addr&0xFF;
+       data[1]=((addr>>8)&0x7) | (on ? 0x40 : 0) | (route==0 ? 0x80 : 0);
+       control.command(CMD_TURNOUT, data, 2);
 }
 
-void Turnout::status_reply(Error err, const string &reply)
+void Turnout::status_reply(const Reply &reply)
 {
-       if(err==ERR_NO_ERROR)
+       if(reply.get_error()==ERR_NO_ERROR)
        {
-               route=(reply[0]&4)?0:1;
+               route=(reply.get_data()[0]&0x04) ? 0 : 1;
                signal_route_changed.emit(route);
        }
 }