From 269be21e443cd2c7c9df25121f7bf751e3cbfed4 Mon Sep 17 00:00:00 2001 From: svn2208 Date: Fri, 19 Nov 2021 10:42:10 +0100 Subject: [PATCH] Improvements due to code review --- .../Adafruit_HMC5883_U.cpp | 2 +- src/src/PluginStructs/P121_data_struct.cpp | 21 ++++++++++++------- src/src/PluginStructs/P121_data_struct.h | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lib/Adafruit_HMC5883_Unified/Adafruit_HMC5883_U.cpp b/lib/Adafruit_HMC5883_Unified/Adafruit_HMC5883_U.cpp index de4d1ca6a..79e0a8102 100644 --- a/lib/Adafruit_HMC5883_Unified/Adafruit_HMC5883_U.cpp +++ b/lib/Adafruit_HMC5883_Unified/Adafruit_HMC5883_U.cpp @@ -165,7 +165,7 @@ Adafruit_HMC5883_Unified::Adafruit_HMC5883_Unified(int32_t sensorID) { /**************************************************************************/ bool Adafruit_HMC5883_Unified::begin() { // Enable I2C - Wire.begin(); + //Wire.begin(); // This is already done by ESP Easy Core // Enable the magnetometer write8(HMC5883_ADDRESS_MAG, HMC5883_REGISTER_MAG_MR_REG_M, 0x00); diff --git a/src/src/PluginStructs/P121_data_struct.cpp b/src/src/PluginStructs/P121_data_struct.cpp index 0078aac90..ec8313c91 100644 --- a/src/src/PluginStructs/P121_data_struct.cpp +++ b/src/src/PluginStructs/P121_data_struct.cpp @@ -7,7 +7,7 @@ #include #include -bool P121_data_struct::begin(bool initSettings) +bool P121_data_struct::begin() { if (!initialized) { @@ -18,16 +18,23 @@ bool P121_data_struct::begin(bool initSettings) // Set up oversampling and filter initialization sensor_t sensor; mag.getSensor(&sensor); + #ifndef BUILD_NO_DEBUG addLog(LOG_LEVEL_DEBUG, F("------------------------------------")); String log = F("Sensor: "); - log += sensor.name; - log += "\nDriver Ver: " + sensor.version; - log += "\nUnique ID: " + sensor.sensor_id; - log += "\nMax Value: " + String(sensor.max_value); - log += "\nMin Value: " + String(sensor.min_value); - log += "\nResolution: " + String(sensor.resolution); + log += F(sensor.name); + log += F("\nDriver Ver: "); + log += sensor.version; + log += F("\nUnique ID: "); + log += sensor.sensor_id; + log += F("\nMax Value: "); + log += String(sensor.max_value); + log += F("\nMin Value: "); + log += String(sensor.min_value); + log += F("\nResolution: "); + log += String(sensor.resolution); addLog(LOG_LEVEL_DEBUG, log); addLog(LOG_LEVEL_DEBUG, F("------------------------------------")); + #endif } } diff --git a/src/src/PluginStructs/P121_data_struct.h b/src/src/PluginStructs/P121_data_struct.h index 64650bd7c..1a803d0d0 100644 --- a/src/src/PluginStructs/P121_data_struct.h +++ b/src/src/PluginStructs/P121_data_struct.h @@ -9,7 +9,7 @@ struct P121_data_struct : public PluginTaskData_base { - bool begin(bool initSettings = true); + bool begin(); Adafruit_HMC5883_Unified mag = Adafruit_HMC5883_Unified(12345);