From cd0fdc85b609e7510af1e3e0b29efaac8e9435ac Mon Sep 17 00:00:00 2001 From: Thomas Kunze Date: Tue, 10 Dec 2019 22:29:14 +0100 Subject: [PATCH] rename sendBytes ->sendBytesMultiCast readBytes -> readBytesMultiCast --- src/esp32_platform.cpp | 4 ++-- src/esp32_platform.h | 4 ++-- src/esp_platform.cpp | 4 ++-- src/esp_platform.h | 4 ++-- src/knx/ip_data_link_layer.cpp | 4 ++-- src/knx/platform.cpp | 4 ++-- src/knx/platform.h | 4 ++-- src/linux_platform.cpp | 4 ++-- src/linux_platform.h | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/esp32_platform.cpp b/src/esp32_platform.cpp index f290cf7..844f446 100644 --- a/src/esp32_platform.cpp +++ b/src/esp32_platform.cpp @@ -55,7 +55,7 @@ void Esp32Platform::closeMultiCast() _udp.stop(); } -bool Esp32Platform::sendBytes(uint8_t * buffer, uint16_t len) +bool Esp32Platform::sendBytesMultiCast(uint8_t * buffer, uint16_t len) { //printHex("<- ",buffer, len); int result = 0; @@ -65,7 +65,7 @@ bool Esp32Platform::sendBytes(uint8_t * buffer, uint16_t len) return true; } -int Esp32Platform::readBytes(uint8_t * buffer, uint16_t maxLen) +int Esp32Platform::readBytesMultiCast(uint8_t * buffer, uint16_t maxLen) { int len = _udp.parsePacket(); if (len == 0) diff --git a/src/esp32_platform.h b/src/esp32_platform.h index 9394577..cfbccb2 100644 --- a/src/esp32_platform.h +++ b/src/esp32_platform.h @@ -24,8 +24,8 @@ public: //multicast void setupMultiCast(uint32_t addr, uint16_t port) override; void closeMultiCast() override; - bool sendBytes(uint8_t* buffer, uint16_t len) override; - int readBytes(uint8_t* buffer, uint16_t maxLen) override; + bool sendBytesMultiCast(uint8_t* buffer, uint16_t len) override; + int readBytesMultiCast(uint8_t* buffer, uint16_t maxLen) override; //memory uint8_t* getEepromBuffer(uint16_t size); diff --git a/src/esp_platform.cpp b/src/esp_platform.cpp index 738df8c..11984ae 100644 --- a/src/esp_platform.cpp +++ b/src/esp_platform.cpp @@ -58,7 +58,7 @@ void EspPlatform::closeMultiCast() _udp.stop(); } -bool EspPlatform::sendBytes(uint8_t * buffer, uint16_t len) +bool EspPlatform::sendBytesMultiCast(uint8_t * buffer, uint16_t len) { //printHex("<- ",buffer, len); int result = 0; @@ -68,7 +68,7 @@ bool EspPlatform::sendBytes(uint8_t * buffer, uint16_t len) return true; } -int EspPlatform::readBytes(uint8_t * buffer, uint16_t maxLen) +int EspPlatform::readBytesMultiCast(uint8_t * buffer, uint16_t maxLen) { int len = _udp.parsePacket(); if (len == 0) diff --git a/src/esp_platform.h b/src/esp_platform.h index e48084c..f292034 100644 --- a/src/esp_platform.h +++ b/src/esp_platform.h @@ -25,8 +25,8 @@ class EspPlatform : public ArduinoPlatform //multicast void setupMultiCast(uint32_t addr, uint16_t port) override; void closeMultiCast() override; - bool sendBytes(uint8_t* buffer, uint16_t len) override; - int readBytes(uint8_t* buffer, uint16_t maxLen) override; + bool sendBytesMultiCast(uint8_t* buffer, uint16_t len) override; + int readBytesMultiCast(uint8_t* buffer, uint16_t maxLen) override; //memory uint8_t* getEepromBuffer(uint16_t size); diff --git a/src/knx/ip_data_link_layer.cpp b/src/knx/ip_data_link_layer.cpp index 2472d05..992e855 100644 --- a/src/knx/ip_data_link_layer.cpp +++ b/src/knx/ip_data_link_layer.cpp @@ -47,7 +47,7 @@ void IpDataLinkLayer::loop() return; uint8_t buffer[512]; - int len = _platform.readBytes(buffer, 512); + int len = _platform.readBytesMultiCast(buffer, 512); if (len <= 0) return; @@ -101,5 +101,5 @@ bool IpDataLinkLayer::sendBytes(uint8_t* bytes, uint16_t length) if (!_enabled) return false; - return _platform.sendBytes(bytes, length); + return _platform.sendBytesMultiCast(bytes, length); } diff --git a/src/knx/platform.cpp b/src/knx/platform.cpp index 59e15df..c975b6b 100644 --- a/src/knx/platform.cpp +++ b/src/knx/platform.cpp @@ -78,12 +78,12 @@ void Platform::setupMultiCast(uint32_t addr, uint16_t port) void Platform::closeMultiCast() {} -bool Platform::sendBytes(uint8_t *buffer, uint16_t len) +bool Platform::sendBytesMultiCast(uint8_t *buffer, uint16_t len) { return false; } -int Platform::readBytes(uint8_t *buffer, uint16_t maxLen) +int Platform::readBytesMultiCast(uint8_t *buffer, uint16_t maxLen) { return 0; } \ No newline at end of file diff --git a/src/knx/platform.h b/src/knx/platform.h index b6d682b..62122dd 100644 --- a/src/knx/platform.h +++ b/src/knx/platform.h @@ -27,8 +27,8 @@ class Platform //multicast socket virtual void setupMultiCast(uint32_t addr, uint16_t port); virtual void closeMultiCast(); - virtual bool sendBytes(uint8_t* buffer, uint16_t len); - virtual int readBytes(uint8_t* buffer, uint16_t maxLen); + virtual bool sendBytesMultiCast(uint8_t* buffer, uint16_t len); + virtual int readBytesMultiCast(uint8_t* buffer, uint16_t maxLen); //UART virtual void setupUart(); diff --git a/src/linux_platform.cpp b/src/linux_platform.cpp index 64510cf..e37d3f8 100644 --- a/src/linux_platform.cpp +++ b/src/linux_platform.cpp @@ -145,7 +145,7 @@ void LinuxPlatform::closeMultiCast() close(_socketFd); } -bool LinuxPlatform::sendBytes(uint8_t* buffer, uint16_t len) +bool LinuxPlatform::sendBytesMultiCast(uint8_t* buffer, uint16_t len) { struct sockaddr_in address = { 0 }; address.sin_family = AF_INET; @@ -166,7 +166,7 @@ bool LinuxPlatform::sendBytes(uint8_t* buffer, uint16_t len) return true; } -int LinuxPlatform::readBytes(uint8_t * buffer, uint16_t maxLen) +int LinuxPlatform::readBytesMultiCast(uint8_t * buffer, uint16_t maxLen) { uint32_t sin_len; struct sockaddr_in sin; diff --git a/src/linux_platform.h b/src/linux_platform.h index 1121e66..bbee364 100644 --- a/src/linux_platform.h +++ b/src/linux_platform.h @@ -29,8 +29,8 @@ public: //multicast void setupMultiCast(uint32_t addr, uint16_t port) override; void closeMultiCast() override; - bool sendBytes(uint8_t* buffer, uint16_t len) override; - int readBytes(uint8_t* buffer, uint16_t maxLen) override; + bool sendBytesMultiCast(uint8_t* buffer, uint16_t len) override; + int readBytesMultiCast(uint8_t* buffer, uint16_t maxLen) override; //spi void setupSpi() override;