Added methods to obtain specific monitor settings for a board

Author: cmaglie

arduino/cores/board.go

@@ -173,3 +173,8 @@ func (b *Board) IsBoardMatchingIDProperties(query *properties.Map) bool {
 	}
 	return false
 }
+
+// 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)
+}

arduino/cores/packagemanager/loader.go

@@ -504,6 +504,7 @@ func (pm *Builder) loadBoards(platform *cores.PlatformRelease) error {
 			convertVidPidIdentificationPropertiesToPluggableDiscovery(boardProperties)
 			convertUploadToolsToPluggableDiscovery(boardProperties)
 		}
+		convertLegacySerialPortRTSDTRSettingsToPluggableMonitor(boardProperties)
 
 		// The board's ID must be available in a board's properties since it can
 		// be used in all configuration files for several reasons, like setting compilation
@@ -523,6 +524,24 @@ func (pm *Builder) loadBoards(platform *cores.PlatformRelease) error {
 	return nil
 }
 
+// Converts the old:
+//
+//   - xxx.serial.disableRTS=true
+//   - xxx.serial.disableDTR=true
+//
+// properties into pluggable monitor compatible:
+//
+//   - 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")
+	}
+	if boardProperties.GetBoolean("serial.disableRTS") {
+		boardProperties.Set("monitor_port.serial.rts", "off")
+	}
+}
+
 // Converts the old:
 //
 //   - xxx.vid.N
@@ -532,7 +551,6 @@ func (pm *Builder) loadBoards(platform *cores.PlatformRelease) error {
 //
 //   - xxx.upload_port.N.vid
 //   - xxx.upload_port.N.pid
-//
 func convertVidPidIdentificationPropertiesToPluggableDiscovery(boardProperties *properties.Map) {
 	n := 0
 	outputVidPid := func(vid, pid string) {

arduino/cores/packagemanager/loader_test.go

@@ -106,6 +106,36 @@ arduino_zero_native.pid.3=0x024d
 }`, zero4.Dump())
 }
 
+func TestDisableDTRRTSConversionToPluggableMonitor(t *testing.T) {
+	m, err := properties.LoadFromBytes([]byte(`
+arduino_zero.serial.disableDTR=true
+arduino_zero.serial.disableRTS=true
+arduino_zero_edbg.serial.disableDTR=false
+arduino_zero_edbg.serial.disableRTS=true
+`))
+	require.NoError(t, err)
+
+	{
+		zero := m.SubTree("arduino_zero")
+		convertLegacySerialPortRTSDTRSettingsToPluggableMonitor(zero)
+		require.Equal(t, `properties.Map{
+  "serial.disableDTR": "true",
+  "serial.disableRTS": "true",
+  "monitor_port.serial.dtr": "off",
+  "monitor_port.serial.rts": "off",
+}`, zero.Dump())
+	}
+	{
+		zero_edbg := m.SubTree("arduino_zero_edbg")
+		convertLegacySerialPortRTSDTRSettingsToPluggableMonitor(zero_edbg)
+		require.Equal(t, `properties.Map{
+  "serial.disableDTR": "false",
+  "serial.disableRTS": "true",
+  "monitor_port.serial.rts": "off",
+}`, zero_edbg.Dump())
+	}
+}
+
 func TestLoadDiscoveries(t *testing.T) {
 	// Create all the necessary data to load discoveries
 	fakePath := paths.New("fake-path")