Some tweaks

m5stack · Aug 1, 2024 · 2e4855f · 2e4855f
1 parent 54a845b
commit 2e4855f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/lib/M5Unit-ENV/src/unit/unit_QMP6988.hpp b/lib/M5Unit-ENV/src/unit/unit_QMP6988.hpp
@@ -222,25 +222,25 @@ class UnitQMP6988
     ///@{
     //! @brief Oldest measured temperature (Celsius)
     inline float temperature() const {
-        return (!_data->empty() && _osTemp != qmp6988::Oversampling::Skip)
+        return (!empty() && _osTemp != qmp6988::Oversampling::Skip)
                    ? oldest().temperature()
                    : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured temperature (Celsius)
     inline float celsius() const {
-        return (!_data->empty() && _osTemp != qmp6988::Oversampling::Skip)
+        return (!empty() && _osTemp != qmp6988::Oversampling::Skip)
                    ? oldest().celsius()
                    : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured temperature (Fahrenheit)
     inline float fahrenheit() const {
-        return (!_data->empty() && _osTemp != qmp6988::Oversampling::Skip)
+        return (!empty() && _osTemp != qmp6988::Oversampling::Skip)
                    ? oldest().fahrenheit()
                    : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured pressure (Pa)
     inline float pressure() const {
-        return (!_data->empty() && _osPressure != qmp6988::Oversampling::Skip)
+        return (!empty() && _osPressure != qmp6988::Oversampling::Skip)
                    ? oldest().pressure()
                    : std::numeric_limits<float>::quiet_NaN();
     }

diff --git a/lib/M5Unit-ENV/src/unit/unit_SCD40.hpp b/lib/M5Unit-ENV/src/unit/unit_SCD40.hpp
@@ -69,27 +69,27 @@ class UnitSCD40 : public Component,
     ///@{
     //! @brief Oldest measured CO2 concentration (ppm)
     inline uint16_t co2() const {
-        return !_data->empty() ? oldest().co2() : 0;
+        return !empty() ? oldest().co2() : 0;
     }
     //! @brief Oldest measured temperature (Celsius)
     inline float temperature() const {
-        return !_data->empty() ? oldest().temperature()
-                               : std::numeric_limits<float>::quiet_NaN();
+        return !empty() ? oldest().temperature()
+                        : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured temperature (Celsius)
     inline float celsius() const {
-        return !_data->empty() ? oldest().celsius()
-                               : std::numeric_limits<float>::quiet_NaN();
+        return !empty() ? oldest().celsius()
+                        : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured temperature (Fahrenheit)
     inline float fahrenheit() const {
-        return !_data->empty() ? oldest().fahrenheit()
-                               : std::numeric_limits<float>::quiet_NaN();
+        return !empty() ? oldest().fahrenheit()
+                        : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured humidity (RH)
     inline float humidity() const {
-        return !_data->empty() ? oldest().humidity()
-                               : std::numeric_limits<float>::quiet_NaN();
+        return !empty() ? oldest().humidity()
+                        : std::numeric_limits<float>::quiet_NaN();
     }
     ///@}
 

diff --git a/lib/M5Unit-ENV/src/unit/unit_SHT30.hpp b/lib/M5Unit-ENV/src/unit/unit_SHT30.hpp
@@ -149,23 +149,23 @@ class UnitSHT30 : public Component,
     ///@{
     //! @brief Oldest measured temperature (Celsius)
     inline float temperature() const {
-        return !_data->empty() ? oldest().temperature()
-                               : std::numeric_limits<float>::quiet_NaN();
+        return !empty() ? oldest().temperature()
+                        : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured temperature (Celsius)
     inline float celsius() const {
-        return !_data->empty() ? oldest().celsius()
-                               : std::numeric_limits<float>::quiet_NaN();
+        return !empty() ? oldest().celsius()
+                        : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured temperature (Fahrenheit)
     inline float fahrenheit() const {
-        return !_data->empty() ? oldest().fahrenheit()
-                               : std::numeric_limits<float>::quiet_NaN();
+        return !empty() ? oldest().fahrenheit()
+                        : std::numeric_limits<float>::quiet_NaN();
     }
     //! @brief Oldest measured humidity (RH)
     inline float humidity() const {
-        return !_data->empty() ? oldest().humidity()
-                               : std::numeric_limits<float>::quiet_NaN();
+        return !empty() ? oldest().humidity()
+                        : std::numeric_limits<float>::quiet_NaN();
     }
     ///@}
 

diff --git a/lib/M5UnitTVOC/src/unit/unit_SGP30.hpp b/lib/M5UnitTVOC/src/unit/unit_SGP30.hpp
@@ -103,7 +103,7 @@ class UnitSGP30 : public Component,
    public:
     /*!
       @struct config_t
-      @brief Settings
+      @brief Settings for begin
      */
     struct config_t : Component::config_t {
         //! @brief Start periodic measurement on begin()?
@@ -162,11 +162,11 @@ class UnitSGP30 : public Component,
     ///@{
     //! @brief Oldest CO2eq (ppm)
     inline uint16_t co2eq() const {
-        return !_data->empty() ? oldest().co2eq() : 0;
+        return !empty() ? oldest().co2eq() : 0;
     }
     //! @brief Oldest TVOC (ppb)
     inline uint16_t tvoc() const {
-        return !_data->empty() ? oldest().tvoc() : 0;
+        return !empty() ? oldest().tvoc() : 0;
     }
     ///@}