mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' of github.com:arendst/Tasmota into pr_max7219

This commit is contained in:
Ajith Vasudevan 2021-03-20 08:41:57 +05:30
parent 7b51da4260 8c8d187aae
commit e65008ab9c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -26,7 +26,7 @@ All notable changes to this project will be documented in this file.
- ESP32 Extent BLE (#11212)
- ESP32 support for WS2812 hardware driver via RMT or I2S
- ESP32 support for secondary I2C controller
- Support for MPU6686 on primary or secondary I2C bus
- Support for MPU6886 on primary or secondary I2C bus
### Changed
- ESP32 core library from v1.0.5-rc6 to v1.0.5

2
tasmota/my_user_config.h
View File

@ -610,7 +610,7 @@
// #define USE_EZORGB // [I2cDriver55] Enable support for EZO's RGB sensor (+0k5 code) - Shared EZO code required for any EZO device (+1k2 code)
// #define USE_EZOPMP // [I2cDriver55] Enable support for EZO's PMP sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code)
// #define USE_SEESAW_SOIL // [I2cDriver56] Enable Capacitice Soil Moisture & Temperature Sensor (I2C addresses 0x36 - 0x39) (+1k3 code)
// #define USE_MPU6886 // [I2cDriver58] Enable MPU6686 - found in M5Stack - support 2 I2C buses on ESP32 (I2C address 0x68) (+2k code)
// #define USE_MPU6886 // [I2cDriver58] Enable MPU6886 - found in M5Stack - support 2 I2C buses on ESP32 (I2C address 0x68) (+2k code)
// #define USE_DISPLAY // Add I2C Display Support (+2k code)
#define USE_DISPLAY_MODES1TO5 // Enable display mode 1 to 5 in addition to mode 0

14
tasmota/xsns_85_mpu6886.ino
View File

@ -44,17 +44,17 @@ struct {
/********************************************************************************************/
const char HTTP_MPU6686[] PROGMEM =
"{s}MPU6686 acc_x" "{m}%3_f G" "{e}"
"{s}MPU6686 acc_y" "{m}%3_f G" "{e}"
"{s}MPU6686 acc_z" "{m}%3_f G" "{e}"
"{s}MPU6686 gyr_x" "{m}%i dps" "{e}"
"{s}MPU6686 gyr_y" "{m}%i dps" "{e}"
"{s}MPU6686 gyr_z" "{m}%i dps" "{e}"
"{s}MPU6886 acc_x" "{m}%3_f G" "{e}"
"{s}MPU6886 acc_y" "{m}%3_f G" "{e}"
"{s}MPU6886 acc_z" "{m}%3_f G" "{e}"
"{s}MPU6886 gyr_x" "{m}%i dps" "{e}"
"{s}MPU6886 gyr_y" "{m}%i dps" "{e}"
"{s}MPU6886 gyr_z" "{m}%i dps" "{e}"
;
void MPU6686_Show(uint32_t json) {
if (json) {
ResponseAppend_P(PSTR(",\"MPU6686\":{\"AX\":%i,\"AY\":%i,\"AZ\":%i,\"GX\":%i,\"GY\":%i,\"GZ\":%i}"),
ResponseAppend_P(PSTR(",\"MPU6886\":{\"AX\":%i,\"AY\":%i,\"AZ\":%i,\"GX\":%i,\"GY\":%i,\"GZ\":%i}"),
mpu6886_sensor.ax, mpu6886_sensor.ay, mpu6886_sensor.az,
mpu6886_sensor.gyx, mpu6886_sensor.gyy, mpu6886_sensor.gyz);
} else {