fast merge

shchen-Lab · Oct 23, 2023 · 4f97afe · 4f97afe
1 parent 7287731
commit 4f97afe
Show file tree

Hide file tree

Showing 10 changed files with 1,323 additions and 399 deletions.
diff --git a/examples/lighting-app/bouffalolab/bl702l/BUILD.gn b/examples/lighting-app/bouffalolab/bl702l/BUILD.gn
@@ -128,9 +128,7 @@ bouffalolab_executable("lighting_app") {
     defines += [ "BOOT_PIN_RESET=16" ]
   }
 
-  if ("BL704LDK" == board) {
-    defines += [ "XT_ZB6_DevKit" ]
-  }
+  defines += [ "BL706_NIGHT_LIGHT" ]
 
   sources = [
     "${example_dir}/common/AppTask.cpp",

diff --git a/examples/lighting-app/bouffalolab/bl702l/mboard.h b/examples/lighting-app/bouffalolab/bl702l/mboard.h
@@ -39,16 +39,22 @@
 
 #ifdef BL706_NIGHT_LIGHT
 
-#define LED_B_PIN_PORT 2
-#define LED_B_PIN 12
+#define LED_B_PIN_PORT 0
+#define LED_B_PIN 0
 
-#define LED_R_PIN_PORT 0
-#define LED_R_PIN 10
+#define LED_R_PIN_PORT 3
+#define LED_R_PIN 3
 
-#define LED_G_PIN_PORT 1
-#define LED_G_PIN 16
+#define LED_G_PIN_PORT 4
+#define LED_G_PIN 9
 
-#define MAX_PWM_CHANNEL 3
+#define LED_C_PIN_PORT 1
+#define LED_C_PIN 21
+
+#define LED_W_PIN_PORT 2
+#define LED_W_PIN 22
+
+#define MAX_PWM_CHANNEL 5
 
 #elif defined(XT_ZB6_DevKit)
 
@@ -75,11 +81,15 @@
 
 #endif
 
+#if defined(BOARD_BTN_BOOT_PIN)
+#define LED_BTN_RESET 16
+#endif
+
 #define SPI_WIFI_MISO_PIN 4
 #define SPI_WIFI_MOSI_PIN 5
 #define SPI_WIFI_CLK_PIN 3
 #define SPI_WIFI_CS_PIN 6
 #define SPI_WIFI_IRQ_PIN 10
 
 #define CHIP_UART_PIN_RX 15
-#define CHIP_UART_PIN_TX 14
+#define CHIP_UART_PIN_TX 14