Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

json/info: brand and product configurable by compile variables

Browse Source 
For MM builds brand = WLEDMM
Will be used in WLED-Native - by Moustachauve

Changed in bh1750, bme280, pir, json.cpp and wled.h
This commit is contained in:
Ewoud
2023-10-15 21:43:55 +02:00
parent 6d9af29042
commit 294a872462
6 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
usermods/BH1750_v2/usermod_bh1750.h
View File

@@ -118,8 +118,8 @@ private:
JsonObject device = doc.createNestedObject(F("device")); // attach the sensor to the same device
device[F("name")] = serverDescription;
device[F("identifiers")] = "wled-sensor-" + String(mqttClientID);
device[F("manufacturer")] = F("WLED");
device[F("model")] = F("FOSS");
device[F("manufacturer")] = F(WLED_BRAND); //WLEDMM + Moustachauve/Wled-Native
device[F("model")] = F(WLED_PRODUCT_NAME); //WLEDMM + Moustachauve/Wled-Native
device[F("sw_version")] = versionString;
String temp;

4
usermods/BME280_v2/usermod_bme280.h
View File

@@ -163,8 +163,8 @@ private:
JsonObject device = doc.createNestedObject(F("device")); // attach the sensor to the same device
device[F("name")] = serverDescription;
device[F("identifiers")] = "wled-sensor-" + String(mqttClientID);
device[F("manufacturer")] = F("WLED");
device[F("model")] = F("FOSS");
device[F("manufacturer")] = F(WLED_BRAND); //WLEDMM + Moustachauve/Wled-Native
device[F("model")] = F(WLED_PRODUCT_NAME); //WLEDMM + Moustachauve/Wled-Native
device[F("sw_version")] = versionString;
String temp;

4
usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h
View File

@@ -189,8 +189,8 @@ private:
JsonObject device = doc.createNestedObject(F("device")); // attach the sensor to the same device
device[F("name")] = serverDescription;
device[F("ids")] = String(F("wled-sensor-")) + mqttClientID;
device[F("mf")] = "WLED";
device[F("mdl")] = F("FOSS");
device[F("mf")] = F(WLED_BRAND); //WLEDMM + Moustachauve/Wled-Native
device[F("mdl")] = F(WLED_PRODUCT_NAME); //WLEDMM + Moustachauve/Wled-Native
device[F("sw")] = versionString;
sprintf_P(buf, PSTR("homeassistant/binary_sensor/%s/config"), uid);

2
wled00/FX.cpp
View File

@@ -8033,7 +8033,7 @@ uint16_t mode_2Doctopus() {
}
if (true) // WLEDMM SuperSync
SEGENV.step = (strip.now / 25) * (SEGMENT.speed / 32 + 1); // WLEDMM 40fps
SEGENV.step = strip.now * (SEGMENT.speed / 32 + 1) / 25; // WLEDMM 40fps
else
SEGENV.step += SEGMENT.speed / 32 + 1; // 1-4 range

4
wled00/json.cpp
View File

@@ -1093,8 +1093,8 @@ void serializeInfo(JsonObject root)
#endif
root[F("opt")] = os;
root[F("brand")] = "WLED";
root[F("product")] = F("FOSS");
root[F("brand")] = F(WLED_BRAND); //WLEDMM + Moustachauve/Wled-Native
root[F("product")] = F(WLED_PRODUCT_NAME); //WLEDMM + Moustachauve/Wled-Native
root["mac"] = escapedMac;
char s[16] = "";
if (Network.isConnected())

20
wled00/wled.h
View File

@@ -8,7 +8,25 @@
*/
// version code in format yymmddb (b = daily build)
#define VERSION 2310081
#define VERSION 2310150
//WLEDMM + Moustachauve/Wled-Native
// You can define custom product info from build flags.
// This is useful to allow API consumer to identify what type of WLED version
// they are interacting with. Be aware that changing this might cause some third
// party API consumers to consider this as a non-WLED device since the values
// returned by the API and by MQTT will no longer be default. However, most
// third party only uses mDNS to validate, so this is generally fine to change.
// For example, Home Assistant will still work fine even with this value changed.
// Use like this:
// -D WLED_BRAND="\"Custom Brand\""
// -D WLED_PRODUCT_NAME="\"Custom Product\""
#ifndef WLED_BRAND
#define WLED_BRAND "WLED"
#endif
#ifndef WLED_PRODUCT_NAME
#define WLED_PRODUCT_NAME "MoonModules"
#endif
//uncomment this if you have a "my_config.h" file you'd like to use
//#define WLED_USE_MY_CONFIG