Changeset afa1e8

Timestamp:

01/26/12 14:38:42 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

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

Children:

ee8f3b41d0207f6a981fa9406fbed01fda1a7411

Parents:

bf72debefba5c47023afd5993290995c613e4185

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-26 14:38:42+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-26 14:38:42+01:00

Message:

Changed usage of strol method, so that windows uses _strtoui64 instead. Closes #172, #175

Location:

telldus-core

Files:

• common/Strings.cpp (modified) (1 diff)
• common/Strings.h (modified) (2 diffs)
• service/ProtocolFineoffset.cpp (modified) (3 diffs)
• service/ProtocolMandolyn.cpp (modified) (1 diff)
• service/ProtocolOregon.cpp (modified) (3 diffs)

telldus-core/common/Strings.cpp

@@ -145 +145 @@
 */
 
+uint64_t TelldusCore::hexTo64l(const std::string data){
+#ifdef _WINDOWS
+        return _strtoui64(data.c_str(), NULL, 16);
+#else
+        return strtol(data.c_str(), NULL, 16);
+#endif
+}
+
 int TelldusCore::wideToInteger(const std::wstring &input){
         std::wstringstream inputstream;

telldus-core/common/Strings.h

@@ -4 +4 @@
 #include <string>
 #include <stdarg.h>
+#ifdef _MSC_VER
+typedef unsigned __int8 uint8_t;
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
+#else
+#include <stdint.h>
+#endif
 
 namespace TelldusCore {
@@ -14 +22 @@
         //std::wstring intToWStringSafe(int value);
         std::string intToString(int value);
+        uint64_t hexTo64l(const std::string data);
         std::string wideToString(const std::wstring &input);
 

telldus-core/service/ProtocolFineoffset.cpp

@@ -1 +1 @@
 #include "ProtocolFineoffset.h"
+#include "Strings.h"
 #include <stdlib.h>
 #include <sstream>
 #include <iomanip>
-#ifdef _MSC_VER
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-#else
-#include <stdint.h>
-#endif
 
 std::string ProtocolFineoffset::decodeData(ControllerMessage &dataMsg)
@@ -17 +12 @@
         }
 
-        uint8_t checksum = strtol(data.substr(data.length()-2).c_str(), NULL, 16);
+        uint8_t checksum = (uint8_t)TelldusCore::hexTo64l(data.substr(data.length()-2));
         data = data.substr(0, data.length()-2);
 
-        uint8_t humidity = strtol(data.substr(data.length()-2).c_str(), NULL, 16);
+        uint8_t humidity = (uint8_t)TelldusCore::hexTo64l(data.substr(data.length()-2));
         data = data.substr(0, data.length()-2);
 
-        uint16_t value = strtol(data.substr(data.length()-3).c_str(), NULL, 16);
+        uint16_t value = (uint16_t)TelldusCore::hexTo64l(data.substr(data.length()-3));
         double temperature = (value & 0x7FF)/10.0;
 
@@ -32 +27 @@
         data = data.substr(0, data.length()-3);
 
-        uint16_t id = strtol(data.c_str(), NULL, 16) & 0xFF;
+        uint16_t id = (uint16_t)TelldusCore::hexTo64l(data) & 0xFF;
 
         std::stringstream retString;

telldus-core/service/ProtocolMandolyn.cpp

@@ -1 +1 @@
 #include "ProtocolMandolyn.h"
+#include "Strings.h"
 #include <stdlib.h>
 #include <sstream>
 #include <iomanip>
 
-#ifdef _MSC_VER
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int32 uint32_t;
-#else
-#include <stdint.h>
-#endif
-
 std::string ProtocolMandolyn::decodeData(ControllerMessage &dataMsg)
 {
         std::string data = dataMsg.getParameter("data");
-        uint32_t value = strtol(data.c_str(), NULL, 16);
+        uint32_t value = (uint32_t)TelldusCore::hexTo64l(data);
 
         bool parity = value & 0x1;

telldus-core/service/ProtocolOregon.cpp

@@ -1 +1 @@
 #include "ProtocolOregon.h"
+#include "Strings.h"
 #include <stdlib.h>
 #include <sstream>
 #include <iomanip>
-#ifdef _MSC_VER
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int64 uint64_t;
-#else
-#include <stdint.h>
-#endif
 
 std::string ProtocolOregon::decodeData(ControllerMessage &dataMsg)
@@ -25 +20 @@
 
 std::string ProtocolOregon::decodeEA4C(const std::string &data) {
-        uint64_t value = strtol(data.c_str(), NULL, 16);
-
+        uint64_t value = TelldusCore::hexTo64l(data);
+        
         uint8_t checksum = 0xE + 0xA + 0x4 + 0xC;
         checksum -= (value & 0xF) * 0x10;
@@ -70 +65 @@
 
 std::string ProtocolOregon::decode1A2D(const std::string &data) {
-        uint64_t value = strtol(data.c_str(), NULL, 16);
+        uint64_t value = TelldusCore::hexTo64l(data);
         uint8_t checksum2 = value & 0xFF;
         value >>= 8;