Changeset f58793

Timestamp:

01/05/12 14:35:18 (17 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

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

Children:

6fa59e9ca978efd34c2798cd97609d9f956f9bd5

Parents:

265daf4714ea69f99888ef035f64ea240f1115e9

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-05 14:35:18+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-05 14:35:18+01:00

Message:

Implement decoding of Oregon 0x1A2D. This closes #144

File:

• telldus-core/service/ProtocolOregon.cpp (modified) (2 diffs)

telldus-core/service/ProtocolOregon.cpp

@@ -17 +17 @@
         if (model.compare(L"0xEA4C") == 0) {
                 return decodeEA4C(data);
-        } else if (model.compare(L"0x1A2D")) {
+        } else if (model.compare(L"0x1A2D") == 0) {
                 return decode1A2D(data);
         }
@@ -70 +70 @@
 
 std::string ProtocolOregon::decode1A2D(const std::string &data) {
-        //TODO
-        return "";
+        uint64_t value = strtol(data.c_str(), NULL, 16);
+        uint8_t checksum2 = value & 0xFF;
+        value >>= 8;
+        uint8_t checksum1 = value & 0xFF;
+        value >>= 8;
+
+        uint8_t checksum = ((value >> 4) & 0xF) + (value & 0xF);
+        uint8_t hum1 = value & 0xF;
+        value >>= 8;
+
+        checksum += ((value >> 4) & 0xF) + (value & 0xF);
+        uint8_t neg = value & (1 << 3);
+        uint8_t hum2 = (value >> 4) & 0xF;
+        value >>= 8;
+
+        checksum += ((value >> 4) & 0xF) + (value & 0xF);
+        uint8_t temp2 = value & 0xF;
+        uint8_t temp1 = (value >> 4) & 0xF;
+        value >>= 8;
+
+        checksum += ((value >> 4) & 0xF) + (value & 0xF);
+        uint8_t temp3 = (value >> 4) & 0xF;
+        value >>= 8;
+
+        checksum += ((value >> 4) & 0xF) + (value & 0xF);
+        uint8_t address = value & 0xFF;
+        value >>= 8;
+
+        checksum += ((value >> 4) & 0xF) + (value & 0xF);
+        uint8_t channel = (value >> 4) & 0x7;
+
+        checksum += 0x1 + 0xA + 0x2 + 0xD - 0xA;
+
+        //TODO: Find out how checksum2 works
+        if (checksum != checksum1) {
+                return "";
+        }
+
+        double temperature = ((temp1 * 100) + (temp2 * 10) + temp3)/10.0;
+        if (neg) {
+                temperature = -temperature;
+        }
+
+        std::stringstream retString;
+        retString << "class:sensor;protocol:oregon;model:1A2D;id:" << (int)address
+                << ";temp:" << std::fixed << std::setprecision(1) << temperature << ";";
+
+        return retString.str();
 }