mirror of
https://github.com/rstrouse/ESPSomfy-RTS.git
synced 2026-10-31 13:52:15 +01:00
Merge pull request #126 from cjkas/chore/drop-rstrouse
chore: name cjkas as the manufacturer in MQTT discovery and SSDP
This commit is contained in:
commit
b4f3b571cf
3 changed files with 5 additions and 4 deletions
|
|
@ -294,9 +294,9 @@ void ESPNetwork::setConnected(conn_types_t connType) {
|
||||||
snprintf(sModel, sizeof(sModel), "ESP32-%s", settings.chipModel);
|
snprintf(sModel, sizeof(sModel), "ESP32-%s", settings.chipModel);
|
||||||
SSDP.setModelNumber(0, sModel);
|
SSDP.setModelNumber(0, sModel);
|
||||||
}
|
}
|
||||||
SSDP.setModelURL(0, "https://github.com/rstrouse/ESPSomfy-RTS");
|
SSDP.setModelURL(0, "https://github.com/cjkas/ESPSomfy-RTS");
|
||||||
SSDP.setManufacturer(0, "rstrouse");
|
SSDP.setManufacturer(0, "cjkas");
|
||||||
SSDP.setManufacturerURL(0, "https://github.com/rstrouse");
|
SSDP.setManufacturerURL(0, "https://github.com/cjkas");
|
||||||
SSDP.setURL(0, "/");
|
SSDP.setURL(0, "/");
|
||||||
SSDP.setActive(0, true);
|
SSDP.setActive(0, true);
|
||||||
resetTaskWdt();
|
resetTaskWdt();
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ void shadeDisco(const shade_disco_t &shade, JsonObject obj, char *topic, size_t
|
||||||
JsonObject dobj = obj["device"].to<JsonObject>();
|
JsonObject dobj = obj["device"].to<JsonObject>();
|
||||||
dobj["hw_version"] = shade.fwVersion;
|
dobj["hw_version"] = shade.fwVersion;
|
||||||
dobj["name"] = shade.hostname;
|
dobj["name"] = shade.hostname;
|
||||||
dobj["mf"] = "rstrouse";
|
dobj["mf"] = "cjkas";
|
||||||
JsonArray arrids = dobj["identifiers"].to<JsonArray>();
|
JsonArray arrids = dobj["identifiers"].to<JsonArray>();
|
||||||
snprintf(topic, len, "mqtt_espsomfyrts_%s", shade.serverId);
|
snprintf(topic, len, "mqtt_espsomfyrts_%s", shade.serverId);
|
||||||
arrids.add(topic);
|
arrids.add(topic);
|
||||||
|
|
|
||||||
|
|
@ -48,6 +48,7 @@ static void test_the_device_is_the_esp() {
|
||||||
TEST_ASSERT_EQUAL_STRING("ESPSomfyRTS", device["name"]);
|
TEST_ASSERT_EQUAL_STRING("ESPSomfyRTS", device["name"]);
|
||||||
TEST_ASSERT_EQUAL_STRING("v4.0.0", device["hw_version"]);
|
TEST_ASSERT_EQUAL_STRING("v4.0.0", device["hw_version"]);
|
||||||
TEST_ASSERT_EQUAL_STRING("ESPSomfy-RTS MQTT", device["model"]);
|
TEST_ASSERT_EQUAL_STRING("ESPSomfy-RTS MQTT", device["model"]);
|
||||||
|
TEST_ASSERT_EQUAL_STRING("cjkas", device["mf"]);
|
||||||
TEST_ASSERT_EQUAL_STRING("somfy/status", d.doc["availability_topic"]);
|
TEST_ASSERT_EQUAL_STRING("somfy/status", d.doc["availability_topic"]);
|
||||||
TEST_ASSERT_EQUAL_STRING("online", d.doc["payload_available"]);
|
TEST_ASSERT_EQUAL_STRING("online", d.doc["payload_available"]);
|
||||||
TEST_ASSERT_EQUAL_STRING("offline", d.doc["payload_not_available"]);
|
TEST_ASSERT_EQUAL_STRING("offline", d.doc["payload_not_available"]);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue