summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrii Pientsov <andrii.pientsov@globallogic.com>2020-07-13 11:42:31 +0300
committerAndrii Pientsov <andrii.pientsov@globallogic.com>2020-07-13 11:42:31 +0300
commit8b4bfd172258ca62932c378f13f2b23a8be6818a (patch)
tree081724af839ca2bde2f71010816a4bf0cc763b4e /src
parente09f54c6b6fe35dc022fcea66935f5269866bff1 (diff)
parentb4b5e4958a11cc9e969355f60e08d0631b01c402 (diff)
downloadlibmts-io-8b4bfd172258ca62932c378f13f2b23a8be6818a.tar.gz
libmts-io-8b4bfd172258ca62932c378f13f2b23a8be6818a.tar.bz2
libmts-io-8b4bfd172258ca62932c378f13f2b23a8be6818a.zip
Merge remote-tracking branch 'origin/delta-radio-fwu' into ap/l4e1-delta-fwu
Diffstat (limited to 'src')
-rw-r--r--src/MTS_IO_QuectelRadio.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/MTS_IO_QuectelRadio.cpp b/src/MTS_IO_QuectelRadio.cpp
index 7aeed96..22374ee 100644
--- a/src/MTS_IO_QuectelRadio.cpp
+++ b/src/MTS_IO_QuectelRadio.cpp
@@ -833,18 +833,18 @@ ICellularRadio::CODE QuectelRadio::setCellularMode(CELLULAR_MODES networks) {
}
ICellularRadio::CODE QuectelRadio::uploadFile(int fd, const std::string& sTargetFilename, ICellularRadio::UpdateCb& stepCb) {
- size_t dPayloadLenght;
+ size_t dPayloadLength;
size_t nChunks;
CODE rc;
- rc = getFileSize(fd, dPayloadLenght, nChunks);
+ rc = getFileSize(fd, dPayloadLength, nChunks);
if (rc != SUCCESS) {
return rc;
}
- printTrace("File size: %d bytes and %d chunks", dPayloadLenght, nChunks);
+ printTrace("File size: %d bytes and %d chunks", dPayloadLength, nChunks);
printTrace("Starting file upload...");
- rc = startFileUpload(sTargetFilename, dPayloadLenght);
+ rc = startFileUpload(sTargetFilename, dPayloadLength);
if (rc != SUCCESS) {
return rc;
}
@@ -854,21 +854,21 @@ ICellularRadio::CODE QuectelRadio::uploadFile(int fd, const std::string& sTarget
uint16_t dChecksum = 0;
size_t nChunksPerCent = (nChunks / 100) + 1;
- size_t nFragmentLenght = 0;
+ size_t nFragmentLength = 0;
std::array<char, FILE_CHUNK_SIZE> vBuffer;
for (size_t iChunk = 1; iChunk < (nChunks + 1); iChunk++) {
- rc = readChunk(fd, vBuffer.data(), vBuffer.size(), nFragmentLenght);
+ rc = readChunk(fd, vBuffer.data(), vBuffer.size(), nFragmentLength);
if (rc != SUCCESS) {
break;
}
// we got our fragment, calculate checksum and flush the data
- uint16_t dFragmentChecksum = getQuectelChecksum(vBuffer.data(), nFragmentLenght);
+ uint16_t dFragmentChecksum = getQuectelChecksum(vBuffer.data(), nFragmentLength);
updateQuectelChecksum(dChecksum, dFragmentChecksum);
- rc = sendData(vBuffer.data(), nFragmentLenght);
+ rc = sendData(vBuffer.data(), nFragmentLength);
if (rc != SUCCESS) {
break;
}
@@ -889,7 +889,7 @@ ICellularRadio::CODE QuectelRadio::uploadFile(int fd, const std::string& sTarget
printTrace("Waiting for acknoledge from the radio");
std::string sExpectedResult = "+QFUPL: ";
- sExpectedResult += MTS::Text::format(dPayloadLenght);
+ sExpectedResult += MTS::Text::format(dPayloadLength);
sExpectedResult += ",";
sExpectedResult += MTS::Text::toLowerCase(MTS::Text::formatHex(dChecksum));
@@ -1074,7 +1074,7 @@ ICellularRadio::CODE QuectelRadio::fumoWaitUpgradeFinished(ICellularRadio::Updat
if (sResponse.find(sFotaUrcPrefix) == std::string::npos) {
printError("No URC messages from the radio in %d ms", duUrcTimeout);
- callNextStep(stepCb, "FUMO error: timeout, radio is not responding");
+ callNextStep(stepCb, "FUMO Error: timeout, radio is not responding");
rc = ERROR;
break;
}
@@ -1176,5 +1176,5 @@ ICellularRadio::CODE QuectelRadio::abortFileUpload() {
* 3) Do not input any character within 1s after “+++” has been inputted.
*/
sleep(1);
- return sendBasicCommand(CMD_ABORT_UPLOAD, 2000);
+ return sendBasicCommand(CMD_ABORT_UPLOAD, 2000, 0x00);
}