devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

Fix yuying compiling

Browse Source
This commit is contained in:
Terrence
2025-02-24 17:55:11 +08:00
parent de783b7c57
commit ffe0b21d18
6 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
main/boards/kevin-sp-v3-dev/config.json
View File

@@ -1,9 +0,0 @@
{
"target": "esp32c3",
"builds": [
{
"name": "kevin-sp-v3-dev",
"sdkconfig_append": []
}
]
}

2
main/boards/kevin-yuying-313lcd/config.json
View File

@@ -1,5 +1,5 @@
{ {
"target": "esp32c3", "target": "esp32s3",
"builds": [ "builds": [
{ {
"name": "kevin-yuying-313lcd", "name": "kevin-yuying-313lcd",

19
main/boards/kevin-yuying-313lcd/esp_lcd_gc9503.c
View File

@@ -4,16 +4,15 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include "driver/gpio.h" #include <driver/gpio.h>
#include "freertos/FreeRTOS.h" #include <freertos/FreeRTOS.h>
#include "freertos/task.h" #include <freertos/task.h>
#include "esp_check.h" #include <esp_check.h>
#include "esp_lcd_panel_commands.h" #include <esp_lcd_panel_commands.h>
#include "esp_lcd_panel_interface.h" #include <esp_lcd_panel_interface.h>
#include "esp_lcd_panel_io.h" #include <esp_lcd_panel_io.h>
#include "esp_lcd_panel_rgb.h" #include <esp_lcd_panel_vendor.h>
#include "esp_lcd_panel_vendor.h" #include <esp_log.h>
#include "esp_log.h"
#include "esp_lcd_gc9503.h" #include "esp_lcd_gc9503.h"

4
main/boards/kevin-yuying-313lcd/esp_lcd_gc9503.h
View File

@@ -12,8 +12,8 @@
#include <stdint.h> #include <stdint.h>
#include "esp_lcd_panel_vendor.h" #include <esp_lcd_panel_vendor.h>
#include "esp_lcd_panel_rgb.h" #include <esp_lcd_panel_rgb.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
main/boards/kevin-yuying-313lcd/kevin_yuying_313lcd.cc
View File

@@ -32,7 +32,6 @@ private:
ESP_LOGI(TAG, "Init GC9503V"); ESP_LOGI(TAG, "Init GC9503V");
esp_lcd_panel_io_handle_t panel_io = nullptr; esp_lcd_panel_io_handle_t panel_io = nullptr;
esp_lcd_panel_handle_t panel = nullptr;
ESP_LOGI(TAG, "Install 3-wire SPI panel IO"); ESP_LOGI(TAG, "Install 3-wire SPI panel IO");
spi_line_config_t line_config = { spi_line_config_t line_config = {

11
scripts/release.py
View File

@@ -70,6 +70,14 @@ def release(board_type, board_config):
print(f"跳过 {board_type} 因为 config.json 不存在") print(f"跳过 {board_type} 因为 config.json 不存在")
return return
# Print Project Version
project_version = get_project_version()
print(f"Project Version: {project_version}")
release_path = f"releases/v{project_version}_{board_type}.zip"
if os.path.exists(release_path):
print(f"跳过 {board_type} 因为 {release_path} 已存在")
return
with open(config_path, "r") as f: with open(config_path, "r") as f:
config = json.load(f) config = json.load(f)
target = config["target"] target = config["target"]
@@ -87,9 +95,6 @@ def release(board_type, board_config):
print(f"target: {target}") print(f"target: {target}")
for append in sdkconfig_append: for append in sdkconfig_append:
print(f"sdkconfig_append: {append}") print(f"sdkconfig_append: {append}")
# Print Project Version
project_version = get_project_version()
print(f"Project Version: {project_version}")
# unset IDF_TARGET # unset IDF_TARGET
os.environ.pop("IDF_TARGET", None) os.environ.pop("IDF_TARGET", None)
# Call set-target # Call set-target