admin/llgo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

export flash, openocd, msd

Browse Source
This commit is contained in:
Li Jie
2025-09-06 16:21:15 +08:00
parent 1033452e8f
commit da9865104f
4 changed files with 61 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/targets/loader.go
View File

@@ -167,6 +167,9 @@ func (l *Loader) mergeConfig(dst, src *Config) {
if src.Flash1200BpsReset != "" {
dst.Flash1200BpsReset = src.Flash1200BpsReset
}
if src.Serial != "" {
dst.Serial = src.Serial
}
if src.MSDFirmwareName != "" {
dst.MSDFirmwareName = src.MSDFirmwareName
}
@@ -202,6 +205,9 @@ func (l *Loader) mergeConfig(dst, src *Config) {
if len(src.ExtraFiles) > 0 {
dst.ExtraFiles = append(dst.ExtraFiles, src.ExtraFiles...)
}
if len(src.SerialPort) > 0 {
dst.SerialPort = append(dst.SerialPort, src.SerialPort...)
}
if len(src.MSDVolumeName) > 0 {
dst.MSDVolumeName = append(dst.MSDVolumeName, src.MSDVolumeName...)
}