diff --git a/ground/src/plugins/uavobjects/uavobject.cpp b/ground/src/plugins/uavobjects/uavobject.cpp index 292f6126f..4c7618b38 100644 --- a/ground/src/plugins/uavobjects/uavobject.cpp +++ b/ground/src/plugins/uavobjects/uavobject.cpp @@ -240,6 +240,7 @@ qint32 UAVObject::unpack(const quint8* dataIn) } emit objectUnpacked(this); // trigger object updated event emit objectUpdated(this); + return numBytes; } @@ -285,7 +286,7 @@ bool UAVObject::save(QFile& file) quint8 tmpId[4]; // Write the object ID - qToBigEndian(objID, tmpId); + qToLittleEndian(objID, tmpId); if ( file.write((const char*)tmpId, 4) == -1 ) { return false; @@ -294,7 +295,7 @@ bool UAVObject::save(QFile& file) // Write the instance ID if (!isSingleInst) { - qToBigEndian(instID, tmpId); + qToLittleEndian(instID, tmpId); if ( file.write((const char*)tmpId, 2) == -1 ) { return false; @@ -360,7 +361,7 @@ bool UAVObject::load(QFile& file) } // Check that the IDs match - if (qFromBigEndian(tmpId) != objID) + if (qFromLittleEndian(tmpId) != objID) { return false; } @@ -372,7 +373,7 @@ bool UAVObject::load(QFile& file) } // Check that the IDs match - if (qFromBigEndian(tmpId) != instID) + if (qFromLittleEndian(tmpId) != instID) { return false; } diff --git a/ground/src/plugins/uavobjects/uavobjectfieldfloat.cpp b/ground/src/plugins/uavobjects/uavobjectfieldfloat.cpp index aaf90d0c0..22d7f78e8 100644 --- a/ground/src/plugins/uavobjects/uavobjectfieldfloat.cpp +++ b/ground/src/plugins/uavobjects/uavobjectfieldfloat.cpp @@ -58,7 +58,7 @@ qint32 UAVObjectFieldFloat::pack(quint8* dataOut) { quint32 value; memcpy(&value, &data[offset + numBytesPerElement*index], numBytesPerElement); - qToBigEndian(value, &dataOut[numBytesPerElement*index]); + qToLittleEndian(value, &dataOut[numBytesPerElement*index]); } // Done return getNumBytes(); @@ -74,7 +74,7 @@ qint32 UAVObjectFieldFloat::unpack(const quint8* dataIn) for (quint32 index = 0; index < numElements; ++index) { quint32 value; - value = qFromBigEndian(&dataIn[numBytesPerElement*index]); + value = qFromLittleEndian(&dataIn[numBytesPerElement*index]); memcpy(&data[offset + numBytesPerElement*index], &value, numBytesPerElement); } // Done diff --git a/ground/src/plugins/uavobjects/uavobjectfieldint16.cpp b/ground/src/plugins/uavobjects/uavobjectfieldint16.cpp index bf4f5fc94..146023c97 100644 --- a/ground/src/plugins/uavobjects/uavobjectfieldint16.cpp +++ b/ground/src/plugins/uavobjects/uavobjectfieldint16.cpp @@ -58,7 +58,7 @@ qint32 UAVObjectFieldInt16::pack(quint8* dataOut) { qint16 value; memcpy(&value, &data[offset + numBytesPerElement*index], numBytesPerElement); - qToBigEndian(value, &dataOut[numBytesPerElement*index]); + qToLittleEndian(value, &dataOut[numBytesPerElement*index]); } // Done return getNumBytes(); @@ -74,7 +74,7 @@ qint32 UAVObjectFieldInt16::unpack(const quint8* dataIn) for (quint32 index = 0; index < numElements; ++index) { qint16 value; - value = qFromBigEndian(&dataIn[numBytesPerElement*index]); + value = qFromLittleEndian(&dataIn[numBytesPerElement*index]); memcpy(&data[offset + numBytesPerElement*index], &value, numBytesPerElement); } // Done diff --git a/ground/src/plugins/uavobjects/uavobjectfieldint32.cpp b/ground/src/plugins/uavobjects/uavobjectfieldint32.cpp index 89940b52f..d604b8d46 100644 --- a/ground/src/plugins/uavobjects/uavobjectfieldint32.cpp +++ b/ground/src/plugins/uavobjects/uavobjectfieldint32.cpp @@ -58,7 +58,7 @@ qint32 UAVObjectFieldInt32::pack(quint8* dataOut) { qint32 value; memcpy(&value, &data[offset + numBytesPerElement*index], numBytesPerElement); - qToBigEndian(value, &dataOut[numBytesPerElement*index]); + qToLittleEndian(value, &dataOut[numBytesPerElement*index]); } // Done return getNumBytes(); @@ -74,7 +74,7 @@ qint32 UAVObjectFieldInt32::unpack(const quint8* dataIn) for (quint32 index = 0; index < numElements; ++index) { qint32 value; - value = qFromBigEndian(&dataIn[numBytesPerElement*index]); + value = qFromLittleEndian(&dataIn[numBytesPerElement*index]); memcpy(&data[offset + numBytesPerElement*index], &value, numBytesPerElement); } // Done diff --git a/ground/src/plugins/uavobjects/uavobjectfielduint16.cpp b/ground/src/plugins/uavobjects/uavobjectfielduint16.cpp index 7e55d6bc8..5dd795b9d 100644 --- a/ground/src/plugins/uavobjects/uavobjectfielduint16.cpp +++ b/ground/src/plugins/uavobjects/uavobjectfielduint16.cpp @@ -58,7 +58,7 @@ qint32 UAVObjectFieldUInt16::pack(quint8* dataOut) { quint16 value; memcpy(&value, &data[offset + numBytesPerElement*index], numBytesPerElement); - qToBigEndian(value, &dataOut[numBytesPerElement*index]); + qToLittleEndian(value, &dataOut[numBytesPerElement*index]); } // Done return getNumBytes(); @@ -74,7 +74,7 @@ qint32 UAVObjectFieldUInt16::unpack(const quint8* dataIn) for (quint32 index = 0; index < numElements; ++index) { quint16 value; - value = qFromBigEndian(&dataIn[numBytesPerElement*index]); + value = qFromLittleEndian(&dataIn[numBytesPerElement*index]); memcpy(&data[offset + numBytesPerElement*index], &value, numBytesPerElement); } // Done diff --git a/ground/src/plugins/uavobjects/uavobjectfielduint32.cpp b/ground/src/plugins/uavobjects/uavobjectfielduint32.cpp index 64a92a053..77cc47018 100644 --- a/ground/src/plugins/uavobjects/uavobjectfielduint32.cpp +++ b/ground/src/plugins/uavobjects/uavobjectfielduint32.cpp @@ -58,7 +58,7 @@ qint32 UAVObjectFieldUInt32::pack(quint8* dataOut) { quint32 value; memcpy(&value, &data[offset + numBytesPerElement*index], numBytesPerElement); - qToBigEndian(value, &dataOut[numBytesPerElement*index]); + qToLittleEndian(value, &dataOut[numBytesPerElement*index]); } // Done return getNumBytes(); @@ -74,7 +74,7 @@ qint32 UAVObjectFieldUInt32::unpack(const quint8* dataIn) for (quint32 index = 0; index < numElements; ++index) { quint32 value; - value = qFromBigEndian(&dataIn[numBytesPerElement*index]); + value = qFromLittleEndian(&dataIn[numBytesPerElement*index]); memcpy(&data[offset + numBytesPerElement*index], &value, numBytesPerElement); } // Done diff --git a/ground/src/plugins/uavtalk/uavtalk.cpp b/ground/src/plugins/uavtalk/uavtalk.cpp index 1a8445e80..b529d1c0a 100644 --- a/ground/src/plugins/uavtalk/uavtalk.cpp +++ b/ground/src/plugins/uavtalk/uavtalk.cpp @@ -156,7 +156,7 @@ bool UAVTalk::processInputByte(quint8 rxbyte) if (rxCount == 4) { // Search for object, if not found reset state machine - rxObjId = (qint32)qFromBigEndian(rxTmpBuffer); + rxObjId = (qint32)qFromLittleEndian(rxTmpBuffer); UAVObject* rxObj = objMngr->getObject(rxObjId); if (rxObj == NULL) { @@ -210,7 +210,7 @@ bool UAVTalk::processInputByte(quint8 rxbyte) rxTmpBuffer[rxCount++] = rxbyte; if (rxCount == 2) { - rxInstId = (qint16)qFromBigEndian(rxTmpBuffer); + rxInstId = (qint16)qFromLittleEndian(rxTmpBuffer); rxCS = updateChecksum(rxCS, rxTmpBuffer, 2); rxCount = 0; // If there is a payload get it, otherwise receive checksum @@ -237,7 +237,7 @@ bool UAVTalk::processInputByte(quint8 rxbyte) rxTmpBuffer[rxCount++] = rxbyte; if (rxCount == 2) { - rxCSPacket = (qint16)qFromBigEndian(rxTmpBuffer); + rxCSPacket = (qint16)qFromLittleEndian(rxTmpBuffer); if (rxCS == rxCSPacket) { mutex->lock(); @@ -486,7 +486,7 @@ bool UAVTalk::transmitSingleObject(UAVObject* obj, quint8 type, bool allInstance // Setup type and object id fields objId = obj->getObjID(); txBuffer[0] = type; - qToBigEndian(objId, &txBuffer[1]); + qToLittleEndian(objId, &txBuffer[1]); // Setup instance ID if one is required if ( obj->isSingleInstance() ) @@ -498,12 +498,12 @@ bool UAVTalk::transmitSingleObject(UAVObject* obj, quint8 type, bool allInstance // Check if all instances are requested if (allInstances) { - qToBigEndian(allInstId, &txBuffer[5]); + qToLittleEndian(allInstId, &txBuffer[5]); } else { instId = obj->getInstID(); - qToBigEndian(instId, &txBuffer[5]); + qToLittleEndian(instId, &txBuffer[5]); } dataOffset = 7; } @@ -536,7 +536,7 @@ bool UAVTalk::transmitSingleObject(UAVObject* obj, quint8 type, bool allInstance // Calculate checksum cs = 0; cs = updateChecksum(cs, txBuffer, dataOffset+length); - qToBigEndian(cs, &txBuffer[dataOffset+length]); + qToLittleEndian(cs, &txBuffer[dataOffset+length]); // Send buffer io->write((const char*)txBuffer, dataOffset+length+CHECKSUM_LENGTH);