Merge pull request #1 from malteu/ATmega

merge ATmega into master

Author: malteu

src/WebSockets.cpp

@@ -92,7 +92,7 @@ void WebSockets::sendFrame(WSclient_t * client, WSopcode_t opcode, uint8_t * pay
  return;
  }
 
- DEBUG_WEBSOCKETS("[WS][%d][sendFrame] ------- send massage frame -------\n", client->num);
+ DEBUG_WEBSOCKETS("[WS][%d][sendFrame] ------- send message frame -------\n", client->num);
  DEBUG_WEBSOCKETS("[WS][%d][sendFrame] fin: %u opCode: %u mask: %u length: %u headerToPayload: %u\n", client->num, fin, opcode, mask, length, headerToPayload);
 
  if(opcode == WSop_text) {
@@ -302,7 +302,7 @@ void WebSockets::handleWebsocket(WSclient_t * client) {
  DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] mask: %u payloadLen: %u\n", client->num, mask, payloadLen);
 
  if(payloadLen > WEBSOCKETS_MAX_DATA_SIZE) {
- DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] payload to big! (%u)\n", client->num, payloadLen);
+ DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] payload too big! (%u)\n", client->num, payloadLen);
  clientDisconnect(client, 1009);
  return;
  }
@@ -320,7 +320,7 @@ void WebSockets::handleWebsocket(WSclient_t * client) {
  payload = (uint8_t *) malloc(payloadLen + 1);
 
  if(!payload) {
- DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] to less memory to handle payload %d!\n", client->num, payloadLen);
+ DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] memory too small to handle payload %d!\n", client->num, payloadLen);
  clientDisconnect(client, 1011);
  return;
  }
@@ -354,7 +354,7 @@ void WebSockets::handleWebsocket(WSclient_t * client) {
  sendFrame(client, WSop_pong, payload, payloadLen);
  break;
  case WSop_pong:
- DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get pong (%s)\n", client->num, payload);
+ DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] got pong (%s)\n", client->num, payload);
  break;
  case WSop_close:
  {
@@ -363,7 +363,7 @@ void WebSockets::handleWebsocket(WSclient_t * client) {
  reasonCode = payload[0] << 8 | payload[1];
  }
 
- DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] get ask for close. Code: %d", client->num, reasonCode);
+ DEBUG_WEBSOCKETS("[WS][%d][handleWebsocket] got asked for close. Code: %d", client->num, reasonCode);
  if(payloadLen > 2) {
  DEBUG_WEBSOCKETS(" (%s)\n", (payload+2));
  } else {

src/WebSocketsServer.cpp

@@ -41,7 +41,7 @@ WebSocketsServer::~WebSocketsServer() {
 }
 
 /**
- * calles to init the Websockets server
+ * calls to init the Websockets server
  */
 void WebSocketsServer::begin(void) {
  WSclient_t * client;
@@ -131,7 +131,7 @@ void WebSocketsServer::sendTXT(uint8_t num, String payload) {
 }
 
 /**
- * send text data to client all
+ * send text data to all clients
  * @param payload uint8_t *
  * @param length size_t
  * @param headerToPayload bool (see sendFrame for more details)
@@ -191,7 +191,7 @@ void WebSocketsServer::sendBIN(uint8_t num, const uint8_t * payload, size_t leng
 }
 
 /**
- * send binary data to client all
+ * send binary data to all clients
  * @param payload uint8_t *
  * @param length size_t
  * @param headerToPayload bool (see sendFrame for more details)
@@ -359,7 +359,7 @@ bool WebSocketsServer::clientIsConnected(WSclient_t * client) {
 }
 
 /**
- * Handle incomming Connection Request
+ * Handle incoming Connection Request
  */
 void WebSocketsServer::handleNewClients(void) {
  WSclient_t * client;
@@ -408,7 +408,7 @@ void WebSocketsServer::handleNewClients(void) {
  IPAddress ip = client->tcp->remoteIP();
  DEBUG_WEBSOCKETS("[WS-Server] no free space new client from %d.%d.%d.%d\n", ip[0], ip[1], ip[2], ip[3]);
 #else
- DEBUG_WEBSOCKETS("[WS-Server] no free space new client\n");
+ DEBUG_WEBSOCKETS("[WS-Server] no free space for new client\n");
 #endif
  tcpClient.stop();
  }
@@ -423,7 +423,7 @@ void WebSocketsServer::handleNewClients(void) {
 }
 
 /**
- * Handel incomming data from Client
+ * Handle incoming data from Client
  */
 void WebSocketsServer::handleClientData(void) {
 
@@ -522,7 +522,7 @@ void WebSocketsServer::handleHeader(WSclient_t * client) {
 
  if(ok) {
 
- DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Websocket connection incomming.\n", client->num);
+ DEBUG_WEBSOCKETS("[WS-Server][%d][handleHeader] Websocket connection incoming.\n", client->num);
 
  // generate Sec-WebSocket-Accept key
  String sKey = acceptKey(client->cKey);

src/WebSocketsServer.h

@@ -28,7 +28,7 @@
 #include <Arduino.h>
 #include "WebSockets.h"
 
-#define WEBSOCKETS_SERVER_CLIENT_MAX (5)
+#define WEBSOCKETS_SERVER_CLIENT_MAX (4)
 
 
 
@@ -68,9 +68,7 @@ class WebSocketsServer: private WebSockets {
  void disconnect(void);
  void disconnect(uint8_t num);
 
-#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
  IPAddress remoteIP(uint8_t num);
-#endif
 
 protected:
  uint16_t _port;