1
0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-10 00:46:09 +01:00
Commit Graph

512 Commits

Author SHA1 Message Date
Federico Fissore
03f27cde63 SerialMonitor: set minimum sizes to avoid components disappearing 2013-07-17 13:42:19 +02:00
Federico Fissore
12cddf0d90 SerialMonitor: added "no line ending" alert 2013-07-17 11:25:33 +02:00
Cristian Maglie
008818868c Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery
Conflicts:
	app/src/cc/arduino/packages/uploaders/SerialUploader.java
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	app/src/processing/app/debug/Uploader.java
2013-07-14 12:01:03 +02:00
Cristian Maglie
7f87574f7e Hardened upload.tool property reading code for boards.txt
Fixes #1464
2013-07-12 20:05:58 +02:00
Cristian Maglie
8ab419fd13 Better error handling for missing preferences.
Fixes #1471
2013-07-12 19:50:57 +02:00
Cristian Maglie
c24b3f6489 IDE didn't stop if an invalid library is found 2013-07-12 16:22:51 +02:00
Federico Fissore
f648715621 Introducing uploader "warnings", a first attempt to give users more feedback with complex uploads 2013-07-10 09:44:49 +02:00
Federico Fissore
21ca1cd9c5 NetworkMonitor: better "retry" messages 2013-07-08 14:30:55 +02:00
Federico Fissore
861d6f4b06 Implemented NetworkMonitor retry 2013-07-05 19:14:59 +02:00
Federico Fissore
f41dc69c08 Refactored Uploader.stringContainsOneOf and StringMatchers.wildcardMatch into StringUitils
SSHUploader: filtered out some platform specific files
2013-06-28 15:29:39 +02:00
Federico Fissore
300ca07b95 better RunnerException 2013-06-28 15:29:39 +02:00
Federico Fissore
6a1cdcdd03 introduced FileUtils.getLinuxPathFrom: replaces backslashes with slashes 2013-06-28 15:29:38 +02:00
Federico Fissore
67cb6047de Added source folder to Uploader.uploadUsingPreferences
Cleaned up Uploader.message
Better SSH output streams consuming
Introduced generic SCP.scpFile method and refactored SCP.scpHexToBoard
2013-06-28 15:29:38 +02:00
Federico Fissore
45f7d1e6f8 attempting to silencing jmdns complains about missing network interfaces 2013-06-14 16:43:50 +02:00
Cristian Maglie
a9e6397e2e Fixed NPE during VID/PID discovery for non-USB serial ports 2013-06-13 13:19:26 +02:00
Federico Fissore
21203cbe1b introducing jsch. now network monitor uses SSH to trigger a telnet session at yun side 2013-06-11 15:02:10 +02:00
Federico Fissore
f791329ddc extremely ugly hack to fix bad behaviour of java6 when dealing with SSL 2013-06-10 09:11:21 +02:00
Federico Fissore
137da0326d found a bug in java6, fixed removing a https protocol from the list
see http://stackoverflow.com/questions/15589880/how-to-make-java-6-which-fails-ssl-connection-with-ssl-peer-shut-down-incorrec
2013-06-10 09:11:21 +02:00
Cristian Maglie
3e4419d6be Merge branch 'ide-1.5.x' into ide-1.5.x-discovery 2013-06-07 00:38:42 +02:00
Cristian Maglie
16b7b67c47 Fixed problem with % processing on .po files. Fixed quote ' processing on I18N lib. 2013-06-06 16:33:20 +02:00
Cristian Maglie
73fa08f272 Removed unused variable 2013-06-04 21:45:56 +02:00
Cristian Maglie
b4852f353c Merge remote-tracking branch 'dog/ide-1.5.x-discovery' into ide-1.5.x-discovery
Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
2013-06-04 19:33:38 +02:00
Federico Fissore
d7c4481baa Using additional info in avahi payload to print discovered board type 2013-06-04 17:26:31 +02:00
Federico Fissore
69e6419394 forgot to move serialRate field to SerialMonitor subclass 2013-06-04 13:36:01 +02:00
Cristian Maglie
4b0a976686 First refactoring of uploaders 2013-06-03 00:44:15 +02:00
Cristian Maglie
ab6eb0843c Refactored port (Serial and Network) discovery. 2013-06-02 19:02:57 +02:00
Federico Fissore
376b0f8b3f Serial.dispose() throws IOException
SerialException extends IOException
SerialMonitor is now a subclass of a generic AbstractMonitor; introducing NetworkMonitor
UploaderFactory becomes PerPortObjectFactory and can build AbstractMonitors
favouring IOException over SerialException
collecting constants in Constants
made MessageSiphon stoppable
2013-05-31 09:45:52 +02:00
Federico Fissore
556c6ea5c1 better error handling on uploading 2013-05-31 09:45:52 +02:00
Federico Fissore
c174737584 httpuploader now uses new lua uploader
https disabled due to some strange bug with uhttpd
2013-05-31 09:45:51 +02:00
Federico Fissore
f830e00916 httpuploader first checks if the board is ready, then uploads the sketch 2013-05-16 10:47:55 +02:00
Federico Fissore
2d6af8264b Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery 2013-05-13 16:58:10 +02:00
Federico Fissore
219d1462fc using https instead of http but ignoring self signed certificates 2013-05-13 16:43:14 +02:00
Cristian Maglie
76fd163a5f Fixed regression: CTRL+Left/CTRL+Right moves cursor one word backward/forward
See 4212be6669
2013-05-12 15:51:33 +02:00
Cristian Maglie
a46259a0cf Merged 1.0.5
Still missing:
- updates to WiFi lib for sam.
- updates to examples of Ehternet and WiFi for sam.

Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
	app/src/processing/app/helpers/FileUtils.java
	app/src/processing/app/i18n/Resources_fr.po
	app/src/processing/app/i18n/Resources_fr.properties
	build/shared/revisions.txt
	hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
	libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino
	libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino
	libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino
	libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino
	libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino
	libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino
	libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
	libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino
	libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
