Fixes to hidden firmware updater window

This commit is contained in:
Collin Kidder
2021-02-01 22:13:48 -05:00
parent 3d4cf98e3d
commit 9a492228fd
2 changed files with 12 additions and 13 deletions
+12 -10
View File
@@ -149,7 +149,7 @@ void FirmwareUploaderWindow::sendFirmwareChunk()
for (int i = 0; i < 6; i++) xorByte = xorByte ^ static_cast<unsigned char>(output->payload()[i]); for (int i = 0; i < 6; i++) xorByte = xorByte ^ static_cast<unsigned char>(output->payload()[i]);
output->payload()[6] = xorByte; output->payload()[6] = xorByte;
output->setPayload(bytes); output->setPayload(bytes);
sendCANFrame(output); CANConManager::getInstance()->sendFrame(*output);
timer->start(); timer->start();
} }
@@ -187,16 +187,18 @@ void FirmwareUploaderWindow::handleStartStopTransfer()
QByteArray bytes(8,0); QByteArray bytes(8,0);
output->bus = bus; output->bus = bus;
output->setFrameId(baseAddress); output->setFrameId(baseAddress);
output->setFrameType(QCanBusFrame::DataFrame);
output->payload()[0] = 0xEF; bytes[0] = 0xEF;
output->payload()[1] = 0xBE; bytes[1] = 0xBE;
output->payload()[2] = 0xAD; bytes[2] = 0xAD;
output->payload()[3] = 0xDE; bytes[3] = 0xDE;
output->payload()[4] = token & 0xFF; bytes[4] = token & 0xFF;
output->payload()[5] = (token >> 8) & 0xFF; bytes[5] = (token >> 8) & 0xFF;
output->payload()[6] = (token >> 16) & 0xFF; bytes[6] = (token >> 16) & 0xFF;
output->payload()[7] = (token >> 24) & 0xFF; bytes[7] = (token >> 24) & 0xFF;
sendCANFrame(output); output->setPayload(bytes);
CANConManager::getInstance()->sendFrame(*output);
} }
else //stop anything in process else //stop anything in process
{ {
-3
View File
@@ -19,9 +19,6 @@ public:
explicit FirmwareUploaderWindow(const QVector<CANFrame> *frames, QWidget *parent = 0); explicit FirmwareUploaderWindow(const QVector<CANFrame> *frames, QWidget *parent = 0);
~FirmwareUploaderWindow(); ~FirmwareUploaderWindow();
signals:
void sendCANFrame(const CANFrame *);
public slots: public slots:
void gotTargettedFrame(CANFrame frame); void gotTargettedFrame(CANFrame frame);