mirror of
https://github.com/HASwitchPlate/openHASP.git
synced 2025-07-27 21:26:43 +00:00
Update environments
This commit is contained in:
parent
8cc15fffd1
commit
9fa8eb7495
BIN
build_output/firmware/d1mini-lolintft24_v0.2.1111.bin
Normal file
BIN
build_output/firmware/d1mini-lolintft24_v0.2.1111.bin
Normal file
Binary file not shown.
BIN
build_output/firmware/d1mini32-lolintft24_v0.2.1111.bin
Normal file
BIN
build_output/firmware/d1mini32-lolintft24_v0.2.1111.bin
Normal file
Binary file not shown.
@ -1,21 +1,15 @@
|
|||||||
; PlatformIO Project Configuration File
|
; PlatformIO Project Configuration File
|
||||||
;
|
;
|
||||||
; Build options: build flags, source filter
|
|
||||||
; Upload options: custom upload port, speed and extra flags
|
|
||||||
; Library options: dependencies, extra library storages
|
|
||||||
; Advanced options: extra scripting
|
|
||||||
;
|
|
||||||
; Please visit documentation for the other options and examples
|
; Please visit documentation for the other options and examples
|
||||||
; http://docs.platformio.org/page/projectconf.html
|
; http://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
|
|
||||||
;***************************************************
|
;**************************************************************
|
||||||
; Common project settings
|
; Common project settings
|
||||||
;***************************************************
|
;**************************************************************
|
||||||
[platformio]
|
[platformio]
|
||||||
extra_configs =
|
extra_configs =
|
||||||
lcd_config.ini
|
lcd_config.ini
|
||||||
pin_config.ini
|
|
||||||
; -- Put active [env] files in this dir to be included in the build menu
|
; -- Put active [env] files in this dir to be included in the build menu
|
||||||
user_setups/active/*.ini
|
user_setups/active/*.ini
|
||||||
; -- Add customizations to this file only:
|
; -- Add customizations to this file only:
|
||||||
@ -48,10 +42,10 @@ lib_deps =
|
|||||||
;TFT_eSPI@^2.2.2 ; Tft SPI drivers
|
;TFT_eSPI@^2.2.2 ; Tft SPI drivers
|
||||||
;TFT_eSPI@^1.4.20 ; Tft SPI drivers
|
;TFT_eSPI@^1.4.20 ; Tft SPI drivers
|
||||||
PubSubClient@^2.8.0 ; MQTT client
|
PubSubClient@^2.8.0 ; MQTT client
|
||||||
ArduinoJson@^6.16.1 ; JSON Parser
|
ArduinoJson@^6.17.1 ; JSON Parser
|
||||||
StreamUtils@^1.4.0
|
StreamUtils@^1.5.0
|
||||||
;Syslog@^2.0.0 ; Obsoleted
|
;Syslog@^2.0.0 ; Obsoleted
|
||||||
AceButton@^1.6.1
|
AceButton@^1.7.0
|
||||||
;AsyncTCP
|
;AsyncTCP
|
||||||
;https://github.com/me-no-dev/ESPAsyncWebServer/archive/master.zip
|
;https://github.com/me-no-dev/ESPAsyncWebServer/archive/master.zip
|
||||||
;https://github.com/me-no-dev/ESPAsyncTCP/archive/master.zip
|
;https://github.com/me-no-dev/ESPAsyncTCP/archive/master.zip
|
||||||
@ -61,20 +55,23 @@ lib_ignore =
|
|||||||
https://github.com/littlevgl/lvgl.git
|
https://github.com/littlevgl/lvgl.git
|
||||||
|
|
||||||
|
|
||||||
; -- littlevgl config options ----------------------
|
|
||||||
build_flags =
|
build_flags =
|
||||||
;-Os ; Code Size Optimization
|
;-Os ; Code Size Optimization
|
||||||
-Og ; Code Debug Optimization
|
-Og ; Code Debug Optimization
|
||||||
;-w ; Suppress warnings
|
;-w ; Suppress warnings
|
||||||
-D CORE_DEBUG_LEVEL=1 ; Errors
|
-D CORE_DEBUG_LEVEL=1 ; Errors
|
||||||
|
-I include ; include lv_conf.h and hasp_conf.h
|
||||||
|
; -- littlevgl build options ------------------------------
|
||||||
-D LV_CONF_INCLUDE_SIMPLE
|
-D LV_CONF_INCLUDE_SIMPLE
|
||||||
-D LV_LVGL_H_INCLUDE_SIMPLE ; for lv_drivers
|
-D LV_LVGL_H_INCLUDE_SIMPLE ; for lv_drivers
|
||||||
|
; -- littlevgl build options ------------------------------
|
||||||
-D SPIFFS_TEMPORAL_FD_CACHE ; speedup opening recent files
|
-D SPIFFS_TEMPORAL_FD_CACHE ; speedup opening recent files
|
||||||
|
; -- ArduinoJson build options ----------------------------
|
||||||
-D ARDUINOJSON_DECODE_UNICODE=1 ; for utf-8 symbols
|
-D ARDUINOJSON_DECODE_UNICODE=1 ; for utf-8 symbols
|
||||||
-D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments
|
-D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments
|
||||||
|
; -- StreamUtils build options ----------------------------
|
||||||
-D STREAMUTILS_ENABLE_EEPROM=1 ; for STM32, it also supports EEPROM
|
-D STREAMUTILS_ENABLE_EEPROM=1 ; for STM32, it also supports EEPROM
|
||||||
;-D DISABLE_LOGGING
|
;-D DISABLE_LOGGING
|
||||||
-I include ; include lv_conf.h and hasp_conf.h
|
|
||||||
${override.build_flags}
|
${override.build_flags}
|
||||||
-D HASP_VERSION_MAJOR=0
|
-D HASP_VERSION_MAJOR=0
|
||||||
-D HASP_VERSION_MINOR=2
|
-D HASP_VERSION_MINOR=2
|
||||||
@ -127,7 +124,7 @@ stm32_flags=
|
|||||||
-D MQTT_MAX_PACKET_SIZE=2048 ; longer PubSubClient messages
|
-D MQTT_MAX_PACKET_SIZE=2048 ; longer PubSubClient messages
|
||||||
|
|
||||||
; -- By default there are no ${override.build_flags} set
|
; -- By default there are no ${override.build_flags} set
|
||||||
; -- to use it, copy platformio_override.ini from the template
|
; -- to use it, copy the platformio_override.ini file from the template
|
||||||
[override]
|
[override]
|
||||||
build_flags =
|
build_flags =
|
||||||
extra_default_envs =
|
extra_default_envs =
|
||||||
|
@ -130,7 +130,7 @@ static inline char * httpGetNodename()
|
|||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
bool httpIsAuthenticated(const __FlashStringHelper * page)
|
bool httpIsAuthenticated(const __FlashStringHelper * fstr_page)
|
||||||
{
|
{
|
||||||
if(httpPassword[0] != '\0') { // Request HTTP auth if httpPassword is set
|
if(httpPassword[0] != '\0') { // Request HTTP auth if httpPassword is set
|
||||||
if(!webServer.authenticate(httpUser, httpPassword)) {
|
if(!webServer.authenticate(httpUser, httpPassword)) {
|
||||||
@ -140,7 +140,7 @@ bool httpIsAuthenticated(const __FlashStringHelper * page)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
|
#if defined(ARDUINO_ARCH_ESP32) || defined(ARDUINO_ARCH_ESP8266)
|
||||||
Log.verbose(TAG_HTTP, F("Sending %s page to client connected from: %s"), page,
|
Log.verbose(TAG_HTTP, F("Sending %S page to client connected from: %s"), fstr_page,
|
||||||
webServer.client().remoteIP().toString().c_str());
|
webServer.client().remoteIP().toString().c_str());
|
||||||
#else
|
#else
|
||||||
// Log.verbose(TAG_HTTP,F("Sending %s page to client connected from: %s"), page,
|
// Log.verbose(TAG_HTTP,F("Sending %s page to client connected from: %s"), page,
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
;***************************************************;
|
;***************************************************;
|
||||||
|
|
||||||
[env:d1mini-lolintft24]
|
[env:d1mini-lolintft24]
|
||||||
platform = espressif8266@^2.6.2
|
platform = espressif8266@^2.7.4
|
||||||
board = d1_mini
|
board = d1_mini
|
||||||
;upload_port = COM7 ; To change the port, use platform_override.ini
|
;upload_port = COM7 ; To change the port, use platform_override.ini
|
||||||
;monitor_port = COM7 ; To change the port, use platform_override.ini
|
;monitor_port = COM7 ; To change the port, use platform_override.ini
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
;***************************************************;
|
;***************************************************;
|
||||||
|
|
||||||
[env:esp12e-st7735]
|
[env:esp12e-st7735]
|
||||||
platform = espressif8266@^2.6.2
|
platform = espressif8266@^2.7.4
|
||||||
board = esp12e
|
board = esp12e
|
||||||
upload_port = COM8 ; To change the port, use platform_override.ini
|
upload_port = COM8 ; To change the port, use platform_override.ini
|
||||||
monitor_port = COM8 ; To change the port, use platform_override.ini
|
monitor_port = COM8 ; To change the port, use platform_override.ini
|
||||||
|
Loading…
x
Reference in New Issue
Block a user