Many little changes to get rid of compile-time warnings.

There now should be no warnings when compiling on LINUX. YMMV elsewhere.
This commit is contained in:
Collin Kidder
2020-02-15 19:52:18 -05:00
parent d550fa79a0
commit e4a3854af4
21 changed files with 89 additions and 93 deletions
+2 -1
View File
@@ -9,7 +9,8 @@ public:
CANBus();
CANBus(const CANBus&);
bool operator==(const CANBus&) const;
virtual ~CANBus(){};
CANBus& operator=(const CANBus& other) = default;
//virtual ~CANBus(){}
int speed;
bool listenOnly;
+1 -1
View File
@@ -214,7 +214,7 @@ bool CANConManager::sendFrame(const CANFrame& pFrame)
foreach (CANConnection* conn, mConns)
{
//check if this CAN connection is supposed to handle the requested bus
if (pFrame.bus < (uint32_t)(busBase + conn->getNumBuses()))
if (pFrame.bus < (busBase + conn->getNumBuses()))
{
workingFrame.bus -= busBase;
workingFrame.isReceived = false;
+1 -1
View File
@@ -8,8 +8,8 @@ CANConnection::CANConnection(QString pPort,
int pNumBuses,
int pQueueLen,
bool pUseThread) :
mQueue(),
mNumBuses(pNumBuses),
mQueue(),
mPort(pPort),
mDriver(pDriver),
mType(pType),
+3 -3
View File
@@ -9,9 +9,9 @@
#include "gvretserial.h"
GVRetSerial::GVRetSerial(QString portName, bool useTcp) :
CANConnection(portName, "gvret", CANCon::GVRET_SERIAL, 3, 4000, true),
useTcp(useTcp),
mTimer(this) /*NB: set this as parent of timer to manage it from working thread */
CANConnection(portName, "gvret", CANCon::GVRET_SERIAL, 3, 4000, true),
mTimer(this), /*NB: set this as parent of timer to manage it from working thread */
useTcp(useTcp)
{
sendDebug("GVRetSerial()");
+1 -1
View File
@@ -91,7 +91,7 @@ protected:
QUdpSocket *udpClient;
int framesRapid;
STATE rx_state;
uint32_t rx_step;
int rx_step;
CANFrame buildFrame;
qint64 buildTimestamp;
quint32 buildId;