Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/build-firmware/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ inputs:
runs:
using: "composite"
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive
- name: 'Board select'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-sdk/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ inputs:
runs:
using: "composite"
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
submodules: recursive
- name: 'Board select'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-simulator/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ runs:
using: "composite"
steps:
- name: "Checkout repo"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
submodules: recursive
- name: Install Linux Dependencies for SDL
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-simulator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
Linux:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
persist-credentials: false
- name: "Build"
Expand All @@ -22,7 +22,7 @@ jobs:
macOS:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
persist-credentials: false
- name: "Build"
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
persist-credentials: false
- name: "Build SDK"
Expand All @@ -36,7 +36,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
persist-credentials: false
- id: set-matrix
Expand All @@ -47,7 +47,7 @@ jobs:
strategy:
matrix: ${{ fromJSON(needs.GenerateDeviceMatrix.outputs.matrix) }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
with:
persist-credentials: false
- name: "Build Firmware"
Expand All @@ -62,15 +62,17 @@ jobs:
(github.event_name == 'push' && github.ref == 'refs/heads/main') ||
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v'))
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
Comment thread
coderabbitai[bot] marked this conversation as resolved.
with:
persist-credentials: false
- name: "Bundle Artifacts"
uses: ./.github/actions/bundle-artifacts
PublishFirmwareSnapshot:
runs-on: ubuntu-latest
needs: [ BundleArtifacts ]
if: (github.event_name == 'push' && github.ref == 'refs/heads/main')
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: "Publish Firmware Snapshot"
env:
CDN_ID: ${{ secrets.CDN_ID }}
Expand All @@ -84,7 +86,7 @@ jobs:
needs: [ BundleArtifacts ]
if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v'))
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: "Publish Firmware Stable"
env:
CDN_ID: ${{ secrets.CDN_ID }}
Expand All @@ -98,7 +100,7 @@ jobs:
needs: [ BundleArtifacts ]
if: (github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')))
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: "Publish SDKs"
env:
CDN_ID: ${{ secrets.CDN_ID }}
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Checkout repo"
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
submodules: recursive
- name: "Configure Project"
Expand All @@ -30,8 +30,7 @@ jobs:
DevicetreeTests:
runs-on: ubuntu-latest
steps:
- name: "Checkout repo"
- uses: actions/checkout@v4
- uses: actions/checkout@v6
Comment thread
KenVanHoeylandt marked this conversation as resolved.
with:
persist-credentials: false
submodules: recursive
Expand Down
5 changes: 5 additions & 0 deletions Buildscripts/DevicetreeCompiler/source/generator.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ def property_to_string(property: DeviceProperty, devices: list[Device]) -> str:
value_list.append(str(item))
return "{ " + ",".join(value_list) + " }"
elif type == "phandle":
# Mirrors the string-passthrough convention "phandles" already uses for sentinel defaults
# like GPIO_PIN_SPEC_NONE: a binding default of "NULL" represents "no device referenced",
# not an actual node name to resolve.
if isinstance(property.value, str) and property.value == "NULL":
return "NULL"
return find_phandle(devices, property.value)
elif type == "phandles":
value_list = list()
Expand Down
4 changes: 2 additions & 2 deletions Buildscripts/Flashing/flash.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ $jsonClean = $json.flash_files -replace '[\{\}\@\;]', ''
$jsonClean = $jsonClean -replace '[\=]', ' '

cd Binaries
$command = "esptool --port $port erase_flash"
$command = "esptool --port $port erase-flash"
Invoke-Expression $command
$command = "esptool --port $port write_flash $jsonClean"
$command = "esptool --port $port write-flash $jsonClean"
Invoke-Expression $command
cd ..

4 changes: 2 additions & 2 deletions Buildscripts/Flashing/flash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fi
# Take the flash_arg file contents and join each line in the file into a single line
flash_args=`grep \n Binaries/flash_args | awk '{print}' ORS=' '`
cd Binaries
$esptoolPath --port $1 erase_flash
$esptoolPath --port $1 write_flash $flash_args
$esptoolPath --port $1 erase-flash
$esptoolPath --port $1 write-flash $flash_args
cd -

4 changes: 2 additions & 2 deletions Devices/cyd-2432s024r/cyd,2432s024r.dts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <tactility/bindings/esp32_spi.h>
#include <tactility/bindings/esp32_sdspi.h>
#include <tactility/bindings/display_placeholder.h>
#include <tactility/bindings/touch_placeholder.h>
#include <tactility/bindings/pointer_placeholder.h>
#include <tactility/bindings/esp32_uart.h>

/ {
Expand Down Expand Up @@ -37,7 +37,7 @@
};

touch@1 {
compatible = "touch-placeholder";
compatible = "pointer-placeholder";
};
};

Expand Down
4 changes: 2 additions & 2 deletions Devices/cyd-2432s028r/cyd,2432s028r.dts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <tactility/bindings/esp32_uart.h>
#include <tactility/bindings/esp32_sdspi.h>
#include <tactility/bindings/display_placeholder.h>
#include <tactility/bindings/touch_placeholder.h>
#include <tactility/bindings/pointer_placeholder.h>

/ {
compatible = "root";
Expand Down Expand Up @@ -46,7 +46,7 @@
};

touch@1 {
compatible = "touch-placeholder";
compatible = "pointer-placeholder";
};
};

