From b95ebcb4fa30e4988e03fb2abbb26b0f56620e5c Mon Sep 17 00:00:00 2001
From: Gregg <homespan@icloud.com>
Date: Tue, 5 Oct 2021 20:08:34 -0500
Subject: [PATCH] Added ARDUINO_ESP_VERSION Macro

Will be "1.0.6", "2.0.0", etc.  Can be used as anywhere as a c-string
---
 src/HomeSpan.cpp | 5 ++---
 src/Settings.h   | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/HomeSpan.cpp b/src/HomeSpan.cpp
index 51693c5..54d96c3 100644
--- a/src/HomeSpan.cpp
+++ b/src/HomeSpan.cpp
@@ -34,7 +34,6 @@
 #include <driver/ledc.h>
 #include <mbedtls/version.h>
 #include <esp_task_wdt.h>
-#include <core_version.h>
 
 #include "HomeSpan.h"
 #include "HAP.h"
@@ -103,8 +102,8 @@ void Span::begin(Category catID, const char *displayName, const char *hostNameBa
   Serial.print(getSketchVersion());  
   Serial.print("\nHomeSpan Version: ");
   Serial.print(HOMESPAN_VERSION);
-  Serial.print("\nArduino Version:  ");
-  Serial.print(STRINGIFY(ARDUINO_ESP32_GIT_DESC));
+  Serial.print("\nArduino-ESP Ver:  ");
+  Serial.print(ARDUINO_ESP_VERSION);
   Serial.printf("\nESP-IDF Version:  %d.%d.%d",ESP_IDF_VERSION_MAJOR,ESP_IDF_VERSION_MINOR,ESP_IDF_VERSION_PATCH);
   Serial.printf("\nESP32 Chip:       %s Rev %d %s-core %dMB Flash", ESP.getChipModel(),ESP.getChipRevision(),
                 ESP.getChipCores()==1?"single":"dual",ESP.getFlashChipSize()/1024/1024);
diff --git a/src/Settings.h b/src/Settings.h
index ccf0323..ec240a1 100644
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -27,6 +27,8 @@
  
 // USER-DEFINED SETTINGS AND REFERENCE ENUMERATION CLASSES
 
+#include <core_version.h>
+
 #pragma once
 
 //////////////////////////////////////////////////////
@@ -49,7 +51,9 @@
 
 #if (REQUIRED>VERSION(HS_MAJOR,HS_MINOR,HS_PATCH))
   #error THIS SKETCH REQUIRES A LATER VERISON OF THE HOMESPAN LIBRARY
-#endif            
+#endif
+
+#define     ARDUINO_ESP_VERSION   STRINGIFY(ARDUINO_ESP32_GIT_DESC)
 
 //////////////////////////////////////////////////////
 //                DEFAULT SETTINGS                  //