Skip to content

Commit 2ac9e7c

Browse files
committed
Comment out support for the ESP32 S3 Box for use with Rust
We're going to revive this with support for the S3-Box-3 next.
1 parent e823aca commit 2ac9e7c

File tree

5 files changed

+30
-24
lines changed

5 files changed

+30
-24
lines changed

.github/workflows/ci.yaml

+17-17
Original file line numberDiff line numberDiff line change
@@ -398,23 +398,23 @@ jobs:
398398
working-directory: examples/mcu-embassy
399399
run: cargo check --bin ui_mcu --target=thumbv8m.main-none-eabihf --no-default-features --features="mcu-embassy/mcu" --release
400400

401-
mcu_esp:
402-
env:
403-
RUSTFLAGS: -D warnings
404-
runs-on: ubuntu-22.04
405-
steps:
406-
- uses: actions/checkout@v4
407-
- uses: dtolnay/rust-toolchain@stable
408-
- uses: esp-rs/[email protected]
409-
with:
410-
default: true
411-
buildtargets: esp32
412-
ldproxy: false
413-
# version pinned until new version of esp-hal with https://github.com/esp-rs/esp-hal/pull/2615/
414-
version: 1.82.0
415-
- uses: Swatinem/rust-cache@v2
416-
- name: S3Box
417-
run: cargo +esp check -p printerdemo_mcu --target xtensa-esp32s3-none-elf --no-default-features --features=mcu-board-support/esp32-s3-box --config examples/mcu-board-support/esp32_s3_box/cargo-config.toml --release
401+
# mcu_esp:
402+
# env:
403+
# RUSTFLAGS: -D warnings
404+
# runs-on: ubuntu-22.04
405+
# steps:
406+
# - uses: actions/checkout@v4
407+
# - uses: dtolnay/rust-toolchain@stable
408+
# - uses: esp-rs/[email protected]
409+
# with:
410+
# default: true
411+
# buildtargets: esp32
412+
# ldproxy: false
413+
# # version pinned until new version of esp-hal with https://github.com/esp-rs/esp-hal/pull/2615/
414+
# version: 1.82.0
415+
# - uses: Swatinem/rust-cache@v2
416+
# - name: S3Box
417+
# run: cargo +esp check -p printerdemo_mcu --target xtensa-esp32s3-none-elf --no-default-features --features=mcu-board-support/esp32-s3-box --config examples/mcu-board-support/esp32_s3_box/cargo-config.toml --release
418418

419419
ffi_32bit_build:
420420
runs-on: ubuntu-22.04

docs/astro/src/content/docs/guide/platforms/embedded.mdx

+3
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ In your build.rs, you must include a call to `slint_build::print_rustc_flags().u
130130
<TabItem label="C++">
131131
To use Slint with your C++ application, you can follow the instructions on the [Espressif Documentation site](https://components.espressif.com/components/slint/slint)
132132
</TabItem>
133+
134+
{/*
133135
<TabItem label="Rust">
134136
#### Prerequisites
135137
@@ -147,6 +149,7 @@ To compile and run the Slint Printer demo:
147149
CARGO_PROFILE_RELEASE_OPT_LEVEL=s cargo +esp run -p printerdemo_mcu --target xtensa-esp32s3-none-elf --no-default-features --features=mcu-board-support/esp32-s3-box --release --config examples/mcu-board-support/esp32_s3_box/cargo-config.toml
148150
```
149151
</TabItem>
152+
*/}
150153
</Tabs>
151154

152155
### ST (STM32)

