diff --git a/library.json b/library.json index 56605425..1d7e4e4a 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "FirebaseClient", - "version": "1.0.8", + "version": "1.0.9", "keywords": "communication, REST, esp32, esp8266, arduino", "description": "Async Firebase Client library for Arduino.", "repository": { diff --git a/library.properties b/library.properties index 8793ac8f..45d3a224 100644 --- a/library.properties +++ b/library.properties @@ -1,6 +1,6 @@ name=FirebaseClient -version=1.0.8 +version=1.0.9 author=Mobizt diff --git a/src/FirebaseClient.h b/src/FirebaseClient.h index 70943d81..dc1745ba 100644 --- a/src/FirebaseClient.h +++ b/src/FirebaseClient.h @@ -30,7 +30,7 @@ #undef FIREBASE_CLIENT_VERSION #endif -#define FIREBASE_CLIENT_VERSION "1.0.8" +#define FIREBASE_CLIENT_VERSION "1.0.9" #include #include "./core/FirebaseApp.h" diff --git a/src/core/NetConfig.h b/src/core/NetConfig.h index 1da1429a..d1d8fa2a 100644 --- a/src/core/NetConfig.h +++ b/src/core/NetConfig.h @@ -1,5 +1,5 @@ /** - * Created March 13, 2024 + * Created April 6, 2024 * * The MIT License (MIT) * Copyright (c) 2024 K. Suwatchai (Mobizt) @@ -85,7 +85,7 @@ struct network_config_data } }; #endif -#if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) +#if defined(FIREBASE_ETH_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) struct ethernet_data { int ethernet_reset_pin = -1; @@ -117,9 +117,9 @@ struct network_config_data #if defined(FIREBASE_GSM_MODEM_IS_AVAILABLE) && defined(ENABLE_GSM_NETWORK) gsm_data gsm; #endif -#if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) +#if defined(FIREBASE_ETH_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) ethernet_data ethernet; - SPI_ETH_Module *eth = NULL; + Firebase_SPI_ETH_Module *eth = NULL; #endif bool initialized = false; bool network_status = false; @@ -146,7 +146,7 @@ struct network_config_data gsm.copy(rhs.gsm); #endif -#if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) +#if defined(FIREBASE_ETH_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) ethernet.copy(rhs.ethernet); #endif @@ -154,7 +154,7 @@ struct network_config_data this->network_status = rhs.network_status; this->reconnect = rhs.reconnect; this->wifi = rhs.wifi; -#if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) +#if defined(FIREBASE_ETH_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) this->eth = rhs.eth; #endif this->net_timer = rhs.net_timer; @@ -167,7 +167,7 @@ struct network_config_data #if defined(FIREBASE_GSM_MODEM_IS_AVAILABLE) && defined(ENABLE_GSM_NETWORK) gsm.clear(); #endif -#if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) +#if defined(FIREBASE_ETH_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) ethernet.clear(); #endif network_data_type = firebase_network_data_undefined; @@ -175,7 +175,7 @@ struct network_config_data network_status = false; reconnect = true; wifi = nullptr; -#if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) +#if defined(FIREBASE_ETH_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) eth = NULL; #endif net_timer.stop(); @@ -241,7 +241,7 @@ class GSMNetwork : public DefaultNetwork }; #endif -#if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) +#if defined(FIREBASE_ETH_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) class EthernetNetwork : public DefaultNetwork { @@ -267,7 +267,7 @@ class DefaultEthernetNetwork : public DefaultNetwork DefaultEthernetNetwork(Firebase_SPI_ETH_Module ð) { init(); -#if defined(FIREBASE_ETHERNET_MODULE_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) +#if defined(FIREBASE_ETH_IS_AVAILABLE) && defined(ENABLE_ETHERNET_NETWORK) network_data.eth = ð #endif network_data.network_data_type = firebase_network_data_default_network;