Changed a lot of pointer references to const (it's more correct and
fixes a weird problem), fixed a problem with JSON to DBC, a few other fixes
This commit is contained in:
@@ -77,6 +77,12 @@ public:
|
||||
*/
|
||||
CANCon::status getStatus();
|
||||
|
||||
/**
|
||||
* @brief setConsoleOutput
|
||||
* @param state - set whether to send debugging info to the console or not
|
||||
*/
|
||||
void setConsoleOutput(bool state);
|
||||
|
||||
|
||||
signals:
|
||||
/*not implemented yet */
|
||||
@@ -194,6 +200,7 @@ public slots:
|
||||
protected:
|
||||
int mNumBuses; //protected to allow connected device to figure out how many buses are available
|
||||
QVector<BusData> mBusData;
|
||||
bool mConsoleOutput; //send debugging info to the console?
|
||||
|
||||
//determine if the passed frame is part of a filter or not.
|
||||
void checkTargettedFrame(CANFrame &frame);
|
||||
|
||||
@@ -119,6 +119,8 @@ bool SerialBusConnection::piSendFrame(const CANFrame& pFrame)
|
||||
return false;
|
||||
if (!mDev_p) return false;
|
||||
|
||||
qDebug() << "Data bytes at lowlevel: " << pFrame.payload().toBase64();
|
||||
|
||||
return mDev_p->writeFrame(pFrame);
|
||||
}
|
||||
|
||||
@@ -179,7 +181,7 @@ void SerialBusConnection::framesReceived()
|
||||
continue;
|
||||
|
||||
/* check frame */
|
||||
if (recFrame.payload().length() <= 8) {
|
||||
//if (recFrame.payload().length() <= 8) {
|
||||
CANFrame* frame_p = getQueue().get();
|
||||
if(frame_p) {
|
||||
frame_p->setPayload(recFrame.payload());
|
||||
@@ -241,7 +243,7 @@ void SerialBusConnection::framesReceived()
|
||||
|
||||
/* enqueue frame */
|
||||
getQueue().queue();
|
||||
}
|
||||
//}
|
||||
#if 0
|
||||
else
|
||||
qDebug() << "can't get a frame, ERROR";
|
||||
|
||||
Reference in New Issue
Block a user