2013-05-11 14:37:25 +02:00
Cristian Maglie
62846f1f1b Fixed disappearing 'Import library' menu 2013-05-11 13:25:37 +02:00
Cristian Maglie
13d8214567 Backported OnlyDirs.class 2013-05-11 13:25:37 +02:00
Federico Fissore
544445524a removed check on .h file existence 2013-05-11 13:25:36 +02:00
Cristian Maglie
fa9566235d Disabled 'fat' (multiplatform) library check.
Conflicts:
	app/src/processing/app/Base.java
2013-05-11 13:25:36 +02:00
Federico Fissore
8266ac5aad better error message when library names clash
filter out non .ZIP files
2013-05-11 13:25:36 +02:00
Federico Fissore
3d5c76a8a1 also rebuild examples menu after library import 2013-05-11 13:25:36 +02:00
Federico Fissore
29856fff53 improved import library: complains if invalid zip or folders are selected 2013-05-11 13:25:36 +02:00
Cristian Maglie
1cdf75d4df "Add library" moved into "Import library" menu 2013-05-11 13:25:36 +02:00
Federico Fissore
8eab205166 import library also import folder (already expanded libraries)
Conflicts:
	app/src/processing/app/helpers/FileUtils.java
	app/test/processing/app/tools/ZipDeflaterTest.java
2013-05-11 13:25:36 +02:00
Cristian Maglie
62a8a0149f keep included folder name as top level folder name, delete MAC folder and hidden files 2013-05-11 13:25:36 +02:00
Cristian Maglie
d66e094a3b Revert ""Add library" moved into "Import library" menu"
This reverts commit 1866050e07.
2013-05-11 13:25:36 +02:00
Federico Fissore
f7797d8621 silencing http client output
gracefully (?) handling errors
setting a connection timeout of 5 secs
2013-05-07 12:14:38 +02:00
Federico Fissore
e1049aacc9 forcing a new requestServiceInfo until we get the remote IP address 2013-05-06 12:31:04 +02:00
Federico Fissore
20cfa72ee7 always print avrdude output
change to port 80
2013-05-06 12:31:04 +02:00
Federico Fissore
11db302b3e made parser aware of that now vid & pid have 0x 2013-05-06 12:31:03 +02:00
Federico Fissore
2f5d71fb59 updated code to reflect upstream API changes 2013-05-06 12:31:03 +02:00