From e321b5187d10a3a1e788a590cb1b6cc090bc9e8c Mon Sep 17 00:00:00 2001
From: peri4 <peri4@peri4-work.(none)>
Date: Thu, 2 Dec 2010 08:18:30 +0300
Subject: [PATCH] bug fixes

---
 piprotocol.cpp | 13 +++++++++++++
 piprotocol.h   |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/piprotocol.cpp b/piprotocol.cpp
index 935cb0c2..51f480ea 100644
--- a/piprotocol.cpp
+++ b/piprotocol.cpp
@@ -49,6 +49,19 @@ void PIProtocol::init() {
 }
 
 
+void PIProtocol::setDevice(const string & dev_ip, int speed_port) {
+	if (type == PIProtocol::Serial) {
+		serial->setDevice(dev_ip);
+		serial->setSpeed(speed_port);
+		devName = dev_ip;
+	}
+    if (type == PIProtocol::Ethernet) {
+		ether->setReadAddress(dev_ip, speed_port);
+		devName = dev_ip + ":" + itos(speed_port);
+	}
+}
+
+
 void PIProtocol::setExpectedFrequency(float frequency)
 {
     exp_freq = frequency;
diff --git a/piprotocol.h b/piprotocol.h
index 8b54d176..3c605972 100644
--- a/piprotocol.h
+++ b/piprotocol.h
@@ -19,9 +19,10 @@ public:
     void stopReceive(); // stop receive
     void startSend(float frequency = 20.f) {sendtimer->start(frequency > 0 ? 1000.f / frequency : 1000);} // start sending
     void stopSend() {sendtimer->stop();} // stop sending
+    void setDevice(const string & dev_ip, int speed_port);
     void setSendData(void * dataPtr, int dataSize) {sendDataPtr = (unsigned char * )dataPtr; sendDataSize = dataSize;}
     void setReceiveData(void * dataPtr, int dataSize) {this->dataPtr = (unsigned char * )dataPtr; this->dataSize = dataSize;}
-    void setSendAddress(string ip, int port) {if (type == PIProtocol::Ethernet) ether->setReadAddress(ip, port);} // for Ethernet
+    void setSendAddress(string ip, int port) {if (type == PIProtocol::Ethernet) ether->setSendAddress(ip, port);} // for Ethernet
     void setParameters(Flags<PISerial::Parameters> parameters) {if (type == PIProtocol::Serial) serial->setParameters(parameters);} // for RS
 
     void setExpectedFrequency(float frequency); // for start diagnostic connection quality