airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-16 18:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

update mDNS servicce and attribute

Browse Source
This commit is contained in:
Phat Nguyen
2024-03-07 21:30:42 +07:00
parent dc742d3c92
commit df937fe65f
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/ONE/ONE.ino
View File

@ -430,8 +430,7 @@ public:
void showServerConfig(void) { void showServerConfig(void) {
Serial.println("Server configuration: "); Serial.println("Server configuration: ");
Serial.printf("inF: %s\r\n", config.inF ? "true" : "false"); Serial.printf("inF: %s\r\n", config.inF ? "true" : "false");
Serial.printf("inUSAQI: %s\r\n", Serial.printf("inUSAQI: %s\r\n", config.inUSAQI ? "true" : "false");
config.inUSAQI ? "true" : "false");
Serial.printf("useRGBLedBar: %d\r\n", (int)config.useRGBLedBar); Serial.printf("useRGBLedBar: %d\r\n", (int)config.useRGBLedBar);
Serial.printf("Model: %s\r\n", config.models); Serial.printf("Model: %s\r\n", config.models);
Serial.printf("MQTT Broker: %s\r\n", config.mqttBrokers); Serial.printf("MQTT Broker: %s\r\n", config.mqttBrokers);
@ -711,7 +710,7 @@ bool hasSensorSGP = true;
bool hasSensorSHT = true; bool hasSensorSHT = true;
int pmFailCount = 0; int pmFailCount = 0;
uint32_t factoryBtnPressTime = 0; uint32_t factoryBtnPressTime = 0;
String mdnsModelName = ""; String mdnsModelName = "I-9PSL";
int getCO2FailCount = 0; int getCO2FailCount = 0;
AgSchedule dispLedSchedule(DISP_UPDATE_INTERVAL, displayAndLedBarUpdate); AgSchedule dispLedSchedule(DISP_UPDATE_INTERVAL, displayAndLedBarUpdate);
AgSchedule configSchedule(SERVER_CONFIG_UPDATE_INTERVAL, AgSchedule configSchedule(SERVER_CONFIG_UPDATE_INTERVAL,
@ -1091,9 +1090,16 @@ static void webServerInit(void) {
webServer.on("/metrics", HTTP_GET, webServerMetricsGet); webServer.on("/metrics", HTTP_GET, webServerMetricsGet);
webServer.begin(); webServer.begin();
MDNS.addService("http", "tcp", 80); MDNS.addService("http", "tcp", 80);
MDNS.addServiceTxt("http", "_tcp", "model", ag.getBoardName()); MDNS.addServiceTxt("http", "_tcp", "model", mdnsModelName);
MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId()); MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId());
MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion()); MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion());
MDNS.addServiceTxt("http", "_tcp", "vendor", "AirGradient");
MDNS.addService("http", "tcp", 80);
MDNS.addService("_airgradient", "tcp", 80);
MDNS.addServiceTxt("airgradient", "_tcp", "model", mdnsModelName);
MDNS.addServiceTxt("airgradient", "_tcp", "serialno", getDevId());
MDNS.addServiceTxt("airgradient", "_tcp", "fw_ver", ag.getVersion());
MDNS.addServiceTxt("airgradient", "_tcp", "vendor", "AirGradient");
if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) != if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) !=
pdTRUE) { pdTRUE) {

33
examples/Open_Air/Open_Air.ino
View File

@ -431,8 +431,7 @@ public:
void showServerConfig(void) { void showServerConfig(void) {
Serial.println("Server configuration: "); Serial.println("Server configuration: ");
Serial.printf("inF: %s\r\n", config.inF ? "true" : "false"); Serial.printf("inF: %s\r\n", config.inF ? "true" : "false");
Serial.printf("inUSAQI: %s\r\n", Serial.printf("inUSAQI: %s\r\n", config.inUSAQI ? "true" : "false");
config.inUSAQI ? "true" : "false");
Serial.printf("useRGBLedBar: %d\r\n", (int)config.useRGBLedBar); Serial.printf("useRGBLedBar: %d\r\n", (int)config.useRGBLedBar);
Serial.printf("Model: %s\r\n", config.models); Serial.printf("Model: %s\r\n", config.models);
Serial.printf("MQTT Broker: %s\r\n", config.mqttBrokers); Serial.printf("MQTT Broker: %s\r\n", config.mqttBrokers);
@ -701,7 +700,8 @@ const int targetCount = 20;
enum { enum {
FW_MODE_PST, /** PMS5003T, S8 and SGP41 */ FW_MODE_PST, /** PMS5003T, S8 and SGP41 */
FW_MODE_PPT, /** PMS5003T_1, PMS5003T_2, SGP41 */ FW_MODE_PPT, /** PMS5003T_1, PMS5003T_2, SGP41 */
FW_MODE_PP /** PMS5003T_1, PMS5003T_2 */ FW_MODE_PP, /** PMS5003T_1, PMS5003T_2 */
FW_MDOE_PS /** PMS5003T, S8 */
}; };
int fw_mode = FW_MODE_PST; int fw_mode = FW_MODE_PST;
@ -953,6 +953,7 @@ void boardInit(void) {
Serial.println("Can not detect SGP run mode 'O-1PP'"); Serial.println("Can not detect SGP run mode 'O-1PP'");
} else { } else {
Serial.println("Can not detect SGP run mode 'O-1PS'"); Serial.println("Can not detect SGP run mode 'O-1PS'");
fw_mode = FW_MDOE_PS;
} }
} }
@ -1004,6 +1005,21 @@ void boardInit(void) {
} }
Serial.printf("Firmware Mode: %s\r\n", getFwMode(fw_mode)); Serial.printf("Firmware Mode: %s\r\n", getFwMode(fw_mode));
switch (fw_mode) {
case FW_MODE_PP:
mdnsModelName = "O-1PP";
break;
case FW_MODE_PPT:
mdnsModelName = "O-1PPT";
break;
case FW_MODE_PST:
mdnsModelName = "O-1PST";
break;
case FW_MDOE_PS:
mdnsModelName = "0-1PS";
default:
break;
}
} }
void failedHandler(String msg) { void failedHandler(String msg) {
@ -1366,6 +1382,8 @@ static const char *getFwMode(int mode) {
return "FW_MODE_PPT"; return "FW_MODE_PPT";
case FW_MODE_PP: case FW_MODE_PP:
return "FW_MODE_PP"; return "FW_MODE_PP";
case FW_MDOE_PS:
return "FW_MODE_PS";
default: default:
break; break;
} }
@ -1394,9 +1412,16 @@ 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", "model", ag.getBoardName()); MDNS.addServiceTxt("http", "_tcp", "model", mdnsModelName);
MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId()); MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId());
MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion()); MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion());
MDNS.addServiceTxt("http", "_tcp", "vendor", "AirGradient");
MDNS.addService("http", "tcp", 80);
MDNS.addService("_airgradient", "tcp", 80);
MDNS.addServiceTxt("airgradient", "_tcp", "model", mdnsModelName);
MDNS.addServiceTxt("airgradient", "_tcp", "serialno", getDevId());
MDNS.addServiceTxt("airgradient", "_tcp", "fw_ver", ag.getVersion());
MDNS.addServiceTxt("airgradient", "_tcp", "vendor", "AirGradient");
if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) != if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) !=
pdTRUE) { pdTRUE) {