jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-28 13:46:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update environments

Browse Source
This commit is contained in:
fvanroie 2022-01-22 01:10:32 +01:00
parent ffaaafbfa3
commit 9100621e0f
8 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yaml vendored
View File

@ -16,8 +16,8 @@ jobs:
fail-fast: false
matrix:
environment:
- env: arduitouch-esp32_ili9341
out: arduitouch
- out: az-touch
env: "az-touch-mod-esp32_ili9341_4MB -e az-touch-mod-esp32_ili9341_8MB"
- env: d1-mini-esp32_ili9341
out: d1-mini-esp32
- env: d1-r32-waveshare_ili9486
@ -30,10 +30,8 @@ jobs:
out: esp32-one
- env: esp32-touchdown
out: esp32-touchdown
- env: freetouchdeck
out: freetouchdeck
- env: freetouchdeck_8MB
out: freetouchdeck
- out: freetouchdeck
env: "freetouchdeck_4MB -e freetouchdeck_8MB"
- out: featherwing
env: "huzzah32-featherwing-24 -e huzzah32-featherwing-35"
- env: lanbon_l8
@ -46,10 +44,8 @@ jobs:
out: makerfabs-tft
- env: ttgo-t7-v1.5_ili9341
out: ttgo-t7
- env: wt32-sc01
out: wt32-sc01
- env: wt32-sc01_16MB
out: wt32-sc01
- out: wt32-sc01
env: "wt32-sc01_4MB -e wt32-sc01_16MB"
- env: yeacreate-nscreen32
out: yeacreate

2
.github/workflows/release.yml vendored
View File

@ -48,7 +48,7 @@ jobs:
run: |
cat platformio_override.ini
- name: Run PlatformIO
run: pio run -e lolin-d32-pro_ili9341 -e arduitouch-esp32_ili9341 -e esp32-one_st7796 -e makerfabs-tft35-cap -e yeacreate-nscreen32 -e d1-mini-esp32_ili9341 -e esp32-touchdown -e freetouchdeck -e huzzah32-featherwing-24 -e huzzah32-featherwing-35 -e lanbon_l8 -e m5stack-core2 -e wt32-sc01 -e linux_sdl_64bits
run: pio run -e lolin-d32-pro_ili9341 -e az-touch-mod-esp32_ili9341_4MB -e esp32-one_st7796 -e makerfabs-tft35-cap -e yeacreate-nscreen32 -e d1-mini-esp32_ili9341 -e esp32-touchdown -e freetouchdeck_4MB -e freetouchdeck_16MB -e huzzah32-featherwing-24 -e huzzah32-featherwing-35 -e lanbon_l8 -e m5stack-core2 -e wt32-sc01_4MB -e wt32-sc01_16MB -e linux_sdl_64bits
- name: Upload output file
uses: actions/upload-artifact@v2
with:

26
CHANGLELOG.md
View File

