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

Merge remote-tracking branch 'upstream/main' into mdev

Browse Source
This commit is contained in:
Frank
2023-03-19 15:15:12 +01:00
parent eac4fe84e1 c9be03c0bc
commit 907679c2f5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
usermods/mpu6050_imu/usermod_mpu6050_imu.h
View File

@@ -296,6 +296,7 @@ class MPU6050Driver : public Usermod {
StaticJsonDocument<800> doc; //measured 528 // WLEDMM added some margin (was 600) StaticJsonDocument<800> doc; //measured 528 // WLEDMM added some margin (was 600)
JsonObject imu_meas = doc.createNestedObject("IMU"); JsonObject imu_meas = doc.createNestedObject("IMU");
//JsonObject imu_meas = user.createNestedObject("IMU");
#ifdef WLED_DEBUG #ifdef WLED_DEBUG
JsonArray quat_json = imu_meas.createNestedArray("Quat"); JsonArray quat_json = imu_meas.createNestedArray("Quat");
quat_json.add(qat.w); quat_json.add(qat.w);

6
wled00/wled.h
View File

@@ -30,7 +30,11 @@
#ifndef WLED_DISABLE_MQTT #ifndef WLED_DISABLE_MQTT
#define WLED_ENABLE_MQTT // saves 12kb #define WLED_ENABLE_MQTT // saves 12kb
#endif #endif
#define WLED_ENABLE_ADALIGHT // saves 500b only (uses GPIO3 (RX) for serial) #ifndef WLED_DISABLE_ADALIGHT // can be used to disable reading commands from serial RX pin (see issue #3128).
#define WLED_ENABLE_ADALIGHT // disable saves 5Kb (uses GPIO3 (RX) for serial). Related serial protocols: Adalight/TPM2, Improv, Continuous Serial Streaming
#else
#undef WLED_ENABLE_ADALIGHT // disable has priority over enable
#endif
//#define WLED_ENABLE_DMX // uses 3.5kb (use LEDPIN other than 2) //#define WLED_ENABLE_DMX // uses 3.5kb (use LEDPIN other than 2)
//#define WLED_ENABLE_JSONLIVE // peek LED output via /json/live (WS binary peek is always enabled) //#define WLED_ENABLE_JSONLIVE // peek LED output via /json/live (WS binary peek is always enabled)
#ifndef WLED_DISABLE_LOXONE #ifndef WLED_DISABLE_LOXONE