Changeset 406874

Timestamp:

01/11/12 16:16:31 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

b0f092e98d602301ead905292420777c5da7640e

Parents:

d7cce515ff9fca11b5be98bf926bcc355c949294

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-11 16:16:31+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-11 16:16:31+01:00

Message:

Setting for 'Not wait for confirmation from TellStick' implemented on windows too. This setting must be set manually. Closes #98

Location:

telldus-core/service

Files:

• SettingsWinRegistry.cpp (modified) (1 diff)
• TellStick_ftd2xx.cpp (modified) (4 diffs)

telldus-core/service/SettingsWinRegistry.cpp

@@ -158 +158 @@
 }
 
+std::wstring Settings::getSetting(const std::wstring &strName) const{
+        std::wstring strReturn;
+        HKEY hk;
+
+        std::wstring strCompleteRegPath = d->strRegPath;
+        long lnExists = RegOpenKeyEx(d->rootKey, strCompleteRegPath.c_str(), 0, KEY_QUERY_VALUE, &hk);
+                        
+        if(lnExists == ERROR_SUCCESS){
+                wchar_t* Buff = new wchar_t[intMaxRegValueLength];
+                DWORD dwLength = sizeof(wchar_t)*intMaxRegValueLength;
+                long lngStatus = RegQueryValueEx(hk, strName.c_str(), NULL, NULL, (LPBYTE)Buff, &dwLength);
+
+                if(lngStatus == ERROR_MORE_DATA){
+                        //The buffer is to small, recreate it
+                        delete Buff;
+                        Buff = new wchar_t[dwLength];
+                        lngStatus = RegQueryValueEx(hk, strName.c_str(), NULL, NULL, (LPBYTE)Buff, &dwLength);
+                }
+                if (lngStatus == ERROR_SUCCESS) {
+                        strReturn = Buff;
+                }
+                delete Buff;
+        }
+        RegCloseKey(hk);
+        return strReturn;
+}
+
 std::wstring Settings::getStringSetting(int intDeviceId, const std::wstring &name, bool parameter) const {
         std::wstring strReturn;

telldus-core/service/TellStick_ftd2xx.cpp

@@ -12 +12 @@
 #include "TellStick.h"
 #include "Mutex.h"
+#include "Settings.h"
 #include "Strings.h"
 #include "Log.h"
@@ -22 +23 @@
 class TellStick::PrivateData {
 public:
-        bool open, running;
+        bool open, running, ignoreControllerConfirmation;
         int vid, pid, fwVersion;
         std::string serial, message;
@@ -55 +56 @@
         d->fwVersion = 0;
         d->serial = td.serial;
+        Settings set;
+        d->ignoreControllerConfirmation = set.getSetting(L"ignoreControllerConfirmation")==L"true";
 
         char *tempSerial = new char[td.serial.size()+1];
@@ -227 +230 @@
         ftStatus = FT_Write(d->ftHandle, tempMessage, (DWORD)strMessage.length(), &bytesWritten);
         free(tempMessage);
-        if(strMessage == "noop"){
+        
+        if(d->ignoreControllerConfirmation || (strMessage == "N+" && ((pid() == 0x0C31 && firmwareVersion() < 5) || (pid() == 0x0C30 && firmwareVersion() < 6)))){
+                //these firmware versions doesn't implement ack to noop, just check that the noop can be sent correctly
                 if(c){
                         return TELLSTICK_SUCCESS;