Skip to content

Commit b0392f7

Browse files
committed
updated HWCDC #ifs with soc defines + more skips for c6
1 parent fa85eae commit b0392f7

File tree

8 files changed

+9
-7
lines changed

8 files changed

+9
-7
lines changed

cores/esp32/HWCDC.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414
#include "USB.h"
15-
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
15+
#if SOC_USB_SERIAL_JTAG_SUPPORTED
1616

1717
#include "esp32-hal.h"
1818
#include "HWCDC.h"
@@ -405,4 +405,4 @@ HWCDC USBSerial;
405405
#endif
406406
#endif
407407

408-
#endif /* CONFIG_TINYUSB_CDC_ENABLED */
408+
#endif /* SOC_USB_SERIAL_JTAG_SUPPORTED */

cores/esp32/HWCDC.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#pragma once
1515

1616
#include "sdkconfig.h"
17-
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
17+
#include "soc/soc_caps.h"
18+
19+
#if SOC_USB_SERIAL_JTAG_SUPPORTED
1820

1921
#include <inttypes.h>
2022
#include "esp_event.h"

cores/esp32/USB.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
// limitations under the License.
1414
#pragma once
1515

16-
#include "sdkconfig.h"
16+
#include "soc/soc_caps.h"
1717

18-
#if CONFIG_TINYUSB_ENABLED
18+
#if SOC_USB_OTG_SUPPORTED
1919

2020
#include "esp_event.h"
2121
#include "USBCDC.h"
@@ -116,4 +116,4 @@ class ESPUSB {
116116

117117
extern ESPUSB USB;
118118

119-
#endif /* CONFIG_TINYUSB_ENABLED */
119+
#endif /* SOC_USB_OTG_SUPPORTED */

libraries/ESP32/examples/RMT/RMTLoopback/RMTLoopback.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
*/
2323

24-
#if CONFIG_IDF_TARGET_ESP32C3
24+
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
2525
// ESP32 C3 has only 2 channels for RX and 2 for TX, thus MAX RMT_MEM is 128
2626
#define RMT_TX_PIN 4
2727
#define RMT_RX_PIN 5

libraries/RainMaker/examples/RMakerCustom/.skip.esp32c6

Whitespace-only changes.

libraries/RainMaker/examples/RMakerCustomAirCooler/.skip.esp32c6

Whitespace-only changes.

libraries/RainMaker/examples/RMakerSonoffDualR3/.skip.esp32c6

Whitespace-only changes.

libraries/RainMaker/examples/RMakerSwitch/.skip.esp32c6

Whitespace-only changes.

0 commit comments

Comments
 (0)