Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-09-11 17:14:27 +00:00
Code Issues Releases Activity

[Build] Change FEATURE_ARDUINO_OTA to use 0/1 state

Browse Source
This commit is contained in:
Ton Huisman
2022-07-24 22:22:51 +02:00
parent af538b2431
commit c7be417e67
13 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platformio.ini
+1 -1
View File
@@ -57,7 +57,7 @@ upload_flags_esp8266 =
--port=18266
upload_flags_esp32 =
--port=3232
build_flags = -DFEATURE_ARDUINO_OTA
build_flags = -DFEATURE_ARDUINO_OTA=1
upload_port = 192.168.1.152
platformio_esp32_envs.ini
+11 -11
View File
@@ -93,7 +93,7 @@ extends = esp32_base
lib_ignore = ${esp32_always.lib_ignore}
ESP32_ping
build_flags = ${esp32_base.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_BUILD_NORMAL_IRext
-DCOLLECTION_USE_RTTTL
lib_deps = ${esp32_base.lib_deps}
@@ -161,7 +161,7 @@ lib_deps = ${esp32_common_LittleFS.lib_deps}
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_SET_COLLECTION_ESP32
-DCOLLECTION_USE_RTTTL
@@ -169,7 +169,7 @@ build_flags = ${esp32_common.build_flags}
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_SET_COLLECTION_B_ESP32
-DCOLLECTION_USE_RTTTL
@@ -177,7 +177,7 @@ build_flags = ${esp32_common.build_flags}
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_SET_COLLECTION_C_ESP32
-DCOLLECTION_USE_RTTTL
@@ -185,7 +185,7 @@ build_flags = ${esp32_common.build_flags}
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_SET_COLLECTION_D_ESP32
-DCOLLECTION_USE_RTTTL
@@ -193,7 +193,7 @@ build_flags = ${esp32_common.build_flags}
extends = esp32_common
board = esp32_4M
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_SET_COLLECTION_E_ESP32
-DCOLLECTION_USE_RTTTL
@@ -234,7 +234,7 @@ board = esp32_4M
lib_deps = ${esp32_common.lib_deps}
ServoESP32
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_ENERGY_COLLECTION
[env:display_ESP32_4M316k]
@@ -243,7 +243,7 @@ board = esp32_4M
lib_deps = ${esp32_common.lib_deps}
ServoESP32
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_DISPLAY_COLLECTION
[env:neopixel_ESP32_4M316k]
@@ -252,7 +252,7 @@ board = esp32_4M
lib_deps = ${esp32_common.lib_deps}
ServoESP32
build_flags = ${esp32_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-D PLUGIN_NEOPIXEL_COLLECTION
@@ -308,7 +308,7 @@ board_upload.flash_size = 16MB
lib_ignore = ${esp32_always.lib_ignore}
ESP32_ping
build_flags = ${esp32_base.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_BUILD_MAX_ESP32
-DPLUGIN_BUILD_IR_EXTENDED
@@ -327,7 +327,7 @@ lib_ignore = ${esp32_always.lib_ignore}
ESP32_ping
build_flags = ${esp32_base.build_flags}
-DUSE_LITTLEFS
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_BUILD_MAX_ESP32
-DPLUGIN_BUILD_IR_EXTENDED
extra_scripts = ${esp32_base.extra_scripts}
platformio_esp32s2_envs.ini
+2 -2
View File
@@ -10,7 +10,7 @@ lib_ignore = ${esp32_always.lib_ignore}
HeatpumpIR
ESP32 BLE Arduino
build_flags = ${esp32_base.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
extra_scripts = ${esp32_base.extra_scripts}
lib_deps = ${esp32_base.lib_deps}
build_unflags = ${esp32_base.build_unflags}
@@ -39,7 +39,7 @@ board = esp32s2
lib_deps = ${esp32s2_common.lib_deps}
ServoESP32
build_flags = ${esp32s2_common.build_flags}
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_NEOPIXEL_COLLECTION
platformio_special_envs.ini
+1 -1
View File
@@ -95,7 +95,7 @@ lib_ignore = ${esp32_always.lib_ignore}
build_flags = ${esp32_base.build_flags}
${debug_pio.build_flags}
-DUSE_LITTLEFS
-DFEATURE_ARDUINO_OTA
-DFEATURE_ARDUINO_OTA=1
-DPLUGIN_BUILD_MAX_ESP32
-DPLUGIN_BUILD_IR_EXTENDED
lib_deps = ${esp32_base.lib_deps}
src/Custom-sample.h
+1 -1
View File
@@ -25,7 +25,7 @@
// Can be set to 1 to enable, 0 to disable, or not set to use the default (usually via define_plugin_sets.h)
#define FEATURE_ESPEASY_P2P 1 // (1/0) enables the ESP Easy P2P protocol
#define FEATURE_ARDUINO_OTA //enables the Arduino OTA capabilities
#define FEATURE_ARDUINO_OTA 1 //enables the Arduino OTA capabilities
// #define FEATURE_SD 1 // Enable SD card support
#ifdef BUILD_GIT
src/src/CustomBuild/define_plugin_sets.h
+1 -1
View File
@@ -1955,7 +1955,7 @@ To create/register a plugin, you have to :
#endif
#endif
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
#ifndef FEATURE_MDNS
#define FEATURE_MDNS
#endif
src/src/ESPEasyCore/ESPEasy_backgroundtasks.cpp
+3 -3
View File
@@ -14,7 +14,7 @@
#include "../Helpers/Networking.h"
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
#include "../Helpers/OTA.h"
#endif
@@ -91,7 +91,7 @@ void backgroundtasks()
}
#endif // ifdef FEATURE_DNS_SERVER
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
if (Settings.ArduinoOTAEnable) {
ArduinoOTA_handle();
@@ -105,7 +105,7 @@ void backgroundtasks()
ArduinoOTA_handle();
}
#endif // ifdef FEATURE_ARDUINO_OTA
#endif // if FEATURE_ARDUINO_OTA
#ifdef FEATURE_MDNS
src/src/ESPEasyCore/ESPEasy_setup.cpp
+4 -4
View File
@@ -35,9 +35,9 @@
# include "../Helpers/PeriodicalActions.h"
#endif // ifdef USE_RTOS_MULTITASKING
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
# include "../Helpers/OTA.h"
#endif // ifdef FEATURE_ARDUINO_OTA
#endif // if FEATURE_ARDUINO_OTA
#ifdef ESP32
#include <soc/boot_mode.h>
@@ -439,12 +439,12 @@ void ESPEasy_setup()
ReportStatus();
#endif // ifdef FEATURE_REPORTING
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
ArduinoOTAInit();
#ifndef BUILD_NO_RAM_TRACKER
logMemUsageAfter(F("ArduinoOTAInit()"));
#endif
#endif // ifdef FEATURE_ARDUINO_OTA
#endif // if FEATURE_ARDUINO_OTA
if (node_time.systemTimePresent()) {
node_time.initTime();
src/src/Globals/Services.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
#include "../Globals/Services.h"
#ifdef FEATURE_ARDUINO_OTA
bool ArduinoOTAtriggered=false;
#if FEATURE_ARDUINO_OTA
bool ArduinoOTAtriggered = false;
#endif
src/src/Globals/Services.h
+1 -1
View File
@@ -42,7 +42,7 @@
#endif
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
//enable Arduino OTA updating.
//Note: This adds around 10kb to the firmware size, and 1kb extra ram.
extern bool ArduinoOTAtriggered;
src/src/Helpers/OTA.cpp
+3 -3
View File
@@ -8,7 +8,7 @@
#include "../Helpers/Hardware.h"
#include "../Helpers/Misc.h"
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
//enable Arduino OTA updating.
//Note: This adds around 10kb to the firmware size, and 1kb extra ram.
#include <ArduinoOTA.h>
@@ -47,7 +47,7 @@ bool OTA_possible(uint32_t& maxSketchSize, bool& use2step) {
#endif // if defined(ESP8266)
}
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
/********************************************************************************************\
Allow updating via the Arduino OTA-protocol. (this allows you to upload directly from platformio)
@@ -118,4 +118,4 @@ void ArduinoOTA_handle()
ArduinoOTA.handle();
}
#endif // ifdef FEATURE_ARDUINO_OTA
#endif // if FEATURE_ARDUINO_OTA
src/src/Helpers/OTA.h
+2 -2
View File
@@ -6,7 +6,7 @@
bool OTA_possible(uint32_t& maxSketchSize,
bool & use2step);
#ifdef FEATURE_ARDUINO_OTA
#if FEATURE_ARDUINO_OTA
/********************************************************************************************\
Allow updating via the Arduino OTA-protocol. (this allows you to upload directly from platformio)
@@ -16,7 +16,7 @@ void ArduinoOTAInit();
void ArduinoOTA_handle();
#endif // ifdef FEATURE_ARDUINO_OTA
#endif // if FEATURE_ARDUINO_OTA
#endif
src/src/WebServer/AdvancedConfigPage.cpp
+2 -2
View File
@@ -224,9 +224,9 @@ void handle_advanced() {
#ifdef ESP32
addUnit(F("1/80 usec"));
#endif
#if defined(FEATURE_ARDUINO_OTA)
#if FEATURE_ARDUINO_OTA
addFormCheckBox(F("Enable Arduino OTA"), F("arduinootaenable"), Settings.ArduinoOTAEnable);
#endif // if defined(FEATURE_ARDUINO_OTA)
#endif // if FEATURE_ARDUINO_OTA
#if defined(ESP32)
addFormCheckBox_disabled(F("Enable RTOS Multitasking"), F("usertosmultitasking"), Settings.UseRTOSMultitasking);
#endif // if defined(ESP32)