Merge pull request #66 from airgradienthq/feature/add-mdns-attributes

Add mDNS attribute
This commit is contained in:
Phat Nguyen
2024-02-29 10:56:48 +07:00
committed by GitHub
6 changed files with 32 additions and 1 deletions

View File

@ -930,6 +930,9 @@ static void webServerInit(void) {
webServer.on("/measures/current", HTTP_GET, webServerMeasureCurrentGet); webServer.on("/measures/current", HTTP_GET, webServerMeasureCurrentGet);
webServer.begin(); webServer.begin();
MDNS.addService("http", "tcp", 80); MDNS.addService("http", "tcp", 80);
MDNS.addServiceTxt("http", "_tcp", "board", ag.getBoardName());
MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId());
MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion());
if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) != if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) !=
pdTRUE) { pdTRUE) {

View File

@ -1330,6 +1330,9 @@ static void webServerInit(void) {
webServer.on("/measures/current", HTTP_GET, webServerMeasureCurrentGet); webServer.on("/measures/current", HTTP_GET, webServerMeasureCurrentGet);
webServer.begin(); webServer.begin();
MDNS.addService("http", "tcp", 80); MDNS.addService("http", "tcp", 80);
MDNS.addServiceTxt("http", "_tcp", "board", ag.getBoardName());
MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId());
MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion());
if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) != if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) !=
pdTRUE) { pdTRUE) {
@ -1491,7 +1494,7 @@ static void factoryConfigReset(void) {
ms = (uint32_t)(millis() - factoryBtnPressTime); ms = (uint32_t)(millis() - factoryBtnPressTime);
if (ms > 10000) { if (ms > 10000) {
ag.statusLed.setOff(); ag.statusLed.setOff();
/** Stop MQTT task first */ /** Stop MQTT task first */
if (mqttTask) { if (mqttTask) {
vTaskDelete(mqttTask); vTaskDelete(mqttTask);

View File

@ -40,3 +40,7 @@ BoardType AirGradient::getBoardType(void) { return boardType; }
double AirGradient::round2(double value) { double AirGradient::round2(double value) {
return (int)(value * 100 + 0.5) / 100.0; return (int)(value * 100 + 0.5) / 100.0;
} }
String AirGradient::getBoardName(void) {
return String(getBoardDefName(boardType));
}

View File

@ -107,6 +107,13 @@ public:
*/ */
String getVersion(void); String getVersion(void);
/**
* @brief Get the Board Name object
*
* @return String
*/
String getBoardName(void);
/** /**
* @brief Round double value with for 2 decimal * @brief Round double value with for 2 decimal
* *

View File

@ -335,6 +335,19 @@ const BoardDef *getBoardDef(BoardType def) {
return &bsps[def]; return &bsps[def];
} }
/**
* @brief Get the Board Name
*
* @param type BoarType
* @return const char*
*/
const char *getBoardDefName(BoardType type) {
if (type >= _BOARD_MAX) {
return NULL;
}
return bsps[type].name;
}
#if defined(ESP8266) #if defined(ESP8266)
#define bspPrintf(c, ...) \ #define bspPrintf(c, ...) \
if (_debug != nullptr) { \ if (_debug != nullptr) { \

View File

@ -83,6 +83,7 @@ struct BoardDef {
}; };
const BoardDef *getBoardDef(BoardType def); const BoardDef *getBoardDef(BoardType def);
const char *getBoardDefName(BoardType type);
void printBoardDef(Stream *_debug); void printBoardDef(Stream *_debug);
#endif /** _AIR_GRADIENT_BOARD_DEF_H_ */ #endif /** _AIR_GRADIENT_BOARD_DEF_H_ */