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

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Phat Nguyen
2024-03-10 10:10:58 +07:00
parent 9ae8fb2355 1810c0f355
commit b94ae9eff0
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/check.yml vendored
View File

@ -40,6 +40,13 @@ jobs:
WiFiManager@2.0.16-rc.2 WiFiManager@2.0.16-rc.2
Arduino_JSON@0.2.0 Arduino_JSON@0.2.0
U8g2@2.34.22 U8g2@2.34.22
# In some cases, actions/checkout@v4 will check out a detached HEAD; for
# example, this happens on pull request events, where an hypothetical
# PR merge commit is checked out. This tends to confuse
# `arduino-cli lib install --git-url`, making it fail with errors such as:
# Error installing Git Library: Library install failed: object not found
# Create and check out a dummy branch to work around this issue.
- run: git checkout -b check
- run: bin/arduino-cli --verbose lib install --git-url . - run: bin/arduino-cli --verbose lib install --git-url .
env: env:
ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL: "true" ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL: "true"

18
examples/ONE/ONE.ino
View File

@ -1065,7 +1065,7 @@ void webServerMetricsGet(void) {
add_metric("temperature", add_metric("temperature",
"The ambient temperature as measured by the AirGradient SHT " "The ambient temperature as measured by the AirGradient SHT "
"sensor, in degrees Celsius", "sensor, in degrees Celsius",
"gauge", "degc"); "gauge", "celcius");
add_metric_point("", String(temp)); add_metric_point("", String(temp));
} }
if (hum >= 0) { if (hum >= 0) {
@ -1100,17 +1100,11 @@ static void webServerInit(void) {
// Make it possible to query this device from Prometheus/OpenMetrics. // Make it possible to query this device from Prometheus/OpenMetrics.
webServer.on("/metrics", HTTP_GET, webServerMetricsGet); webServer.on("/metrics", HTTP_GET, webServerMetricsGet);
webServer.begin(); webServer.begin();
MDNS.addService("http", "tcp", 80); MDNS.addService("_airgradient", "_tcp", 80);
MDNS.addServiceTxt("http", "_tcp", "model", mdnsModelName); MDNS.addServiceTxt("_airgradient", "_tcp", "model", mdnsModelName);
MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId()); MDNS.addServiceTxt("_airgradient", "_tcp", "serialno", getDevId());
MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion()); MDNS.addServiceTxt("_airgradient", "_tcp", "fw_ver", ag.getVersion());
MDNS.addServiceTxt("http", "_tcp", "vendor", "AirGradient"); MDNS.addServiceTxt("_airgradient", "_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) {