Skip to content

Commit 705aa68

Browse files
committed
Bump dependencies to last version (induced some refactoring)
1 parent 77ad668 commit 705aa68

File tree

4 files changed

+132
-104
lines changed

4 files changed

+132
-104
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
.vscode/extensions.json
77
src/config.h
88
clean.bat
9+
config.h
10+
*.bak

platformio.ini

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@
99
; http://docs.platformio.org/page/projectconf.html
1010

1111
[env:d1_mini]
12-
platform = espressif8266@2.4.0
12+
platform = espressif8266@2.6.2
13+
framework = arduino
14+
1315
board = d1_mini
14-
lib_ldf_mode = deep+
1516
board_build.f_cpu = 160000000L
17+
1618
build_flags =
17-
-DARDUINOJSON_ENABLE_PROGMEM=1
18-
-DMQTT_MAX_PACKET_SIZE=1024
19-
framework = arduino
19+
-D ARDUINOJSON_ENABLE_PROGMEM=1
20+
21+
lib_deps =
22+
earlephilhower/ESP8266Audio @ 1.7
23+
jrowberg/I2Cdevlib-MPU6050 @ 0.0.0-alpha+sha.fbde122cc5
24+
fastled/FastLED @ 3.3.3
25+
me-no-dev/ESP Async WebServer @ 1.2.3
26+
knolleary/PubSubClient @ 2.8
27+
bblanchon/ArduinoJson @ 6.17.2
28+
lib_ldf_mode = deep+
29+
2030
upload_speed = 921600
2131
; Uncomment the 2 lines below after 1st firmware upload, to activate OTA
2232
;upload_protocol = espota
2333
;upload_port = esparkle.local
24-
lib_deps =
25-
ESP8266Audio@1.2
26-
I2Cdevlib-MPU6050@fbde122cc5
27-
FastLED@3.3.3
28-
ESP Async WebServer@1.2.3
29-
PubSubClient@2.7
30-
ArduinoJson@5.13.4

src/config.h.SAMPLE

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@
44
//############################################################################
55
// ESPARKLE VERSION
66
//############################################################################
7-
#define ESPARKLE_VERSION "1.0"
7+
8+
#define ESPARKLE_VERSION "1.1"
89

910
//############################################################################
1011
// WIFI
1112
//############################################################################
12-
#define ESP_NAME "ESParkle" // ESP8266 host name
1313

14-
const WifiAPEntry AP_LIST[] = { // Access points list
14+
// ESP8266 host name
15+
#define ESP_NAME "ESParkle"
16+
17+
// Access points list
18+
const WifiAPEntry AP_LIST[] = {
1519
{"YOUR_SSID_1", "YOUR_PASSPHRASE_1"},
1620
{"YOUR_SSID_2", "YOUR_PASSPHRASE_2"},
1721
{"YOUR_SSID_3", "YOUR_PASSPHRASE_3"}
@@ -20,43 +24,52 @@ const WifiAPEntry AP_LIST[] = {
2024
//############################################################################
2125
// MQTT
2226
//############################################################################
27+
2328
#define MQTT_HOST "mXX.cloudmqtt.com"
2429
#define MQTT_PORT 12345
2530
#define MQTT_USER "YOUR_MQTT_USER"
2631
#define MQTT_PASSWORD "YOUR_MQTT_PASSWORD"
2732
#define MQTT_IN_TOPIC "esparkle/in"
2833
#define MQTT_OUT_TOPIC "esparkle/out"
34+
#define MQTT_BUFF_SIZE 1024
2935

3036
//############################################################################
3137
// AUDIO
3238
//############################################################################
33-
#define RANDOM_STREAM_URL "http://www.dummyhost.net/esparkle/esparkle_mp3.php?action=random" // URL of companion PHP script for random MP3
34-
#define TTS_PROXY_URL "http://www.dummyhost.net/esparkle/esparkle_tts.php" // URL of companion PHP script for TTS
35-
#define TTS_PROXY_USER "YOUR_TTS_PROXY_USER" // HTTP Basic authentication user name for TTS
36-
#define TTS_PROXY_PASSWORD "YOUR_TTS_PROXY_PASSWORD" // HTTP Basic authentication password for TTS
3739

38-
float defaultGain = .3;
40+
#define RANDOM_STREAM_URL "http://www.dummyhost.net/esparkle/esparkle_mp3.php?action=random" // URL of companion PHP script for random MP3
41+
#define TTS_PROXY_URL "http://www.dummyhost.net/esparkle/esparkle_tts.php" // URL of companion PHP script for TTS
42+
#define TTS_PROXY_USER "YOUR_TTS_PROXY_USER" // HTTP Basic authentication user name for TTS
43+
#define TTS_PROXY_PASSWORD "YOUR_TTS_PROXY_PASSWORD" // HTTP Basic authentication password for TTS
44+
45+
float defaultGain = .3;
3946

4047
//############################################################################
4148
// LED
4249
//############################################################################
43-
#define COLOR_ORDER GRB // Set GRB for WS2812B and GBR for APA102
44-
#define LED_TYPE WS2812B // APA102, WS2801 or WS2812B
45-
#define NUM_LEDS 3 // Number of LEDs
46-
uint8_t max_bright = 128; // Default overall brightness
50+
51+
#define COLOR_ORDER GRB // Set GRB for WS2812B and GBR for APA102
52+
#define LED_TYPE WS2812B // APA102, WS2801 or WS2812B
53+
#define NUM_LEDS 7 // Number of LEDs
54+
uint8_t max_bright = 128; // Default overall brightness
4755

4856
//############################################################################
4957
// MPU
5058
//############################################################################
59+
60+
// MPU sensitivity params
5161
#define MPU_INTERRUPT_INTERVAL_MS 750
5262
#define MPU_MULTITAP_INTERVAL_MS 2000
53-
#define MPU_MULTITAP_RESTART 5
5463
#define MOTION_DETECTION_THRESHOLD 10
5564
#define MOTION_DETECTION_DURATION 5
5665

66+
// Number of taps to trigger ESP restart
67+
#define MPU_MULTITAP_RESTART 5
68+
5769
//############################################################################
5870
// PINS
5971
//############################################################################
72+
6073
/* --------+--------------+--------------------------------
6174
* D1 pin ESP-8266 pin Function
6275
* --------+--------------+--------------------------------

0 commit comments

Comments
 (0)