Support for ESP32-C2 & ESP32-C6 #4377

vidplace7 · 2023-02-02T06:29:30Z

What does this implement/fix?

Add initial support for GPIO validation on ESP32-C2 and ESP32-C6
These variants require ESP-IDF 5.x support added via #4364

This PR simply seeks to add variant-specific modifications for GPIO Validation, ADC, Deep Sleep wakeup, SPI, and logging based on espressif's datasheets.

~~Some additional work still needs to be done in logger.cpp and logger.h, marking this as a Draft PR until this is completed.~~

Docs I referenced:

ESP32-C2:
https://www.espressif.com/sites/default/files/documentation/esp8684_datasheet_en.pdf

ESP32-C6:
https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf

Types of changes

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
Other

Related issue or feature (if applicable): fixes

Pull request in esphome-docs with documentation (if applicable): esphome/esphome-docs#

Test Environment

ESP32
ESP32 IDF
ESP8266
RP2040

Example entry for `config.yaml`:

N/A

Checklist:

The code change is tested and works locally.
Tests have been added to verify that the new code works (under tests/ folder).

If user exposed functionality or configuration variables are added/changed:

Documentation added/updated in esphome-docs.

vidplace7 · 2023-02-02T06:32:08Z

esphome/components/esp32/__init__.py

@@ -29,7 +29,6 @@
    KEY_ESP32,
    KEY_SDKCONFIG_OPTIONS,
    KEY_VARIANT,
-    VARIANT_ESP32C3,


This was un-used, removed it while I was in here.

vidplace7 · 2023-02-02T06:33:14Z

esphome/components/spi/spi.cpp

