Changeset 0c8de2

Timestamp:

01/10/12 17:35:18 (17 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

('master', 'a231b56d57a69513303d0061f5fa3e3cd51c85c1')('controller-upgrade', '72b31cc86eeeef18f1371a3067b6e8a5ca21abfc')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

8d22eff5da33b1ab94e7459832a33e1f1ab6587c

Parents:

673daf471de0a8094bad2a567b78527158a5f15d

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-10 17:35:18+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-10 17:35:18+01:00

Message:

Cycling port and trying to reconnect TellStick on noop or send when missing

File:

• telldus-core/service/TellStick_ftd2xx.cpp (modified) (3 diffs)

telldus-core/service/TellStick_ftd2xx.cpp

@@ -112 +112 @@
 int TellStick::pid() const {
         return d->pid;
+}
+
+int TellStick::vid() const {
+        return d->vid;
+}
+
+std::string TellStick::serial() const {
+        return d->serial;
 }
 
@@ -150 +158 @@
 }
 
+int TellStick::reset(){
+        int success = FT_CyclePort( d->ftHandle );
+        if(success == FT_OK){
+                return success;
+        }
+        return TELLSTICK_ERROR_UNKNOWN;
+}
+
 void TellStick::run() {
         d->running = true;
@@ -211 +227 @@
         ftStatus = FT_Write(d->ftHandle, tempMessage, (DWORD)strMessage.length(), &bytesWritten);
         free(tempMessage);
+        if(strMessage == "noop"){
+                if(c){
+                        return TELLSTICK_SUCCESS;
+                }
+                else{
+                        return TELLSTICK_ERROR_COMMUNICATION;
+                }
+        }
 
         while(c) {