Merge branch 'ide-1.5.x' into dev-ide-1.5.x-discovery

Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java

1 files changed, 0 insertions, 41 deletions

diff --git a/libraries/Ethernet/Ethernet.h b/libraries/Ethernet/Ethernet.h
deleted file mode 100644
index 2a07ff3..0000000
--- a/libraries/Ethernet/Ethernet.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef ethernet_h
-#define ethernet_h
-
-#include <inttypes.h>
-//#include "w5100.h"
-#include "IPAddress.h"
-#include "EthernetClient.h"
-#include "EthernetServer.h"
-#include "Dhcp.h"
-
-#define MAX_SOCK_NUM 4
-
-class EthernetClass {
-private:
-  IPAddress _dnsServerAddress;
-  DhcpClass* _dhcp;
-public:
-  static uint8_t _state[MAX_SOCK_NUM];
-  static uint16_t _server_port[MAX_SOCK_NUM];
-  // Initialise the Ethernet shield to use the provided MAC address and gain the rest of the
-  // configuration through DHCP.
-  // Returns 0 if the DHCP configuration failed, and 1 if it succeeded
-  int begin(uint8_t *mac_address);
-  void begin(uint8_t *mac_address, IPAddress local_ip);
-  void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server);
-  void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway);
-  void begin(uint8_t *mac_address, IPAddress local_ip, IPAddress dns_server, IPAddress gateway, IPAddress subnet);
-  int maintain();
-
-  IPAddress localIP();
-  IPAddress subnetMask();
-  IPAddress gatewayIP();
-  IPAddress dnsServerIP();
-
-  friend class EthernetClient;
-  friend class EthernetServer;
-};
-
-extern EthernetClass Ethernet;
-
-#endif