Device generator

.gitignore

@@ -11,6 +11,9 @@
 # Folders
 .vscode
 /build*/
+/etc/
 
 # others
 *~
+*.swp
+*.swo

cmd/version.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -8,4 +8,4 @@ package main
 
 var version string
 
-const copyright = "(C) 2023 Arm Ltd."
+const copyright = "(C) 2023-2024 Arm Ltd."

internal/common/common.go

@@ -23,6 +23,7 @@ func ReadYml(path string, out interface{}) error {
 	err = yaml.Unmarshal(yamlFile, out)
 	if err != nil {
 		log.Errorf("Unmarshal: %v", err)
+		return err
 	}
 
 	return nil

internal/generator/generator.go

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2024 Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package generator
+
+import (
+	"errors"
+
+	"github.com/open-cmsis-pack/generator-bridge/internal/common"
+	"github.com/open-cmsis-pack/generator-bridge/internal/utils"
+)
+
+type ParamsType struct {
+	ID          string
+	DownloadURL string
+}
+
+type GeneratorType struct {
+	Generator []struct {
+		ID          string `yaml:"id"`
+		Description string `yaml:"description"`
+		DownloadURL string `yaml:"download-url"`
+		Run         string `yaml:"run"`
+		Path        string `yaml:"path"`
+	} `yaml:"generator"`
+}
+
+func Read(name string, params *ParamsType) error {
+	var gen GeneratorType
+
+	if !utils.FileExists(name) {
+		text := "File not found: "
+		text += name
+		return errors.New(text)
+	}
+
+	err := common.ReadYml(name, &gen)
+	if err != nil {
+		return err
+	}
+	for _, genx := range gen.Generator {
+		if genx.ID == "CubeMX" {
+			params.ID = genx.ID
+			params.DownloadURL = genx.DownloadURL
+			break
+		}
+	}
+	if params.ID != "CubeMX" {
+		return errors.New("generator CubeMX missing in global.generator.yml")
+	}
+	return nil
+}

internal/generator/generator_test.go

@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2024 Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package generator
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestRead(t *testing.T) {
+	var params ParamsType
+
+	type args struct {
+		name   string
+		params *ParamsType
+	}
+	tests := []struct {
+		name    string
+		args    args
+		want    ParamsType
+		wantErr bool
+	}{
+		{"wrong.yml", args{"../../testdata/wrong.yml", &params}, ParamsType{}, true},
+		{"global.yml", args{"../../testdata/global.yml", &params}, ParamsType{ID: "CubeMX", DownloadURL: "https://nix.html"}, false},
+		{"global-nix.yml", args{"../../testdata/global-nix.yml", &params}, ParamsType{}, true},
+		{"wrong.yml", args{"../../testdata/wrong.yml", &params}, ParamsType{}, true},
+		{"xxx.yml", args{"../../testdata/xxx.yml", &params}, ParamsType{}, true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			params.ID = ""
+			params.DownloadURL = ""
+			if err := Read(tt.args.name, tt.args.params); (err != nil) != tt.wantErr {
+				t.Errorf("Read() %s error = %v, wantErr %v", tt.name, err, tt.wantErr)
+			}
+			if !reflect.DeepEqual(params, tt.want) {
+				t.Errorf("createContextMap() %s got = %v, want %v", tt.name, params, tt.want)
+			}
+		})
+	}
+}

internal/readFile/readFile.go

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Arm Limited. All rights reserved.
+ * Copyright (c) 2023-2024 Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -75,7 +75,11 @@ func Process(inFile, inFile2, outPath string) error {
 				workDir = path.Join(workDir, parms.OutPath)
 			}
 		} else {
-			workDir = path.Join(workDir, outPath)
+			if filepath.IsAbs(outPath) {
+				workDir = outPath
+			} else {
+				workDir = path.Join(workDir, outPath)
+			}
 		}
 		workDir = filepath.Clean(workDir)
 		workDir = filepath.ToSlash(workDir)

internal/stm32CubeMX/iniReader.go

@@ -244,8 +244,7 @@ func GetIni(path string) (*ini.File, error) {
 
 func GetSections(inidata *ini.File, iniSections *IniSectionsType) error {
 	sectionsData := inidata.SectionStrings()
-	for sectionID := range sectionsData {
-		section := sectionsData[sectionID]
+	for _, section := range sectionsData {
 		var iniName string
 		var sectionName string
 		sectionString := strings.Split(section, ":")