Added support for GCC, CLAN and IAR compiler. Added startup, system a…

…nd linker files (generated by CubeMX) to cgen.yml. (#38)
Open-CMSIS-Pack · Mar 18, 2024 · bb1e2ff · bb1e2ff
1 parent 28196b8
commit bb1e2ff
Show file tree

Hide file tree

Showing 914 changed files with 1,107,444 additions and 31 deletions.
diff --git a/go.mod b/go.mod
@@ -19,6 +19,6 @@ require (
  github.com/kr/text v0.2.0 // indirect
  github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- golang.org/x/sys v0.12.0 // indirect
+ golang.org/x/sys v0.13.0 // indirect
  gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
 )
diff --git a/go.sum b/go.sum
@@ -31,6 +31,8 @@ golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqR
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

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, false)
+ mxprojectAll, _ := stm32cubemx.IniReader(mxprojectFile, params.Subsystem[0].Compiler, 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
  }
- PreviousUsedKeilFiles struct {
+ PreviousUsedFiles struct {
  SourceFiles []string
  HeaderPath []string
  CDefines []string
@@ -188,7 +188,7 @@ func AppendToCores(iniSectionCore IniSectionCore, list *[]IniSectionCore) {
  *list = append(*list, iniSectionCore)
 }
 
-func IniReader(path string, trustzone bool) (MxprojectAllType, error) {
+func IniReader(path string, compiler string, trustzone bool) (MxprojectAllType, error) {
  var mxprojectAll MxprojectAllType
 
  if !utils.FileExists(path) {
@@ -218,7 +218,7 @@ func IniReader(path string, trustzone bool) (MxprojectAllType, error) {
  }
  coreName := core.CoreName
  trustzone := core.trustzone
- mxproject, _ := GetData(inidata, iniName)
+ mxproject, _ := GetData(inidata, iniName, compiler)
  mxproject.CoreName = coreName
  mxproject.Trustzone = trustzone
  mxprojectAll.Mxproject = append(mxprojectAll.Mxproject, mxproject)
@@ -283,20 +283,26 @@ func GetSections(inidata *ini.File, iniSections *IniSectionsType) error {
  return nil
 }
 
-func GetData(inidata *ini.File, iniName string) (MxprojectType, error) {
+func GetData(inidata *ini.File, iniName string, compiler string) (MxprojectType, error) {
  var mxproject MxprojectType
  var sectionName string
- const PreviousUsedKeilFilesID = "PreviousUsedKeilFiles"
+ var PreviousUsedFilesID string
+
+ PreviousUsedFilesID, err := GetPreviousUsedFilesID(compiler)
+ if err != nil {
+ return mxproject, err
+ }
+
  if iniName != "" {
- sectionName = iniName + ":" + PreviousUsedKeilFilesID
+ sectionName = iniName + ":" + PreviousUsedFilesID
  } else {
- sectionName = PreviousUsedKeilFilesID
+ sectionName = PreviousUsedFilesID
  }
  section := inidata.Section(sectionName)
  if section != nil {
- StoreItemCsv(&mxproject.PreviousUsedKeilFiles.SourceFiles, section, "SourceFiles")
- StoreItemCsv(&mxproject.PreviousUsedKeilFiles.HeaderPath, section, "HeaderPath")
- StoreItemCsv(&mxproject.PreviousUsedKeilFiles.CDefines, section, "CDefines")
+ StoreItemCsv(&mxproject.PreviousUsedFiles.SourceFiles, section, "SourceFiles")
+ StoreItemCsv(&mxproject.PreviousUsedFiles.HeaderPath, section, "HeaderPath")
+ StoreItemCsv(&mxproject.PreviousUsedFiles.CDefines, section, "CDefines")
  PrintItemCsv(section, "SourceFiles")
  PrintItemCsv(section, "HeaderPath")
  PrintItemCsv(section, "CDefines")
@@ -343,3 +349,18 @@ func GetData(inidata *ini.File, iniName string) (MxprojectType, error) {
 
  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
+}