pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-19 16:29:31 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fix trunk warnings

Browse Source
This commit is contained in:
Mikhael Skvortsov 2025-03-20 10:46:27 +03:00
parent fbd1e2b0f3
commit 65710a9299
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/platform/esp32/WiFiOTA.cpp
View File

@ -1,6 +1,6 @@
#include <WiFiOTA.h> #include "WiFiOTA.h"
#include <Preferences.h>
#include "configuration.h" #include "configuration.h"
#include <Preferences.h>
#include <esp_ota_ops.h> #include <esp_ota_ops.h>
namespace WiFiOTA namespace WiFiOTA
@ -58,8 +58,7 @@ void saveConfig(meshtastic_Config_NetworkConfig *network)
bool trySwitchToOTA() bool trySwitchToOTA()
{ {
esp_app_desc_t app_desc; esp_app_desc_t app_desc;
const esp_partition_t *part = esp_partition_find_first( const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, NULL);
ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, NULL);
if (!part) if (!part)
return false; return false;
if (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc)) != ESP_OK) if (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc)) != ESP_OK)
@ -75,8 +74,7 @@ String getVersion()
{ {
String version; String version;
esp_app_desc_t app_desc; esp_app_desc_t app_desc;
const esp_partition_t *part = esp_partition_find_first( const esp_partition_t *part = esp_partition_find_first(ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, NULL);
ESP_PARTITION_TYPE_APP, ESP_PARTITION_SUBTYPE_APP_OTA_1, NULL);
if (!part) if (!part)
return version; return version;
if (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc)) != ESP_OK) if (ESP_ERROR_CHECK_WITHOUT_ABORT(esp_ota_get_partition_description(part, &app_desc)) != ESP_OK)
@ -85,4 +83,4 @@ String getVersion()
return version; return version;
} }
} } // namespace WiFiOTA

4
src/platform/esp32/WiFiOTA.h
View File

@ -1,8 +1,8 @@
#ifndef WIFIOTA_H #ifndef WIFIOTA_H
#define WIFIOTA_H #define WIFIOTA_H
#include <Arduino.h>
#include "mesh-pb-constants.h" #include "mesh-pb-constants.h"
#include <Arduino.h>
namespace WiFiOTA namespace WiFiOTA
{ {
@ -13,6 +13,6 @@ void recoverConfig(meshtastic_Config_NetworkConfig *network);
void saveConfig(meshtastic_Config_NetworkConfig *network); void saveConfig(meshtastic_Config_NetworkConfig *network);
bool trySwitchToOTA(); bool trySwitchToOTA();
String getVersion(); String getVersion();
} } // namespace WiFiOTA
#endif // WIFIOTA_H #endif // WIFIOTA_H