mirror of
https://github.com/goldenfishs/MRobot.git
synced 2026-04-01 05:17:13 +08:00
修复更新代码库的bug
This commit is contained in:
@@ -743,7 +743,7 @@ class bsp_gpio(QWidget):
|
||||
self.project_path = project_path
|
||||
self.available_list = self._get_all_gpio_list()
|
||||
# 加载描述
|
||||
describe_path = os.path.join(os.path.dirname(__file__), "../../assets/User_code/bsp/describe.csv")
|
||||
describe_path = os.path.join(CodeGenerator.get_assets_dir("User_code/bsp"), "describe.csv")
|
||||
self.descriptions = load_descriptions(describe_path)
|
||||
self._init_ui()
|
||||
self._load_config()
|
||||
@@ -982,7 +982,7 @@ class bsp_pwm(QWidget):
|
||||
self.project_path = project_path
|
||||
self.available_list = self._get_pwm_channels()
|
||||
# 加载描述
|
||||
describe_path = os.path.join(os.path.dirname(__file__), "../../assets/User_code/bsp/describe.csv")
|
||||
describe_path = os.path.join(CodeGenerator.get_assets_dir("User_code/bsp"), "describe.csv")
|
||||
self.descriptions = load_descriptions(describe_path)
|
||||
self._init_ui()
|
||||
self._load_config()
|
||||
@@ -1236,7 +1236,7 @@ class bsp(QWidget):
|
||||
def generate_bsp(project_path, pages):
|
||||
"""生成所有BSP代码"""
|
||||
# 自动添加 bsp.h
|
||||
src_bsp_h = os.path.join(os.path.dirname(__file__), "../../assets/User_code/bsp/bsp.h")
|
||||
src_bsp_h = os.path.join(CodeGenerator.get_assets_dir("User_code/bsp"), "bsp.h")
|
||||
dst_bsp_h = os.path.join(project_path, "User/bsp/bsp.h")
|
||||
os.makedirs(os.path.dirname(dst_bsp_h), exist_ok=True)
|
||||
if os.path.exists(src_bsp_h):
|
||||
|
||||
@@ -318,7 +318,8 @@ class component(QWidget):
|
||||
components_to_generate.add(dep_name)
|
||||
|
||||
# 为没有对应页面但需要生成的依赖组件创建临时页面
|
||||
user_code_dir = os.path.join(os.path.dirname(__file__), "../../assets/User_code")
|
||||
from ..tools.code_generator import CodeGenerator
|
||||
user_code_dir = CodeGenerator.get_assets_dir("User_code")
|
||||
for comp_name in components_to_generate:
|
||||
if comp_name not in component_pages:
|
||||
# 创建临时组件页面
|
||||
|
||||
Reference in New Issue
Block a user