WebSVN – HomeAutomation – Diff – /trunk/PcSoftware/Atom/CanNet/canidtranslator.cpp

 /***************************************************************************
  *   Copyright (C) November 28, 2008 by Mattias Runge                             *
  *   mattias@runge.se                                                      *
  *   canidtranslator.cpp                                            *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "canidtranslator.h"
 CanIdTranslator* CanIdTranslator::myInstance = NULL;
 CanIdTranslator& CanIdTranslator::getInstance()
+{
     if (myInstance == NULL)
+    {
         myInstance = new CanIdTranslator();
+    }
     return *myInstance;
+}
 void CanIdTranslator::deleteInstance()
+{
     delete myInstance;
     myInstance = NULL;
+}
 CanIdTranslator::CanIdTranslator()
+{
     SyslogStream &slog = SyslogStream::getInstance();
     string filename = Settings::get("CanIdXMLFile");
     if (file_exists(filename))
+    {
         xmlNode.load(filename.c_str());
         slog << "Loading definitions from " + filename + ".\n";
+    }
     else
+    {
         slog << "CanIdXMLFile is not defined in the config file, this will probably not work at all.\n";
+    }
+}
 string CanIdTranslator::lookupClassName(int classId)
+{
     XmlNode classesNode = xmlNode.findChild("classes");
     vector<XmlNode> classNodes = classesNode.getChildren();
     for (int n = 0; n < classNodes.size(); n++)
+    {
         map<string, string> attributes = classNodes[n].getAttributes();
         if (stoi(attributes["id"]) == classId)
+        {
             return attributes["name"];
+        }
+    }
     return "";
+}
 int CanIdTranslator::resolveClassId(string className)
+{
     XmlNode classesNode = xmlNode.findChild("classes");
     vector<XmlNode> classNodes = classesNode.getChildren();
     for (int n = 0; n < classNodes.size(); n++)
+    {
         map<string, string> attributes = classNodes[n].getAttributes();
         if (attributes["name"].compare(className) == 0)
+        {
             return stoi(attributes["id"]);
+        }
+    }
     return -1;
+}
 string CanIdTranslator::lookupCommandName(int commandId, string moduleName)
+{
     XmlNode commandsNode = xmlNode.findChild("commands");
     vector<XmlNode> commandNodes = commandsNode.getChildren();
     for (int n = 0; n < commandNodes.size(); n++)
+    {
         map<string, string> attributes = commandNodes[n].getAttributes();
         if (commandId >= 128)
+        {
             if (stoi(attributes["id"]) == commandId && attributes["module"] == moduleName)
+            {
                 return attributes["name"];
+            }
+        }
         else if (stoi(attributes["id"]) == commandId)
+        {
             return attributes["name"];
+        }
+    }
     return "";
+}
 int CanIdTranslator::resolveCommandId(string commandName, string moduleName)
+{
     XmlNode commandsNode = xmlNode.findChild("commands");
     vector<XmlNode> commandNodes = commandsNode.getChildren();
     for (int n = 0; n < commandNodes.size(); n++)
+    {
         map<string, string> attributes = commandNodes[n].getAttributes();
         if (attributes["name"].compare(commandName) == 0)
+        {
             int commandId = stoi(attributes["id"]);
             if (commandId >= 128)
+            {
                 if (attributes["module"] == moduleName)
+                {
                     return commandId;
+                }
+            }
             else
+            {
                 return commandId;
+            }
+        }
+    }
     return -1;
+}
 string CanIdTranslator::lookupNMTCommandName(int commandId)
+{
     XmlNode commandsNode = xmlNode.findChild("nmt_messages");
     vector<XmlNode> commandNodes = commandsNode.getChildren();
     for (int n = 0; n < commandNodes.size(); n++)
+    {
         map<string, string> attributes = commandNodes[n].getAttributes();
         if (stoi(attributes["id"]) == commandId)
+        {
             return attributes["name"];
+        }
+    }
     return "";
+}
 int CanIdTranslator::resolveNMTCommandId(string commandName)
+{
     XmlNode commandsNode = xmlNode.findChild("nmt_messages");
     vector<XmlNode> commandNodes = commandsNode.getChildren();
     for (int n = 0; n < commandNodes.size(); n++)
+    {
         map<string, string> attributes = commandNodes[n].getAttributes();
         if (attributes["name"].compare(commandName) == 0)
+        {
             return stoi(attributes["id"]);
+        }
+    }
     return -1;
+}
 string CanIdTranslator::getDefineId(string name, string group)
+{
     XmlNode definesNode = xmlNode.findChild("defines");
     vector<XmlNode> defineNodes = definesNode.getChildren();
     for (int n = 0; n < defineNodes.size(); n++)
+    {
         map<string, string> attributes = defineNodes[n].getAttributes();
         if (attributes["group"] == group && attributes["name"] == name)
+        {
             return attributes["id"];
+        }
+    }
     return "";
+}
 string CanIdTranslator::lookupDirectionFlag(int directionFlag)
+{
     XmlNode definesNode = xmlNode.findChild("defines");
     vector<XmlNode> defineNodes = definesNode.getChildren();
     for (int n = 0; n < defineNodes.size(); n++)
+    {
         map<string, string> attributes = defineNodes[n].getAttributes();
         if (attributes["group"].compare("DirectionFlag") == 0 && stoi(attributes["id"]) == directionFlag)
+        {
             return attributes["name"];
+        }
+    }
     return "";
+}
 int CanIdTranslator::resolveDirectionFlag(string directionName)
+{
     XmlNode definesNode = xmlNode.findChild("defines");
     vector<XmlNode> defineNodes = definesNode.getChildren();
     for (int n = 0; n < defineNodes.size(); n++)
+    {
         map<string, string> attributes = defineNodes[n].getAttributes();
         if (attributes["group"].compare("DirectionFlag") == 0 && attributes["name"].compare(directionName) == 0)
+        {
             return stoi(attributes["id"]);
+        }
+    }
     return -1;
+}
 string CanIdTranslator::lookupModuleName(int moduleId)
+{
     XmlNode modulesNode = xmlNode.findChild("modules");
     vector<XmlNode> moduleNodes = modulesNode.getChildren();
     for (int n = 0; n < moduleNodes.size(); n++)
+    {
         map<string, string> attributes = moduleNodes[n].getAttributes();
         if (stoi(attributes["id"]) == moduleId)
+        {
             return attributes["name"];
+        }
+    }
     return "";
+}
 int CanIdTranslator::resolveModuleId(string moduleName)
+{
     XmlNode modulesNode = xmlNode.findChild("modules");
     vector<XmlNode> moduleNodes = modulesNode.getChildren();
     for (int n = 0; n < moduleNodes.size(); n++)
+    {
         map<string, string> attributes = moduleNodes[n].getAttributes();
         if (attributes["name"].compare(moduleName) == 0)
+        {
             return stoi(attributes["id"]);
+        }
+    }
     return -1;
+}
-string CanIdTranslator::translateDataToHex(int commandId, string moduleName, map<string, CanVariable> data)
+void CanIdTranslator::makeNMTDataValid(int commandId, map<string, CanVariable> &data)
+{
-    XmlNode commandsNode = xmlNode.findChild("commands");
-    vector<XmlNode> commandNodes = commandsNode.getChildren();
+    vector<XmlNode> commandNodes = xmlNode.findChild("nmt_messages").getChildren();
+    for (int n = 0; n < commandNodes.size(); n++)
+    {
-    map<string, CanVariable> sortedData;
+        map<string, string> attributes = commandNodes[n].getAttributes();
+        if (stoi(attributes["id"]) == commandId)
+        {
+            XmlNode varablesNode = commandNodes[n].findChild("variables");
+            makeDataValid(varablesNode.getChildren(), data);
-    for (int n = 0; n < commandNodes.size(); n++)
-    {
-        map<string, string> attributes = commandNodes[n].getAttributes();
-        bool correct = false;
-        if (commandId >= 128)
-        {
-            if (stoi(attributes["id"]) == commandId && attributes["module"] == moduleName)
-            {
-                correct = true;
-            }
-        }
-        else if (stoi(attributes["id"]) == commandId)
-        {
-            correct = true;
-        }
-        if (correct)
-        {
-            XmlNode varablesNode = commandNodes[n].findChild("variables");
-            vector<XmlNode> variableNodes = varablesNode.getChildren();
-            for (int c = 0; c < variableNodes.size(); c++)
-            {
-                map<string, string> attributes = variableNodes[c].getAttributes();
-                if (data.find(attributes["name"]) != data.end())
-                {
-                    int bitStart = stoi(attributes["start_bit"]);///FIXME: This is not a good way
-                    int bitLength = stoi(attributes["bit_length"]);
-                    sortedData[attributes["name"]].setType(attributes["type"]);
-                    sortedData[attributes["name"]].setUnit(attributes["unit"]);
-                    sortedData[attributes["name"]].setBitLength(bitLength);
-                    sortedData[attributes["name"]].setBitLength(bitLength);
-                    sortedData[attributes["name"]].setStartBit(bitStart);
-                    sortedData[attributes["name"]].setName(attributes["name"]);
-                    sortedData[attributes["name"]].setValue(data[attributes["name"]].getValue());
-                }
-            }
-        }
-    }
-    string bin = "0000000000000000000000000000000000000000000000000000000000000000";
-    int heighestBit = 0;
-    map<string, CanVariable>::iterator iter;
-    for (iter = sortedData.begin(); iter != sortedData.end(); iter++)///FIXME: We should check order and length
-    {
-        if (iter->second.getType() == "uint")
-        {
-            if (iter->second.getStartBit() + iter->second.getBitLength() > heighestBit)
-                heighestBit = iter->second.getStartBit() + iter->second.getBitLength();
-            //cout << iter->first << ":" <<  stoi(iter->second.getValue()) << endl;
-            unsigned int a = stoi(iter->second.getValue());
-            bin.replace(iter->second.getStartBit(), iter->second.getBitLength(), uint2bin(a, iter->second.getBitLength()));
-        }
-        else if (iter->second.getType() == "float")
-        {
-            if (iter->second.getStartBit() + iter->second.getBitLength() > heighestBit)
-                heighestBit = iter->second.getStartBit() + iter->second.getBitLength();
-            bin.replace(iter->second.getStartBit(), iter->second.getBitLength(), float2bin(stof(iter->second.getValue()), iter->second.getBitLength()));
-        }
-        else if (iter->second.getType() == "ascii")
-        {
-            //cout << iter->second.getValue() << endl;
-            for (int n = 0; n < iter->second.getValue().length(); n++)
-            {
-                if (iter->second.getStartBit()+n*8 + 8 > heighestBit)
-                    heighestBit = iter->second.getStartBit()+n*8 + 8;
-                //cout << iter->second.getValue()[n] << ":" << (unsigned int)iter->second.getValue()[n] << endl;
-                bin.replace(iter->second.getStartBit()+n*8, 8, uint2bin((unsigned int)iter->second.getValue()[n], 8));
-            }
-        }
-        else if (iter->second.getType() == "hexstring")
-        {
-            for (int n = 0; n < iter->second.getValue().length(); n++)
-            {
-                if (iter->second.getStartBit()+n*4 + 4 > heighestBit)
-                    heighestBit = iter->second.getStartBit()+n*4 + 4;
-                string character;
-                character += iter->second.getValue()[n];
-                bin.replace(iter->second.getStartBit()+n*4, 4, hex2bin(character));
-            }
-        }
-    }
-    bin = bin.substr(0, heighestBit);
-    //cout << bin2hex(bin) << endl;
-    return bin2hex(bin);
-}
-map<string, CanVariable> CanIdTranslator::translateData(int commandId, string moduleName, string dataHex)
-{
-    map<string, CanVariable> variables;
-    XmlNode commandsNode = xmlNode.findChild("commands");
-    vector<XmlNode> commandNodes = commandsNode.getChildren();
-    string dataBin = hex2bin(dataHex);
-    for (int n = 0; n < commandNodes.size(); n++)
-    {
-        map<string, string> attributes = commandNodes[n].getAttributes();
-        bool correct = false;
-        if (commandId >= 128)
-        {
-            if (stoi(attributes["id"]) == commandId && attributes["module"] == moduleName)
-            {
-                correct = true;
-            }
-        }
-        else if (stoi(attributes["id"]) == commandId)
-        {
-            correct = true;
+            return;
         }
-        if (correct)
-        {
-            XmlNode varablesNode = commandNodes[n].findChild("variables");
-            vector<XmlNode> variableNodes = varablesNode.getChildren();
-            for (int c = 0; c < variableNodes.size(); c++)
-            {
-                map<string, string> attributes = variableNodes[c].getAttributes();
-                int bitStart = stoi(attributes["start_bit"]);
-                int bitLength = stoi(attributes["bit_length"]);
-                string bits = dataBin.substr(bitStart, bitLength);
-                CanVariable variable;
-                variable.setName(attributes["name"]);
-                variable.setType(attributes["type"]);
-                variable.setUnit(attributes["unit"]);
-                variable.setBitLength(bitLength);
-                if (attributes["type"] == "uint")
-                {
-                    variable.setValue(itos(bin2uint(bits)));
-                }
-                else if (attributes["type"] == "float")
-                {
-                    variable.setValue(ftos(bin2float(bits)));
-                }
-                else if (attributes["type"] == "ascii")
-                {
-                    string str;
-                    for (int k = 0; k < bits.length(); k += 8)
-                    {
-                        str += (char)bin2uint(bits.substr(k, 8));
-                    }
-                    variable.setValue(str);
-                }
-                else if (attributes["type"] == "hexstring")
-                {
-                    string str;
-                    for (int k = 0; k < bits.length(); k += 4)
-                    {
-                        str += bin2hex(bits.substr(k, 4));
-                    }
-                    variable.setValue(str);
-                }
-                variables[attributes["name"]] = variable;
-            }
-            return variables;
+    }
+}
-    return variables;
-}
-map<string, CanVariable> CanIdTranslator::translateNMTData(int commandId, string dataHex)
+void CanIdTranslator::makeDataValid(int commandId, string moduleName, map<string, CanVariable> &data)
+{
-    map<string, CanVariable> variables;
-    XmlNode commandsNode = xmlNode.findChild("nmt_messages");
-    vector<XmlNode> commandNodes = commandsNode.getChildren();
+    vector<XmlNode> commandNodes = xmlNode.findChild("commands").getChildren();
-    string dataBin = hex2bin(dataHex);
     for (int n = 0; n < commandNodes.size(); n++)
+    {
         map<string, string> attributes = commandNodes[n].getAttributes();
-        if (stoi(attributes["id"]) == commandId)
+        if ((stoi(attributes["id"]) == commandId) || (commandId >= 128 && (stoi(attributes["id"]) == commandId && attributes["module"] == moduleName)))
         {
             XmlNode varablesNode = commandNodes[n].findChild("variables");
-            vector<XmlNode> variableNodes = varablesNode.getChildren();
+            makeDataValid(varablesNode.getChildren(), data);
-            for (int c = 0; c < variableNodes.size(); c++)
+            return;
-            {
+        }
-                map<string, string> attributes = variableNodes[c].getAttributes();
+    }
-                int bitStart = stoi(attributes["start_bit"]);
-                int bitLength = stoi(attributes["bit_length"]);
+}
-                string bits = dataBin.substr(bitStart, bitLength);
-                CanVariable variable;
+void CanIdTranslator::makeDataValid(vector<XmlNode> variableNodes, map<string, CanVariable> &data)
+{
-                variable.setName(attributes["name"]);
+    ///FIXME: Remove variables that do not exist in the xmlfile
-                variable.setType(attributes["type"]);
+    for (int c = 0; c < variableNodes.size(); c++)
+    {
-                variable.setUnit(attributes["unit"]);
+        map<string, string> attributes = variableNodes[c].getAttributes();
-                variable.setBitLength(bitLength);
-                if (attributes["type"] == "uint")
+        if (data.find(attributes["name"]) != data.end())
-                {
+        {
-                    variable.setValue(itos(bin2uint(bits)));
+            data[attributes["name"]].setType(attributes["type"]);
-                }
-                else if (attributes["type"] == "float")
+            data[attributes["name"]].setUnit(attributes["unit"]);
-                {
+            data[attributes["name"]].setBitLength(stoi(attributes["bit_length"]));
-                    variable.setValue(ftos(bin2float(bits)));
+            data[attributes["name"]].setStartBit(stoi(attributes["start_bit"]));
-                }
+        }
-                else if (attributes["type"] == "ascii")
-                {
+    }
-                    string str;
+}
-                    for (int k = 0; k < bits.length(); k += 8)
+string CanIdTranslator::translateDataToHex(int commandId, string moduleName, map<string, CanVariable> &data)
-                    {
+{
-                        str += (char)bin2uint(bits.substr(k, 8));
+    makeDataValid(commandId, moduleName, data);
-                    }
-                    variable.setValue(str);
+    return translateValidDataToHex(data);
-                }
+}
-                else if (attributes["type"] == "hexstring")
+map<string, CanVariable> CanIdTranslator::translateData(int commandId, string moduleName, string dataHex)
-                {
+{
-                    string str;
+    vector<XmlNode> commandNodes = xmlNode.findChild("commands").getChildren();
-                    for (int k = 0; k < bits.length(); k += 4)
+    for (int n = 0; n < commandNodes.size(); n++)
-                    {
+    {
-                        str += bin2hex(bits.substr(k, 4));
+        map<string, string> attributes = commandNodes[n].getAttributes();
-                    }
-                    variable.setValue(str);
+        if ((stoi(attributes["id"]) == commandId) || (commandId >= 128 && (stoi(attributes["id"]) == commandId && attributes["module"] == moduleName)))
-                }
+        {
+            XmlNode varablesNode = commandNodes[n].findChild("variables");
-                variables[attributes["name"]] = variable;
+            return translateData(varablesNode.getChildren(), dataHex);
-            }
+        }
+    }
+    map<string, CanVariable> variables;
-            return variables;
+    return variables;
+}
-    }
-    //return dataString + " ]";
-    return variables;
-}
-string CanIdTranslator::translateNMTDataToHex(int commandId, map<string, CanVariable> data)
+map<string, CanVariable> CanIdTranslator::translateNMTData(int commandId, string dataHex)
+{
-    XmlNode commandsNode = xmlNode.findChild("nmt_messages");
+    vector<XmlNode> commandNodes = xmlNode.findChild("nmt_messages").getChildren();
-    vector<XmlNode> commandNodes = commandsNode.getChildren();
-    map<string, CanVariable> sortedData;
     for (int n = 0; n < commandNodes.size(); n++)
+    {
         map<string, string> attributes = commandNodes[n].getAttributes();
         if (stoi(attributes["id"]) == commandId)
+        {
             XmlNode varablesNode = commandNodes[n].findChild("variables");
-            vector<XmlNode> variableNodes = varablesNode.getChildren();
+            return translateData(varablesNode.getChildren(), dataHex);
-            for (int c = 0; c < variableNodes.size(); c++)
-            {
-                map<string, string> attributes = variableNodes[c].getAttributes();
-                if (data.find(attributes["name"]) != data.end())
-                {
-                    int bitStart = stoi(attributes["start_bit"]);///FIXME: This is not a good way
-                    int bitLength = stoi(attributes["bit_length"]);
-                    sortedData[attributes["name"]].setType(attributes["type"]);
-                    sortedData[attributes["name"]].setUnit(attributes["unit"]);
-                    sortedData[attributes["name"]].setBitLength(bitLength);
-                    sortedData[attributes["name"]].setBitLength(bitLength);
-                    sortedData[attributes["name"]].setStartBit(bitStart);
-                    sortedData[attributes["name"]].setName(attributes["name"]);
-                    sortedData[attributes["name"]].setValue(data[attributes["name"]].getValue());
-                }
+        }
+    }
+    map<string, CanVariable> variables;
+    return variables;
+}
+string CanIdTranslator::translateNMTDataToHex(int commandId, map<string, CanVariable> &data)
+{
+    makeNMTDataValid(commandId, data);
+    return translateValidDataToHex(data);
+}
+string CanIdTranslator::translateValidDataToHex(map<string, CanVariable> &data)
+{
     string bin = "0000000000000000000000000000000000000000000000000000000000000000";
-    int heighestBit = 0;
+    int highestBit = 0;
-    map<string, CanVariable>::iterator iter;
-    for (iter = sortedData.begin(); iter != sortedData.end(); iter++)///FIXME: We should check order and length
+    for (map<string, CanVariable>::iterator iter = data.begin(); iter != data.end(); iter++)
+    {
         if (iter->second.getType() == "uint")
+        {
-            if (iter->second.getStartBit() + iter->second.getBitLength() > heighestBit)
+            if (iter->second.getStartBit() + iter->second.getBitLength() > highestBit)
-                heighestBit = iter->second.getStartBit() + iter->second.getBitLength();
+                highestBit = iter->second.getStartBit() + iter->second.getBitLength();
-            //cout << iter->first << ":" <<  stoi(iter->second.getValue()) << endl;
             unsigned int a = stoi(iter->second.getValue());
             bin.replace(iter->second.getStartBit(), iter->second.getBitLength(), uint2bin(a, iter->second.getBitLength()));
+        }
         else if (iter->second.getType() == "float")
+        {
-            if (iter->second.getStartBit() + iter->second.getBitLength() > heighestBit)
+            if (iter->second.getStartBit() + iter->second.getBitLength() > highestBit)
-                heighestBit = iter->second.getStartBit() + iter->second.getBitLength();
+                highestBit = iter->second.getStartBit() + iter->second.getBitLength();
             bin.replace(iter->second.getStartBit(), iter->second.getBitLength(), float2bin(stof(iter->second.getValue()), iter->second.getBitLength()));
+        }
         else if (iter->second.getType() == "ascii")
+        {
-            //cout << iter->second.getValue() << endl;
             for (int n = 0; n < iter->second.getValue().length(); n++)
+            {
-                if (iter->second.getStartBit()+n*8 + 8 > heighestBit)
+                if (iter->second.getStartBit()+n*8 + 8 > highestBit)
-                    heighestBit = iter->second.getStartBit()+n*8 + 8;
+                    highestBit = iter->second.getStartBit()+n*8 + 8;
-                //cout << iter->second.getValue()[n] << ":" << (unsigned int)iter->second.getValue()[n] << endl;
                 bin.replace(iter->second.getStartBit()+n*8, 8, uint2bin((unsigned int)iter->second.getValue()[n], 8));
+            }
+        }
         else if (iter->second.getType() == "hexstring")
+        {
             for (int n = 0; n < iter->second.getValue().length(); n++)
+            {
-                if (iter->second.getStartBit()+n*4 + 4 > heighestBit)
+                if (iter->second.getStartBit()+n*4 + 4 > highestBit)
-                    heighestBit = iter->second.getStartBit()+n*4 + 4;
+                    highestBit = iter->second.getStartBit()+n*4 + 4;
                 string character;
                 character += iter->second.getValue()[n];
                 bin.replace(iter->second.getStartBit()+n*4, 4, hex2bin(character));
+            }
+        }
+    }
-    bin = bin.substr(0, heighestBit);
+    bin = bin.substr(0, highestBit);
+    return bin2hex(bin);
+}
+map<string, CanVariable> CanIdTranslator::translateData(vector<XmlNode> variableNodes, string dataHex)
+{
+    map<string, CanVariable> variables;
+    string dataBin = hex2bin(dataHex);
+    for (int c = 0; c < variableNodes.size(); c++)
+    {
+        map<string, string> attributes = variableNodes[c].getAttributes();
+        int bitStart = stoi(attributes["start_bit"]);
+        int bitLength = stoi(attributes["bit_length"]);
+        string bits = dataBin.substr(bitStart, bitLength);
+        CanVariable variable;
+        variable.setName(attributes["name"]);
+        variable.setType(attributes["type"]);
+        variable.setUnit(attributes["unit"]);
-    //cout << bin2hex(bin) << endl;
+        variable.setStartBit(bitStart);
+        variable.setBitLength(bitLength);
+        if (attributes["type"] == "uint")
+        {
+            variable.setValue(itos(bin2uint(bits)));
+        }
+        else if (attributes["type"] == "float")
+        {
+            variable.setValue(ftos(bin2float(bits)));
+        }
+        else if (attributes["type"] == "ascii")
+        {
-    return bin2hex(bin);
+            string str;
+            for (int k = 0; k < bits.length(); k += 8)
+            {
+                str += (char)bin2uint(bits.substr(k, 8));
+            }
+            variable.setValue(str);
+        }
+        else if (attributes["type"] == "hexstring")
+        {
+            string str;
+            for (int k = 0; k < bits.length(); k += 4)
+            {
+                str += bin2hex(bits.substr(k, 4));
+            }
+            variable.setValue(str);
+        }
+        variables[attributes["name"]] = variable;
+    }
+    return variables;
+}

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/CanNet/canidtranslator.cpp @ 991 – Rev 986 → 991