2018-09-24 16:36:11 +02:00
|
|
|
#ifdef USE_OTA
|
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
/*
|
|
|
|
Parts of this code:
|
|
|
|
Copyright (c) 2014-present PlatformIO <contact@platformio.org>
|
|
|
|
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
you may not use this file except in compliance with the License.
|
|
|
|
You may obtain a copy of the License at
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
See the License for the specific language governing permissions and
|
|
|
|
limitations under the License.
|
|
|
|
*/
|
|
|
|
|
2018-09-21 19:30:02 +02:00
|
|
|
#include "ota.h"
|
2018-08-12 15:42:58 +02:00
|
|
|
|
2018-09-22 19:39:31 +02:00
|
|
|
using namespace std;
|
|
|
|
|
2018-08-12 15:42:58 +02:00
|
|
|
const BintrayClient bintray(BINTRAY_USER, BINTRAY_REPO, BINTRAY_PACKAGE);
|
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
// Connection port (HTTPS)
|
|
|
|
const int port = 443;
|
2018-08-12 23:42:39 +02:00
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
// Variables to validate firmware content
|
2018-09-23 22:12:10 +02:00
|
|
|
int volatile contentLength = 0;
|
|
|
|
bool volatile isValidContentType = false;
|
2018-08-16 21:10:13 +02:00
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
// Local logging tag
|
|
|
|
static const char TAG[] = "main";
|
2018-08-12 23:42:39 +02:00
|
|
|
|
2018-09-23 18:07:40 +02:00
|
|
|
// helper function to extract header value from header
|
|
|
|
inline String getHeaderValue(String header, String headerName) {
|
|
|
|
return header.substring(strlen(headerName.c_str()));
|
2018-09-23 15:07:00 +02:00
|
|
|
}
|
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
void start_ota_update() {
|
|
|
|
|
2018-11-04 19:25:11 +01:00
|
|
|
/*
|
|
|
|
// check battery status if we can before doing ota
|
|
|
|
#ifdef HAS_BATTERY_PROBE
|
|
|
|
if (!batt_sufficient()) {
|
|
|
|
ESP_LOGW(TAG, "Battery voltage %dmV too low for OTA", batt_voltage);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
*/
|
2018-09-23 18:45:46 +02:00
|
|
|
|
2018-11-04 19:25:11 +01:00
|
|
|
switch_LED(LED_ON);
|
2018-09-23 15:07:00 +02:00
|
|
|
|
2018-09-22 19:39:31 +02:00
|
|
|
#ifdef HAS_DISPLAY
|
|
|
|
u8x8.begin();
|
|
|
|
u8x8.setFont(u8x8_font_chroma48medium8_r);
|
|
|
|
u8x8.clear();
|
|
|
|
#ifdef DISPLAY_FLIP
|
|
|
|
u8x8.setFlipMode(1);
|
|
|
|
#endif
|
2018-09-23 15:07:00 +02:00
|
|
|
u8x8.setInverseFont(1);
|
|
|
|
u8x8.print("SOFTWARE UPDATE \n");
|
|
|
|
u8x8.setInverseFont(0);
|
|
|
|
u8x8.print("WiFi connect ..\n");
|
|
|
|
u8x8.print("Has Update? ..\n");
|
2018-09-30 23:11:25 +02:00
|
|
|
u8x8.print("Fetching ..\n");
|
2018-09-22 19:39:31 +02:00
|
|
|
u8x8.print("Downloading ..\n");
|
|
|
|
u8x8.print("Rebooting ..");
|
|
|
|
#endif
|
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
ESP_LOGI(TAG, "Starting Wifi OTA update");
|
2018-09-23 15:07:00 +02:00
|
|
|
display(1, "**", WIFI_SSID);
|
2018-08-12 23:42:39 +02:00
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
WiFi.begin(WIFI_SSID, WIFI_PASS);
|
2018-08-12 23:42:39 +02:00
|
|
|
|
2018-11-04 19:25:11 +01:00
|
|
|
int i = WIFI_MAX_TRY, j = OTA_MAX_TRY;
|
2018-11-05 15:28:26 +01:00
|
|
|
int ret = 1; // 0 = finished, 1 = retry, -1 = abort
|
2018-09-23 15:07:00 +02:00
|
|
|
|
2018-11-05 00:03:47 +01:00
|
|
|
ESP_LOGI(TAG, "Trying to connect to %s", WIFI_SSID);
|
2018-09-16 12:18:11 +02:00
|
|
|
while (i--) {
|
2018-11-04 19:25:11 +01:00
|
|
|
if (WiFi.status() == WL_CONNECTED) {
|
|
|
|
// we now have wifi connection and try to do an OTA over wifi update
|
|
|
|
ESP_LOGI(TAG, "Connected to %s", WIFI_SSID);
|
|
|
|
display(1, "OK", "WiFi connected");
|
2018-11-04 19:54:09 +01:00
|
|
|
// do a number of tries to update firmware limited by OTA_MAX_TRY
|
2018-11-05 00:30:32 +01:00
|
|
|
while ((j--) && (ret > 0)) {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Starting OTA update, attempt %u of %u", OTA_MAX_TRY - j,
|
|
|
|
OTA_MAX_TRY);
|
2018-11-04 19:54:09 +01:00
|
|
|
ret = do_ota_update();
|
2018-11-04 20:51:48 +01:00
|
|
|
}
|
|
|
|
goto end;
|
2018-11-04 19:25:11 +01:00
|
|
|
}
|
2018-11-05 00:03:47 +01:00
|
|
|
vTaskDelay(5000 / portTICK_PERIOD_MS);
|
2018-09-22 19:39:31 +02:00
|
|
|
}
|
2018-08-12 15:42:58 +02:00
|
|
|
|
2018-11-04 19:54:09 +01:00
|
|
|
// wifi did not connect
|
|
|
|
ESP_LOGI(TAG, "Could not connect to %s", WIFI_SSID);
|
2018-11-04 19:25:11 +01:00
|
|
|
display(1, " E", "no WiFi connect");
|
2018-11-04 19:54:09 +01:00
|
|
|
vTaskDelay(5000 / portTICK_PERIOD_MS);
|
2018-09-23 15:07:00 +02:00
|
|
|
|
2018-11-04 19:25:11 +01:00
|
|
|
end:
|
|
|
|
switch_LED(LED_OFF);
|
2018-11-05 00:32:38 +01:00
|
|
|
ESP_LOGI(TAG, "Rebooting to %s firmware", (ret == 0) ? "new" : "current");
|
2018-11-04 19:25:11 +01:00
|
|
|
display(5, "**", ""); // mark line rebooting
|
2018-09-23 15:07:00 +02:00
|
|
|
vTaskDelay(5000 / portTICK_PERIOD_MS);
|
|
|
|
ESP.restart();
|
2018-09-15 16:29:52 +02:00
|
|
|
|
|
|
|
} // start_ota_update
|
|
|
|
|
2018-11-05 15:28:26 +01:00
|
|
|
// Reads data vom wifi client and flashes it to ota partition
|
|
|
|
// returns: 0 = finished, 1 = retry, -1 = abort
|
|
|
|
int do_ota_update() {
|
2018-11-04 19:25:11 +01:00
|
|
|
|
2018-09-23 18:07:40 +02:00
|
|
|
char buf[17];
|
2018-11-04 19:25:11 +01:00
|
|
|
bool redirect = true;
|
|
|
|
size_t written = 0;
|
2018-09-23 18:07:40 +02:00
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
// Fetch the latest firmware version
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Checking latest firmware version on server");
|
2018-09-23 15:07:00 +02:00
|
|
|
display(2, "**", "checking version");
|
2018-09-15 16:29:52 +02:00
|
|
|
const String latest = bintray.getLatestVersion();
|
2018-09-17 17:23:02 +02:00
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
if (latest.length() == 0) {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Could not fetch info on latest firmware");
|
2018-09-23 15:07:00 +02:00
|
|
|
display(2, " E", "file not found");
|
2018-11-05 00:30:32 +01:00
|
|
|
return -1;
|
2018-09-17 17:23:02 +02:00
|
|
|
} else if (version_compare(latest, cfg.version) <= 0) {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Current firmware is up to date");
|
2018-09-23 15:07:00 +02:00
|
|
|
display(2, "NO", "no update found");
|
2018-11-05 15:28:26 +01:00
|
|
|
return -1;
|
2018-09-15 16:29:52 +02:00
|
|
|
}
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "New firmware version v%s available", latest.c_str());
|
2018-09-23 18:07:40 +02:00
|
|
|
display(2, "OK", latest.c_str());
|
2018-09-23 18:45:46 +02:00
|
|
|
|
2018-09-23 18:07:40 +02:00
|
|
|
display(3, "**", "");
|
|
|
|
String firmwarePath = bintray.getBinaryPath(latest);
|
2018-09-15 16:29:52 +02:00
|
|
|
if (!firmwarePath.endsWith(".bin")) {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Unsupported binary format");
|
2018-09-23 15:07:00 +02:00
|
|
|
display(3, " E", "file type error");
|
2018-11-05 00:30:32 +01:00
|
|
|
return -1;
|
2018-09-15 16:29:52 +02:00
|
|
|
}
|
2018-08-12 15:42:58 +02:00
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
String currentHost = bintray.getStorageHost();
|
|
|
|
String prevHost = currentHost;
|
|
|
|
|
|
|
|
WiFiClientSecure client;
|
2018-11-05 00:03:47 +01:00
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
client.setCACert(bintray.getCertificate(currentHost));
|
2018-11-05 15:28:26 +01:00
|
|
|
// client.setTimeout(RESPONSE_TIMEOUT_MS);
|
2018-11-05 13:13:31 +01:00
|
|
|
// --> causing error [E][WiFiClient.cpp:236] setSocketOption(): 1006 : 9
|
|
|
|
// so we unfortunately need patched update.cpp which sets the stream timeout
|
2018-09-15 16:29:52 +02:00
|
|
|
|
|
|
|
if (!client.connect(currentHost.c_str(), port)) {
|
|
|
|
ESP_LOGI(TAG, "Cannot connect to %s", currentHost.c_str());
|
2018-09-23 15:07:00 +02:00
|
|
|
display(3, " E", "connection lost");
|
2018-11-05 00:30:32 +01:00
|
|
|
goto abort;
|
2018-09-15 16:29:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
while (redirect) {
|
|
|
|
if (currentHost != prevHost) {
|
|
|
|
client.stop();
|
|
|
|
client.setCACert(bintray.getCertificate(currentHost));
|
|
|
|
if (!client.connect(currentHost.c_str(), port)) {
|
2018-09-15 21:10:11 +02:00
|
|
|
ESP_LOGI(TAG, "Redirect detected, but cannot connect to %s",
|
2018-09-15 16:29:52 +02:00
|
|
|
currentHost.c_str());
|
2018-09-23 15:07:00 +02:00
|
|
|
display(3, " E", "server error");
|
2018-11-05 00:30:32 +01:00
|
|
|
goto abort;
|
2018-09-15 16:29:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-19 01:35:20 +02:00
|
|
|
ESP_LOGI(TAG, "Requesting %s", firmwarePath.c_str());
|
2018-09-15 16:29:52 +02:00
|
|
|
|
|
|
|
client.print(String("GET ") + firmwarePath + " HTTP/1.1\r\n");
|
|
|
|
client.print(String("Host: ") + currentHost + "\r\n");
|
|
|
|
client.print("Cache-Control: no-cache\r\n");
|
|
|
|
client.print("Connection: close\r\n\r\n");
|
|
|
|
|
|
|
|
unsigned long timeout = millis();
|
|
|
|
while (client.available() == 0) {
|
2018-11-05 13:13:31 +01:00
|
|
|
if ((millis() - timeout) > (RESPONSE_TIMEOUT_MS)) {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Client timeout");
|
2018-09-23 15:07:00 +02:00
|
|
|
display(3, " E", "client timeout");
|
2018-11-05 00:30:32 +01:00
|
|
|
goto abort;
|
2018-09-15 16:29:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
while (client.available()) {
|
|
|
|
String line = client.readStringUntil('\n');
|
|
|
|
// Check if the line is end of headers by removing space symbol
|
|
|
|
line.trim();
|
|
|
|
// if the the line is empty, this is the end of the headers
|
|
|
|
if (!line.length()) {
|
|
|
|
break; // proceed to OTA update
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check allowed HTTP responses
|
|
|
|
if (line.startsWith("HTTP/1.1")) {
|
|
|
|
if (line.indexOf("200") > 0) {
|
|
|
|
ESP_LOGI(TAG, "Got 200 status code from server. Proceeding to "
|
|
|
|
"firmware flashing");
|
|
|
|
redirect = false;
|
|
|
|
} else if (line.indexOf("302") > 0) {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Got 302 status code from server. Redirecting to "
|
2018-09-15 16:29:52 +02:00
|
|
|
"new address");
|
|
|
|
redirect = true;
|
|
|
|
} else {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Could not get firmware download URL");
|
2018-11-05 15:28:26 +01:00
|
|
|
goto retry;
|
2018-09-15 16:29:52 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extracting new redirect location
|
|
|
|
if (line.startsWith("Location: ")) {
|
|
|
|
String newUrl = getHeaderValue(line, "Location: ");
|
|
|
|
ESP_LOGI(TAG, "Got new url: %s", newUrl.c_str());
|
|
|
|
newUrl.remove(0, newUrl.indexOf("//") + 2);
|
|
|
|
currentHost = newUrl.substring(0, newUrl.indexOf('/'));
|
|
|
|
newUrl.remove(newUrl.indexOf(currentHost), currentHost.length());
|
|
|
|
firmwarePath = newUrl;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Checking headers
|
|
|
|
if (line.startsWith("Content-Length: ")) {
|
|
|
|
contentLength =
|
|
|
|
atoi((getHeaderValue(line, "Content-Length: ")).c_str());
|
|
|
|
ESP_LOGI(TAG, "Got %d bytes from server", contentLength);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (line.startsWith("Content-Type: ")) {
|
|
|
|
String contentType = getHeaderValue(line, "Content-Type: ");
|
|
|
|
ESP_LOGI(TAG, "Got %s payload", contentType.c_str());
|
|
|
|
if (contentType == "application/octet-stream") {
|
|
|
|
isValidContentType = true;
|
|
|
|
}
|
|
|
|
}
|
2018-11-05 13:13:31 +01:00
|
|
|
} // while (client.available())
|
|
|
|
} // while (redirect)
|
2018-09-15 16:29:52 +02:00
|
|
|
|
2018-09-23 15:07:00 +02:00
|
|
|
display(3, "OK", ""); // line download
|
2018-09-22 19:39:31 +02:00
|
|
|
|
2018-09-15 16:29:52 +02:00
|
|
|
// check whether we have everything for OTA update
|
2018-11-04 19:25:11 +01:00
|
|
|
if (!(contentLength && isValidContentType)) {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Invalid OTA server response");
|
2018-11-04 19:25:11 +01:00
|
|
|
display(4, " E", "response error");
|
2018-11-05 00:30:32 +01:00
|
|
|
goto retry;
|
2018-11-04 19:25:11 +01:00
|
|
|
}
|
2018-09-18 22:58:02 +02:00
|
|
|
|
2018-11-05 15:28:26 +01:00
|
|
|
#ifdef HAS_LED
|
|
|
|
#ifndef LED_ACTIVE_LOW
|
|
|
|
if (!Update.begin(contentLength, U_FLASH, HAS_LED, HIGH)) {
|
|
|
|
#else
|
|
|
|
if (!Update.begin(contentLength, U_FLASH, HAS_LED, LOW)) {
|
|
|
|
#endif
|
|
|
|
#else
|
2018-11-04 19:25:11 +01:00
|
|
|
if (!Update.begin(contentLength)) {
|
2018-11-05 15:28:26 +01:00
|
|
|
#endif
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Not enough space to start OTA update");
|
2018-11-04 19:25:11 +01:00
|
|
|
display(4, " E", "disk full");
|
2018-11-05 00:30:32 +01:00
|
|
|
goto abort;
|
2018-11-04 19:25:11 +01:00
|
|
|
}
|
2018-09-18 22:58:02 +02:00
|
|
|
|
2018-09-24 16:36:11 +02:00
|
|
|
#ifdef HAS_DISPLAY
|
2018-11-04 19:25:11 +01:00
|
|
|
// register callback function for showing progress while streaming data
|
|
|
|
Update.onProgress(&show_progress);
|
2018-09-24 16:36:11 +02:00
|
|
|
#endif
|
2018-09-18 22:58:02 +02:00
|
|
|
|
2018-11-04 19:25:11 +01:00
|
|
|
display(4, "**", "writing...");
|
2018-11-05 13:13:31 +01:00
|
|
|
written = Update.writeStream(client); // this is a blocking call
|
2018-09-19 01:35:20 +02:00
|
|
|
|
2018-11-04 19:25:11 +01:00
|
|
|
if (written == contentLength) {
|
|
|
|
ESP_LOGI(TAG, "Written %u bytes successfully", written);
|
|
|
|
snprintf(buf, 17, "%ukB Done!", (uint16_t)(written / 1024));
|
|
|
|
display(4, "OK", buf);
|
|
|
|
} else {
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "Written only %u of %u bytes, OTA update attempt cancelled",
|
2018-11-04 19:25:11 +01:00
|
|
|
written, contentLength);
|
|
|
|
}
|
2018-09-18 22:58:02 +02:00
|
|
|
|
2018-11-04 19:25:11 +01:00
|
|
|
if (Update.end()) {
|
|
|
|
goto finished;
|
2018-09-15 16:29:52 +02:00
|
|
|
} else {
|
2018-11-05 00:03:47 +01:00
|
|
|
ESP_LOGI(TAG, "An error occurred. Error#: %d", Update.getError());
|
|
|
|
snprintf(buf, 17, "Error#: %d", Update.getError());
|
2018-11-04 19:25:11 +01:00
|
|
|
display(4, " E", buf);
|
2018-11-05 00:30:32 +01:00
|
|
|
goto retry;
|
2018-09-15 16:29:52 +02:00
|
|
|
}
|
2018-11-04 19:25:11 +01:00
|
|
|
|
|
|
|
finished:
|
|
|
|
client.stop();
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "OTA update finished");
|
2018-11-05 00:30:32 +01:00
|
|
|
return 0;
|
2018-11-04 19:25:11 +01:00
|
|
|
|
2018-11-05 00:30:32 +01:00
|
|
|
abort:
|
2018-11-04 19:25:11 +01:00
|
|
|
client.stop();
|
2018-11-04 21:02:37 +01:00
|
|
|
ESP_LOGI(TAG, "OTA update failed");
|
2018-11-05 00:30:32 +01:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
retry:
|
|
|
|
return 1;
|
2018-11-04 19:25:11 +01:00
|
|
|
|
2018-09-23 18:07:40 +02:00
|
|
|
} // do_ota_update
|
|
|
|
|
2018-09-30 15:08:00 +02:00
|
|
|
void display(const uint8_t row, const std::string status,
|
2018-11-04 19:25:11 +01:00
|
|
|
const std::string msg) {
|
2018-09-23 18:07:40 +02:00
|
|
|
#ifdef HAS_DISPLAY
|
|
|
|
u8x8.setCursor(14, row);
|
|
|
|
u8x8.print((status.substr(0, 2)).c_str());
|
|
|
|
if (!msg.empty()) {
|
|
|
|
u8x8.clearLine(7);
|
|
|
|
u8x8.setCursor(0, 7);
|
|
|
|
u8x8.print(msg.substr(0, 16).c_str());
|
|
|
|
}
|
2018-09-30 15:08:00 +02:00
|
|
|
#endif
|
2018-09-23 18:07:40 +02:00
|
|
|
}
|
|
|
|
|
2018-09-30 15:08:00 +02:00
|
|
|
#ifdef HAS_DISPLAY
|
2018-09-23 18:07:40 +02:00
|
|
|
// callback function to show download progress while streaming data
|
2018-11-04 19:25:11 +01:00
|
|
|
void show_progress(unsigned long current, unsigned long size) {
|
2018-09-23 18:07:40 +02:00
|
|
|
char buf[17];
|
2018-09-23 18:45:46 +02:00
|
|
|
snprintf(buf, 17, "%-9lu (%3lu%%)", current, current * 100 / size);
|
2018-09-23 18:07:40 +02:00
|
|
|
display(4, "**", buf);
|
2018-09-17 17:23:02 +02:00
|
|
|
}
|
2018-09-30 15:08:00 +02:00
|
|
|
#endif
|
2018-09-17 17:23:02 +02:00
|
|
|
|
|
|
|
// helper function to compare two versions. Returns 1 if v2 is
|
|
|
|
// smaller, -1 if v1 is smaller, 0 if equal
|
|
|
|
|
|
|
|
int version_compare(const String v1, const String v2) {
|
|
|
|
// vnum stores each numeric part of version
|
|
|
|
int vnum1 = 0, vnum2 = 0;
|
|
|
|
|
2018-09-21 18:23:34 +02:00
|
|
|
// loop until both string are processed
|
2018-09-17 17:23:02 +02:00
|
|
|
for (int i = 0, j = 0; (i < v1.length() || j < v2.length());) {
|
|
|
|
// storing numeric part of version 1 in vnum1
|
|
|
|
while (i < v1.length() && v1[i] != '.') {
|
|
|
|
vnum1 = vnum1 * 10 + (v1[i] - '0');
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
|
|
|
|
// storing numeric part of version 2 in vnum2
|
|
|
|
while (j < v2.length() && v2[j] != '.') {
|
|
|
|
vnum2 = vnum2 * 10 + (v2[j] - '0');
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (vnum1 > vnum2)
|
|
|
|
return 1;
|
|
|
|
if (vnum2 > vnum1)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
// if equal, reset variables and go for next numeric
|
|
|
|
// part
|
|
|
|
vnum1 = vnum2 = 0;
|
|
|
|
i++;
|
|
|
|
j++;
|
|
|
|
}
|
|
|
|
return 0;
|
2018-09-18 17:25:18 +02:00
|
|
|
}
|
2018-09-24 16:36:11 +02:00
|
|
|
#endif // USE_OTA
|