Subversion Repositories HomeAutomation

Rev

Rev 986 | Rev 997 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 986 Rev 991
Line 146... Line 146...
146 
    }
 146 
    }
147 
 
 147 
 
148 
    rawHex += "\n";
 148 
    rawHex += "\n";
149 
 
 149 
 
150 
    return rawHex;
 150 
    return rawHex;
- 
 
 151 
}
- 
 
 152 
 
- 
 
 153 
void CanMessage::setData(map<string, CanVariable> data)
- 
 
 154 
{
- 
 
 155 
    myData = data;
- 
 
 156 
 
- 
 
 157 
    CanIdTranslator &translator = CanIdTranslator::getInstance();
- 
 
 158 
 
- 
 
 159 
    int commandNameId = translator.resolveNMTCommandId(myCommandName);
- 
 
 160 
 
- 
 
 161 
    if (myClassName == "nmt")
- 
 
 162 
    {
- 
 
 163 
        translator.makeNMTDataValid(commandNameId, data);
- 
 
 164 
    }
- 
 
 165 
    else
- 
 
 166 
    {
- 
 
 167 
        translator.makeDataValid(commandNameId, myModuleName, data);
- 
 
 168 
    }
151 
}
 169 
}
152 
 
 170 
 
153 
string CanMessage::getJSONData()
 171 
string CanMessage::getJSONData()
154 
{
 172 
{
155 
    string json = "{";
 173 
    string json = "{";