From 34b9726c36df47cc7a1a5e6ffce02a813e2b3e36 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 27 Jan 2021 10:38:45 +0100
Subject: [PATCH] Clarify file name functionality

---
 ...52_BLE_ESP32.ino => xdrv_79_esp32_ble.ino} | 33 ++++++++-----------
 ...droidgo.ino => xdrv_80_esp32_odroidgo.ino} |  4 +--
 ...81_webcam.ino => xdrv_81_esp32_webcam.ino} |  2 +-
 ...thernet.ino => xdrv_82_esp32_ethernet.ino} |  2 +-
 ...esp32watch.ino => xdrv_83_esp32_watch.ino} |  2 +-
 ...v_84_core2.ino => xdrv_84_esp32_core2.ino} |  2 +-
 6 files changed, 20 insertions(+), 25 deletions(-)
 rename tasmota/{xdrv_52_BLE_ESP32.ino => xdrv_79_esp32_ble.ino} (99%)
 rename tasmota/{xdrv_80_odroidgo.ino => xdrv_80_esp32_odroidgo.ino} (91%)
 rename tasmota/{xdrv_81_webcam.ino => xdrv_81_esp32_webcam.ino} (99%)
 mode change 100755 => 100644
 rename tasmota/{xdrv_82_ethernet.ino => xdrv_82_esp32_ethernet.ino} (99%)
 rename tasmota/{xdrv_83_esp32watch.ino => xdrv_83_esp32_watch.ino} (99%)
 rename tasmota/{xdrv_84_core2.ino => xdrv_84_esp32_core2.ino} (99%)

diff --git a/tasmota/xdrv_52_BLE_ESP32.ino b/tasmota/xdrv_79_esp32_ble.ino
similarity index 99%
rename from tasmota/xdrv_52_BLE_ESP32.ino
rename to tasmota/xdrv_79_esp32_ble.ino
index 162c434f9..3452d67d5 100644
--- a/tasmota/xdrv_52_BLE_ESP32.ino
+++ b/tasmota/xdrv_79_esp32_ble.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_52_BLE_ESP32.ino - BLE via ESP32 support for Tasmota
+  xdrv_79_esp32_ble.ino - BLE via ESP32 support for Tasmota
 
   Copyright (C) 2020  Christian Baars and Theo Arends and Simon Hailes
 
@@ -22,8 +22,18 @@
   --------------------------------------------------------------------------------------------
 */
 
+// TEMPORARILY define ESP32 and USE_BLE_ESP32 so VSCODE shows highlighting....
+//#define VSCODE_DEV
+#ifdef VSCODE_DEV
+#define ESP32
+#define USE_BLE_ESP32
+#endif
+
+#ifdef ESP32                       // ESP32 only. Use define USE_HM10 for ESP8266 support
+#ifdef USE_BLE_ESP32
+
 /*
-  xdrv_52:
+  xdrv_79:
   This driver uses the ESP32 BLE functionality to hopefully provide enough
   BLE functionality to implement specific drivers on top of it.
 
@@ -80,27 +90,12 @@ i.e. the Bluetooth of the ESP can be shared without conflict.
 
 */
 
-
-// TEMPORARILY define ESP32 and USE_BLE_ESP32 so VSCODE shows highlighting....
-//#define VSCODE_DEV
-
-#ifdef VSCODE_DEV
-#define ESP32
-#define USE_BLE_ESP32
-#endif
-
-#ifdef ESP32                       // ESP32 only. Use define USE_HM10 for ESP8266 support
-
-#ifdef USE_BLE_ESP32
-
 #define BLE_ESP32_ALIASES
 
 // uncomment for more diagnostic/information messages - + more flash use.
 //#define BLE_ESP32_DEBUG
 
-
-
-#define XDRV_52                    52
+#define XDRV_79                    79
 #define USE_MI_DECRYPTION
 
 #include <vector>