@@ -76,7 +76,7 @@ void SPIComponent::setup() {
    if (spi_bus_num == 0) {
      this->hw_spi_ = &SPI;
    } else {
-#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C2) || defined(USE_ESP32_VARIANT_ESP32C6)


Confirmed ESP32-C2 and ESP32-C6 use FSPI. This line may have grown too long...

Yeah, the clang-format test baulked on it.

Suggested change

#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32C2) || defined(USE_ESP32_VARIANT_ESP32C6)

#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || \

defined(USE_ESP32_VARIANT_ESP32C2) || defined(USE_ESP32_VARIANT_ESP32C6)

Hedda · 2023-03-20T15:33:49Z

@vidplace7 Any chance you would also be willing to look at adding support for ESP32-H2 (ESP32-H2-MINI-1 / ESP32-H2-DevKitM-1) as well?

At least on paper, the ESP32-H2 looks to need the same config ESP32-C6 but the ESP32-H2 SoC is without Wi-Fi radio support:

https://www.espressif.com/en/products/socs/esp32-h2

https://www.espressif.com/en/news/ESP32_H2

https://media.digikey.com/pdf/Data%20Sheets/Espressif%20PDFs/ESP32-H2_MINI_1_Prelim_v0.2_EN.pdf

https://github.com/espressif/esp-idf/search?q=esp32h2

github-actions · 2023-06-19T00:45:35Z

There hasn't been any activity on this pull request recently. This pull request has been automatically marked as stale because of that and will be closed if no further activity occurs within 7 days. Thank you for your contributions.

Hedda · 2023-06-19T05:21:30Z

@vidplace7 any updates on this?

HarvsG · 2023-07-01T15:35:23Z

These variants are still pending ESP-IDF 5.x support in ESPHome. See: #4364

As per @Hedda in esphome/feature-requests#1397 (comment)

Espressif ESP-IDF v5.1 with ESP32-C6 and ESP32-H2 has now been released

https://github.com/espressif/esp-idf/releases/tag/v5.1

HeMan · 2023-07-03T05:37:00Z

Does my debug+logger-pr #5036 work with this?

stintel · 2023-08-08T11:23:12Z

@vidplace7 would you mind updating this PR with stintel/esphome@ec1c4b4 and unmarking it as draft? Alternatively, you could give me access to your repo/branch and let me do it, or close this PR and I open a new one including your commit? I'll be travelling from 12/08 until at least 31/08, and I'd like to open a PR for ESP32-C6 support before that, and this PR is a dependency of my work.

Thanks!

Add initial support for GPIO validation on ESP32-C2 and ESP32-C6 ESP32-C2: https://www.espressif.com/sites/default/files/documentation/esp8684_datasheet_en.pdf ESP32-C6: https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf [fix conflicts, CI errors] Signed-off-by: Stijn Tintel <[email protected]>

stintel · 2023-08-08T13:49:48Z

I've been testing this for months on multiple ESP32-C6 devices. Have a few of them in production for a few months, and they've been doing great. I'd say it's time to merge this PR.

Signed-off-by: Stijn Tintel <[email protected]>

probot-esphome · 2023-08-08T14:10:56Z

Hey there @esphome/core, mind taking a look at this pull request as it has been labeled with an integration (adc) you are listed as a code owner for? Thanks!
Hey there @esphome/core, mind taking a look at this pull request as it has been labeled with an integration (logger) you are listed as a code owner for? Thanks!
Hey there @esphome/core, mind taking a look at this pull request as it has been labeled with an integration (spi) you are listed as a code owner for? Thanks!
Hey there @esphome/core, mind taking a look at this pull request as it has been labeled with an integration (esp32) you are listed as a code owner for? Thanks!
Hey there @jesserockz, mind taking a look at this pull request as it has been labeled with an integration (esp32_rmt_led_strip) you are listed as a code owner for? Thanks!
_{^{(message by CodeOwnersMention)}}

vidplace7 · 2023-08-08T14:13:26Z

Un-marked as draft thanks to @stintel's amazing work finishing this off.

slimcdk · 2023-08-08T16:48:20Z

Not really contributing with anything but an apprecation for the implementation and a verfication! No issues flashing my C6 modules with the following config:

esp32:
  board: esp32-c6-devkitc-1
  variant: esp32c6
  framework:
    type: esp-idf
    version: 5.1.0
    platform_version: https://github.com/stintel/platform-espressif32#esp32-c6-test

HemmiBZ · 2023-08-17T12:43:57Z

I am a newcomer with home assistant but I would like to built some projects with the new esp32-c6 using zigbee or thread. If I understood right there is a chance that within a few months this chip can be used in esphome of home assistant? Or I am wrong? I am not so experienced and I would like to use the simple way selecting esp32-c6 as device. Or should I use the esphome beta integration/add on? Thank you.
@slimcdk If I anderstood right you selected esp32 adding the new device and then you added with yaml the other lines? Did you use esphome or esphome beta? Does it work with zigbee and/or thread?

slimcdk · 2023-08-17T13:41:03Z

@HemmiBZ Please join the Discord server and let's chat there https://discord.com/invite/KhAMKrd

Hedda · 2023-08-17T20:42:34Z

I am a newcomer with home assistant but I would like to built some projects with the new esp32-c6 using zigbee or thread.

...

Does it work with zigbee and/or thread?

@HemmiBZ I think that Zigbee and Thread implementations would be completely new features so really separate from ESP32-C6.

Neither Zigbee or Thread support exist today in ESPHome and I expect either require quite a lot of work and time to implement.

If you are not a developer then recommend checking out the existing feature request like this -> esphome/feature-requests#1397

Anyway, both Zigbee and Thread and really off-topic for this specific pull request.

slimcdk · 2023-08-20T16:11:50Z

The UART component won't compile with the current used clock source (UART_SCLK_APB). Adding a check to use a different source should fix it, unless switching entirely to the new source is fine. I've tested one of my projects with an S3 and UART_SCLK_RTC source and it worked fine, but I'm not sure if it will break something else.

https://github.com/esphome/esphome/blob/f16a24ddf460c48176391b06078a70bdedd974b1/esphome/components/uart/uart_component_esp_idf.cpp#L51C34-L51C34

  uart_config_t uart_config;
  uart_config.baud_rate = this->baud_rate_;
  uart_config.data_bits = data_bits;
  uart_config.parity = parity;
  uart_config.stop_bits = this->stop_bits_ == 1 ? UART_STOP_BITS_1 : UART_STOP_BITS_2;
  uart_config.flow_ctrl = UART_HW_FLOWCTRL_DISABLE;
#if USE_ESP32_VARIANT_ESP32C6
  uart_config.source_clk = UART_SCLK_RTC;
#else
  uart_config.source_clk = UART_SCLK_APB;
#endif
  uart_config.rx_flow_ctrl_thresh = 122;

jesserockz

Changes look good. Thanks

stintel · 2023-08-21T10:57:20Z

Technically this is enough to close esphome/feature-requests#2176 but merging #5289 would auto-close that. Up to you :-)

probot-esphome bot added core integration: adc integration: deep_sleep integration: esp32 integration: logger integration: spi labels Feb 2, 2023

vidplace7 commented Feb 2, 2023

View reviewed changes

vidplace7 mentioned this pull request Feb 8, 2023

Support for ESP32-C2 SoC (ESP8684) esphome/feature-requests#1897

Open

stintel mentioned this pull request Mar 20, 2023

Support for ESP32-C6 chipset esphome/feature-requests#2176

Closed

github-actions bot added the stale label Jun 19, 2023

github-actions bot removed the stale label Jun 20, 2023

stintel force-pushed the esp32-c6 branch 2 times, most recently from 03054ab to f751fb5 Compare August 8, 2023 13:46

stintel force-pushed the esp32-c6 branch from f751fb5 to b773d2f Compare August 8, 2023 13:47

probot-esphome bot added the integration: esp32_rmt_led_strip label Aug 8, 2023

stintel force-pushed the esp32-c6 branch from 6129d01 to 7b79abb Compare August 8, 2023 13:55

stintel added 2 commits August 8, 2023 16:56

logger: fix build for ESP32-C6

07d2f0b

Signed-off-by: Stijn Tintel <[email protected]>

esp32_rmt_led_strip: add ESP32-C6

ef5eef9

Signed-off-by: Stijn Tintel <[email protected]>

stintel force-pushed the esp32-c6 branch from 7b79abb to ef5eef9 Compare August 8, 2023 13:56

vidplace7 marked this pull request as ready for review August 8, 2023 14:10

vidplace7 requested a review from jesserockz as a code owner August 8, 2023 14:10

probot-esphome bot assigned jesserockz Aug 8, 2023

vidplace7 changed the title ~~Initial Support for ESP32-C2 & ESP32-C6~~ Support for ESP32-C2 & ESP32-C6 Aug 8, 2023

jesserockz approved these changes Aug 20, 2023

View reviewed changes

jesserockz merged commit fe7893d into esphome:dev Aug 20, 2023

stintel deleted the esp32-c6 branch August 21, 2023 10:57

Hedda mentioned this pull request Aug 21, 2023

Zigbee/Thread support on the new upcoming ESP32-H2 variant? esphome/feature-requests#1397

Open

github-actions bot locked and limited conversation to collaborators Aug 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support for ESP32-C2 & ESP32-C6 #4377

Support for ESP32-C2 & ESP32-C6 #4377

vidplace7 commented Feb 2, 2023 •

edited

Loading

vidplace7 Feb 2, 2023

vidplace7 Feb 2, 2023 •

edited

Loading

na4ma4 Feb 17, 2023 •

edited

Loading

Hedda commented Mar 20, 2023 •

edited

Loading

github-actions bot commented Jun 19, 2023

Hedda commented Jun 19, 2023

HarvsG commented Jul 1, 2023

HeMan commented Jul 3, 2023

stintel commented Aug 8, 2023

stintel commented Aug 8, 2023

probot-esphome bot commented Aug 8, 2023

vidplace7 commented Aug 8, 2023

slimcdk commented Aug 8, 2023

HemmiBZ commented Aug 17, 2023 •

edited

Loading

slimcdk commented Aug 17, 2023

Hedda commented Aug 17, 2023 •

edited

Loading

slimcdk commented Aug 20, 2023

jesserockz left a comment

stintel commented Aug 21, 2023

	#if defined(USE_ESP32_VARIANT_ESP32C3) \|\| defined(USE_ESP32_VARIANT_ESP32S2) \|\| defined(USE_ESP32_VARIANT_ESP32S3) \|\| defined(USE_ESP32_VARIANT_ESP32C2) \|\| defined(USE_ESP32_VARIANT_ESP32C6)
	#if defined(USE_ESP32_VARIANT_ESP32C3) \|\| defined(USE_ESP32_VARIANT_ESP32S2) \|\| defined(USE_ESP32_VARIANT_ESP32S3) \|\| \
	defined(USE_ESP32_VARIANT_ESP32C2) \|\| defined(USE_ESP32_VARIANT_ESP32C6)

Support for ESP32-C2 & ESP32-C6 #4377

Support for ESP32-C2 & ESP32-C6 #4377

Conversation

vidplace7 commented Feb 2, 2023 • edited Loading

What does this implement/fix?

Types of changes

Test Environment

Example entry for config.yaml:

Checklist:

vidplace7 Feb 2, 2023

Choose a reason for hiding this comment

vidplace7 Feb 2, 2023 • edited Loading

Choose a reason for hiding this comment

na4ma4 Feb 17, 2023 • edited Loading

Choose a reason for hiding this comment

Hedda commented Mar 20, 2023 • edited Loading

github-actions bot commented Jun 19, 2023

Hedda commented Jun 19, 2023

HarvsG commented Jul 1, 2023

HeMan commented Jul 3, 2023

stintel commented Aug 8, 2023

stintel commented Aug 8, 2023

probot-esphome bot commented Aug 8, 2023

vidplace7 commented Aug 8, 2023

slimcdk commented Aug 8, 2023

HemmiBZ commented Aug 17, 2023 • edited Loading

slimcdk commented Aug 17, 2023

Hedda commented Aug 17, 2023 • edited Loading

slimcdk commented Aug 20, 2023

jesserockz left a comment

Choose a reason for hiding this comment

stintel commented Aug 21, 2023

vidplace7 commented Feb 2, 2023 •

edited

Loading

Example entry for `config.yaml`:

vidplace7 Feb 2, 2023 •

edited

Loading

na4ma4 Feb 17, 2023 •

edited

Loading

Hedda commented Mar 20, 2023 •

edited

Loading

HemmiBZ commented Aug 17, 2023 •

edited

Loading

Hedda commented Aug 17, 2023 •

edited

Loading