forked from arduino/nina-fw
-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'arduino/master' into sync-upstream
# Conflicts: # CHANGELOG # README.md # arduino/cores/esp32/wiring_digital.h # arduino/libraries/WiFi/src/WiFi.cpp # arduino/libraries/WiFi/src/WiFi.h # arduino/libraries/WiFi/src/WiFiClient.cpp # combine.py # data/roots.pem # main/CommandHandler.cpp # main/sketch.ino.cpp # sdkconfig
- Loading branch information
Showing
376 changed files
with
81,800 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| COMPONENT_ADD_INCLUDEDIRS := cores/esp32 libraries/SPIS/src libraries/WiFi/src | ||
| COMPONENT_ADD_INCLUDEDIRS := cores/esp32 libraries/SPIS/src libraries/WiFi/src libraries/Wire/src libraries/ArduinoECCX08/src libraries/ArduinoBearSSL/src | ||
|
|
||
| COMPONENT_SRCDIRS := cores/esp32 libraries/SPIS/src libraries/WiFi/src | ||
| COMPONENT_SRCDIRS := cores/esp32 libraries/SPIS/src libraries/WiFi/src libraries/Wire/src libraries/ArduinoECCX08/src libraries/ArduinoBearSSL/src libraries/ArduinoBearSSL/src/bearssl libraries/ArduinoBearSSL/src/utility |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| Client.h - Base class that provides Client | ||
| Copyright (c) 2011 Adrian McEwen. All right reserved. | ||
| This library is free software; you can redistribute it and/or | ||
| modify it under the terms of the GNU Lesser General Public | ||
| License as published by the Free Software Foundation; either | ||
| version 2.1 of the License, or (at your option) any later version. | ||
| This library is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| Lesser General Public License for more details. | ||
| You should have received a copy of the GNU Lesser General Public | ||
| License along with this library; if not, write to the Free Software | ||
| Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| */ | ||
|
|
||
| #ifndef client_h | ||
| #define client_h | ||
| #include "Print.h" | ||
| #include "Stream.h" | ||
| #include "IPAddress.h" | ||
|
|
||
| class Client : public Stream { | ||
|
|
||
| public: | ||
| virtual int connect(IPAddress ip, uint16_t port) =0; | ||
| virtual int connect(const char *host, uint16_t port) =0; | ||
| virtual size_t write(uint8_t) =0; | ||
| virtual size_t write(const uint8_t *buf, size_t size) =0; | ||
| virtual int available() = 0; | ||
| virtual int read() = 0; | ||
| virtual int read(uint8_t *buf, size_t size) = 0; | ||
| virtual int peek() = 0; | ||
| virtual void flush() = 0; | ||
| virtual void stop() = 0; | ||
| virtual uint8_t connected() = 0; | ||
| virtual operator bool() = 0; | ||
| protected: | ||
| uint8_t* rawIPAddress(IPAddress& addr) { return addr.raw_address(); }; | ||
| }; | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| IPAddress.cpp - Base class that provides IPAddress | ||
| Copyright (c) 2011 Adrian McEwen. All right reserved. | ||
| This library is free software; you can redistribute it and/or | ||
| modify it under the terms of the GNU Lesser General Public | ||
| License as published by the Free Software Foundation; either | ||
| version 2.1 of the License, or (at your option) any later version. | ||
| This library is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| Lesser General Public License for more details. | ||
| You should have received a copy of the GNU Lesser General Public | ||
| License along with this library; if not, write to the Free Software | ||
| Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
| */ | ||
|
|
||
| #include <Arduino.h> | ||
| #include <IPAddress.h> | ||
|
|
||
| IPAddress::IPAddress() | ||
| { | ||
| _address.dword = 0; | ||
| } | ||
|
|
||
| IPAddress::IPAddress(uint8_t first_octet, uint8_t second_octet, uint8_t third_octet, uint8_t fourth_octet) | ||
| { | ||
| _address.bytes[0] = first_octet; | ||
| _address.bytes[1] = second_octet; | ||
| _address.bytes[2] = third_octet; | ||
| _address.bytes[3] = fourth_octet; | ||
| } | ||
|
|
||
| IPAddress::IPAddress(uint32_t address) | ||
| { | ||
| _address.dword = address; | ||
| } | ||
|
|
||
| IPAddress::IPAddress(const uint8_t *address) | ||
| { | ||
| memcpy(_address.bytes, address, sizeof(_address.bytes)); | ||
| } | ||
|
|
||
| bool IPAddress::fromString(const char *address) | ||
| { | ||
| // TODO: add support for "a", "a.b", "a.b.c" formats | ||
|
|
||
| uint16_t acc = 0; // Accumulator | ||
| uint8_t dots = 0; | ||
|
|
||
| while (*address) | ||
| { | ||
| char c = *address++; | ||
| if (c >= '0' && c <= '9') | ||
| { | ||
| acc = acc * 10 + (c - '0'); | ||
| if (acc > 255) { | ||
| // Value out of [0..255] range | ||
| return false; | ||
| } | ||
| } | ||
| else if (c == '.') | ||
| { | ||
| if (dots == 3) { | ||
| // Too much dots (there must be 3 dots) | ||
| return false; | ||
| } | ||
| _address.bytes[dots++] = acc; | ||
| acc = 0; | ||
| } | ||
| else | ||
| { | ||
| // Invalid char | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| if (dots != 3) { | ||
| // Too few dots (there must be 3 dots) | ||
| return false; | ||
| } | ||
| _address.bytes[3] = acc; | ||
| return true; | ||
| } | ||
|
|
||
| IPAddress& IPAddress::operator=(const uint8_t *address) | ||
| { | ||
| memcpy(_address.bytes, address, sizeof(_address.bytes)); | ||
| return *this; | ||
| } | ||
|
|
||
| IPAddress& IPAddress::operator=(uint32_t address) | ||
| { | ||
| _address.dword = address; | ||
| return *this; | ||
| } | ||
|
|
||
| bool IPAddress::operator==(const uint8_t* addr) const | ||
| { | ||
| return memcmp(addr, _address.bytes, sizeof(_address.bytes)) == 0; | ||
| } |
Oops, something went wrong.