@@ -3456,7 +3451,7 @@ int ExtStopBLE(){
   return 0;
 }
 
-bool Xdrv52(uint8_t function)
+bool Xdrv79(uint8_t function)
 {
   //if (!Settings.flag5.mi32_enable) { return false; }  // SetOption115 - Enable ESP32 BLE BLE
 
diff --git a/tasmota/xdrv_80_odroidgo.ino b/tasmota/xdrv_80_esp32_odroidgo.ino
similarity index 91%
rename from tasmota/xdrv_80_odroidgo.ino
rename to tasmota/xdrv_80_esp32_odroidgo.ino
index e1d7ed412..bd7fd8cc1 100644
--- a/tasmota/xdrv_80_odroidgo.ino
+++ b/tasmota/xdrv_80_esp32_odroidgo.ino
@@ -1,7 +1,7 @@
 /*
-  xdrv_81_webcam.ino - ESP32 webcam support for Tasmota
+  xdrv_81_esp32_odroidgo.ino - ESP32 odroid go support for Tasmota
 
-  Copyright (C) 2021  Gerhard Mutz and Theo Arends
+  Copyright (C) 2021  Theo Arends
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
diff --git a/tasmota/xdrv_81_webcam.ino b/tasmota/xdrv_81_esp32_webcam.ino
old mode 100755
new mode 100644
similarity index 99%
rename from tasmota/xdrv_81_webcam.ino
rename to tasmota/xdrv_81_esp32_webcam.ino
index 0844b1ba9..97f88b9d3
--- a/tasmota/xdrv_81_webcam.ino
+++ b/tasmota/xdrv_81_esp32_webcam.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_81_webcam.ino - ESP32 webcam support for Tasmota
+  xdrv_81_esp32_webcam.ino - ESP32 webcam support for Tasmota
 
   Copyright (C) 2021  Gerhard Mutz and Theo Arends
 
diff --git a/tasmota/xdrv_82_ethernet.ino b/tasmota/xdrv_82_esp32_ethernet.ino
similarity index 99%
rename from tasmota/xdrv_82_ethernet.ino
rename to tasmota/xdrv_82_esp32_ethernet.ino
index abb6922ad..c537fae05 100644
--- a/tasmota/xdrv_82_ethernet.ino
+++ b/tasmota/xdrv_82_esp32_ethernet.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_82_ethernet.ino - ESP32 (PoE) ethernet support for Tasmota
+  xdrv_82_esp32_ethernet.ino - ESP32 (PoE) ethernet support for Tasmota
 
   Copyright (C) 2021  Theo Arends
 
diff --git a/tasmota/xdrv_83_esp32watch.ino b/tasmota/xdrv_83_esp32_watch.ino
similarity index 99%
rename from tasmota/xdrv_83_esp32watch.ino
rename to tasmota/xdrv_83_esp32_watch.ino
index e452e1b74..70cc1a912 100644
--- a/tasmota/xdrv_83_esp32watch.ino
+++ b/tasmota/xdrv_83_esp32_watch.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_83_esp32watch.ino - ESP32 TTGO watch support for Tasmota
+  xdrv_83_esp32_watch.ino - ESP32 TTGO watch support for Tasmota
 
   Copyright (C) 2021  Gerhard Mutz and Theo Arends
 
diff --git a/tasmota/xdrv_84_core2.ino b/tasmota/xdrv_84_esp32_core2.ino
similarity index 99%
rename from tasmota/xdrv_84_core2.ino
rename to tasmota/xdrv_84_esp32_core2.ino
index da3e202e9..dc196536c 100644
--- a/tasmota/xdrv_84_core2.ino
+++ b/tasmota/xdrv_84_esp32_core2.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_84_core2.ino - ESP32 m5stack core2 support for Tasmota
+  xdrv_84_esp32_core2.ino - ESP32 m5stack core2 support for Tasmota
 
   Copyright (C) 2021  Gerhard Mutz and Theo Arends