Merge pull request #426 from arduino/scerza/pluggable-discovery-support

Add support for pluggable discovery

platform.txt

@@ -89,6 +89,12 @@ recipe.preproc.includes="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags}
 preproc.macros.flags=-w -x c++ -E -CC
 recipe.preproc.macros="{compiler.path}{compiler.cpp.cmd}" {compiler.cpp.flags} {preproc.macros.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.cpp.extra_flags} {build.extra_flags} {includes} "{source_file}" -o "{preprocessed_file_path}"
 
+# Required discoveries and monitors
+# ---------------------------------
+pluggable_discovery.required.0=builtin:serial-discovery
+pluggable_discovery.required.1=builtin:mdns-discovery
+pluggable_monitor.required.serial=builtin:serial-monitor
+
 # AVR Uploader/Programmers tools
 # ------------------------------
 
@@ -96,8 +102,6 @@ tools.avrdude.path={runtime.tools.avrdude.path}
 tools.avrdude.cmd.path={path}/bin/avrdude
 tools.avrdude.config.path={path}/etc/avrdude.conf
 
-tools.avrdude.network_cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
-
 tools.avrdude.upload.params.verbose=-v
 tools.avrdude.upload.params.quiet=-q -q
 # tools.avrdude.upload.verify is needed for backwards compatibility with IDE 1.6.8 or older, IDE 1.6.9 or newer overrides this value
