Rev 976 | Rev 983 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed
| Rev 976 | Rev 981 | ||
|---|---|---|---|
| Line 57... | Line 57... | ||
| 57 | 57 | ||
| 58 | void CanNetManager::openChannel() |
58 | void CanNetManager::openChannel() |
| 59 | { |
59 | { |
| 60 | SyslogStream &slog = SyslogStream::getInstance(); |
60 | SyslogStream &slog = SyslogStream::getInstance(); |
| 61 | VirtualMachine &vm = VirtualMachine::getInstance(); |
61 | VirtualMachine &vm = VirtualMachine::getInstance(); |
| - | 62 | CanDebug &canDebug = CanDebug::getInstance(); |
|
| 62 | 63 | ||
| 63 | string address = Settings::get("CanNetAddress"); |
64 | string address = Settings::get("CanNetAddress"); |
| 64 | string port = Settings::get("CanNetPort"); |
65 | string port = Settings::get("CanNetPort"); |
| 65 | 66 | ||
| 66 | myChannel->setAddress(address, stoi(port)); |
67 | myChannel->setAddress(address, stoi(port)); |
| Line 92... | Line 93... | ||
| 92 | ///FIXME: Verify that \n is right here, have seen that it does not always work |
93 | ///FIXME: Verify that \n is right here, have seen that it does not always work |
| 93 | vector<string> dataLines = explode("\n", data); |
94 | vector<string> dataLines = explode("\n", data); |
| 94 | 95 | ||
| 95 | for (int n = 0; n < dataLines.size(); n++) |
96 | for (int n = 0; n < dataLines.size(); n++) |
| 96 | { |
97 | { |
| 97 | data = trim( |
98 | data = trim(dataLines[n], '\n'); |
| 98 | 99 | ||
| 99 | if (data == "PONG") |
100 | if (data == "PONG") |
| 100 | { |
101 | { |
| 101 | slog << "Received pong.\n"; |
102 | slog << "Received pong.\n"; |
| 102 | continue; |
103 | continue; |
| Line 108... | Line 109... | ||
| 108 | //slog << "Received: " << data; |
109 | //slog << "Received: " << data; |
| 109 | 110 | ||
| 110 | if (!canMessage.isUnknown()) |
111 | if (!canMessage.isUnknown()) |
| 111 | { |
112 | { |
| 112 | vm.queueCanMessage(canMessage); |
113 | vm.queueCanMessage(canMessage); |
| - | 114 | canDebug.sendCanMessage(canMessage); |
|
| - | 115 | } |
|
| - | 116 | else |
|
| - | 117 | { |
|
| - | 118 | canDebug.sendData(data + "\n"); |
|
| 113 | } |
119 | } |
| 114 | /*else |
120 | /*else |
| 115 | { |
121 | { |
| 116 | slog << "Received unknown message. Skipping...\n"; |
122 | slog << "Received unknown message. Skipping...\n"; |
| 117 | }*/ |
123 | }*/ |
| Line 156... | Line 162... | ||
| 156 | myChannel->stopEvent(); |
162 | myChannel->stopEvent(); |
| 157 | } |
163 | } |
| 158 | 164 | ||
| 159 | void CanNetManager::sendMessage(CanMessage canMessage) |
165 | void CanNetManager::sendMessage(CanMessage canMessage) |
| 160 | { |
166 | { |
| - | 167 | CanDebug &canDebug = CanDebug::getInstance(); |
|
| - | 168 | canDebug.sendCanMessage(canMessage); |
|
| 161 | myChannel->sendData(canMessage.getRaw()); |
169 | myChannel->sendData(canMessage.getRaw()); |
| 162 | } |
170 | } |
| 163 | 171 | ||