examples/mcu-board-support/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ path = "lib.rs"
2121
pico-st7789 = ["slint/unsafe-single-threaded", "rp-pico", "embedded-hal", "embedded-hal-nb", "cortex-m-rt", "embedded-alloc", "fugit", "cortex-m", "dep:mipidsi", "defmt", "defmt-rtt", "slint/libm", "embedded-dma", "embedded-graphics", "euclid/libm"]
2222
pico2-st7789 = ["slint/unsafe-single-threaded", "rp235x-hal/binary-info", "rp235x-hal/critical-section-impl", "rp235x-hal/rt", "rp235x-hal/defmt", "embedded-hal", "embedded-hal-nb", "cortex-m-rt", "embedded-alloc", "fugit", "cortex-m", "dep:mipidsi", "defmt", "defmt-rtt", "slint/libm", "embedded-dma", "embedded-graphics", "euclid/libm"]
2323
stm32h735g = ["slint/unsafe-single-threaded", "cortex-m/critical-section-single-core", "cortex-m-rt","embedded-alloc", "embedded-time", "stm32h7xx-hal/stm32h735", "defmt", "defmt-rtt", "embedded-display-controller", "ft5336", "panic-probe", "slint/libm", "getrandom"]
24-
esp32-s3-box = ["slint/unsafe-single-threaded", "esp-hal/esp32s3", "embedded-hal", "embedded-hal-bus", "esp-alloc", "esp-println/esp32s3", "esp-backtrace/esp32s3", "dep:mipidsi", "embedded-graphics-core", "slint/libm", "tt21100"]
24+
# esp32-s3-box = ["slint/unsafe-single-threaded", "esp-hal/esp32s3", "embedded-hal", "embedded-hal-bus", "esp-alloc", "esp-println/esp32s3", "esp-backtrace/esp32s3", "dep:mipidsi", "embedded-graphics-core", "slint/libm", "tt21100"]
2525

2626
[dependencies]
2727
slint = { version = "=1.11.0", path = "../../api/rs/slint", default-features = false, features = ["compat-1-2", "renderer-software"] }

examples/mcu-board-support/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,13 @@ CARGO_PROFILE_RELEASE_OPT_LEVEL=s CARGO_TARGET_THUMBV7EM_NONE_EABIHF_RUNNER="pro
196196
When flashing, with `esplash`, you will be prompted to select a USB port. If this port is always the same, then you can also pass it as a parameter on the command line to avoid the prompt. For example if
197197
`/dev/ttyUSB1` is the device file for your port, the command line changes to `espflash --monitor /dev/ttyUSB1 path/to/binary/to/flash_and_monitor`.
198198

199+
<!--
199200
#### ESP32-S3-Box
200201
201202
To compile and run the demo:
202203
203204
```sh
204205
CARGO_PROFILE_RELEASE_OPT_LEVEL=s cargo +esp run -p printerdemo_mcu --target xtensa-esp32s3-none-elf --no-default-features --features=mcu-board-support/esp32-s3-box --release --config examples/mcu-board-support/esp32_s3_box/cargo-config.toml
205206
```
207+
208+
-->

examples/mcu-board-support/lib.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ mod stm32h735g;
2424
#[cfg(feature = "stm32h735g")]
2525
pub use stm32h735g::*;
2626

27-
#[cfg(feature = "esp32-s3-box")]
28-
mod esp32_s3_box;
29-
#[cfg(feature = "esp32-s3-box")]
30-
pub use esp32_s3_box::*;
27+
// #[cfg(feature = "esp32-s3-box")]
28+
// mod esp32_s3_box;
29+
// #[cfg(feature = "esp32-s3-box")]
30+
// pub use esp32_s3_box::*;
3131

3232
#[cfg(not(any(
3333
feature = "pico-st7789",
3434
feature = "pico2-st7789",
3535
feature = "stm32h735g",
36-
feature = "esp32-s3-box"
36+
// feature = "esp32-s3-box"
3737
)))]
3838
pub use i_slint_core_macros::identity as entry;
3939

4040
#[cfg(not(any(
4141
feature = "pico-st7789",
4242
feature = "pico2-st7789",
4343
feature = "stm32h735g",
44-
feature = "esp32-s3-box"
44+
// feature = "esp32-s3-box"
4545
)))]
4646
pub fn init() {}

0 commit comments

Comments
 (0)