Skip to content

Commit 5029ed7

Browse files
fixup! defining OTAInterface
1 parent dde41cb commit 5029ed7

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

src/ota/interface/OTAInterface.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const char* const OTACloudProcessInterface::STATE_NAMES[] = { // used only for d
4141
"OtaStorageOpenFail",
4242
"OtaHeaderLengthFail",
4343
"OtaHeaderCrcFail",
44-
"OtaHeaterMagicNumberFail",
44+
"OtaHeaderMagicNumberFail",
4545
"ParseHttpHeaderFail",
4646
"UrlParseErrorFail",
4747
"ServerConnectErrorFail",
@@ -129,7 +129,6 @@ OTACloudProcessInterface::State OTACloudProcessInterface::otaBegin() {
129129
}
130130

131131
void OTACloudProcessInterface::calculateSHA256(SHA256& sha256_calc) {
132-
DEBUG_VERBOSE("calculate sha on: 0x%X len 0x%X %d", appStartAddress(), appSize(), appSize());
133132
auto res = appFlashOpen();
134133
if(!res) {
135134
// TODO return error

src/ota/interface/OTAInterface.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class OTACloudProcessInterface: public CloudProcess {
5959
OtaStorageOpenFail = static_cast<State>(ota::OTAError::OtaStorageOpen),
6060
OtaHeaderLengthFail = static_cast<State>(ota::OTAError::OtaHeaderLength),
6161
OtaHeaderCrcFail = static_cast<State>(ota::OTAError::OtaHeaderCrc),
62-
OtaHeaterMagicNumberFail = static_cast<State>(ota::OTAError::OtaHeaterMagicNumber),
62+
OtaHeaderMagicNumberFail = static_cast<State>(ota::OTAError::OtaHeaterMagicNumber),
6363
ParseHttpHeaderFail = static_cast<State>(ota::OTAError::ParseHttpHeader),
6464
UrlParseErrorFail = static_cast<State>(ota::OTAError::UrlParseError),
6565
ServerConnectErrorFail = static_cast<State>(ota::OTAError::ServerConnectError),

src/ota/interface/OTAInterfaceDefault.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ OTACloudProcessInterface::State OTADefaultCloudProcessInterface::fetch() {
125125
res = OtaDownloadFail;
126126
} else if(context->downloadState == OtaDownloadMagicNumberMismatch) {
127127
DEBUG_VERBOSE("OTA ERROR: Magic number mismatch");
128-
res = OtaHeaterMagicNumberFail;
128+
res = OtaHeaderMagicNumberFail;
129129
}
130130

131131
exit:
@@ -144,7 +144,7 @@ void OTADefaultCloudProcessInterface::parseOta(uint8_t* buffer, size_t buf_len)
144144
switch(context->downloadState) {
145145
case OtaDownloadHeader: {
146146
uint32_t copied = buf_len < sizeof(context->header.buf) ? buf_len : sizeof(context->header.buf);
147-
memcpy(context->header.buf, buffer, copied);
147+
memcpy(context->header.buf+context->headerCopiedBytes, buffer, copied);
148148
cursor += copied;
149149
context->headerCopiedBytes += copied;
150150

0 commit comments

Comments
 (0)