Diff: UipEthernet.h

Revision:

11:647d53d146f1

Parent:

9:a156d3de5647

Child:

13:95c00132cd98

--- a/UipEthernet.h	Tue Aug 27 22:08:54 2019 +0000
+++ b/UipEthernet.h	Fri Aug 30 08:11:40 2019 +0000
@@ -18,8 +18,8 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
-#ifndef UIPETHERNET_H
-#define UIPETHERNET_H
+#ifndef UIPETHERNET_h
+#define UIPETHERNET_h
 
 //#define UIPETHERNET_DEBUG
 //#define UIPETHERNET_DEBUG_CHKSUM
@@ -28,7 +28,7 @@
 #include "mbed.h"
 #include "DhcpClient.h"
 #include "IpAddress.h"
-#include "utility/Enc28j60Py.h"
+#include "utility/Enc28j60Eth.h"
 #include "TcpClient.h"
 #include "TcpServer.h"
 #include "UdpSocket.h"
@@ -64,7 +64,7 @@
 public:
     static UipEthernet* ethernet;
     static IpAddress    dnsServerAddress;
-    Enc28j60Phy         phy;
+    Enc28j60Eth         enc28j60Eth;
 
     UipEthernet (const uint8_t mac[6], PinName mosi, PinName miso, PinName sck, PinName cs);
 
@@ -74,6 +74,7 @@
     void              set_network(IpAddress ip, IpAddress dns);
     void              set_network(IpAddress ip, IpAddress dns, IpAddress gateway);
     void              set_network(IpAddress ip, IpAddress dns, IpAddress gateway, IpAddress subnet);
+    void              set_network(const char *ip_address, const char *netmask, const char *gateway);
     void              tick();
     IpAddress         localIP();
     IpAddress         subnetMask();
@@ -84,6 +85,7 @@
     const char*       get_gateway();
     static uint16_t   chksum(uint16_t sum, const uint8_t* data, uint16_t len);
     static uint16_t   ipchksum();
+    bool              stoip4(const char *ip4addr, size_t len, void *dest);
 private:
     uint8_t *const    _mac;
     IpAddress         _ip;
@@ -114,4 +116,5 @@
     uint16_t          uip_icmp6chksum();
 #endif
 };
+
 #endif