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

  *   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 "canmessageexception.h"
 #include "canvariable.h"
 #include <vector>
 CanIdTranslator* CanIdTranslator::myInstance = NULL;
 CanIdTranslator& CanIdTranslator::getInstance()
+{
     if (myInstance == NULL)
     {
         myInstance = new CanIdTranslator();
+    }
     return *myInstance;
+}
     delete myInstance;
     myInstance = NULL;
+}
 CanIdTranslator::CanIdTranslator()
 {
     Logger &log = Logger::getInstance();
     string filename = Settings::get("CanIdXMLFile");
     if (file_exists(filename))
+    }
     else
+    {
         log.add("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();
+}
 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)
+        {
     for (int n = 0; n < commandNodes.size(); n++)
+    {
         map<string, string> attributes = commandNodes[n].getAttributes();
         if (attributes["name"] == commandName)
         {
             XmlNode varablesNode = commandNodes[n].findChild("variables");
             makeDataValid(varablesNode.getChildren(), data);
             return;
+        }
+    }
+}
     map<string, CanVariable> variables;
     return variables;
+}
 map<string, CanVariable> CanIdTranslator::translateNMTData(int commandId, string dataHex)
 {
     vector<XmlNode> commandNodes = xmlNode.findChild("nmt_messages").getChildren();
     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");
             return translateData(varablesNode.getChildren(), dataHex);
         }
     }
     map<string, CanVariable> variables;
     return variables;
+}
 string CanIdTranslator::translateNMTDataToHex(string commandName, map<string, CanVariable> &data)
     return translateValidDataToHex(data);
+}
 string CanIdTranslator::translateValidDataToHex(map<string, CanVariable> &data)
 {
     string bin = "0000000000000000000000000000000000000000000000000000000000000000";
     int highestBit = 0;
     for (map<string, CanVariable>::iterator iter = data.begin(); iter != data.end(); iter++)
+    {
         if (iter->second.getType() == "uint")
         {
             if (iter->second.getStartBit() + iter->second.getBitLength() > highestBit)
                 highestBit = iter->second.getStartBit() + iter->second.getBitLength();
             unsigned int a = stou(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() > highestBit)
                 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() == "enum")
         {
             if (iter->second.getStartBit() + iter->second.getBitLength() > highestBit)
                 highestBit = iter->second.getStartBit() + iter->second.getBitLength();
-            bin.replace(iter->second.getStartBit(), iter->second.getBitLength(), uint2bin(stou(iter->second.getEnumIdValue()), iter->second.getBitLength()));
+            string value = iter->second.getEnumIdValue();
+            if (value == "")
+            {
+                throw new CanMessageException("Got enum that could not be converterd to a value. value = \"" + iter->second.getValue() + "\" enumString is \"" + iter->second.getEnumsString() + "\"\n");
+            }
+            else
+            {
+                bin.replace(iter->second.getStartBit(), iter->second.getBitLength(), uint2bin(stou(value), iter->second.getBitLength()));
+            }
+        }
         else if (iter->second.getType() == "ascii")
+        {
             for (int n = 0; n < iter->second.getValue().length(); n++)
+            {

Subversion Repositories HomeAutomation

(root)/trunk/PcSoftware/Atom/src/CanNet/canidtranslator.cpp – Rev 1046 → 1048