Allow submenu properties to override monitor settings

Author: cmaglie

arduino/cores/board.go

@@ -175,6 +175,7 @@ func (b *Board) IsBoardMatchingIDProperties(query *properties.Map) bool {
 }
 
 // GetMonitorSettings returns the settings for the pluggable monitor of the given protocol
-func (b *Board) GetMonitorSettings(protocol string) *properties.Map {
-	return b.Properties.SubTree("monitor_port." + protocol)
+// and set of board properties.
+func GetMonitorSettings(protocol string, boardProperties *properties.Map) *properties.Map {
+	return boardProperties.SubTree("monitor_port." + protocol)
 }

arduino/cores/packagemanager/loader.go

@@ -534,11 +534,29 @@ func (pm *Builder) loadBoards(platform *cores.PlatformRelease) error {
 //   - xxx.monitor_port.serial.rts=off
 //   - xxx.monitor_port.serial.dtr=off
 func convertLegacySerialPortRTSDTRSettingsToPluggableMonitor(boardProperties *properties.Map) {
-	if boardProperties.GetBoolean("serial.disableDTR") {
-		boardProperties.Set("monitor_port.serial.dtr", "off")
+	disabledToOnOff := func(k string) string {
+		if boardProperties.GetBoolean(k) {
+			return "off" // Disabled
+		}
+		return "on" // Not disabled
+	}
+	if boardProperties.ContainsKey("serial.disableDTR") {
+		boardProperties.Set("monitor_port.serial.dtr", disabledToOnOff("serial.disableDTR"))
+	}
+	if boardProperties.ContainsKey("serial.disableRTS") {
+		boardProperties.Set("monitor_port.serial.rts", disabledToOnOff("serial.disableRTS"))
 	}
-	if boardProperties.GetBoolean("serial.disableRTS") {
-		boardProperties.Set("monitor_port.serial.rts", "off")
+	for _, k := range boardProperties.Keys() {
+		if strings.HasSuffix(k, ".serial.disableDTR") {
+			boardProperties.Set(
+				strings.TrimSuffix(k, ".serial.disableDTR")+".monitor_port.serial.dtr",
+				disabledToOnOff(k))
+		}
+		if strings.HasSuffix(k, ".serial.disableRTS") {
+			boardProperties.Set(
+				strings.TrimSuffix(k, ".serial.disableRTS")+".monitor_port.serial.rts",
+				disabledToOnOff(k))
+		}
 	}
 }
 

arduino/cores/packagemanager/loader_test.go

@@ -108,8 +108,20 @@ arduino_zero_native.pid.3=0x024d
 
 func TestDisableDTRRTSConversionToPluggableMonitor(t *testing.T) {
 	m, err := properties.LoadFromBytes([]byte(`
+menu.rts=RTS
+menu.dtr=DTR
+foo.menu.rts.on=On
+foo.menu.rts.on.serial.disableRTS=false
+foo.menu.rts.off=Off
+foo.menu.rts.off.serial.disableRTS=true
+foo.menu.dtr.on=On
+foo.menu.dtr.on.serial.disableDTR=false
+foo.menu.dtr.off=Off
+foo.menu.dtr.off.serial.disableDTR=true
+
 arduino_zero.serial.disableDTR=true
 arduino_zero.serial.disableRTS=true
+
 arduino_zero_edbg.serial.disableDTR=false
 arduino_zero_edbg.serial.disableRTS=true
 `))
@@ -131,9 +143,28 @@ arduino_zero_edbg.serial.disableRTS=true
 		require.Equal(t, `properties.Map{
   "serial.disableDTR": "false",
   "serial.disableRTS": "true",
+  "monitor_port.serial.dtr": "on",
   "monitor_port.serial.rts": "off",
 }`, zeroEdbg.Dump())
 	}
+	{
+		foo := m.SubTree("foo")
+		convertLegacySerialPortRTSDTRSettingsToPluggableMonitor(foo)
+		require.Equal(t, `properties.Map{
+  "menu.rts.on": "On",
+  "menu.rts.on.serial.disableRTS": "false",
+  "menu.rts.off": "Off",
+  "menu.rts.off.serial.disableRTS": "true",
+  "menu.dtr.on": "On",
+  "menu.dtr.on.serial.disableDTR": "false",
+  "menu.dtr.off": "Off",
+  "menu.dtr.off.serial.disableDTR": "true",
+  "menu.rts.on.monitor_port.serial.rts": "on",
+  "menu.rts.off.monitor_port.serial.rts": "off",
+  "menu.dtr.on.monitor_port.serial.dtr": "on",
+  "menu.dtr.off.monitor_port.serial.dtr": "off",
+}`, foo.Dump())
+	}
 }
 
 func TestLoadDiscoveries(t *testing.T) {

commands/monitor/monitor.go

@@ -128,12 +128,12 @@ func findMonitorAndSettingsForProtocolAndBoard(pme *packagemanager.Explorer, pro
 			return nil, nil, &arduino.InvalidFQBNError{Cause: err}
 		}
 
-		_, boardPlatform, board, boardProperties, _, err := pme.ResolveFQBN(fqbn)
+		_, boardPlatform, _, boardProperties, _, err := pme.ResolveFQBN(fqbn)
 		if err != nil {
 			return nil, nil, &arduino.UnknownFQBNError{Cause: err}
 		}
 
-		boardSettings = board.GetMonitorSettings(protocol)
+		boardSettings = cores.GetMonitorSettings(protocol, boardProperties)
 
 		if mon, ok := boardPlatform.Monitors[protocol]; ok {
 			monitorDepOrRecipe = mon