Rev 985 | Rev 991 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 985 | Rev 986 | ||
|---|---|---|---|
| Line 134... | Line 134... | ||
| 134 | } |
134 | } |
| 135 | } |
135 | } |
| 136 | 136 | ||
| 137 | void CanDebug::sendCanMessage(CanMessage canMessage) |
137 | void CanDebug::sendCanMessage(CanMessage canMessage) |
| 138 | { |
138 | { |
| 139 | if ( |
139 | if (myClientSockets.size() > 0) |
| 140 | { |
140 | { |
| 141 | string debugData = ""; |
141 | string debugData = ""; |
| 142 | 142 | ||
| - | 143 | if (canMessage.getClassName() == "nmt") |
|
| - | 144 | { |
|
| - | 145 | debugData += "NMT"; |
|
| - | 146 | } |
|
| - | 147 | else |
|
| - | 148 | { |
|
| 143 | if (canMessage.getDirectionFlag() == "To_Owner") |
149 | if (canMessage.getDirectionFlag() == "To_Owner") |
| 144 | { |
150 | { |
| 145 | debugData += "RX"; |
151 | debugData += "RX"; |
| 146 | } |
152 | } |
| 147 | else if (canMessage.getDirectionFlag() == "From_Owner") |
153 | else if (canMessage.getDirectionFlag() == "From_Owner") |
| 148 | { |
154 | { |
| 149 | debugData += "TX"; |
155 | debugData += "TX"; |
| 150 | } |
156 | } |
| 151 | else |
157 | else |
| 152 | { |
158 | { |
| 153 | debugData += "??"; |
159 | debugData += "??"; |
| 154 | } |
160 | } |
| 155 | 161 | ||
| 156 | debugData += " " + canMessage.getClassName(); |
162 | debugData += " " + canMessage.getClassName(); |
| 157 | debugData += "_" + canMessage.getModuleName(); |
163 | debugData += "_" + canMessage.getModuleName(); |
| 158 | debugData += ":" + itos(canMessage.getModuleId()); |
164 | debugData += ":" + itos(canMessage.getModuleId()); |
| - | 165 | } |
|
| - | 166 | ||
| 159 | debugData += " CMD=" + canMessage.getCommandName() + " "; |
167 | debugData += " CMD=" + canMessage.getCommandName() + " "; |
| 160 | 168 | ||
| 161 | map<string, CanVariable> vars = canMessage.getData(); |
169 | map<string, CanVariable> vars = canMessage.getData(); |
| 162 | 170 | ||
| 163 | map<string, CanVariable>::iterator iter; |
171 | map<string, CanVariable>::iterator iter; |