mirror of
https://github.com/HASwitchPlate/openHASP.git
synced 2025-07-21 02:06:35 +00:00
Merge branch 'master' of https://github.com/HASwitchPlate/openHASP
This commit is contained in:
commit
73c1539fda
35
.devcontainer/devcontainer.json
Normal file
35
.devcontainer/devcontainer.json
Normal file
@ -0,0 +1,35 @@
|
||||
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
|
||||
// README at: https://github.com/devcontainers/templates/tree/main/src/ubuntu
|
||||
{
|
||||
"name": "Ubuntu",
|
||||
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
|
||||
"image": "mcr.microsoft.com/devcontainers/base:jammy",
|
||||
|
||||
// Features to add to the dev container. More info: https://containers.dev/features.
|
||||
"features": {
|
||||
"ghcr.io/devcontainers/features/python:1": {}
|
||||
},
|
||||
|
||||
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||
// "forwardPorts": [],
|
||||
|
||||
// Use 'postCreateCommand' to run commands after the container is created.
|
||||
// "postCreateCommand": "uname -a",
|
||||
|
||||
// Configure tool-specific properties.
|
||||
"customizations": {
|
||||
"vscode": {
|
||||
"extensions": [
|
||||
"ms-vscode.cpptools",
|
||||
"platformio.platformio-ide"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
||||
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
|
||||
// "remoteUser": "root"
|
||||
|
||||
// Allow uploading to device
|
||||
"mounts": ["type=bind,source=/dev/bus/usb,target=/dev/bus/usb"],
|
||||
"runArgs": ["--privileged"]
|
||||
}
|
12
.github/dependabot.yml
vendored
Normal file
12
.github/dependabot.yml
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
# To get started with Dependabot version updates, you'll need to specify which
|
||||
# package ecosystems to update and where the package manifests are located.
|
||||
# Please see the documentation for more information:
|
||||
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
|
||||
# https://containers.dev/guide/dependabot
|
||||
|
||||
version: 2
|
||||
updates:
|
||||
- package-ecosystem: "devcontainers"
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: weekly
|
@ -22,7 +22,7 @@ build_flags =
|
||||
|
||||
;region -- Default Build Environments : Used when Build All ---
|
||||
extra_default_envs =
|
||||
; Uncomment specific environments or create extra:
|
||||
; Uncomment specific environments or create extra (copy names from square brackets in user_setups/*/*.ini):
|
||||
; az-touch-mod-esp32_ili9341_4MB
|
||||
; az-touch-mod-esp32_ili9341_8MB
|
||||
; d1-mini-esp32_ili9341
|
||||
@ -64,6 +64,9 @@ extra_default_envs =
|
||||
; makerfabs-tft35-cap_4MB
|
||||
; makerfabs-tft-s2_ili9488
|
||||
; nodemcu32s-raspi
|
||||
; panlee-zw3d95ce01s-ar-4848_16MB
|
||||
; panlee-zw3d95ce01s-tr-4848_16MB
|
||||
; panlee-zw3d95ce01s-ur-4848_16MB
|
||||
; s2-mini-esp32s2_ili9341
|
||||
; ttgo_esp32_poe-ili9341
|
||||
; lilygo-lily-pi_ili9481
|
||||
|
@ -4,20 +4,19 @@
|
||||
; - TT21100 touch controller ;
|
||||
;***************************************************;
|
||||
|
||||
[env:esp-box]
|
||||
[esp_box]
|
||||
extends = arduino_esp32s3_v2, flash_16mb
|
||||
board = esp32s3box
|
||||
board = esp32-s3-devkitc-1 ; setting board to 'esp32s3box' breaks ESP32-S3-BOX-3 sadly as that overrides the TFT_RST parameter.
|
||||
board_build.arduino.memory_type = qio_opi
|
||||
|
||||
build_flags =
|
||||
-D HASP_MODEL="ESP-BOX"
|
||||
${arduino_esp32s3_v2.build_flags}
|
||||
${esp32s3.ps_ram}
|
||||
|
||||
;region -- TFT_eSPI build options ------------------------
|
||||
;region -- display build options ------------------------
|
||||
-D LGFX_USE_V1=1
|
||||
-D HASP_USE_LGFX_TOUCH=1
|
||||
-D TOUCH_DRIVER=0x21100
|
||||
|
||||
-D ILI9341_DRIVER=1
|
||||
-D INVERT_COLORS=0
|
||||
-D TFT_ROTATION=2
|
||||
@ -25,21 +24,47 @@ build_flags =
|
||||
-D TFT_HEIGHT=240
|
||||
-D TOUCH_SDA=8
|
||||
-D TOUCH_SCL=18
|
||||
-D TOUCH_OFFSET_ROTATION=4 ; 1=swap xy, 2=invert x, 4=inverty
|
||||
-D TOUCH_IRQ=3
|
||||
-D I2C_TOUCH_FREQUENCY=400000
|
||||
-D I2C_TOUCH_PORT=1
|
||||
-D I2C_TOUCH_ADDRESS=0x24
|
||||
-D TFT_DC=4
|
||||
-D TFT_CS=5
|
||||
-D TFT_MOSI=6
|
||||
-D TFT_MISO=-1
|
||||
-D TFT_SCLK=7
|
||||
-D TFT_RST=48
|
||||
-D TFT_BCKL=45
|
||||
-D SPI_FREQUENCY=40000000
|
||||
; -D SERIAL_SPEED=-1
|
||||
;endregion
|
||||
|
||||
lib_deps =
|
||||
${arduino_esp32s3_v2.lib_deps}
|
||||
${lovyangfx.lib_deps}
|
||||
${tft_espi.lib_deps}
|
||||
|
||||
|
||||
[env:esp32-s3-box]
|
||||
extends = esp_box
|
||||
|
||||
build_flags =
|
||||
-D HASP_MODEL="ESP32-S3-BOX"
|
||||
${esp_box.build_flags}
|
||||
|
||||
-D TOUCH_DRIVER=0x21100
|
||||
-D I2C_TOUCH_ADDRESS=0x24
|
||||
-D I2C_TOUCH_PORT=1
|
||||
-D TOUCH_OFFSET_ROTATION=4 ; 1=swap xy axis (rotate), 2=invert x, 4=inverty
|
||||
-D TFT_BCKL=45
|
||||
-D TFT_RST=48
|
||||
|
||||
; GPIO1 for mute status
|
||||
[env:esp32-s3-box-3]
|
||||
extends = esp_box
|
||||
|
||||
build_flags =
|
||||
-D HASP_MODEL="ESP32-S3-BOX-3"
|
||||
${esp_box.build_flags}
|
||||
|
||||
-D TOUCH_DRIVER=0x911
|
||||
-D I2C_TOUCH_ADDRESS=0x14
|
||||
-D I2C_TOUCH_PORT=0
|
||||
-D TOUCH_OFFSET_ROTATION=2 ; 1=swap xy axis (rotate), 2=invert x, 4=inverty
|
||||
-D TFT_BCKL=47
|
||||
-D TFT_RST=-1
|
Loading…
x
Reference in New Issue
Block a user