Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit 760234c

Browse files
authored
v1.6.2 for ESP32 + ENC28J60
#### Releases v1.6.2 1. Initial coding to port [ESPAsyncWebServer](https://github.com/me-no-dev/ESPAsyncWebServer) to ESP32 boards using ENC28J60 Ethernet. 2. Bump up to `v1.6.2` to sync with [AsyncWebServer_ESP32_ENC v1.6.2](https://github.com/khoih-prog/AsyncWebServer_ESP32_ENC). 3. Use `allman astyle`
1 parent 6d2b6f5 commit 760234c

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,8 @@ request->version(); // uint8_t: 0 = HTTP/1.0, 1 = HTTP/1.1
341341
request->method(); // enum: HTTP_GET, HTTP_POST, HTTP_DELETE, HTTP_PUT, HTTP_PATCH, HTTP_HEAD, HTTP_OPTIONS
342342
request->url(); // String: URL of the request (not including host, port or GET parameters)
343343
request->host(); // String: The requested host (can be used for virtual hosting)
344-
request->contentType(); // String: ContentType of the request (not avaiable in Handler::canHandle)
345-
request->contentLength(); // size_t: ContentLength of the request (not avaiable in Handler::canHandle)
344+
request->contentType(); // String: ContentType of the request (not available in Handler::canHandle)
345+
request->contentLength(); // size_t: ContentLength of the request (not available in Handler::canHandle)
346346
request->multipart(); // bool: True if the request has content type "multipart"
347347
```
348348

src/AsyncEventSource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ class AsyncEventSource: public AsyncWebHandler
169169
void close();
170170
void onConnect(ArEventHandlerFunction cb);
171171
void send(const char *message, const char *event = NULL, uint32_t id = 0, uint32_t reconnect = 0);
172-
size_t count() const; //number clinets connected
172+
size_t count() const; //number clients connected
173173
size_t avgPacketsWaiting() const;
174174

175175
//system callbacks (do not call)

src/WebHandlers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ bool AsyncStaticWebHandler::_getFile(AsyncWebServerRequest *request)
156156
if (_default_file.length() == 0)
157157
return false;
158158

159-
// Try to add default file, ensure there is a trailing '/' ot the path.
159+
// Try to add default file, ensure there is a trailing '/' to the path.
160160
if (path.length() == 0 || path[path.length() - 1] != '/')
161161
path += "/";
162162

src/enc28j60/esp32_enc28j60.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ bool ESP32_ENC::begin(int MISO_GPIO, int MOSI_GPIO, int SCLK_GPIO, int CS_GPIO,
143143
}
144144

145145
// holds a few microseconds to let DHCP start and enter into a good state
146-
// FIX ME -- adresses issue https://github.com/espressif/arduino-esp32/issues/5733
146+
// FIX ME -- addresses issue https://github.com/espressif/arduino-esp32/issues/5733
147147
delay(50);
148148

149149
return true;

src/enc28j60/extmod/enc28j60.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ extern "C" {
9393
#define ENC28J60_EPMCSH (0x0111) // Pattern Match Checksum High Byte (EPMCS<15:0>)
9494
#define ENC28J60_EPMOL (0x0114) // Pattern Match Offset Low Byte (EPMO<7:0>)
9595
#define ENC28J60_EPMOH (0x0115) // Pattern Match Offset High Byte (EPMO<12:8>)
96-
#define ENC28J60_ERXFCON (0x0118) // Receive Fileter Control
96+
#define ENC28J60_ERXFCON (0x0118) // Receive Filter Control
9797
#define ENC28J60_EPKTCNT (0x0119) // Ethernet Packet Count
9898

9999
// Bank 2 Register

src/enc28j60/extmod/esp_eth_mac_enc28j60.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ static esp_err_t enc28j60_register_read(emac_enc28j60_t *emac, uint16_t reg_addr
547547
////////////////////////////////////////
548548

549549
/**
550-
@brief Read ENC28J60 internal memroy
550+
@brief Read ENC28J60 internal memory
551551
*/
552552
static esp_err_t enc28j60_read_packet(emac_enc28j60_t *emac, uint32_t addr, uint8_t *packet, uint32_t len)
553553
{
@@ -1209,7 +1209,7 @@ static esp_err_t emac_enc28j60_receive(esp_eth_mac_t *mac, uint8_t *buf, uint32_
12091209
MAC_CHECK(enc28j60_register_read(emac, ENC28J60_EPKTCNT, &pk_counter) == ESP_OK,
12101210
"read EPKTCNT failed", out, ESP_FAIL);
12111211

1212-
*length = rx_len - 4; // substract the CRC length
1212+
*length = rx_len - 4; // subtract the CRC length
12131213
emac->packets_remain = pk_counter > 0;
12141214
out:
12151215
return ret;
@@ -1247,7 +1247,7 @@ static esp_err_t emac_enc28j60_init(esp_eth_mac_t *mac)
12471247
/* reset enc28j60 */
12481248
MAC_CHECK(enc28j60_do_reset(emac) == ESP_OK, "reset enc28j60 failed", out, ESP_FAIL);
12491249
/* verify chip id */
1250-
MAC_CHECK(enc28j60_verify_id(emac) == ESP_OK, "vefiry chip ID failed", out, ESP_FAIL);
1250+
MAC_CHECK(enc28j60_verify_id(emac) == ESP_OK, "verify chip ID failed", out, ESP_FAIL);
12511251
/* default setup of internal registers */
12521252
MAC_CHECK(enc28j60_setup_default(emac) == ESP_OK, "enc28j60 default setup failed", out, ESP_FAIL);
12531253
/* clear multicast hash table */

0 commit comments

Comments
 (0)