logging and udp

This commit is contained in:
Dmitry Borisenko
2020-11-01 02:52:57 +03:00
parent 8445dd3b0c
commit 1126575822
18 changed files with 223 additions and 118 deletions

View File

@@ -12,7 +12,6 @@ class LineParsing {
String _page;
String _descr;
String _order;
String _addr;
String _reg;
String _pin;
@@ -22,6 +21,9 @@ class LineParsing {
String _state;
String _db;
String _type;
String _int;
String _cnt;
String _val;
public:
LineParsing() :
@@ -39,7 +41,10 @@ class LineParsing {
_inv{""},
_state{""},
_db{""},
_type{""}
_type{""},
_int{""},
_cnt{""},
_val{""}
{};
@@ -84,6 +89,15 @@ class LineParsing {
if (arg.indexOf("reg[") != -1) {
_reg = extractInner(arg);
}
if (arg.indexOf("int[") != -1) {
_int = extractInner(arg);
}
if (arg.indexOf("cnt[") != -1) {
_cnt = extractInner(arg);
}
if (arg.indexOf("val[") != -1) {
_val = extractInner(arg);
}
}
}
@@ -115,10 +129,10 @@ class LineParsing {
return _order;
}
String gpin() {
return _pin; //
return _pin;
}
String ginv() {
return _inv; //
return _inv;
}
String gstate() {
return _state;
@@ -138,6 +152,15 @@ class LineParsing {
String gregaddr() {
return _reg;
}
String gint() {
return _int;
}
String gmaxcnt() {
return _cnt;
}
String gvalue() {
return _val;
}
void clear() {
_key = "";
@@ -154,6 +177,9 @@ class LineParsing {
_state = "";
_db = "";
_type = "";
_int = "";
_cnt = "";
_val = "";
}
String extractInnerDigit(String str) {

View File

@@ -44,7 +44,7 @@
//#define MDNS_ENABLED
//#define WEBSOCKET_ENABLED
//#define LAYOUT_IN_RAM
//#define UDP_ENABLED
#define UDP_ENABLED
#define SSDP_ENABLED
//
@@ -88,13 +88,6 @@ enum TimerTask_t { WIFI_SCAN,
WIFI_MQTT_CONNECTION_CHECK,
SENSORS10SEC,
SENSORS30SEC,
STEPPER1,
STEPPER2,
LOG1,
LOG2,
LOG3,
LOG4,
LOG5,
TIMER_COUNTDOWN,
TIME,
TIME_SYNC,

View File

@@ -49,3 +49,5 @@ extern void bmp280ReadingPress();
extern void sysUptime();
extern void uptimeReading();
extern void logging();

View File

@@ -1,7 +1,7 @@
//#pragma once
//#include "ESPAsyncUDP.h"
//extern AsyncUDP asyncUdp;
//extern void asyncUdpInit();
//extern String uint8tToString(uint8_t* data, size_t len);
//extern bool udpPacketValidation(String& data);
//extern void udpPacketParse(String& data);
#pragma once
#include "ESPAsyncUDP.h"
extern AsyncUDP asyncUdp;
extern void asyncUdpInit();
extern String uint8tToString(uint8_t* data, size_t len);
extern bool udpPacketValidation(String& data);
extern void udpPacketParse(String& data);