Revert "Added support for GCC, CLAN and IAR compiler. Added startup, …

…system a…" (#36) This reverts commit 16a10cb.
Open-CMSIS-Pack · Mar 14, 2024 · 1576f17 · 1576f17
1 parent 16a10cb
commit 1576f17
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 377 deletions.
diff --git a/internal/readFile/readFile.go b/internal/readFile/readFile.go
@@ -54,7 +54,7 @@ func Process(inFile, inFile2, outPath string) error {
 	}
 
 	if mxprojectFile != "" {
-		mxprojectAll, _ := stm32cubemx.IniReader(mxprojectFile, params.Subsystem[0].Compiler, false)
+		mxprojectAll, _ := stm32cubemx.IniReader(mxprojectFile, false)
 
 		if params.Board == "" && params.Device == "" {
 			params.Board = "Test Board"

diff --git a/internal/stm32CubeMX/iniReader.go b/internal/stm32CubeMX/iniReader.go
@@ -30,7 +30,7 @@ type MxprojectType struct {
 	PreviousLibFiles struct {
 		LibFiles []string
 	}
-	PreviousUsedFiles struct {
+	PreviousUsedKeilFiles struct {
 		SourceFiles []string
 		HeaderPath  []string
 		CDefines    []string
@@ -191,7 +191,7 @@ func AppendToCores(iniSectionCore IniSectionCore, list *[]IniSectionCore) {
 	*list = append(*list, iniSectionCore)
 }
 
-func IniReader(path string, compiler string, trustzone bool) (MxprojectAllType, error) {
+func IniReader(path string, trustzone bool) (MxprojectAllType, error) {
 	var mxprojectAll MxprojectAllType
 
 	if !utils.FileExists(path) {
@@ -221,7 +221,7 @@ func IniReader(path string, compiler string, trustzone bool) (MxprojectAllType,
 		}
 		coreName := core.CoreName
 		trustzone := core.trustzone
-		mxproject, _ := GetData(inidata, iniName, compiler)
+		mxproject, _ := GetData(inidata, iniName)
 		mxproject.CoreName = coreName
 		mxproject.Trustzone = trustzone
 		mxprojectAll.Mxproject = append(mxprojectAll.Mxproject, mxproject)
@@ -286,26 +286,20 @@ func GetSections(inidata *ini.File, iniSections *IniSectionsType) error {
 	return nil
 }
 
-func GetData(inidata *ini.File, iniName string, compiler string) (MxprojectType, error) {
+func GetData(inidata *ini.File, iniName string) (MxprojectType, error) {
 	var mxproject MxprojectType
 	var sectionName string
-	var PreviousUsedFilesID string
-
-	PreviousUsedFilesID, err := GetPreviousUsedFilesID(compiler)
-	if err != nil {
-		return mxproject, err
-	}
-
+	const PreviousUsedKeilFilesID = "PreviousUsedKeilFiles"
 	if iniName != "" {
-		sectionName = iniName + ":" + PreviousUsedFilesID
+		sectionName = iniName + ":" + PreviousUsedKeilFilesID
 	} else {
-		sectionName = PreviousUsedFilesID
+		sectionName = PreviousUsedKeilFilesID
 	}
 	section := inidata.Section(sectionName)
 	if section != nil {
-		StoreItemCsv(&mxproject.PreviousUsedFiles.SourceFiles, section, "SourceFiles")
-		StoreItemCsv(&mxproject.PreviousUsedFiles.HeaderPath, section, "HeaderPath")
-		StoreItemCsv(&mxproject.PreviousUsedFiles.CDefines, section, "CDefines")
+		StoreItemCsv(&mxproject.PreviousUsedKeilFiles.SourceFiles, section, "SourceFiles")
+		StoreItemCsv(&mxproject.PreviousUsedKeilFiles.HeaderPath, section, "HeaderPath")
+		StoreItemCsv(&mxproject.PreviousUsedKeilFiles.CDefines, section, "CDefines")
 		PrintItemCsv(section, "SourceFiles")
 		PrintItemCsv(section, "HeaderPath")
 		PrintItemCsv(section, "CDefines")
@@ -352,18 +346,3 @@ func GetData(inidata *ini.File, iniName string, compiler string) (MxprojectType,
 
 	return mxproject, nil
 }
-
-func GetPreviousUsedFilesID(compiler string) (string, error) {
-	var sectionMapping = map[string]string{
-		"AC6":   "PreviousUsedKeilFiles",
-		"GCC":   "PreviousUsedCubeIDEFiles",
-		"IAR":   "PreviousUsedIarFiles",
-		"CLANG": "PreviousUsedCubeIDEFiles",
-	}
-
-	PreviousUsedFilesID, ok := sectionMapping[compiler]
-	if !ok {
-		return "", errors.New("unknown compiler")
-	}
-	return PreviousUsedFilesID, nil
-}