fix: fitgen's factory and mesgdef on evaluating scale offset (#481)

* fix: factory and mesgdef on evaluatin scale and offset * fitgen: generate factory and mesgdef
muktihari · Oct 5, 2024 · 21f4b2d · 21f4b2d
1 parent 9dc160f
commit 21f4b2d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/factory/factory_gen.go b/factory/factory_gen.go
diff --git a/internal/cmd/fitgen/factory/builder.go b/internal/cmd/fitgen/factory/builder.go
@@ -138,9 +138,14 @@ func (b *Builder) makeFieldBases(message parser.Message) string {
 		if array := field.Array != ""; array {
 			strbuf.WriteString(fmt.Sprintf("Array: %t, %s", array, makeArrayComment(field.Array)))
 		}
-		strbuf.WriteString(fmt.Sprintf("Scale: %g,", scaleOrDefault(field.Scales, 0))) // first index or default
-		if offset := offsetOrDefault(field.Offsets, 0); offset != 0 {
-			strbuf.WriteString(fmt.Sprintf("Offset: %g,", offset)) // first index or default
+		// Scale and offset do not apply for field that has more than one components
+		if len(field.Components) > 1 {
+			strbuf.WriteString(fmt.Sprintf("Scale: %d,", 1))
+		} else {
+			strbuf.WriteString(fmt.Sprintf("Scale: %g,", scaleOrDefault(field.Scales, 0))) // first index or default
+			if offset := offsetOrDefault(field.Offsets, 0); offset != 0 {
+				strbuf.WriteString(fmt.Sprintf("Offset: %g,", offset)) // first index or default
+			}
 		}
 		if accumulate := accumulateOrDefault(field.Accumulate, 0); accumulate {
 			strbuf.WriteString(fmt.Sprintf("Accumulate: %t,", accumulate))

diff --git a/internal/cmd/fitgen/profile/mesgdef/builder.go b/internal/cmd/fitgen/profile/mesgdef/builder.go
@@ -136,11 +136,11 @@ func (b *Builder) Build() ([]generator.Data, error) {
 				field.InvalidValue += fmt.Sprintf("&& %s != \"\"", field.ComparableValue)
 			}
 
-			if len(parserField.Scales) <= 1 { // Multiple scales only for components
+			// Scale and offset do not apply for field that has more than one components
+			if len(parserField.Components) > 1 {
+				field.Scale, field.Offset = 1, 0
+			} else {
 				field.Scale = scaleOrDefault(parserField.Scales, 0)
-			}
-
-			if len(parserField.Offsets) <= 1 { // Multiple offsets only for components
 				field.Offset = offsetOrDefault(parserField.Offsets, 0)
 			}