Use Arduino naming for MAC address API

Rename macAddress() to MACAddress().

Fixes #35

Signed-off-by: Frederic Pillon <[email protected]>

Author: fpistm

README.md

@@ -43,12 +43,12 @@ You can get the MAC address with following function, this must done after Ethern
 
 	uint8_t *mac;
 	Ethernet.begin();
-	mac = Ethernet.macAddress();
+	mac = Ethernet.MACAddress();
 
 You can also set a new user based MAC address, this must done before Ethernet.begin()
 
 	uint8_t newMAC[] = {0x00, 0x80, 0xE1, 0x01, 0x01, 0x01};
-	Ethernet.macAddress(newMAC);
+	Ethernet.MACAddress(newMAC);
 	Ethernet.begin();
 
 ## Note

keywords.txt

@@ -32,7 +32,7 @@ remoteIP	KEYWORD2
 remotePort	KEYWORD2
 getSocketNumber	KEYWORD2
 localIP	KEYWORD2
-macAddress	KEYWORD2
+MACAddress	KEYWORD2
 maintain	KEYWORD2
 
 #######################################

src/STM32Ethernet.cpp

@@ -5,7 +5,7 @@ int EthernetClass::begin(unsigned long timeout, unsigned long responseTimeout)
 {
   static DhcpClass s_dhcp;
   _dhcp = &s_dhcp;
-  stm32_eth_init(macAddressDefault(), NULL, NULL, NULL);
+  stm32_eth_init(MACAddressDefault(), NULL, NULL, NULL);
 
   // Now try to get our config info from a DHCP server
   int ret = _dhcp->beginWithDHCP(mac_address, timeout, responseTimeout);
@@ -43,7 +43,7 @@ void EthernetClass::begin(IPAddress local_ip, IPAddress subnet, IPAddress gatewa
 
 void EthernetClass::begin(IPAddress local_ip, IPAddress subnet, IPAddress gateway, IPAddress dns_server)
 {
-  stm32_eth_init(macAddressDefault(), local_ip.raw_address(), gateway.raw_address(), subnet.raw_address());
+  stm32_eth_init(MACAddressDefault(), local_ip.raw_address(), gateway.raw_address(), subnet.raw_address());
   /* If there is a local DHCP informs it of our manual IP configuration to
   prevent IP conflict */
   stm32_DHCP_manual_config();
@@ -63,7 +63,7 @@ int EthernetClass::begin(uint8_t *mac_address, unsigned long timeout, unsigned l
   {
     _dnsServerAddress = _dhcp->getDnsServerIp();
   }
-  macAddress(mac_address);
+  MACAddress(mac_address);
   return ret;
 }
 
@@ -98,7 +98,7 @@ void EthernetClass::begin(uint8_t *mac, IPAddress local_ip, IPAddress dns_server
   prevent IP conflict */
   stm32_DHCP_manual_config();
   _dnsServerAddress = dns_server;
-  macAddress(mac);
+  MACAddress(mac);
 }
 
 EthernetLinkStatus EthernetClass::linkStatus()
@@ -137,7 +137,7 @@ void EthernetClass::schedule(void)
   stm32_eth_scheduler();
 }
 
-uint8_t * EthernetClass::macAddressDefault(void)
+uint8_t * EthernetClass::MACAddressDefault(void)
 {
   if ((mac_address[0] + mac_address[1] + mac_address[2] + mac_address[3] + mac_address[4] + mac_address[5]) == 0) {
     uint32_t baseUID = *(uint32_t *)UID_BASE;
@@ -151,7 +151,7 @@ uint8_t * EthernetClass::macAddressDefault(void)
   return mac_address;
 }
 
-void EthernetClass::macAddress(uint8_t *mac) {
+void EthernetClass::MACAddress(uint8_t *mac) {
   mac_address[0] = mac[0];
   mac_address[1] = mac[1];
   mac_address[2] = mac[2];
@@ -160,7 +160,7 @@ void EthernetClass::macAddress(uint8_t *mac) {
   mac_address[5] = mac[5];
 }
 
-uint8_t * EthernetClass::macAddress(void) {
+uint8_t * EthernetClass::MACAddress(void) {
   return mac_address;
 }
 

src/STM32Ethernet.h

@@ -18,7 +18,7 @@ class EthernetClass {
   IPAddress _dnsServerAddress;
   DhcpClass* _dhcp;
   uint8_t mac_address[6];
-  uint8_t *  macAddressDefault(void);
+  uint8_t *  MACAddressDefault(void);
 
 public:
   // Initialise the Ethernet with the internal provided MAC address and gain the rest of the
@@ -43,8 +43,8 @@ class EthernetClass {
   int maintain();
   void schedule(void);
 
-  void macAddress(uint8_t *mac);
-  uint8_t * macAddress(void);
+  void MACAddress(uint8_t *mac);
+  uint8_t * MACAddress(void);
   IPAddress localIP();
   IPAddress subnetMask();
   IPAddress gatewayIP();