Changes

Spooks4576 · Nov 5, 2024 · 51a465f · 51a465f
1 parent 22e302b
commit 51a465f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/main/core/serial_manager.c b/main/core/serial_manager.c
@@ -159,7 +159,9 @@ void serial_manager_init() {
     uart_param_config(UART_NUM_1, &ghost_uart_config);
     uart_set_pin(UART_NUM_1, GHOST_UART_TX_PIN, GHOST_UART_RX_PIN, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
     uart_driver_install(UART_NUM_1, GHOST_UART_BUF_SIZE * 2, 0, 0, NULL, 0);
-#elif CONFIG_HAS_GPS
+#endif
+
+#ifdef CONFIG_HAS_GPS
 
     const uart_config_t gps_uart_config = {
         .baud_rate = 9600,                     // Most GPS modules use 9600 baud by default
@@ -170,7 +172,7 @@ void serial_manager_init() {
     };
 
     uart_param_config(UART_NUM_1, &gps_uart_config);
-    uart_set_pin(UART_NUM_1, GPS_UART_TX_PIN, GPS_UART_RX_PIN, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
+    uart_set_pin(UART_NUM_1, CONFIG_GPS_UART_TX_PIN, CONFIG_GPS_UART_RX_PIN, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
     uart_driver_install(UART_NUM_1, 1024 * 2, 0, 0, NULL, 0);
     gps_manager_init(&g_gpsManager);
 #endif

diff --git a/main/vendor/drivers/ST7262.c b/main/vendor/drivers/ST7262.c
@@ -59,7 +59,10 @@ static const int lcd_data_gpio_nums[] = {
 #define LCD_BACKLIGHT_GPIO   GPIO_NUM_2  
 #define LCD_RESET_GPIO       GPIO_NUM_4  // Corrected to GPIO4
 
-#elif CONFIG_Waveshare_LCD
+
+#endif
+
+#ifdef CONFIG_Waveshare_LCD
 // Waveshare display
 static const int lcd_data_gpio_nums[] = {
     GPIO_NUM_14, // D0 - B3
@@ -89,7 +92,9 @@ static const int lcd_data_gpio_nums[] = {
 #define LCD_BACKLIGHT_GPIO   -1      // Not used
 #define LCD_RESET_GPIO       GPIO_NUM_4  // Corrected to GPIO4
 
-#elif CONFIG_Sunton_LCD
+#endif
+
+#ifdef CONFIG_Sunton_LCD
 
 static const int lcd_data_gpio_nums[] = {
     GPIO_NUM_8,   // D0 - B0