diff --git a/main/boards/bread-compact-esp32-lcd/config.h b/main/boards/bread-compact-esp32-lcd/config.h index c3ccc859..2068a2d6 100644 --- a/main/boards/bread-compact-esp32-lcd/config.h +++ b/main/boards/bread-compact-esp32-lcd/config.h @@ -35,12 +35,18 @@ #define BUILTIN_LED_GPIO GPIO_NUM_2 +#ifdef CONFIG_LCD_ST7789_240X240_7PIN #define DISPLAY_BACKLIGHT_PIN GPIO_NUM_22 +#define DISPLAY_CS_PIN GPIO_NUM_NC +#else +#define DISPLAY_CS_PIN GPIO_NUM_22 +#define DISPLAY_BACKLIGHT_PIN GPIO_NUM_23 +#endif + #define DISPLAY_MOSI_PIN GPIO_NUM_4 #define DISPLAY_CLK_PIN GPIO_NUM_15 #define DISPLAY_DC_PIN GPIO_NUM_21 #define DISPLAY_RST_PIN GPIO_NUM_18 -#define DISPLAY_CS_PIN GPIO_NUM_NC #ifdef CONFIG_LCD_ST7789_240X320 diff --git a/main/iot/things/lamp.cc b/main/iot/things/lamp.cc index 392b36cd..8848aadf 100644 --- a/main/iot/things/lamp.cc +++ b/main/iot/things/lamp.cc @@ -12,7 +12,11 @@ namespace iot { // 这里仅定义 Lamp 的属性和方法,不包含具体的实现 class Lamp : public Thing { private: +#ifdef CONFIG_IDF_TARGET_ESP32 + gpio_num_t gpio_num_ = GPIO_NUM_35; +#else gpio_num_t gpio_num_ = GPIO_NUM_18; +#endif bool power_ = false; void InitializeGpio() {