New version number, synched to upgraded GVRET version. Some fixes to make file comparator window work better. Add ability to enter single wire mode from SavvyCAN. Add continuous comm validation to SavvyCAN. It will now continuously make sure the connection seems to be viable and try to reconnect if things went south.

This commit is contained in:
Collin Kidder
2015-07-28 21:29:31 -04:00
parent b8bd058f40
commit fc470ade58
7 changed files with 89 additions and 11 deletions
+7 -1
View File
@@ -20,7 +20,8 @@ enum STATE //keep this enum synchronized with the Arduino firmware project
SET_DIG_OUTPUTS,
SETUP_CANBUS,
GET_CANBUS_PARAMS,
GET_DEVICE_INFO
GET_DEVICE_INFO,
SET_SINGLEWIRE_MODE
};
class SerialWorker : public QObject
@@ -43,6 +44,7 @@ private slots: //we receive things in slots
void readSerialData();
void connectionTimeout();
void handleTick();
void handleReconnect();
public slots:
void setSerialPort(QSerialPortInfo*);
@@ -58,7 +60,10 @@ private:
bool connected;
bool capturing;
bool doValidation;
bool gotValidated;
bool isAutoRestart;
QSerialPort *serial;
QSerialPortInfo *currentPort;
CANFrameModel *canModel;
QTimer *ticker;
QTime *elapsedTime;
@@ -73,6 +78,7 @@ private:
int deviceSingleWireMode;
void procRXChar(unsigned char);
void sendCommValidation();
};
#endif // SERIALTHREAD_H