patch for 2.4.x

Author: akaJes

library.properties

@@ -1,5 +1,5 @@
 name=AsyncPing(esp8266)
-version=1.0.0
+version=1.1.0
 author=Jes
 maintainer=jes <[email protected]>
 sentence=Enables asynchronous ping. For Espressif's ESP8266 MCUs.

readme.md

@@ -3,6 +3,7 @@ This is a fully asynchronous Ping library for Espressif's ESP8266 MCUs.
 have full ping statistic and hardware MAC address
 
 tested on 2.3.0 esp8266/Arduino
+patched for 2.4.x
 
 to install:
 `git clone https://github.com/akaJes/AsyncPing.git ~/Arduino/libraries/AsyncPing`

src/AsyncPing.cpp

@@ -136,7 +136,7 @@ void AsyncPing::ping_prepare_echo(struct icmp_echo_hdr *iecho, u16_t len) {
   iecho->chksum = inet_chksum(iecho, len);
 }
 
-u8_t AsyncPing::ping_recv (raw_pcb*pcb, pbuf*p, ip_addr*addr) {
+u8_t AsyncPing::ping_recv (raw_pcb*pcb, pbuf*p, C_IP_ADDR ip_addr_t *addr) {
   struct icmp_echo_hdr *iecho = NULL;
   struct ip_hdr *ip = (struct ip_hdr *)p->payload;
   if (pbuf_header( p, -PBUF_IP_HLEN) == 0) {
@@ -146,7 +146,7 @@ u8_t AsyncPing::ping_recv (raw_pcb*pcb, pbuf*p, ip_addr*addr) {
       _response.ttl = ip->_ttl;
       _response.answer = true;
       _response.total_recv++;
-      ip_addr_t *unused_ipaddr;
+      C_IP_ADDR ip_addr_t *unused_ipaddr;
       if (_response.mac == NULL)
         etharp_find_addr(NULL, addr, &_response.mac, &unused_ipaddr);
       if (_on_recv){
@@ -162,7 +162,7 @@ u8_t AsyncPing::ping_recv (raw_pcb*pcb, pbuf*p, ip_addr*addr) {
   return 0; /* don't eat the packet */
 }
 
-u8_t AsyncPing::_s_ping_recv (void*arg, raw_pcb*tpcb, pbuf*pb, ip_addr*addr){
+u8_t AsyncPing::_s_ping_recv (void*arg, raw_pcb*tpcb, pbuf*pb, C_IP_ADDR ip_addr_t *addr){
   return reinterpret_cast<AsyncPing*>(arg)->ping_recv(tpcb, pb, addr);
 }
 

src/AsyncPing.h

@@ -1,5 +1,6 @@
 #include "IPAddress.h"
 #include <functional>
+#include "core_version.h"
 
 extern "C" {
   #include <lwip/raw.h>
@@ -21,7 +22,11 @@ class AsyncPingResponse{
     u32_t timeout;
     IPAddress addr;
 };
-
+#ifdef ARDUINO_ESP8266_RELEASE_2_3_0
+  #define C_IP_ADDR
+#else
+  #define C_IP_ADDR const
+#endif
 class AsyncPing{
 public:
   typedef std::function< bool (const AsyncPingResponse& ) > THandlerFunction;
@@ -54,8 +59,8 @@ class AsyncPing{
   void  send_packet();
   void  ping_send(struct raw_pcb *raw, ip_addr_t *addr);
   void  ping_prepare_echo( struct icmp_echo_hdr *iecho, u16_t len);
-  u8_t  ping_recv (raw_pcb*pcb, pbuf*p, ip_addr*addr);
-  static u8_t _s_ping_recv (void*arg, raw_pcb*tpcb, pbuf*pb, ip_addr*addr);
+  u8_t  ping_recv (raw_pcb*pcb, pbuf*p, C_IP_ADDR ip_addr_t *addr);
+  static u8_t _s_ping_recv (void*arg, raw_pcb*tpcb, pbuf*pb, C_IP_ADDR ip_addr_t *addr);
   THandlerFunction _on_recv;
   THandlerFunction _on_sent;
 };