Merge pull request #229 from ayushsharma82/dev

fix: merge improvements and updated dependencies

.github/workflows/ci.yml

@@ -7,15 +7,13 @@ on:
       - "/keywords.txt"
       - "/library.json"
       - "/library.properties"
-      - "/vue-frontend"
       - "/docs"
   pull_request:
     paths-ignore:
       - "**/**.md"
       - "/keywords.txt"
       - "/library.json"
       - "/library.properties"
-      - "/vue-frontend"
       - "/docs"
 
 jobs:
@@ -58,16 +56,16 @@ jobs:
         run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}
 
       - name: Install AsyncTCP
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.1.4
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.2.3
 
       - name: Install ESPAsyncTCP
         run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
 
       - name: Install ESPAsyncWebServer
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.0.2
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.1.1
 
       - name: Install ArduinoJson
-        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/bblanchon/ArduinoJson#v7.0.4
+        run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/bblanchon/ArduinoJson#v7.1.0
 
       - name: Build AccessPoint
         run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/AccessPoint/AccessPoint.ino"
@@ -105,7 +103,7 @@ jobs:
           - name: esp32dev|arduino-3
             board: esp32dev
             platform: espressif32
-            opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip'"
+            opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'"
           - name: esp32-s3-devkitc-1|arduino
             board: esp32-s3-devkitc-1
             platform: espressif32
@@ -117,7 +115,7 @@ jobs:
           - name: esp32-s3-devkitc-1|arduino-3
             board: esp32-s3-devkitc-1
             platform: espressif32
-            opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip'"
+            opts: "--project-option 'lib_compat_mode = strict' --project-option 'platform_packages=platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3, platform_packages=platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip'"
           - name: huzzah|espressif8266
             board: huzzah
             platform: espressif8266

library.json

@@ -15,20 +15,20 @@
       "maintainer": true
     }
   ],
-  "version": "4.0.5",
+  "version": "4.0.6",
   "frameworks": "arduino",
   "platforms": ["espressif32", "espressif8266"],
   "dependencies": [
     {
       "owner": "bblanchon",
       "name": "ArduinoJson",
-      "version": "^7.0.4",
+      "version": "^7.1.0",
       "platforms": ["espressif8266", "espressif32"]
     },
     {
       "owner": "mathieucarbou",
-      "name": "ESP Async WebServer",
-      "version": "^3.0.2",
+      "name": "ESPAsyncWebServer",
+      "version": "^3.1.1",
       "platforms": ["espressif8266", "espressif32"]
     }
   ]

library.properties

@@ -1,5 +1,5 @@
 name=ESP-DASH
-version=4.0.5
+version=4.0.6
 author=Ayush Sharma
 category=Communication
 maintainer=Ayush Sharma <[email protected]>

platformio.ini

@@ -5,9 +5,9 @@ build_flags =
   -D CONFIG_ARDUHAL_LOG_COLORS
   -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
 lib_deps = 
-  bblanchon/ArduinoJson @ 7.0.4
-  mathieucarbou/Async TCP @ ^3.1.4
-  mathieucarbou/ESP Async WebServer @ 3.0.2
+  bblanchon/ArduinoJson@^7.1.0
+  mathieucarbou/AsyncTCP@^3.2.3
+  mathieucarbou/ESPAsyncWebServer@^3.1.1
 upload_protocol = esptool
 monitor_speed = 115200
 monitor_filters = esp32_exception_decoder, log2file
@@ -32,14 +32,14 @@ board = esp32-s3-devkitc-1
 [env:arduino-3]
 platform = espressif32
 platform_packages=
-  platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2
-  platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip
+  platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3
+  platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip
 board = esp32-s3-devkitc-1
 
 [env:esp8266]
 platform = espressif8266
 board = huzzah
 lib_deps = 
-  bblanchon/ArduinoJson @ 7.0.4
-  mathieucarbou/ESP Async WebServer @ 3.0.2
-  esphome/ESPAsyncTCP-esphome @ 2.0.0
+  bblanchon/ArduinoJson@^7.1.0
+  mathieucarbou/ESPAsyncWebServer@^3.1.1
+  esphome/ESPAsyncTCP-esphome@^2.0.0

src/Chart.cpp

@@ -58,7 +58,7 @@ void Chart::updateX(int arr_x[], size_t x_size){
     _x_axis_i_ptr = arr_x;
     _x_axis_ptr_size = x_size;
   #endif
-  _changed = true;
+  _x_changed = true;
 }
 
 void Chart::updateX(float arr_x[], size_t x_size){
@@ -73,7 +73,7 @@ void Chart::updateX(float arr_x[], size_t x_size){
     _x_axis_f_ptr = arr_x;
     _x_axis_ptr_size = x_size;
   #endif
-  _changed = true;
+  _x_changed = true;
 }
 
 void Chart::updateX(String arr_x[], size_t x_size){
@@ -88,7 +88,7 @@ void Chart::updateX(String arr_x[], size_t x_size){
     _x_axis_s_ptr = arr_x;
     _x_axis_ptr_size = x_size;
   #endif
-  _changed = true;
+  _x_changed = true;
 }
 
 void Chart::updateX(const char* arr_x[], size_t x_size){
@@ -103,7 +103,7 @@ void Chart::updateX(const char* arr_x[], size_t x_size){
     _x_axis_char_ptr = arr_x;
     _x_axis_ptr_size = x_size;
   #endif
-  _changed = true;
+  _x_changed = true;
 }
 
 void Chart::updateY(int arr_y[], size_t y_size){
@@ -118,7 +118,7 @@ void Chart::updateY(int arr_y[], size_t y_size){
     _y_axis_i_ptr = arr_y;
     _y_axis_ptr_size = y_size;
   #endif
-  _changed = true;
+  _y_changed = true;
 }
 
 void Chart::updateY(float arr_y[], size_t y_size){
@@ -133,7 +133,7 @@ void Chart::updateY(float arr_y[], size_t y_size){
     _y_axis_f_ptr = arr_y;
     _y_axis_ptr_size = y_size;
   #endif
-  _changed = true;
+  _y_changed = true;
 }
 
 /*

src/Chart.h

@@ -35,7 +35,8 @@ class Chart {
     uint32_t _id;
     const char *_name;
     int   _type;
-    bool  _changed;
+    bool  _x_changed;
+    bool  _y_changed;
     GraphAxisType _x_axis_type;
     GraphAxisType _y_axis_type;