@@ -122,7 +126,12 @@ tools.avrdude.bootloader.pattern="{cmd.path}" "-C{config.path}" {bootloader.verb
 
 tools.avrdude_remote.upload.pattern=/usr/bin/run-avrdude /tmp/sketch.hex {upload.verbose} -p{build.mcu}
 
-tools.avrdude.upload.network_pattern="{network_cmd}" -address {serial.port} -port {upload.network.port} -sketch "{build.path}/{build.project_name}.hex" -upload {upload.network.endpoint_upload} -sync {upload.network.endpoint_sync} -reset {upload.network.endpoint_reset} -sync_exp {upload.network.sync_return}
+# the following rule is deprecated by pluggable discovery
+tools.avrdude.upload.network_pattern="{tools.arduino_ota.cmd}" -address {serial.port} -port {upload.network.port} -sketch "{build.path}/{build.project_name}.hex" -upload {upload.network.endpoint_upload} -sync {upload.network.endpoint_sync} -reset {upload.network.endpoint_reset} -sync_exp {upload.network.sync_return}
+
+# arduino ota
+tools.arduino_ota.cmd={runtime.tools.arduinoOTA.path}/bin/arduinoOTA
+tools.arduino_ota.upload.pattern="{cmd}" -address {upload.port.address} -port {upload.port.properties.port} -sketch "{build.path}/{build.project_name}.hex" -upload {upload.port.properties.endpoint_upload} -sync {upload.port.properties.endpoint_sync} -reset {upload.port.properties.endpoint_reset} -sync_exp {upload.port.properties.sync_return}
 
 # USB Default Flags
 # Default blank usb manufacturer will be filled in at compile time

programmers.txt

@@ -3,6 +3,7 @@ avrisp.communication=serial
 avrisp.protocol=stk500v1
 avrisp.program.protocol=stk500v1
 avrisp.program.tool=avrdude
+avrisp.program.tool.default=avrdude
 avrisp.program.extra_params=-P{serial.port}
 
 avrispmkii.name=AVRISP mkII
@@ -10,21 +11,25 @@ avrispmkii.communication=usb
 avrispmkii.protocol=stk500v2
 avrispmkii.program.protocol=stk500v2
 avrispmkii.program.tool=avrdude
+avrispmkii.program.tool.default=avrdude
 avrispmkii.program.extra_params=-Pusb
 
 usbtinyisp.name=USBtinyISP
 usbtinyisp.protocol=usbtiny
 usbtinyisp.program.tool=avrdude
+usbtinyisp.program.tool.default=avrdude
 usbtinyisp.program.extra_params=
 
 arduinoisp.name=ArduinoISP
 arduinoisp.protocol=arduinoisp
 arduinoisp.program.tool=avrdude
+arduinoisp.program.tool.default=avrdude
 arduinoisp.program.extra_params=
 
 arduinoisporg.name=ArduinoISP.org
 arduinoisporg.protocol=arduinoisporg
 arduinoisporg.program.tool=avrdude
+arduinoisporg.program.tool.default=avrdude
 arduinoisporg.program.extra_params=
 
 usbasp.name=USBasp
@@ -32,6 +37,7 @@ usbasp.communication=usb
 usbasp.protocol=usbasp
 usbasp.program.protocol=usbasp
 usbasp.program.tool=avrdude
+usbasp.program.tool.default=avrdude
 usbasp.program.extra_params=-Pusb
 
 parallel.name=Parallel Programmer
@@ -39,6 +45,7 @@ parallel.protocol=dapa
 parallel.force=true
 # parallel.delay=200
 parallel.program.tool=avrdude
+parallel.program.tool.default=avrdude
 parallel.program.extra_params=-F
 
 arduinoasisp.name=Arduino as ISP
@@ -48,6 +55,7 @@ arduinoasisp.speed=19200
 arduinoasisp.program.protocol=stk500v1
 arduinoasisp.program.speed=19200
 arduinoasisp.program.tool=avrdude
+arduinoasisp.program.tool.default=avrdude
 arduinoasisp.program.extra_params=-P{serial.port} -b{program.speed}
 
 arduinoasispatmega32u4.name=Arduino as ISP (ATmega32U4)
@@ -57,11 +65,13 @@ arduinoasispatmega32u4.speed=19200
 arduinoasispatmega32u4.program.protocol=arduino
 arduinoasispatmega32u4.program.speed=19200
 arduinoasispatmega32u4.program.tool=avrdude
+arduinoasispatmega32u4.program.tool.default=avrdude
 arduinoasispatmega32u4.program.extra_params=-P{serial.port} -b{program.speed}
 
 usbGemma.name=Arduino Gemma
 usbGemma.protocol=arduinogemma
 usbGemma.program.tool=avrdude
+usbGemma.program.tool.default=avrdude
 usbGemma.program.extra_params=
 usbGemma.config.path={runtime.platform.path}/bootloaders/gemma/avrdude.conf
 
@@ -76,6 +86,7 @@ buspirate.communication=serial
 buspirate.protocol=buspirate
 buspirate.program.protocol=buspirate
 buspirate.program.tool=avrdude
+buspirate.program.tool.default=avrdude
 buspirate.program.extra_params=-P{serial.port}
 
 # STK500 firmware version v1 and v2 use different serial protocols.
@@ -88,6 +99,7 @@ stk500.communication=serial
 stk500.protocol=stk500
 stk500.program.protocol=stk500
 stk500.program.tool=avrdude
+stk500.program.tool.default=avrdude
 stk500.program.extra_params=-P{serial.port}
 
 jtag3isp.name=Atmel JTAGICE3 (ISP mode)
@@ -95,6 +107,7 @@ jtag3isp.communication=usb
 jtag3isp.protocol=jtag3isp
 jtag3isp.program.protocol=jtag3isp
 jtag3isp.program.tool=avrdude
+jtag3isp.program.tool.default=avrdude
 jtag3isp.program.extra_params=
 
 jtag3.name=Atmel JTAGICE3 (JTAG mode)
@@ -102,6 +115,7 @@ jtag3.communication=usb
 jtag3.protocol=jtag3
 jtag3.program.protocol=jtag3
 jtag3.program.tool=avrdude
+jtag3.program.tool.default=avrdude
 # Set a bitclock of 0.1us (the fastest supported value). This should
 # work regardless of the crystal used, since JTAG doesn't use the MCU
 # clock but dictates its own clock.
@@ -112,4 +126,5 @@ atmel_ice.communication=usb
 atmel_ice.protocol=atmelice_isp
 atmel_ice.program.protocol=atmelice_isp
 atmel_ice.program.tool=avrdude
+atmel_ice.program.tool.default=avrdude
 atmel_ice.program.extra_params=-Pusb