jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-29 06:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ass mdns

Browse Source
This commit is contained in:
fvanroie 2020-03-07 21:05:59 +01:00
parent 594c31f1db
commit 3e37329ce3
3 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/hasp_conf.h
View File

@ -2,14 +2,14 @@
#define HASP_VERSION_MAJOR 0 #define HASP_VERSION_MAJOR 0
#define HASP_VERSION_MINOR 0 #define HASP_VERSION_MINOR 0
#define HASP_VERSION_REVISION 9 #define HASP_VERSION_REVISION 10
#define HASP_USE_APP 1 #define HASP_USE_APP 1
#define HASP_USE_WIFI 1 #define HASP_USE_WIFI 1
#define HASP_USE_MQTT 1 #define HASP_USE_MQTT 1
#define HASP_USE_HTTP 1 #define HASP_USE_HTTP 1
#define HASP_USE_MDNS 0 #define HASP_USE_MDNS 1
#define HASP_USE_SYSLOG 0 #define HASP_USE_SYSLOG 0
#define HASP_USE_TELNET 1 #define HASP_USE_TELNET 1

64
src/hasp_mdns.cpp
View File

@ -5,36 +5,52 @@
#include <ESPmDNS.h> #include <ESPmDNS.h>
#else #else
#include <ESP8266mDNS.h> #include <ESP8266mDNS.h>
MDNSResponder::hMDNSService hMDNSService; // MDNSResponder::hMDNSService hMDNSService;
#endif #endif
#include "hasp_conf.h"
#include "hasp_log.h"
#include "hasp_mdns.h" #include "hasp_mdns.h"
#include "hasp_mqtt.h"
#include "hasp_config.h"
const char F_CONFIG_ENABLE[] PROGMEM = "enable"; uint8_t mdnsEnabled = true;
bool mdnsEnabled = true;
String hasp2Node = "plate01";
const float haspVersion = 0.38; const float haspVersion = 0.38;
void mdnsSetup(const JsonObject & settings) void mdnsSetup(const JsonObject & settings)
{
mqttSetConfig(settings);
}
void mdnsStart()
{ {
if(mdnsEnabled) { if(mdnsEnabled) {
String hasp2Node = mqttGetNodename();
// Setup mDNS service discovery if enabled // Setup mDNS service discovery if enabled
// MDNS.addService(String(hasp2Node), String("tcp"), 80);
/*if(debugTelnetEnabled) { /*if(debugTelnetEnabled) {
MDNS.addService(haspNode, "telnet", "tcp", 23); }
}*/ return;
// MDNS.addServiceTxt(hasp2Node, "tcp", "app_name", "HASwitchPlate"); char buffer[127];
// MDNS.addServiceTxt(hasp2Node, "tcp", "app_version", String(haspVersion).c_str()); snprintf_P(buffer, sizeof(buffer), PSTR("%u.%u.%u"), HASP_VERSION_MAJOR, HASP_VERSION_MINOR,
MDNS.begin(hasp2Node.c_str()); HASP_VERSION_REVISION);
MDNS.addServiceTxt(hasp2Node, "tcp", "app_version", buffer); */
if(MDNS.begin(hasp2Node.c_str())) {
debugPrintln(F("MDNS: Responder started"));
MDNS.addService(F("http"), F("tcp"), 80);
MDNS.addService(F("telnet"), F("tcp"), 23);
MDNS.addServiceTxt(hasp2Node, F("tcp"), F("app_name"), F("HASP-lvgl"));
} else {
errorPrintln(String(F("MDNS: %sResponder failed to start ")) + hasp2Node);
};
} }
} }
void mdnsLoop(bool wifiIsConnected) void mdnsLoop(bool wifiIsConnected)
{ {
// if(mdnsEnabled) { if(mdnsEnabled) {
// MDNS(); MDNS.update();
// }s }
} }
void mdnsStop() void mdnsStop()
@ -44,12 +60,20 @@ void mdnsStop()
bool mdnsGetConfig(const JsonObject & settings) bool mdnsGetConfig(const JsonObject & settings)
{ {
if(!settings.isNull() && settings[F_CONFIG_ENABLE] == mdnsEnabled) return false; settings[FPSTR(F_CONFIG_ENABLE)] = mdnsEnabled;
settings[F_CONFIG_ENABLE] = mdnsEnabled;
serializeJson(settings, Serial);
Serial.println();
configOutput(settings);
return true; return true;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
bool mdnsSetConfig(const JsonObject & settings)
{
configOutput(settings);
bool changed = false;
changed |= configSet(mdnsEnabled, settings[FPSTR(F_CONFIG_ENABLE)], PSTR("mdnsEnabled"));
return changed;
} }

5
src/hasp_mdns.h
View File

@ -5,7 +5,10 @@
void mdnsSetup(const JsonObject & settings); void mdnsSetup(const JsonObject & settings);
void mdnsLoop(bool wifiIsConnected); void mdnsLoop(bool wifiIsConnected);
void mdnsStop(); void mdnsStart(void);
void mdnsStop(void);
bool mdnsGetConfig(const JsonObject & settings); bool mdnsGetConfig(const JsonObject & settings);
bool mdnsSetConfig(const JsonObject & settings);
#endif #endif