Skip to content

Commit 092f59e

Browse files
Merge pull request #229 from ayushsharma82/dev
fix: merge improvements and updated dependencies
2 parents 1388c1d + 52979b8 commit 092f59e

File tree

10 files changed

+3185
-3127
lines changed

10 files changed

+3185
-3127
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@ on:
77
- "/keywords.txt"
88
- "/library.json"
99
- "/library.properties"
10-
- "/vue-frontend"
1110
- "/docs"
1211
pull_request:
1312
paths-ignore:
1413
- "**/**.md"
1514
- "/keywords.txt"
1615
- "/library.json"
1716
- "/library.properties"
18-
- "/vue-frontend"
1917
- "/docs"
2018

2119
jobs:
@@ -58,16 +56,16 @@ jobs:
5856
run: arduino-cli core install --additional-urls "${{ matrix.index_url }}" ${{ matrix.core }}
5957

6058
- name: Install AsyncTCP
61-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.1.4
59+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/AsyncTCP#v3.2.3
6260

6361
- name: Install ESPAsyncTCP
6462
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/esphome-ESPAsyncTCP#v2.0.0
6563

6664
- name: Install ESPAsyncWebServer
67-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.0.2
65+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/mathieucarbou/ESPAsyncWebServer#v3.1.1
6866

6967
- name: Install ArduinoJson
70-
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/bblanchon/ArduinoJson#v7.0.4
68+
run: ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL=true arduino-cli lib install --git-url https://github.com/bblanchon/ArduinoJson#v7.1.0
7169

7270
- name: Build AccessPoint
7371
run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/AccessPoint/AccessPoint.ino"
@@ -105,7 +103,7 @@ jobs:
105103
- name: esp32dev|arduino-3
106104
board: esp32dev
107105
platform: espressif32
108-
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'"
106+
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'"
109107
- name: esp32-s3-devkitc-1|arduino
110108
board: esp32-s3-devkitc-1
111109
platform: espressif32
@@ -117,7 +115,7 @@ jobs:
117115
- name: esp32-s3-devkitc-1|arduino-3
118116
board: esp32-s3-devkitc-1
119117
platform: espressif32
120-
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'"
118+
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'"
121119
- name: huzzah|espressif8266
122120
board: huzzah
123121
platform: espressif8266

library.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
"maintainer": true
1616
}
1717
],
18-
"version": "4.0.5",
18+
"version": "4.0.6",
1919
"frameworks": "arduino",
2020
"platforms": ["espressif32", "espressif8266"],
2121
"dependencies": [
2222
{
2323
"owner": "bblanchon",
2424
"name": "ArduinoJson",
25-
"version": "^7.0.4",
25+
"version": "^7.1.0",
2626
"platforms": ["espressif8266", "espressif32"]
2727
},
2828
{
2929
"owner": "mathieucarbou",
30-
"name": "ESP Async WebServer",
31-
"version": "^3.0.2",
30+
"name": "ESPAsyncWebServer",
31+
"version": "^3.1.1",
3232
"platforms": ["espressif8266", "espressif32"]
3333
}
3434
]

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=ESP-DASH
2-
version=4.0.5
2+
version=4.0.6
33
author=Ayush Sharma
44
category=Communication
55
maintainer=Ayush Sharma <[email protected]>

platformio.ini

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ build_flags =
55
-D CONFIG_ARDUHAL_LOG_COLORS
66
-D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
77
lib_deps =
8-
bblanchon/ArduinoJson @ 7.0.4
9-
mathieucarbou/Async TCP @ ^3.1.4
10-
mathieucarbou/ESP Async WebServer @ 3.0.2
8+
bblanchon/ArduinoJson@^7.1.0
9+
mathieucarbou/AsyncTCP@^3.2.3
10+
mathieucarbou/ESPAsyncWebServer@^3.1.1
1111
upload_protocol = esptool
1212
monitor_speed = 115200
1313
monitor_filters = esp32_exception_decoder, log2file
@@ -32,14 +32,14 @@ board = esp32-s3-devkitc-1
3232
[env:arduino-3]
3333
platform = espressif32
3434
platform_packages=
35-
platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.2
36-
platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.2/esp32-arduino-libs-3.0.2.zip
35+
platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3
36+
platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip
3737
board = esp32-s3-devkitc-1
3838

3939
[env:esp8266]
4040
platform = espressif8266
4141
board = huzzah
4242
lib_deps =
43-
bblanchon/ArduinoJson @ 7.0.4
44-
mathieucarbou/ESP Async WebServer @ 3.0.2
45-
esphome/ESPAsyncTCP-esphome @ 2.0.0
43+
bblanchon/ArduinoJson@^7.1.0
44+
mathieucarbou/ESPAsyncWebServer@^3.1.1
45+
esphome/ESPAsyncTCP-esphome@^2.0.0

src/Chart.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void Chart::updateX(int arr_x[], size_t x_size){
5858
_x_axis_i_ptr = arr_x;
5959
_x_axis_ptr_size = x_size;
6060
#endif
61-
_changed = true;
61+
_x_changed = true;
6262
}
6363

6464
void Chart::updateX(float arr_x[], size_t x_size){
@@ -73,7 +73,7 @@ void Chart::updateX(float arr_x[], size_t x_size){
7373
_x_axis_f_ptr = arr_x;
7474
_x_axis_ptr_size = x_size;
7575
#endif
76-
_changed = true;
76+
_x_changed = true;
7777
}
7878

7979
void Chart::updateX(String arr_x[], size_t x_size){
@@ -88,7 +88,7 @@ void Chart::updateX(String arr_x[], size_t x_size){
8888
_x_axis_s_ptr = arr_x;
8989
_x_axis_ptr_size = x_size;
9090
#endif
91-
_changed = true;
91+
_x_changed = true;
9292
}
9393

9494
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){
103103
_x_axis_char_ptr = arr_x;
104104
_x_axis_ptr_size = x_size;
105105
#endif
106-
_changed = true;
106+
_x_changed = true;
107107
}
108108

109109
void Chart::updateY(int arr_y[], size_t y_size){
@@ -118,7 +118,7 @@ void Chart::updateY(int arr_y[], size_t y_size){
118118
_y_axis_i_ptr = arr_y;
119119
_y_axis_ptr_size = y_size;
120120
#endif
121-
_changed = true;
121+
_y_changed = true;
122122
}
123123

124124
void Chart::updateY(float arr_y[], size_t y_size){
@@ -133,7 +133,7 @@ void Chart::updateY(float arr_y[], size_t y_size){
133133
_y_axis_f_ptr = arr_y;
134134
_y_axis_ptr_size = y_size;
135135
#endif
136-
_changed = true;
136+
_y_changed = true;
137137
}
138138

139139
/*

src/Chart.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ class Chart {
3535
uint32_t _id;
3636
const char *_name;
3737
int _type;
38-
bool _changed;
38+
bool _x_changed;
39+
bool _y_changed;
3940
GraphAxisType _x_axis_type;
4041
GraphAxisType _y_axis_type;
4142

0 commit comments

Comments
 (0)