@ -10,6 +10,15 @@
- ~~Breaking: The UTF codes for the built-in icons have changed from the previous list!~~
- Font ID is replaced by `namexx` (`where xx is the size`) but the previous Font ID still works for backwards compatibility
### Web UI
- _Selectable dark/light theme?_
### Services
- Add SimpleFTPServer to easily upload and download files to the plate *(one simultanious connection only)*
## v0.6.3
### Web UI
- Updated to modern responsive design
- Allow for a customizible `vars.css`, `style.css`, `script.js` and `edit.htm`
@ -21,7 +30,7 @@
- Hide cursor during `antiburn` and `idle` if the pointer is enabled
### Objects
- `img.src` now accepts `https` urls, needs testing
- `img.src` now accepts `https` urls (thanks @htvekov)
### Bug fixes
- Fix a bug in `dropdownlist` were `close` method performed `open` instead (thanks @htvekov)
@ -36,9 +45,9 @@
- Moved to Arduino 2.0.2 with native LittleFS library
- Moved to ESP-IDF 4.4 with fix for FragAttacks CVEs
- Prepare support for ESP32-S2
- Breaking: Removed support for ESP8266
- **Breaking:** Removed support for ESP8266!
Update libraries to ArduinoJson 6.19.1, TFT_eSPI 2.4.25, LovyanGFX 0.4.12 and Adafruit STMPE610 1.1.4
Updated libraries to ArduinoJson 6.19.1, TFT_eSPI 2.4.25, LovyanGFX 0.4.12 and Adafruit STMPE610 1.1.4
## v0.6.2
@ -57,12 +66,9 @@ Update libraries to ArduinoJson 6.19.1, TFT_eSPI 2.4.25, LovyanGFX 0.4.12 and Ad
### Objects
- Add `antiburn` command to prevent static parts of the screen to create a *ghosting* effect in some LCDs or conditions
## Services
- Add SimpleFTPServer to easily upload and download files to the plate *(one simultanious connection only)*
### Devices
- Add Analog touch driver for Unoshield displays (thanks @wesleygas)
- Add Arduitouch MOD ESP32 with 2.4" or 2.8"
- Add AZ-Touch MOD ESP32 with 2.4" or 2.8"
- Add Lilygo®Ttgo Pi ESP32 with TFT 3.5"
- Add Waveshare ESP32 One development board with Rpi MHS4001(B) or Waveshare RPi(C) LCD display
- Add D1-R32 ESP32 development board with with Waveshare ILI9486 Touch Shield
@ -74,7 +80,7 @@ Update libraries to ArduinoJson 6.19.1, TFT_eSPI 2.4.25, LovyanGFX 0.4.12 and Ad
- Fix configurable mqttPort (thanks @Qargh)
- Fix opaque background of `spinner` object in HASP theme (thanks @nagyrobi)
Updated AceButton to 1.9.1 and ArduinoJson to 6.18.5
Updated libraries to AceButton 1.9.1 and ArduinoJson 6.18.5
## v0.6.1
@ -152,7 +158,7 @@ Updated AceButton to 1.9.1 and ArduinoJson to 6.18.5
- Allow dynamic configuration of HA entities using the [openHASP Custom Component](https://github.com/HASwitchPlate/openHASP-custom-component/releases/) (thanks @dgomes)
- Add Manufacturer and Model to statusupdate
### Updated lvgl to 7.11.0, ArduinoJson to 6.18.0 and TFT_eSPI to 2.3.70
Updated libraries to lvgl 7.11.0, ArduinoJson 6.18.0 and TFT_eSPI 2.3.70
### Internationalization:
- Added French language
@ -183,7 +189,7 @@ Name changed to openHASP - https://haswitchplate.github.io/openHASP-docs/
- Add `action` property for local page navigation
- Add `back`, `prev`, `next` attributes to pages #114
- JSON Serialize text in payloads containing text attributes #140
- Add arduitouch-esp32_ili9341 config and allow for TFT_BACKLIGHT_ON set to LOW #131
- Add az-touch-mod-esp32_ili9341 config and allow for TFT_BACKLIGHT_ON set to LOW #131
- Add [FreeTouchDeck](https://haswitchplate.github.io/openHASP-docs/#devices/freetouchdeck/) and [ESP32-Touchdown](https://haswitchplate.github.io/openHASP-docs/#devices/esp32-touchdown/) configs
- Add roller `mode` `infinite` attribute
- Add btnmatrix `toggle` and `one_check` attributes

36
platformio_override-template.ini
View File

@ -22,7 +22,7 @@ build_flags =
;region -- Default Build Environments : Used when Build All ---
extra_default_envs =
; Uncomment specific environments or create extra:
; arduitouch-esp32_ili9341
; az-touch-mod-esp32_ili9341
; d1-mini-esp32_ili9341
; d1-r32-unoshield
; esp32-9341-unoshield-analog
@ -48,16 +48,24 @@ upload_port = ${env:d1-mini-esp32_ili9341.monitor_port}
monitor_port = COM3 ; Change to the correct port
upload_port = ${env:esp32dev-mrb3511.monitor_port}
[env:d1-r32-unoshield]
monitor_port = COM9 ; Change to the correct port
;upload_port = ${$env:d132-unoshield.monitor_port}
upload_port = 192.168.4.4 ; IP of the ESP
upload_protocol = espota ; Use ArduinoOTA after flashing over serial
upload_flags = --port=3232 ; --auth=haspadmin ; OTA password
[env:az-touch-mod-esp32_ili9341_4MB]
upload_port = COM16
monitor_port = COM16
[env:esp32-9341-unoshield-analog]
monitor_port = COM7 ; Leave commented to autodescover
; upload_port = ${$env:esp32-9341-unoshield-analog.monitor_port}
[env:az-touch-mod-esp32_ili9341_8MB]
upload_port = COM16
monitor_port = COM16
[env:d1-r32-unoshield_ili9486_adc]
monitor_port = COM5
upload_port = COM5
[env:d1-r32-unoshield_ili9341_adc]
;upload_protocol = espota ; Use ArduinoOTA after flashing over serial
;upload_port = 192.168.0.4 ; IP of the ESP
;upload_flags = --port=3232 ; --auth=haspadmin ; OTA password
monitor_port = COM5
upload_port = COM5
[env:esp32-one_st7796]
upload_port = COM6 ; Change to the correct port
@ -71,15 +79,15 @@ upload_port = ${env:lolin-d32-pro_ili9341.monitor_port}
[env:ttgo_esp32_poe-ili9341]
monitor_port = COM9 ; Change to the correct port
;upload_port = ${env:ttgo_esp32_poe-ili9341.monitor_port}
upload_port = 192.168.4.5 ; IP of the ESP
upload_protocol = espota ; Use ArduinoOTA after flashing over serial
;upload_port = 192.168.4.5 ; IP of the ESP
;upload_protocol = espota ; Use ArduinoOTA after flashing over serial
upload_flags = --port=3232 ; --auth=haspadmin ; OTA password
[env:ttgo-lilygo-pi_ili9481]
monitor_port = COM9 ; Change to the correct port
;upload_port = ${env:ttgo_esp32_poe-ili9341.monitor_port}
upload_port = 192.168.4.5 ; IP of the ESP
upload_protocol = espota ; Use ArduinoOTA after flashing over serial
;upload_port = 192.168.4.5 ; IP of the ESP
;upload_protocol = espota ; Use ArduinoOTA after flashing over serial
upload_flags = --port=3232 ; --auth=haspadmin ; OTA password
;region -- Custom Environment configuration example -----------------

4
tools/esp_merge_bin.py
View File

@ -30,7 +30,7 @@ def get_fw_version(source, target, env):
def copy_merge_bins(source, target, env):
version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV)
name = str(target[0]).split(os.path.sep)[2]
name = name.replace('_8MB', '').replace('_16MB', '')
name = name.replace('_4MB', '').replace('_8MB', '').replace('_16MB', '').replace('_32MB', '')
flash_size = env.GetProjectOption("board_upload.flash_size")
bootloader = "{}tools{}sdk{}esp32{}bin{}bootloader_dio_40m.bin".format(FRAMEWORK_DIR, os.path.sep, os.path.sep, os.path.sep, os.path.sep, os.path.sep)
@ -70,7 +70,7 @@ def copy_merge_bins(source, target, env):
def copy_ota(source, target, env):
version = 'v' + str(HASP_VER_MAJ) + '.' + str(HASP_VER_MIN) + '.' + str(HASP_VER_REV)
name =str(target[0]).split(os.path.sep)[2]
name = name.replace('_8MB', '').replace('_16MB', '')
name = name.replace('_4MB', '').replace('_8MB', '').replace('_16MB', '').replace('_32MB', '')
firmware_src = str(target[0])
firmware_dst ="{}firmware{}{}_ota_{}.bin".format(OUTPUT_DIR, os.path.sep, name, version)

17
user_setups/esp32/arduitouch-esp32_ili9341.ini → user_setups/esp32/az-touch-mod-esp32_ili9341.ini
View File

@ -1,19 +1,18 @@
;***************************************************;
; AZ ArduiTouch PCB with ESP32 with 2.4" or 2.8" ;
; - ESP32-WROOM or WROVER board ;
; AZ-Touch MOD PCB with ESP32 with 2.4" or 2.8" ;
; - ESP32-WROOM or WROVER DevKitC ;
; - ili9341 TFT ;
; - xpt2046 touch controller ;
;***************************************************;
[env:arduitouch-esp32_ili9341]
extends = esp32_4mb
[az-touch-mod-esp32_ili9341]
board = esp32dev
build_flags =
${env.build_flags}
${esp32.build_flags}
${esp32.ps_ram}
-D HASP_MODEL="Arduitouch ESP32"
-D HASP_MODEL="AZ-Touch MOD ESP32 DevKitC"
; -D HASP_USE_MDNS=0 ; saves 32 KiB flash
; -D HASP_USE_OTA=0 ; No ArduinoOTA on port 3232
@ -38,4 +37,10 @@ lib_deps =
lib_ignore =
${env.lib_ignore}
${esp32.lib_ignore}
;endregion
;endregion
[env:az-touch-mod-esp32_ili9341_4MB]
extends = az-touch-mod-esp32_ili9341, esp32_4mb
[env:az-touch-mod-esp32_ili9341_8MB]
extends = az-touch-mod-esp32_ili9341, esp32_8mb

2
user_setups/esp32/freetouchdeck.ini
View File

@ -49,7 +49,7 @@ lib_ignore =
${esp32.lib_ignore}
;endregion
[env:freetouchdeck]
[env:freetouchdeck_4MB]
extends = freetouchdeck, esp32_4mb
[env:freetouchdeck_8MB]

2
user_setups/esp32/wt32-sc01.ini
View File

@ -46,7 +46,7 @@ lib_ignore =
${esp32.lib_ignore}
;endregion
[env:wt32-sc01]
[env:wt32-sc01_4MB]
extends = wt32-sc01, esp32_4mb
[env:wt32-sc01_16MB]