Skip to content

Commit cc5765f

Browse files
me-no-devme-no-dev
committed
Rename network classes
cc @sgryphon
1 parent 7afd573 commit cc5765f

15 files changed

+108
-108
lines changed

‎CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ set(ARDUINO_LIBRARY_WiFiClientSecure_SRCS
204204
libraries/WiFiClientSecure/src/WiFiClientSecure.cpp)
205205

206206
set(ARDUINO_LIBRARY_Networking_SRCS
207-
libraries/Networking/src/ESP_Network_Interface.cpp
208-
libraries/Networking/src/ESP_Network_Events.cpp
209-
libraries/Networking/src/ESP_Network_Manager.cpp
207+
libraries/Networking/src/NetworkInterface.cpp
208+
libraries/Networking/src/NetworkEvents.cpp
209+
libraries/Networking/src/NetworkManager.cpp
210210
libraries/Networking/src/WiFiClient.cpp
211211
libraries/Networking/src/WiFiServer.cpp
212212
libraries/Networking/src/WiFiUdp.cpp)

‎libraries/ESPmDNS/src/ESPmDNS.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ License (MIT license):
5050
#define STR(tok) tok
5151
#endif
5252

53-
// static void addInterface(ESP_Network_Interface * iface){
53+
// static void addInterface(NetworkInterface * iface){
5454
// #if defined(CONFIG_MDNS_ADD_CUSTOM_NETIF) && !defined(CONFIG_MDNS_PREDEF_NETIF_STA) && !defined(CONFIG_MDNS_PREDEF_NETIF_ETH)
5555
// /* Demonstration of adding a custom netif to mdns service, but we're adding the default example one,
5656
// * so we must disable all predefined interfaces (PREDEF_NETIF_STA, AP and ETH) first

‎libraries/Ethernet/src/ETH.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ bool ETHClass::begin(eth_phy_type_t type, int32_t phy_addr, int mdc, int mdio, i
285285
}
286286

287287
/* attach to receive events */
288-
initNetif((ESP_Network_Interface_ID)(ESP_NETIF_ID_ETH+_eth_index));
288+
initNetif((Network_Interface_ID)(ESP_NETIF_ID_ETH+_eth_index));
289289