Expand Down
4 changes: 2 additions & 2 deletions Devices/cyd-2432s028rv3/cyd,2432s028rv3.dts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <tactility/bindings/esp32_spi.h>
#include <tactility/bindings/esp32_sdspi.h>
#include <tactility/bindings/display_placeholder.h>
#include <tactility/bindings/touch_placeholder.h>
#include <tactility/bindings/pointer_placeholder.h>

/ {
compatible = "root";
Expand Down Expand Up @@ -46,7 +46,7 @@
};

touch@1 {
compatible = "touch-placeholder";
compatible = "pointer-placeholder";
};
};

Expand Down
4 changes: 2 additions & 2 deletions Devices/cyd-e32r28t/cyd,e32r28t.dts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <tactility/bindings/esp32_spi.h>
#include <tactility/bindings/esp32_sdspi.h>
#include <tactility/bindings/display_placeholder.h>
#include <tactility/bindings/touch_placeholder.h>
#include <tactility/bindings/pointer_placeholder.h>

/ {
compatible = "root";
Expand Down Expand Up @@ -36,7 +36,7 @@
};

touch@1 {
compatible = "touch-placeholder";
compatible = "pointer-placeholder";
};
};

Expand Down
4 changes: 2 additions & 2 deletions Devices/cyd-e32r32p/cyd,e32r32p.dts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <tactility/bindings/esp32_spi.h>
#include <tactility/bindings/esp32_sdspi.h>
#include <tactility/bindings/display_placeholder.h>
#include <tactility/bindings/touch_placeholder.h>
#include <tactility/bindings/pointer_placeholder.h>

/ {
compatible = "root";
Expand Down Expand Up @@ -45,7 +45,7 @@
};

touch@1 {
compatible = "touch-placeholder";
compatible = "pointer-placeholder";
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <tactility/bindings/esp32_uart.h>
#include <tactility/bindings/esp32_sdspi.h>
#include <tactility/bindings/display_placeholder.h>
#include <tactility/bindings/touch_placeholder.h>
#include <tactility/bindings/pointer_placeholder.h>

/ {
compatible = "root";
Expand Down Expand Up @@ -47,7 +47,7 @@
};

touch@1 {
compatible = "touch-placeholder";
compatible = "pointer-placeholder";
};
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <tactility/bindings/esp32_uart.h>
#include <tactility/bindings/esp32_sdspi.h>
#include <tactility/bindings/display_placeholder.h>
#include <tactility/bindings/touch_placeholder.h>
#include <tactility/bindings/pointer_placeholder.h>

/ {
compatible = "root";
Expand Down Expand Up @@ -47,7 +47,7 @@
};

touch@1 {
compatible = "touch-placeholder";
compatible = "pointer-placeholder";
};
};

Expand Down
6 changes: 3 additions & 3 deletions Devices/lilygo-tdeck/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
file(GLOB_RECURSE SOURCE_FILES source/*.c*)

idf_component_register(
SRCS ${SOURCE_FILES}
INCLUDE_DIRS "Source"
REQUIRES Tactility EspLcdCompat ST7789 GT911 PwmBacklight EstimatedPower driver
INCLUDE_DIRS "include"
REQUIRES Tactility driver
)
30 changes: 0 additions & 30 deletions Devices/lilygo-tdeck/Source/Configuration.cpp

This file was deleted.

7 changes: 0 additions & 7 deletions Devices/lilygo-tdeck/Source/Drivers.cpp

This file was deleted.

Loading
Loading