Removed hardcoded build.warn_data_percentage in build.options file

Also fixed the "low memory" warning printer.

Author: cmaglie

internal/arduino/builder/builder.go

@@ -59,9 +59,6 @@ type Builder struct {
 	// Parallel processes
 	jobs int
 
-	// Custom build properties defined by user (line by line as "key=value" pairs)
-	customBuildProperties []string
-
 	// core related
 	coreBuildCachePath       *paths.Path
 	extraCoreBuildCachePaths paths.PathList
@@ -171,7 +168,6 @@ func NewBuilder(
 		return nil, fmt.Errorf("invalid build properties: %w", err)
 	}
 	buildProperties.Merge(customBuildProperties)
-	customBuildPropertiesArgs := append(requestBuildProperties, "build.warn_data_percentage=75")
 
 	sketchBuildPath, err := buildPath.Join("sketch").Abs()
 	if err != nil {
@@ -213,7 +209,6 @@ func NewBuilder(
 		coreBuildPath:                 coreBuildPath,
 		librariesBuildPath:            librariesBuildPath,
 		jobs:                          jobs,
-		customBuildProperties:         customBuildPropertiesArgs,
 		coreBuildCachePath:            coreBuildCachePath,
 		extraCoreBuildCachePaths:      extraCoreBuildCachePaths,
 		logger:                        log,
@@ -231,7 +226,7 @@ func NewBuilder(
 			hardwareDirs, librariesDirs,
 			builtInLibrariesDirs, buildPath,
 			sk,
-			customBuildPropertiesArgs,
+			requestBuildProperties,
 			fqbn,
 			clean,
 			buildProperties.Get("compiler.optimization_flags"),

internal/arduino/builder/sizer.go

@@ -199,15 +199,17 @@ func (b *Builder) checkSize() (ExecutablesFileSections, error) {
 		return executableSectionsSize, errors.New(i18n.Tr("data section exceeds available space in board"))
 	}
 
+	warnDataPercentage := 75
 	if w := properties.Get("build.warn_data_percentage"); w != "" {
-		warnDataPercentage, err := strconv.Atoi(w)
-		if err != nil {
-			return executableSectionsSize, err
-		}
-		if maxDataSize > 0 && dataSize > maxDataSize*warnDataPercentage/100 {
-			b.logger.Warn(i18n.Tr("Low memory available, stability problems may occur."))
+		if p, err := strconv.Atoi(w); err == nil {
+			warnDataPercentage = p
+		} else {
+			b.logger.Warn(i18n.Tr("Invalid value for build.warn_data_percentage: %s", w))
 		}
 	}
+	if maxDataSize > 0 && dataSize > maxDataSize*warnDataPercentage/100 {
+		b.logger.Warn(i18n.Tr("Low memory available, stability problems may occur."))
+	}
 
 	return executableSectionsSize, nil
 }

internal/integrationtest/compile_4/compile_test.go

@@ -1045,15 +1045,14 @@ func TestBuildOptionsFile(t *testing.T) {
 		"sketchLocation"
 	]`)
 	requirejson.Query(t, buildOptionsBytes, ".fqbn", `"arduino:avr:uno"`)
-	requirejson.Query(t, buildOptionsBytes, ".customBuildProperties", `"build.warn_data_percentage=75"`)
 
 	// Recompiling a second time should provide the same result
 	_, _, err = cli.Run("compile", "-b", "arduino:avr:uno", "--build-path", buildPath.String(), sketchPath.String())
 	require.NoError(t, err)
 
-	buildOptionsBytes, err = buildPath.Join("build.options.json").ReadFile()
+	buildOptionsBytes2, err := buildPath.Join("build.options.json").ReadFile()
 	require.NoError(t, err)
-	requirejson.Query(t, buildOptionsBytes, ".customBuildProperties", `"build.warn_data_percentage=75"`)
+	require.Equal(t, buildOptionsBytes, buildOptionsBytes2)
 
 	// Recompiling with a new build option must produce a new `build.options.json`
 	_, _, err = cli.Run("compile", "-b", "arduino:avr:uno", "--build-path", buildPath.String(),
@@ -1062,7 +1061,7 @@ func TestBuildOptionsFile(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	buildOptionsBytes, err = buildPath.Join("build.options.json").ReadFile()
+	buildOptionsBytes3, err := buildPath.Join("build.options.json").ReadFile()
 	require.NoError(t, err)
-	requirejson.Query(t, buildOptionsBytes, ".customBuildProperties", `"custom=prop,build.warn_data_percentage=75"`)
+	require.NotEqual(t, buildOptionsBytes, buildOptionsBytes3)
 }