Showing the changes to interface/src/SerialInterface.cpp (1 of 2 files). Show all
Unified · Split
| @@ -27,7 +27,7 @@ char serial_buffer[MAX_BUFFER]; · 26 unmodified lines | ||
| 27 | 27 | int serial_buffer_pos = 0; |
| 28 | 28 | |
| 29 | 29 | const int ZERO_OFFSET = 2048; |
| 30 | −const short NO_READ_MAXIMUM = 10; | |
| 30 | +const short NO_READ_MAXIMUM_MSECS = 3000; | |
| 31 | 31 | const short SAMPLES_TO_DISCARD = 100; |
| 32 | 32 | |
| 33 | 33 | void SerialInterface::pair() { |
| @@ -166,14 +166,12 @@ void SerialInterface::readData() { · 132 unmodified lines | ||
| 166 | 166 | |
| 167 | 167 | int initialSamples = totalSamples; |
| 168 | 168 | |
| 169 | − while (read(serial_fd, &bufchar, 1) > 0) | |
| 170 | − { | |
| 169 | + while (read(serial_fd, &bufchar, 1) > 0) { | |
| 171 | 170 | //std::cout << bufchar[0]; |
| 172 | 171 | serial_buffer[serial_buffer_pos] = bufchar[0]; |
| 173 | 172 | serial_buffer_pos++; |
| 174 | 173 | // Have we reached end of a line of input? |
| 175 | − if ((bufchar[0] == '\n') || (serial_buffer_pos >= MAX_BUFFER)) | |
| 176 | − { | |
| 174 | + if ((bufchar[0] == '\n') || (serial_buffer_pos >= MAX_BUFFER)) { | |
| 177 | 175 | std::string serialLine(serial_buffer, serial_buffer_pos-1); |
| 178 | 176 | //std::cout << serialLine << "\n"; |
| 179 | 177 | int spot; |
| @@ -204,26 +202,27 @@ void SerialInterface::readData() { · 24 unmodified lines | ||
| 204 | 202 | } |
| 205 | 203 | } |
| 206 | 204 | |
| 207 | − if (initialSamples == totalSamples) { | |
| 208 | − noReadCount++; | |
| 209 | − std::cout << "#" << noReadCount << " blank read from serial.\n"; | |
| 205 | + if (initialSamples == totalSamples) { | |
| 206 | + timeval now; | |
| 207 | + gettimeofday(&now, NULL); | |
| 210 | 208 | |
| 211 | − if (noReadCount >= NO_READ_MAXIMUM) { | |
| 209 | + if (diffclock(&lastGoodRead, &now) > NO_READ_MAXIMUM_MSECS) { | |
| 210 | + std::cout << "No data coming over serial. Shutting down SerialInterface.\n"; | |
| 212 | 211 | resetSerial(); |
| 213 | 212 | } |
| 213 | + } else { | |
| 214 | + gettimeofday(&lastGoodRead, NULL); | |
| 214 | 215 | } |
| 215 | 216 | } |
| 216 | 217 | |
| 217 | 218 | void SerialInterface::resetSerial() { |
| 218 | − std::cout << "Reached maximum blank read count. Shutting down serial.\n"; | |
| 219 | − | |
| 220 | 219 | active = false; |
| 221 | − noReadCount = 0; | |
| 222 | 220 | totalSamples = 0; |
| 223 | 221 | |
| 222 | + gettimeofday(&lastGoodRead, NULL); | |
| 223 | + | |
| 224 | 224 | // Clear the measured and average channel data |
| 225 | − for (int i = 0; i < NUM_CHANNELS; i++) | |
| 226 | − { | |
| 225 | + for (int i = 0; i < NUM_CHANNELS; i++) { | |
| 227 | 226 | lastMeasured[i] = 0; |
| 228 | 227 | trailingAverage[i] = 0.0; |
| 229 | 228 | } |