From a485176ae16b4ba70fda59463c51ad05792ae6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Grome=C5=A1?= <jgromes@users.noreply.github.com>
Date: Mon, 2 Apr 2018 16:29:27 +0200
Subject: [PATCH] Updated keyword highlights

---
 keywords.txt            | 21 +++++++++++++++------
 src/KiteLib.h           |  6 +++---
 src/modules/ESP8266.cpp | 24 ++++++++++++------------
 src/modules/ESP8266.h   | 10 +++++-----
 4 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/keywords.txt b/keywords.txt
index ad0445be..bd1cdc2f 100644
--- a/keywords.txt
+++ b/keywords.txt
@@ -9,12 +9,13 @@
 KiteLib	KEYWORD1
 Kite	KEYWORD1
 Packet	KEYWORD1
+
 ESP8266	KEYWORD1
-SX1278	KEYWORD1
-SX1272	KEYWORD1
 HC05	KEYWORD1
-XBee	KEYWORD1
 RF69	KEYWORD1
+SX1272	KEYWORD1
+SX1278	KEYWORD1
+XBee	KEYWORD1
 
 Bandwidth	KEYWORD1
 SpreadingFactor	KEYWORD1
@@ -39,7 +40,7 @@ setSourceStr	KEYWORD2
 setDestinationStr	KEYWORD2
 copyInto	KEYWORD2
 
-# SX1278/SX1272
+# SX1278/SX1272 + RF69
 dataRate	KEYWORD2
 lastPacketRSSI	KEYWORD2
 begin	KEYWORD2
@@ -53,11 +54,19 @@ setCodingRate	KEYWORD2
 
 # ESP8266
 join	KEYWORD2
-createTCP	KEYWORD2
+reset	KEYWORD2
+HttpGet	KEYWORD2
+HttpPost	KEYWORD2
+startTcp	KEYWORD2
+closeTcp	KEYWORD2
+startUdp	KEYWORD2
+closeUdp	KEYWORD2
 send	KEYWORD2
+receive	KEYWORD2
 
 # XBee
-send	KEYWORD2
+setDestinationAddress	KEYWORD2
+setPanId	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
diff --git a/src/KiteLib.h b/src/KiteLib.h
index cdeacf6a..b4b22e35 100644
--- a/src/KiteLib.h
+++ b/src/KiteLib.h
@@ -5,11 +5,11 @@
 #include "Module.h"
 
 #include "modules/ESP8266.h"
-#include "modules/SX1278.h"
-#include "modules/SX1272.h"
 #include "modules/HC05.h"
-#include "modules/XBee.h"
 #include "modules/RF69.h"
+#include "modules/SX1272.h"
+#include "modules/SX1278.h"
+#include "modules/XBee.h"
 
 #define KITE_CS_A   10
 #define KITE_TX_A   9
diff --git a/src/modules/ESP8266.cpp b/src/modules/ESP8266.cpp
index d7322402..a26ada95 100644
--- a/src/modules/ESP8266.cpp
+++ b/src/modules/ESP8266.cpp
@@ -1,8 +1,8 @@
 #include "ESP8266.h"
 
 ESP8266::ESP8266(Module* module) {
-  portTCP = 80; // Default HTTP port (TCP application)
-  portUDP = 53; // Default DNS port (UDP application)
+  portTcp = 80; // Default HTTP port (TCP application)
+  portUdp = 53; // Default DNS port (UDP application)
   _mod = module;
 }
 
@@ -88,7 +88,7 @@ uint16_t ESP8266::HttpGet(const char* url, String& response) {
   request += "\r\n\r\n";
   
   // create TCP connection
-  uint8_t state = startTCP(host.c_str());
+  uint8_t state = startTcp(host.c_str());
   if(state != ERR_NONE) {
     return(state);
   }
@@ -103,7 +103,7 @@ uint16_t ESP8266::HttpGet(const char* url, String& response) {
   String raw = receive();
   
   // close the TCP connection
-  state = closeTCP();
+  state = closeTcp();
   if(state != ERR_NONE) {
     return(state);
   }
@@ -148,7 +148,7 @@ uint16_t ESP8266::HttpPost(const char* url, String content, String& response, co
   request += "\r\n\r\n";
   
   // create TCP connection
-  uint8_t state = startTCP(host.c_str());
+  uint8_t state = startTcp(host.c_str());
   if(state != ERR_NONE) {
     return(state);
   }
@@ -160,7 +160,7 @@ uint16_t ESP8266::HttpPost(const char* url, String content, String& response, co
   }
   
   // close the TCP connection
-  state = closeTCP();
+  state = closeTcp();
   if(state != ERR_NONE) {
     return(state);
   }
@@ -184,19 +184,19 @@ uint16_t ESP8266::HttpPost(const char* url, String content, String& response, co
   return(statusString.toInt());
 }
 
-uint8_t ESP8266::startTCP(const char* host) {
-  openTransportConnection(host, "TCP", portTCP);
+uint8_t ESP8266::startTcp(const char* host) {
+  openTransportConnection(host, "TCP", portTcp);
 }
 
-uint8_t ESP8266::closeTCP() {
+uint8_t ESP8266::closeTcp() {
   closeTransportConnection();
 }
 
-uint8_t ESP8266::startUDP(const char* host) {
-  openTransportConnection(host, "UDP", portUDP);
+uint8_t ESP8266::startUdp(const char* host) {
+  openTransportConnection(host, "UDP", portUdp);
 }
 
-uint8_t ESP8266::closeUDP() {
+uint8_t ESP8266::closeUdp() {
   closeTransportConnection();
 }
 
diff --git a/src/modules/ESP8266.h b/src/modules/ESP8266.h
index 39c373e8..41387a6d 100644
--- a/src/modules/ESP8266.h
+++ b/src/modules/ESP8266.h
@@ -7,7 +7,7 @@ class ESP8266 {
   public:
     ESP8266(Module* module);
     
-    uint16_t portTCP, portUDP;
+    uint16_t portTdp, portUdp;
     
     // Basic methods
     uint8_t begin(long speed);
@@ -19,10 +19,10 @@ class ESP8266 {
     uint16_t HttpPost(const char* url, String content, String& response, const char* contentType = "");
     
     // Transport layer methods
-    uint8_t startTCP(const char* host);
-    uint8_t closeTCP();
-    uint8_t startUDP(const char* host);
-    uint8_t closeUDP();
+    uint8_t startTcp(const char* host);
+    uint8_t closeTcp();
+    uint8_t startUdp(const char* host);
+    uint8_t closeUdp();
     uint8_t send(String data);
     String receive(uint32_t timeout = 10000);