290290
ret = esp_eth_start(_eth_handle);
291291
if(ret != ESP_OK){
@@ -679,7 +679,7 @@ bool ETHClass::beginSPI(eth_phy_type_t type, int32_t phy_addr, int cs, int irq,
679679
}
680680

681681
/* attach to receive events */
682-
initNetif((ESP_Network_Interface_ID)(ESP_NETIF_ID_ETH+_eth_index));
682+
initNetif((Network_Interface_ID)(ESP_NETIF_ID_ETH+_eth_index));
683683

684684
// Start Ethernet driver state machine
685685
ret = esp_eth_start(_eth_handle);

‎libraries/Ethernet/src/ETH.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ typedef enum {
107107
ETH_PHY_MAX
108108
} eth_phy_type_t;
109109

110-
class ETHClass: public ESP_Network_Interface {
110+
class ETHClass: public NetworkInterface {
111111
public:
112112
ETHClass(uint8_t eth_index=0);
113113
~ETHClass();

‎libraries/Networking/src/ESP_Network_Events.cpp renamed to ‎libraries/Networking/src/NetworkEvents.cpp

+23-23
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
6-
#include "ESP_Network_Events.h"
7-
#include "ESP_Network_Manager.h"
6+
#include "NetworkEvents.h"
7+
#include "NetworkManager.h"
88
#include "esp_task.h"
99
#include "esp32-hal.h"
1010

@@ -25,18 +25,18 @@ static std::vector<NetworkEventCbList_t> cbEventList;
2525

2626
static void _network_event_task(void * arg){
2727
for (;;) {
28-
((ESP_Network_Events*)arg)->checkForEvent();
28+
((NetworkEvents*)arg)->checkForEvent();
2929
}
3030
vTaskDelete(NULL);
3131
}
3232

33-
ESP_Network_Events::ESP_Network_Events()
33+
NetworkEvents::NetworkEvents()
3434
: _arduino_event_group(NULL)
3535
, _arduino_event_queue(NULL)
3636
, _arduino_event_task_handle(NULL)
3737
{}
3838

39-
ESP_Network_Events::~ESP_Network_Events(){
39+
NetworkEvents::~NetworkEvents(){
4040
if(_arduino_event_task_handle != NULL){
4141
vTaskDelete(_arduino_event_task_handle);
4242
_arduino_event_task_handle = NULL;
@@ -57,7 +57,7 @@ ESP_Network_Events::~ESP_Network_Events(){
5757

5858
static uint32_t _initial_bits = NET_DNS_IDLE_BIT;
5959

60-
bool ESP_Network_Events::initNetworkEvents(){
60+
bool NetworkEvents::initNetworkEvents(){
6161
if(!_arduino_event_group){
6262
_arduino_event_group = xEventGroupCreate();
6363
if(!_arduino_event_group){
@@ -92,7 +92,7 @@ bool ESP_Network_Events::initNetworkEvents(){
9292
return true;
9393
}
9494

95-
bool ESP_Network_Events::postEvent(arduino_event_t *data)
95+
bool NetworkEvents::postEvent(arduino_event_t *data)
9696
{
9797
if(data == NULL || _arduino_event_queue == NULL){
9898
return false;
@@ -110,7 +110,7 @@ bool ESP_Network_Events::postEvent(arduino_event_t *data)
110110
return true;
111111
}
112112

113-
void ESP_Network_Events::checkForEvent()
113+
void NetworkEvents::checkForEvent()
114114
{
115115
arduino_event_t *event = NULL;
116116
if(_arduino_event_queue == NULL){
@@ -140,7 +140,7 @@ void ESP_Network_Events::checkForEvent()
140140
free(event);
141141
}
142142

143-
network_event_handle_t ESP_Network_Events::onEvent(NetworkEventCb cbEvent, arduino_event_id_t event)
143+
network_event_handle_t NetworkEvents::onEvent(NetworkEventCb cbEvent, arduino_event_id_t event)
144144
{
145145
if(!cbEvent) {
146146
return 0;
@@ -154,7 +154,7 @@ network_event_handle_t ESP_Network_Events::onEvent(NetworkEventCb cbEvent, ardui
154154
return newEventHandler.id;
155155
}
156156

157-
network_event_handle_t ESP_Network_Events::onEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event)
157+
network_event_handle_t NetworkEvents::onEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event)
158158
{
159159
if(!cbEvent) {
160160
return 0;
@@ -168,7 +168,7 @@ network_event_handle_t ESP_Network_Events::onEvent(NetworkEventFuncCb cbEvent, a
168168
return newEventHandler.id;
169169
}
170170

171-
network_event_handle_t ESP_Network_Events::onEvent(NetworkEventSysCb cbEvent, arduino_event_id_t event)
171+
network_event_handle_t NetworkEvents::onEvent(NetworkEventSysCb cbEvent, arduino_event_id_t event)
172172
{
173173
if(!cbEvent) {
174174
return 0;
@@ -182,7 +182,7 @@ network_event_handle_t ESP_Network_Events::onEvent(NetworkEventSysCb cbEvent, ar
182182
return newEventHandler.id;
183183
}
184184

185-
network_event_handle_t ESP_Network_Events::onSysEvent(NetworkEventCb cbEvent, arduino_event_id_t event)
185+
network_event_handle_t NetworkEvents::onSysEvent(NetworkEventCb cbEvent, arduino_event_id_t event)
186186
{
187187
if(!cbEvent) {
188188
return 0;
@@ -196,7 +196,7 @@ network_event_handle_t ESP_Network_Events::onSysEvent(NetworkEventCb cbEvent, ar
196196
return newEventHandler.id;
197197
}
198198

199-
network_event_handle_t ESP_Network_Events::onSysEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event)
199+
network_event_handle_t NetworkEvents::onSysEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event)
200200
{
201201
if(!cbEvent) {
202202
return 0;
@@ -210,7 +210,7 @@ network_event_handle_t ESP_Network_Events::onSysEvent(NetworkEventFuncCb cbEvent
210210
return newEventHandler.id;
211211
}
212212

213-
network_event_handle_t ESP_Network_Events::onSysEvent(NetworkEventSysCb cbEvent, arduino_event_id_t event)
213+
network_event_handle_t NetworkEvents::onSysEvent(NetworkEventSysCb cbEvent, arduino_event_id_t event)
214214
{
215215
if(!cbEvent) {
216216
return 0;
@@ -224,7 +224,7 @@ network_event_handle_t ESP_Network_Events::onSysEvent(NetworkEventSysCb cbEvent,
224224
return newEventHandler.id;
225225
}
226226

227-
void ESP_Network_Events::removeEvent(NetworkEventCb cbEvent, arduino_event_id_t event)
227+
void NetworkEvents::removeEvent(NetworkEventCb cbEvent, arduino_event_id_t event)
228228
{
229229
if(!cbEvent) {
230230
return;
@@ -245,7 +245,7 @@ static size_t getStdFunctionAddress(std::function<T(U...)> f) {
245245
return (size_t) *fnPointer;
246246
}
247247

248-
void ESP_Network_Events::removeEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event)
248+
void NetworkEvents::removeEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event)
249249
{
250250
if(!cbEvent) {
251251
return;
@@ -259,7 +259,7 @@ void ESP_Network_Events::removeEvent(NetworkEventFuncCb cbEvent, arduino_event_i
259259
}
260260
}
261261

262-
void ESP_Network_Events::removeEvent(NetworkEventSysCb cbEvent, arduino_event_id_t event)
262+
void NetworkEvents::removeEvent(NetworkEventSysCb cbEvent, arduino_event_id_t event)
263263
{
264264
if(!cbEvent) {
265265
return;
@@ -273,7 +273,7 @@ void ESP_Network_Events::removeEvent(NetworkEventSysCb cbEvent, arduino_event_id
273273
}
274274
}
275275

276-
void ESP_Network_Events::removeEvent(network_event_handle_t id)
276+
void NetworkEvents::removeEvent(network_event_handle_t id)
277277
{
278278
for(uint32_t i = 0; i < cbEventList.size(); i++) {
279279
NetworkEventCbList_t entry = cbEventList[i];
@@ -283,30 +283,30 @@ void ESP_Network_Events::removeEvent(network_event_handle_t id)
283283
}
284284
}
285285

286-
int ESP_Network_Events::setStatusBits(int bits){
286+
int NetworkEvents::setStatusBits(int bits){
287287
if(!_arduino_event_group){
288288
_initial_bits |= bits;
289289
return _initial_bits;
290290
}
291291
return xEventGroupSetBits(_arduino_event_group, bits);
292292
}
293293

294-
int ESP_Network_Events::clearStatusBits(int bits){
294+
int NetworkEvents::clearStatusBits(int bits){
295295
if(!_arduino_event_group){
296296
_initial_bits &= ~bits;
297297
return _initial_bits;
298298
}
299299
return xEventGroupClearBits(_arduino_event_group, bits);
300300
}
301301

302-
int ESP_Network_Events::getStatusBits(){
302+
int NetworkEvents::getStatusBits(){
303303
if(!_arduino_event_group){
304304
return _initial_bits;
305305
}
306306
return xEventGroupGetBits(_arduino_event_group);
307307
}
308308

309-
int ESP_Network_Events::waitStatusBits(int bits, uint32_t timeout_ms){
309+
int NetworkEvents::waitStatusBits(int bits, uint32_t timeout_ms){
310310
if(!_arduino_event_group){
311311
return 0;
312312
}
@@ -324,7 +324,7 @@ int ESP_Network_Events::waitStatusBits(int bits, uint32_t timeout_ms){
324324
* @return A string representation of the event id.
325325
* @note: arduino_event_id_t values as of Mar 2023 (arduino-esp32 r2.0.7) are: 0-39 (ARDUINO_EVENT_MAX=40) and are defined in WiFiGeneric.h.
326326
*/
327-
const char * ESP_Network_Events::eventName(arduino_event_id_t id) {
327+
const char * NetworkEvents::eventName(arduino_event_id_t id) {
328328
switch(id) {
329329
case ARDUINO_EVENT_ETH_START: return "ETH_START";
330330
case ARDUINO_EVENT_ETH_STOP: return "ETH_STOP";

‎libraries/Networking/src/ESP_Network_Events.h renamed to ‎libraries/Networking/src/NetworkEvents.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,10 @@ typedef void (*NetworkEventSysCb)(arduino_event_t *event);
124124

125125
typedef size_t network_event_handle_t;
126126

127-
class ESP_Network_Events {
127+
class NetworkEvents {
128128
public:
129-
ESP_Network_Events();
130-
~ESP_Network_Events();
129+
NetworkEvents();
130+
~NetworkEvents();
131131

132132
network_event_handle_t onEvent(NetworkEventCb cbEvent, arduino_event_id_t event = ARDUINO_EVENT_MAX);
133133
network_event_handle_t onEvent(NetworkEventFuncCb cbEvent, arduino_event_id_t event = ARDUINO_EVENT_MAX);

0 commit comments

Comments
 (0)