mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-17 22:23:10 +03:00
Merge branch 'new-extension' into HEAD
Conflicts: .classpath .settings/org.eclipse.jdt.core.prefs .settings/org.eclipse.jdt.ui.prefs app/src/processing/app/Base.java app/src/processing/app/Editor.java app/src/processing/app/Sketch.java app/src/processing/app/debug/Compiler.java build/build.xml build/shared/lib/preferences.txt hardware/arduino/avr/boards.txt hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168.c hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex hardware/arduino/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex hardware/arduino/avr/bootloaders/atmega/Makefile hardware/arduino/avr/bootloaders/atmega8/ATmegaBOOT.c hardware/arduino/avr/bootloaders/atmega8/ATmegaBOOT.hex hardware/arduino/avr/bootloaders/atmega8/Makefile hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168.c hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168.hex hardware/arduino/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex hardware/arduino/avr/bootloaders/bt/Makefile hardware/arduino/avr/bootloaders/lilypad/LilyPadBOOT_168.hex hardware/arduino/avr/bootloaders/lilypad/src/ATmegaBOOT.c hardware/arduino/avr/bootloaders/lilypad/src/Makefile hardware/arduino/avr/bootloaders/optiboot/optiboot.c hardware/arduino/avr/bootloaders/optiboot/optiboot_atmega328-Mini.hex hardware/arduino/avr/bootloaders/stk500v2/License.txt hardware/arduino/avr/bootloaders/stk500v2/Makefile hardware/arduino/avr/bootloaders/stk500v2/STK500V2.pnproj hardware/arduino/avr/bootloaders/stk500v2/STK500V2.pnps hardware/arduino/avr/bootloaders/stk500v2/avrinterruptnames.h hardware/arduino/avr/bootloaders/stk500v2/command.h hardware/arduino/avr/bootloaders/stk500v2/stk500boot.c hardware/arduino/avr/bootloaders/stk500v2/stk500boot.ppg hardware/arduino/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex hardware/arduino/avr/cores/arduino/Arduino.h hardware/arduino/avr/cores/arduino/HardwareSerial.cpp hardware/arduino/avr/cores/arduino/HardwareSerial.h hardware/arduino/avr/cores/arduino/IPAddress.cpp hardware/arduino/avr/cores/arduino/IPAddress.h hardware/arduino/avr/cores/arduino/Printable.h hardware/arduino/avr/cores/arduino/Tone.cpp hardware/arduino/avr/cores/arduino/WCharacter.h hardware/arduino/avr/cores/arduino/WInterrupts.c hardware/arduino/avr/cores/arduino/WMath.cpp hardware/arduino/avr/cores/arduino/WString.cpp hardware/arduino/avr/cores/arduino/WString.h hardware/arduino/avr/cores/arduino/binary.h hardware/arduino/avr/cores/arduino/wiring.c hardware/arduino/avr/cores/arduino/wiring_analog.c hardware/arduino/avr/cores/arduino/wiring_digital.c hardware/arduino/avr/cores/arduino/wiring_private.h hardware/arduino/avr/cores/arduino/wiring_pulse.c hardware/arduino/avr/cores/arduino/wiring_shift.c hardware/arduino/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex hardware/arduino/avr/firmwares/README.txt hardware/arduino/avr/firmwares/UNO-dfu_and_usbserial_combined.hex hardware/arduino/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c hardware/arduino/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h hardware/arduino/avr/firmwares/arduino-usbdfu/Board/LEDs.h hardware/arduino/avr/firmwares/arduino-usbdfu/Descriptors.c hardware/arduino/avr/firmwares/arduino-usbdfu/Descriptors.h hardware/arduino/avr/firmwares/arduino-usbdfu/makefile hardware/arduino/avr/firmwares/arduino-usbdfu/readme.txt hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial.c hardware/arduino/avr/firmwares/arduino-usbserial/Arduino-usbserial.h hardware/arduino/avr/firmwares/arduino-usbserial/Board/LEDs.h hardware/arduino/avr/firmwares/arduino-usbserial/Descriptors.c hardware/arduino/avr/firmwares/arduino-usbserial/Descriptors.h hardware/arduino/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h hardware/arduino/avr/firmwares/arduino-usbserial/makefile hardware/arduino/avr/firmwares/arduino-usbserial/readme.txt hardware/arduino/avr/libraries/EEPROM/EEPROM.cpp hardware/arduino/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.ino hardware/arduino/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.ino hardware/arduino/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.ino hardware/arduino/avr/libraries/EEPROM/keywords.txt hardware/arduino/avr/libraries/Ethernet/Dhcp.cpp hardware/arduino/avr/libraries/Ethernet/Dhcp.h hardware/arduino/avr/libraries/Ethernet/Dns.cpp hardware/arduino/avr/libraries/Ethernet/Dns.h hardware/arduino/avr/libraries/Ethernet/Ethernet.cpp hardware/arduino/avr/libraries/Ethernet/Ethernet.h hardware/arduino/avr/libraries/Ethernet/EthernetClient.cpp hardware/arduino/avr/libraries/Ethernet/EthernetServer.cpp hardware/arduino/avr/libraries/Ethernet/EthernetUdp.cpp hardware/arduino/avr/libraries/Ethernet/EthernetUdp.h hardware/arduino/avr/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.ino hardware/arduino/avr/libraries/Ethernet/examples/ChatServer/ChatServer.ino hardware/arduino/avr/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.ino hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino hardware/arduino/avr/libraries/Ethernet/examples/PachubeClient/PachubeClient.ino hardware/arduino/avr/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino hardware/arduino/avr/libraries/Ethernet/examples/TelnetClient/TelnetClient.ino hardware/arduino/avr/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.ino hardware/arduino/avr/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.ino hardware/arduino/avr/libraries/Ethernet/examples/WebClient/WebClient.ino hardware/arduino/avr/libraries/Ethernet/examples/WebServer/WebServer.ino hardware/arduino/avr/libraries/Ethernet/keywords.txt hardware/arduino/avr/libraries/Ethernet/util.h hardware/arduino/avr/libraries/Ethernet/utility/socket.cpp hardware/arduino/avr/libraries/Ethernet/utility/socket.h hardware/arduino/avr/libraries/Ethernet/utility/w5100.cpp hardware/arduino/avr/libraries/Ethernet/utility/w5100.h hardware/arduino/avr/libraries/Firmata/Boards.h hardware/arduino/avr/libraries/Firmata/Firmata.cpp hardware/arduino/avr/libraries/Firmata/Firmata.h hardware/arduino/avr/libraries/Firmata/LICENSE.txt hardware/arduino/avr/libraries/Firmata/TODO.txt hardware/arduino/avr/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.ino hardware/arduino/avr/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.ino hardware/arduino/avr/libraries/Firmata/examples/EchoString/EchoString.ino hardware/arduino/avr/libraries/Firmata/examples/I2CFirmata/I2CFirmata.ino hardware/arduino/avr/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt hardware/arduino/avr/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.ino hardware/arduino/avr/libraries/Firmata/examples/ServoFirmata/ServoFirmata.ino hardware/arduino/avr/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.ino hardware/arduino/avr/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.ino hardware/arduino/avr/libraries/Firmata/examples/StandardFirmata/LICENSE.txt hardware/arduino/avr/libraries/Firmata/examples/StandardFirmata/StandardFirmata.ino hardware/arduino/avr/libraries/Firmata/keywords.txt hardware/arduino/avr/libraries/SD/File.cpp hardware/arduino/avr/libraries/SD/README.txt hardware/arduino/avr/libraries/SD/SD.cpp hardware/arduino/avr/libraries/SD/SD.h hardware/arduino/avr/libraries/SD/examples/CardInfo/CardInfo.ino hardware/arduino/avr/libraries/SD/examples/Datalogger/Datalogger.ino hardware/arduino/avr/libraries/SD/examples/DumpFile/DumpFile.ino hardware/arduino/avr/libraries/SD/examples/Files/Files.ino hardware/arduino/avr/libraries/SD/examples/ReadWrite/ReadWrite.ino hardware/arduino/avr/libraries/SD/examples/listfiles/listfiles.ino hardware/arduino/avr/libraries/SD/keywords.txt hardware/arduino/avr/libraries/SD/utility/FatStructs.h hardware/arduino/avr/libraries/SD/utility/Sd2Card.cpp hardware/arduino/avr/libraries/SD/utility/Sd2Card.h hardware/arduino/avr/libraries/SD/utility/Sd2PinMap.h hardware/arduino/avr/libraries/SD/utility/SdFat.h hardware/arduino/avr/libraries/SD/utility/SdFatUtil.h hardware/arduino/avr/libraries/SD/utility/SdFatmainpage.h hardware/arduino/avr/libraries/SD/utility/SdFile.cpp hardware/arduino/avr/libraries/SD/utility/SdInfo.h hardware/arduino/avr/libraries/SD/utility/SdVolume.cpp hardware/arduino/avr/libraries/SPI/SPI.cpp hardware/arduino/avr/libraries/SPI/SPI.h hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.ino hardware/arduino/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.ino hardware/arduino/avr/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.ino hardware/arduino/avr/libraries/SPI/keywords.txt hardware/arduino/avr/libraries/Servo/Servo.cpp hardware/arduino/avr/libraries/Servo/Servo.h hardware/arduino/avr/libraries/Servo/examples/Knob/Knob.ino hardware/arduino/avr/libraries/Servo/examples/Sweep/Sweep.ino hardware/arduino/avr/libraries/Servo/keywords.txt hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.cpp hardware/arduino/avr/libraries/SoftwareSerial/SoftwareSerial.h hardware/arduino/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino hardware/arduino/avr/libraries/SoftwareSerial/keywords.txt hardware/arduino/avr/libraries/Wire/Wire.cpp hardware/arduino/avr/libraries/Wire/Wire.h hardware/arduino/avr/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.ino hardware/arduino/avr/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.ino hardware/arduino/avr/libraries/Wire/examples/master_reader/master_reader.ino hardware/arduino/avr/libraries/Wire/examples/master_writer/master_writer.ino hardware/arduino/avr/libraries/Wire/examples/slave_receiver/slave_receiver.ino hardware/arduino/avr/libraries/Wire/examples/slave_sender/slave_sender.ino hardware/arduino/avr/libraries/Wire/keywords.txt hardware/arduino/avr/libraries/Wire/utility/twi.c hardware/arduino/avr/libraries/Wire/utility/twi.h hardware/arduino/avr/programmers.txt hardware/arduino/avr/variants/mega/pins_arduino.h hardware/arduino/avr/variants/micro/pins_arduino.h hardware/arduino/avr/variants/standard/pins_arduino.h hardware/arduino/boards.txt hardware/arduino/bootloaders/atmega/ATmegaBOOT_168.c hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_ng.hex hardware/arduino/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex hardware/arduino/bootloaders/atmega/Makefile hardware/arduino/bootloaders/atmega8/ATmegaBOOT.c hardware/arduino/bootloaders/atmega8/ATmegaBOOT.hex hardware/arduino/bootloaders/atmega8/Makefile hardware/arduino/bootloaders/bt/ATmegaBOOT_168.c hardware/arduino/bootloaders/bt/ATmegaBOOT_168.hex hardware/arduino/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex hardware/arduino/bootloaders/bt/Makefile hardware/arduino/bootloaders/lilypad/LilyPadBOOT_168.hex hardware/arduino/bootloaders/lilypad/src/ATmegaBOOT.c hardware/arduino/bootloaders/lilypad/src/Makefile hardware/arduino/bootloaders/optiboot/optiboot.c hardware/arduino/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex hardware/arduino/bootloaders/stk500v2/License.txt hardware/arduino/bootloaders/stk500v2/Makefile hardware/arduino/bootloaders/stk500v2/STK500V2.pnproj hardware/arduino/bootloaders/stk500v2/STK500V2.pnps hardware/arduino/bootloaders/stk500v2/avrinterruptnames.h hardware/arduino/bootloaders/stk500v2/command.h hardware/arduino/bootloaders/stk500v2/stk500boot.c hardware/arduino/bootloaders/stk500v2/stk500boot.ppg hardware/arduino/bootloaders/stk500v2/stk500boot_v2_mega2560.hex hardware/arduino/cores/arduino/Arduino.h hardware/arduino/cores/arduino/HardwareSerial.cpp hardware/arduino/cores/arduino/HardwareSerial.h hardware/arduino/cores/arduino/Stream.h hardware/arduino/cores/arduino/Tone.cpp hardware/arduino/cores/arduino/WCharacter.h hardware/arduino/cores/arduino/WInterrupts.c hardware/arduino/cores/arduino/WMath.cpp hardware/arduino/cores/arduino/WString.cpp hardware/arduino/cores/arduino/WString.h hardware/arduino/cores/arduino/binary.h hardware/arduino/cores/arduino/wiring.c hardware/arduino/cores/arduino/wiring_analog.c hardware/arduino/cores/arduino/wiring_digital.c hardware/arduino/cores/arduino/wiring_private.h hardware/arduino/cores/arduino/wiring_pulse.c hardware/arduino/cores/arduino/wiring_shift.c hardware/arduino/firmwares/MEGA-dfu_and_usbserial_combined.hex hardware/arduino/firmwares/README.txt hardware/arduino/firmwares/UNO-dfu_and_usbserial_combined.hex hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.c hardware/arduino/firmwares/arduino-usbdfu/Arduino-usbdfu.h hardware/arduino/firmwares/arduino-usbdfu/Board/LEDs.h hardware/arduino/firmwares/arduino-usbdfu/Descriptors.c hardware/arduino/firmwares/arduino-usbdfu/Descriptors.h hardware/arduino/firmwares/arduino-usbdfu/makefile hardware/arduino/firmwares/arduino-usbdfu/readme.txt hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.c hardware/arduino/firmwares/arduino-usbserial/Arduino-usbserial.h hardware/arduino/firmwares/arduino-usbserial/Board/LEDs.h hardware/arduino/firmwares/arduino-usbserial/Descriptors.c hardware/arduino/firmwares/arduino-usbserial/Descriptors.h hardware/arduino/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h hardware/arduino/firmwares/arduino-usbserial/makefile hardware/arduino/firmwares/arduino-usbserial/readme.txt hardware/arduino/pins/mega/pins_arduino.h hardware/arduino/pins/standard/pins_arduino.h hardware/arduino/programmers.txt hardware/avr/boards.txt hardware/avr/bootloaders/atmega/ATmegaBOOT_168.c hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega1280.hex hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328.hex hardware/avr/bootloaders/atmega/ATmegaBOOT_168_atmega328_pro_8MHz.hex hardware/avr/bootloaders/atmega/ATmegaBOOT_168_diecimila.hex hardware/avr/bootloaders/atmega/ATmegaBOOT_168_ng.hex hardware/avr/bootloaders/atmega/ATmegaBOOT_168_pro_8MHz.hex hardware/avr/bootloaders/atmega/Makefile hardware/avr/bootloaders/atmega8/ATmegaBOOT.c hardware/avr/bootloaders/atmega8/ATmegaBOOT.hex hardware/avr/bootloaders/atmega8/Makefile hardware/avr/bootloaders/bt/ATmegaBOOT_168.c hardware/avr/bootloaders/bt/ATmegaBOOT_168.hex hardware/avr/bootloaders/bt/ATmegaBOOT_168_atmega328_bt.hex hardware/avr/bootloaders/bt/Makefile hardware/avr/bootloaders/lilypad/LilyPadBOOT_168.hex hardware/avr/bootloaders/lilypad/src/ATmegaBOOT.c hardware/avr/bootloaders/lilypad/src/Makefile hardware/avr/bootloaders/optiboot/Makefile hardware/avr/bootloaders/optiboot/makeall hardware/avr/bootloaders/optiboot/optiboot.c hardware/avr/bootloaders/optiboot/optiboot_atmega328.hex hardware/avr/bootloaders/optiboot/optiboot_atmega328.lst hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.hex hardware/avr/bootloaders/optiboot/optiboot_atmega328_pro_8MHz.lst hardware/avr/bootloaders/optiboot/optiboot_diecimila.hex hardware/avr/bootloaders/optiboot/optiboot_diecimila.lst hardware/avr/bootloaders/optiboot/optiboot_lilypad.hex hardware/avr/bootloaders/optiboot/optiboot_lilypad.lst hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.hex hardware/avr/bootloaders/optiboot/optiboot_lilypad_resonator.lst hardware/avr/bootloaders/optiboot/optiboot_luminet.hex hardware/avr/bootloaders/optiboot/optiboot_luminet.lst hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.hex hardware/avr/bootloaders/optiboot/optiboot_pro_16MHz.lst hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.hex hardware/avr/bootloaders/optiboot/optiboot_pro_20mhz.lst hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.hex hardware/avr/bootloaders/optiboot/optiboot_pro_8MHz.lst hardware/avr/bootloaders/stk500v2/License.txt hardware/avr/bootloaders/stk500v2/Makefile hardware/avr/bootloaders/stk500v2/STK500V2.pnproj hardware/avr/bootloaders/stk500v2/STK500V2.pnps hardware/avr/bootloaders/stk500v2/avrinterruptnames.h hardware/avr/bootloaders/stk500v2/command.h hardware/avr/bootloaders/stk500v2/stk500boot.c hardware/avr/bootloaders/stk500v2/stk500boot.ppg hardware/avr/bootloaders/stk500v2/stk500boot_v2_mega2560.hex hardware/avr/cores/arduino/Arduino.h hardware/avr/cores/arduino/HardwareSerial.cpp hardware/avr/cores/arduino/HardwareSerial.h hardware/avr/cores/arduino/Print.cpp hardware/avr/cores/arduino/Print.h hardware/avr/cores/arduino/Stream.h hardware/avr/cores/arduino/WCharacter.h hardware/avr/cores/arduino/WInterrupts.c hardware/avr/cores/arduino/WMath.cpp hardware/avr/cores/arduino/WString.cpp hardware/avr/cores/arduino/WString.h hardware/avr/cores/arduino/main.cpp hardware/avr/cores/arduino/wiring.c hardware/avr/cores/arduino/wiring_analog.c hardware/avr/cores/arduino/wiring_digital.c hardware/avr/cores/arduino/wiring_private.h hardware/avr/cores/arduino/wiring_pulse.c hardware/avr/cores/arduino/wiring_shift.c hardware/avr/firmwares/MEGA-dfu_and_usbserial_combined.hex hardware/avr/firmwares/README.txt hardware/avr/firmwares/UNO-dfu_and_usbserial_combined.hex hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.c hardware/avr/firmwares/arduino-usbdfu/Arduino-usbdfu.h hardware/avr/firmwares/arduino-usbdfu/Board/LEDs.h hardware/avr/firmwares/arduino-usbdfu/Descriptors.c hardware/avr/firmwares/arduino-usbdfu/Descriptors.h hardware/avr/firmwares/arduino-usbdfu/makefile hardware/avr/firmwares/arduino-usbdfu/readme.txt hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-mega.hex hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial-uno.hex hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.c hardware/avr/firmwares/arduino-usbserial/Arduino-usbserial.h hardware/avr/firmwares/arduino-usbserial/Board/LEDs.h hardware/avr/firmwares/arduino-usbserial/Descriptors.c hardware/avr/firmwares/arduino-usbserial/Descriptors.h hardware/avr/firmwares/arduino-usbserial/Lib/LightweightRingBuff.h hardware/avr/firmwares/arduino-usbserial/makefile hardware/avr/firmwares/arduino-usbserial/readme.txt hardware/avr/libraries/EEPROM/EEPROM.cpp hardware/avr/libraries/EEPROM/EEPROM.h hardware/avr/libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde hardware/avr/libraries/EEPROM/examples/eeprom_read/eeprom_read.pde hardware/avr/libraries/EEPROM/examples/eeprom_write/eeprom_write.pde hardware/avr/libraries/EEPROM/keywords.txt hardware/avr/libraries/Ethernet/Client.cpp hardware/avr/libraries/Ethernet/Client.h hardware/avr/libraries/Ethernet/Dhcp.cpp hardware/avr/libraries/Ethernet/Dhcp.h hardware/avr/libraries/Ethernet/Dns.cpp hardware/avr/libraries/Ethernet/Dns.h hardware/avr/libraries/Ethernet/Ethernet.cpp hardware/avr/libraries/Ethernet/Ethernet.h hardware/avr/libraries/Ethernet/IPAddress.cpp hardware/avr/libraries/Ethernet/IPAddress.h hardware/avr/libraries/Ethernet/Server.cpp hardware/avr/libraries/Ethernet/Server.h hardware/avr/libraries/Ethernet/Udp.cpp hardware/avr/libraries/Ethernet/Udp.h hardware/avr/libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde hardware/avr/libraries/Ethernet/examples/ChatServer/ChatServer.pde hardware/avr/libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde hardware/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde hardware/avr/libraries/Ethernet/examples/PachubeClient/PachubeClient.pde hardware/avr/libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde hardware/avr/libraries/Ethernet/examples/TelnetClient/TelnetClient.pde hardware/avr/libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde hardware/avr/libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde hardware/avr/libraries/Ethernet/examples/WebClient/WebClient.pde hardware/avr/libraries/Ethernet/examples/WebServer/WebServer.pde hardware/avr/libraries/Ethernet/keywords.txt hardware/avr/libraries/Ethernet/util.h hardware/avr/libraries/Ethernet/utility/socket.cpp hardware/avr/libraries/Ethernet/utility/socket.h hardware/avr/libraries/Ethernet/utility/w5100.cpp hardware/avr/libraries/Ethernet/utility/w5100.h hardware/avr/libraries/Firmata/Boards.h hardware/avr/libraries/Firmata/Firmata.cpp hardware/avr/libraries/Firmata/Firmata.h hardware/avr/libraries/Firmata/LICENSE.txt hardware/avr/libraries/Firmata/TODO.txt hardware/avr/libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde hardware/avr/libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde hardware/avr/libraries/Firmata/examples/AnalogFirmata/Makefile hardware/avr/libraries/Firmata/examples/EchoString/EchoString.pde hardware/avr/libraries/Firmata/examples/EchoString/Makefile hardware/avr/libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde hardware/avr/libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt hardware/avr/libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde hardware/avr/libraries/Firmata/examples/ServoFirmata/Makefile hardware/avr/libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/Makefile hardware/avr/libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/Makefile hardware/avr/libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde hardware/avr/libraries/Firmata/examples/StandardFirmata/LICENSE.txt hardware/avr/libraries/Firmata/examples/StandardFirmata/Makefile hardware/avr/libraries/Firmata/examples/StandardFirmata/StandardFirmata.pde hardware/avr/libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde hardware/avr/libraries/Firmata/keywords.txt hardware/avr/libraries/SD/File.cpp hardware/avr/libraries/SD/README.txt hardware/avr/libraries/SD/SD.cpp hardware/avr/libraries/SD/SD.h hardware/avr/libraries/SD/examples/CardInfo/CardInfo.pde hardware/avr/libraries/SD/examples/Datalogger/Datalogger.pde hardware/avr/libraries/SD/examples/DumpFile/DumpFile.pde hardware/avr/libraries/SD/examples/Files/Files.pde hardware/avr/libraries/SD/examples/ReadWrite/ReadWrite.pde hardware/avr/libraries/SD/examples/listfiles/listfiles.pde hardware/avr/libraries/SD/keywords.txt hardware/avr/libraries/SD/utility/FatStructs.h hardware/avr/libraries/SD/utility/Sd2Card.cpp hardware/avr/libraries/SD/utility/Sd2Card.h hardware/avr/libraries/SD/utility/Sd2PinMap.h hardware/avr/libraries/SD/utility/SdFat.h hardware/avr/libraries/SD/utility/SdFatUtil.h hardware/avr/libraries/SD/utility/SdFatmainpage.h hardware/avr/libraries/SD/utility/SdFile.cpp hardware/avr/libraries/SD/utility/SdInfo.h hardware/avr/libraries/SD/utility/SdVolume.cpp hardware/avr/libraries/SPI/SPI.cpp hardware/avr/libraries/SPI/SPI.h hardware/avr/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde hardware/avr/libraries/Servo/Servo.cpp hardware/avr/libraries/Servo/Servo.h hardware/avr/libraries/Servo/examples/Knob/Knob.pde hardware/avr/libraries/Servo/examples/Sweep/Sweep.pde hardware/avr/libraries/Servo/keywords.txt hardware/avr/libraries/SoftwareSerial/SoftwareSerial.cpp hardware/avr/libraries/SoftwareSerial/SoftwareSerial.h hardware/avr/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino hardware/avr/libraries/SoftwareSerial/examples/TwoPortRXExample/TwoPortRXExample.pde hardware/avr/libraries/SoftwareSerial/icrmacros.h hardware/avr/libraries/SoftwareSerial/keywords.txt hardware/avr/libraries/Wire/Wire.cpp hardware/avr/libraries/Wire/Wire.h hardware/avr/libraries/Wire/utility/twi.c hardware/avr/libraries/Wire/utility/twi.h hardware/avr/programmers.txt hardware/avr/variants/mega/pins_arduino.h hardware/avr/variants/standard/pins_arduino.h hardware/sam/cores/sam/Tone.cpp.disabled hardware/sam/cores/sam/binary.h hardware/sam/libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde hardware/sam/libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde hardware/sam/libraries/SPI/keywords.txt hardware/sam/libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde hardware/sam/libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde hardware/sam/libraries/Wire/examples/master_reader/master_reader.pde hardware/sam/libraries/Wire/examples/master_writer/master_writer.pde hardware/sam/libraries/Wire/examples/slave_receiver/slave_receiver.pde hardware/sam/libraries/Wire/examples/slave_sender/slave_sender.pde hardware/sam/libraries/Wire/keywords.txt libraries/EEPROM/EEPROM.cpp libraries/EEPROM/EEPROM.h libraries/EEPROM/examples/eeprom_clear/eeprom_clear.pde libraries/EEPROM/examples/eeprom_read/eeprom_read.pde libraries/EEPROM/examples/eeprom_write/eeprom_write.pde libraries/EEPROM/keywords.txt libraries/Ethernet/Client.cpp libraries/Ethernet/Dhcp.cpp libraries/Ethernet/Dhcp.h libraries/Ethernet/Dns.cpp libraries/Ethernet/Dns.h libraries/Ethernet/Ethernet.cpp libraries/Ethernet/Ethernet.h libraries/Ethernet/IPAddress.cpp libraries/Ethernet/IPAddress.h libraries/Ethernet/Server.cpp libraries/Ethernet/Udp.cpp libraries/Ethernet/Udp.h libraries/Ethernet/examples/BarometricPressureWebServer/BarometricPressureWebServer.pde libraries/Ethernet/examples/ChatServer/ChatServer.pde libraries/Ethernet/examples/DhcpAddressPrinter/DhcpAddressPrinter.pde libraries/Ethernet/examples/DnsWebClient/DnsWebClient.pde libraries/Ethernet/examples/PachubeClient/PachubeClient.pde libraries/Ethernet/examples/PachubeClientString/PachubeClientString.pde libraries/Ethernet/examples/TelnetClient/TelnetClient.pde libraries/Ethernet/examples/UDPSendReceiveString/UDPSendReceiveString.pde libraries/Ethernet/examples/UdpNtpClient/UdpNtpClient.pde libraries/Ethernet/examples/WebClient/WebClient.pde libraries/Ethernet/examples/WebServer/WebServer.pde libraries/Ethernet/keywords.txt libraries/Ethernet/util.h libraries/Ethernet/utility/socket.cpp libraries/Ethernet/utility/socket.h libraries/Ethernet/utility/w5100.cpp libraries/Ethernet/utility/w5100.h libraries/Firmata/Boards.h libraries/Firmata/Firmata.cpp libraries/Firmata/Firmata.h libraries/Firmata/LICENSE.txt libraries/Firmata/TODO.txt libraries/Firmata/examples/AllInputsFirmata/AllInputsFirmata.pde libraries/Firmata/examples/AnalogFirmata/AnalogFirmata.pde libraries/Firmata/examples/EchoString/EchoString.pde libraries/Firmata/examples/I2CFirmata/I2CFirmata.pde libraries/Firmata/examples/OldStandardFirmata/LICENSE.txt libraries/Firmata/examples/OldStandardFirmata/OldStandardFirmata.pde libraries/Firmata/examples/ServoFirmata/ServoFirmata.pde libraries/Firmata/examples/SimpleAnalogFirmata/SimpleAnalogFirmata.pde libraries/Firmata/examples/SimpleDigitalFirmata/SimpleDigitalFirmata.pde libraries/Firmata/examples/StandardFirmata/LICENSE.txt libraries/Firmata/examples/StandardFirmata_2_2_forUNO_0_3/StandardFirmata_2_2_forUNO_0_3.pde libraries/Firmata/keywords.txt libraries/SD/File.cpp libraries/SD/README.txt libraries/SD/SD.cpp libraries/SD/SD.h libraries/SD/examples/CardInfo/CardInfo.pde libraries/SD/examples/Datalogger/Datalogger.pde libraries/SD/examples/DumpFile/DumpFile.pde libraries/SD/examples/Files/Files.pde libraries/SD/examples/ReadWrite/ReadWrite.pde libraries/SD/examples/listfiles/listfiles.pde libraries/SD/keywords.txt libraries/SD/utility/FatStructs.h libraries/SD/utility/Sd2Card.cpp libraries/SD/utility/Sd2Card.h libraries/SD/utility/Sd2PinMap.h libraries/SD/utility/SdFat.h libraries/SD/utility/SdFatUtil.h libraries/SD/utility/SdFatmainpage.h libraries/SD/utility/SdFile.cpp libraries/SD/utility/SdInfo.h libraries/SD/utility/SdVolume.cpp libraries/SPI/SPI.cpp libraries/SPI/SPI.h libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor.pde libraries/SPI/examples/BarometricPressureSensor/BarometricPressureSensor/BarometricPressureSensor.pde libraries/SPI/examples/DigitalPotControl/DigitalPotControl.pde libraries/SPI/keywords.txt libraries/Servo/Servo.cpp libraries/Servo/Servo.h libraries/Servo/examples/Knob/Knob.pde libraries/Servo/examples/Sweep/Sweep.pde libraries/Servo/keywords.txt libraries/SoftwareSerial/SoftwareSerial.cpp libraries/SoftwareSerial/SoftwareSerial.h libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino libraries/SoftwareSerial/keywords.txt libraries/Wire/Wire.cpp libraries/Wire/Wire.h libraries/Wire/examples/SFRRanger_reader/SFRRanger_reader.pde libraries/Wire/examples/digital_potentiometer/digital_potentiometer.pde libraries/Wire/examples/master_reader/master_reader.pde libraries/Wire/examples/master_writer/master_writer.pde libraries/Wire/examples/slave_receiver/slave_receiver.pde libraries/Wire/examples/slave_sender/slave_sender.pde libraries/Wire/keywords.txt libraries/Wire/utility/twi.c libraries/Wire/utility/twi.h
This commit is contained in:
Cristian Maglie
@ -2,19 +2,11 @@
|
||||
<classpath>
|
||||
<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/dxf"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/net"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/opengl">
|
||||
<attributes>
|
||||
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="opengl/library"/>
|
||||
</attributes>
|
||||
</classpathentry>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/pdf"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/video"/>
|
||||
<classpathentry kind="lib" path="lib/antlr.jar"/>
|
||||
<classpathentry kind="lib" path="lib/jna.jar"/>
|
||||
<classpathentry kind="lib" path="lib/ecj.jar"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
|
||||
<classpathentry kind="lib" path="lib/apple.jar"/>
|
||||
<classpathentry kind="lib" path="lib/RXTXcomm.jar"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
0
app/src/processing/app/debug/AvrdudeUploader.java
Executable file → Normal file
0
app/src/processing/app/debug/AvrdudeUploader.java
Executable file → Normal file
104
app/src/processing/app/debug/BossaCUploader.java
Normal file
104
app/src/processing/app/debug/BossaCUploader.java
Normal file
@ -0,0 +1,104 @@
|
||||
/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
|
||||
|
||||
/*
|
||||
AvrdudeUploader - uploader implementation using avrdude
|
||||
Part of the Arduino project - http://www.arduino.cc/
|
||||
|
||||
Copyright (c) 2011 Cristian Maglie
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software Foundation,
|
||||
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
$Id$
|
||||
*/
|
||||
|
||||
package processing.app.debug;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
import processing.app.Base;
|
||||
import processing.app.Preferences;
|
||||
import processing.app.SerialException;
|
||||
|
||||
public class BossaCUploader extends Uploader {
|
||||
|
||||
public boolean uploadUsingPreferences(String buildPath, String className,
|
||||
boolean usingProgrammer)
|
||||
throws RunnerException, SerialException {
|
||||
List<String> commandDownloader = new ArrayList<String>();
|
||||
String port = Preferences.get("serial.port");
|
||||
if (port.startsWith("/dev/"))
|
||||
port = port.substring(5);
|
||||
commandDownloader.add("--port=" + port);
|
||||
commandDownloader.add("-e");
|
||||
commandDownloader.add("-w");
|
||||
commandDownloader.add("-v");
|
||||
commandDownloader.add("-b");
|
||||
commandDownloader.add(buildPath + File.separator + className + ".bin");
|
||||
|
||||
return bossac(commandDownloader);
|
||||
}
|
||||
|
||||
public boolean burnBootloader() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean bossac(Collection params) throws RunnerException {
|
||||
List commandDownloader = new ArrayList();
|
||||
commandDownloader.add("bossac");
|
||||
|
||||
if (verbose || Preferences.getBoolean("upload.verbose")) {
|
||||
commandDownloader.add("-i");
|
||||
commandDownloader.add("-d");
|
||||
}
|
||||
commandDownloader.addAll(params);
|
||||
|
||||
return executeUploadCommand(commandDownloader);
|
||||
}
|
||||
|
||||
protected boolean executeUploadCommand(List<String> cmdParams)
|
||||
throws RunnerException {
|
||||
|
||||
try {
|
||||
String avrBasePath = Base.getHardwarePath() + "/tools/";
|
||||
|
||||
String[] cmdArray = cmdParams.toArray(new String[0]);
|
||||
cmdArray[0] = avrBasePath + cmdArray[0];
|
||||
|
||||
if (verbose || Preferences.getBoolean("upload.verbose")) {
|
||||
for (String cmd : cmdArray)
|
||||
System.out.print(cmd + " ");
|
||||
System.out.println();
|
||||
}
|
||||
|
||||
Process bossac = Runtime.getRuntime().exec(cmdArray);
|
||||
new MessageSiphon(bossac.getInputStream(), this);
|
||||
new MessageSiphon(bossac.getErrorStream(), this);
|
||||
|
||||
// wait for the process to finish. if interrupted
|
||||
// before waitFor returns, continue waiting
|
||||
int result = bossac.waitFor();
|
||||
if (result != 0)
|
||||
return false;
|
||||
return true;
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,67 +1,77 @@
|
||||
/* -*- mode: jde; c-basic-offset: 2; indent-tabs-mode: nil -*- */
|
||||
|
||||
/*
|
||||
Sizer - computes the size of a .hex file
|
||||
Part of the Arduino project - http://www.arduino.cc/
|
||||
Sizer - computes the size of a .hex file
|
||||
Part of the Arduino project - http://www.arduino.cc/
|
||||
|
||||
Copyright (c) 2006 David A. Mellis
|
||||
Copyright (c) 2006 David A. Mellis
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software Foundation,
|
||||
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
$Id$
|
||||
*/
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software Foundation,
|
||||
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
$Id$
|
||||
*/
|
||||
|
||||
package processing.app.debug;
|
||||
|
||||
import processing.app.Base;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
import java.io.File;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.Map;
|
||||
import java.util.NoSuchElementException;
|
||||
import java.util.StringTokenizer;
|
||||
|
||||
public class Sizer implements MessageConsumer {
|
||||
private String buildPath, sketchName;
|
||||
|
||||
private String firstLine;
|
||||
|
||||
private long size;
|
||||
|
||||
private RunnerException exception;
|
||||
|
||||
public Sizer(String buildPath, String sketchName) {
|
||||
private Map<String, String> prefs;
|
||||
|
||||
public Sizer(String buildPath, String sketchName,
|
||||
Map<String, String> prefs) {
|
||||
this.buildPath = buildPath;
|
||||
this.sketchName = sketchName;
|
||||
this.prefs = prefs;
|
||||
}
|
||||
|
||||
|
||||
public long computeSize() throws RunnerException {
|
||||
String avrBasePath = Base.getAvrBasePath();
|
||||
String commandSize[] = new String[] {
|
||||
avrBasePath + "avr-size",
|
||||
" "
|
||||
};
|
||||
|
||||
commandSize[1] = buildPath + File.separator + sketchName + ".hex";
|
||||
String args[] = new String[3];
|
||||
args[0] = prefs.get("compiler.path");
|
||||
args[1] = prefs.get("compiler.size.cmd");
|
||||
args[2] = buildPath + File.separator + sketchName;
|
||||
|
||||
String recipe = prefs.get("recipe.size.pattern");
|
||||
MessageFormat compileFormat = new MessageFormat(recipe);
|
||||
String command = compileFormat.format(args);
|
||||
String[] commandArray = command.split("\\|");
|
||||
|
||||
int r = 0;
|
||||
try {
|
||||
exception = null;
|
||||
size = -1;
|
||||
firstLine = null;
|
||||
Process process = Runtime.getRuntime().exec(commandSize);
|
||||
Process process = Runtime.getRuntime().exec(commandArray);
|
||||
MessageSiphon in = new MessageSiphon(process.getInputStream(), this);
|
||||
MessageSiphon err = new MessageSiphon(process.getErrorStream(), this);
|
||||
|
||||
boolean running = true;
|
||||
|
||||
while(running) {
|
||||
while (running) {
|
||||
try {
|
||||
if (in.thread != null)
|
||||
in.thread.join();
|
||||
@ -69,25 +79,28 @@ public class Sizer implements MessageConsumer {
|
||||
err.thread.join();
|
||||
r = process.waitFor();
|
||||
running = false;
|
||||
} catch (InterruptedException intExc) { }
|
||||
} catch (InterruptedException intExc) {
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
// The default Throwable.toString() never returns null, but apparently
|
||||
// some sub-class has overridden it to do so, thus we need to check for
|
||||
// it. See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1166589459
|
||||
exception = new RunnerException(
|
||||
(e.toString() == null) ? e.getClass().getName() + r : e.toString() + r);
|
||||
// it. See: http://www.arduino.cc/cgi-bin/yabb2/YaBB.pl?num=1166589459
|
||||
if (e.toString() == null)
|
||||
exception = new RunnerException(e.getClass().getName() + r);
|
||||
else
|
||||
exception = new RunnerException(e.toString() + r);
|
||||
}
|
||||
|
||||
|
||||
if (exception != null)
|
||||
throw exception;
|
||||
|
||||
|
||||
if (size == -1)
|
||||
throw new RunnerException(firstLine);
|
||||
|
||||
|
||||
return size;
|
||||
}
|
||||
|
||||
|
||||
public void message(String s) {
|
||||
if (firstLine == null)
|
||||
firstLine = s;
|
||||
|
||||
0
app/src/processing/app/debug/Uploader.java
Executable file → Normal file
0
app/src/processing/app/debug/Uploader.java
Executable file → Normal file
Reference in New Issue
Block a user