Skip to content

Commit

Permalink
Merge pull request #10 from akkoyun/03.02.10
Browse files Browse the repository at this point in the history
03.02.10 - Initial update
  • Loading branch information
akkoyun authored Feb 14, 2022
2 parents 948811d + 71c1fe2 commit c3b5b48
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 12 deletions.
2 changes: 1 addition & 1 deletion library.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Environment",
"version": "3.2.8",
"version": "3.2.10",
"keywords": "Sensor, Environment, SHT21, HDC2010, TSL2561, MPL3115, Temperature, Humidity, Pressure, Light",
"description": "Function measures the value of given sensors. Library is used data mining for stable sensor data. Also cleared for lite use.",
"authors":
Expand Down
2 changes: 1 addition & 1 deletion library.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name=Environment
version=3.2.8
version=3.2.10
author=Gunce Akkoyun <[email protected]>
maintainer=Gunce Akkoyun <[email protected]>
sentence=Read enviroment sensors
Expand Down
5 changes: 0 additions & 5 deletions src/Environment.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ float Environment::SHT21_Temperature(const uint8_t Read_Count_, const uint8_t Av
// Calculate Data
uint16_t _Data_Size = sizeof(Measurement_Array) / sizeof(Measurement_Array[0]);
Value_ = Stats.Array_Average(Measurement_Array, _Data_Size, Average_Type_);
Stats.Array_Statistic_Clear();

// ************************************************************
// Control For Sensor Range
Expand Down Expand Up @@ -275,7 +274,6 @@ float Environment::SHT21_Humidity(const uint8_t Read_Count_, const uint8_t Avera
// Calculate Data
uint16_t _Data_Size = sizeof(Measurement_Array) / sizeof(Measurement_Array[0]);
Value_ = Stats.Array_Average(Measurement_Array, _Data_Size, Average_Type_);
Stats.Array_Statistic_Clear();

// ************************************************************
// Control For Sensor Range
Expand Down Expand Up @@ -505,7 +503,6 @@ float Environment::HDC2010_Temperature(const uint8_t Read_Count_, const uint8_t
// Calculate Data
uint16_t _Data_Size = sizeof(Measurement_Array) / sizeof(Measurement_Array[0]);
Value_ = Stats.Array_Average(Measurement_Array, _Data_Size, Average_Type_);
Stats.Array_Statistic_Clear();

// ************************************************************
// Control For Sensor Range
Expand Down Expand Up @@ -734,7 +731,6 @@ float Environment::HDC2010_Humidity(const uint8_t Read_Count_, const uint8_t Ave
// Calculate Data
uint16_t _Data_Size = sizeof(Measurement_Array) / sizeof(Measurement_Array[0]);
Value_ = Stats.Array_Average(Measurement_Array, _Data_Size, Average_Type_);
Stats.Array_Statistic_Clear();

// ************************************************************
// Control For Sensor Range
Expand Down Expand Up @@ -1416,7 +1412,6 @@ float Environment::MCP3422_Pressure(const uint8_t _Channel, const uint8_t _Read_
// Calculate Data
float _Value = (Stats.Array_Average(Pressure_RAW_Array, _Read_Count, _Average_Type) * _Sensor_Max);
_Value = (_Value * 1.5304) - 1.3437;
Stats.Array_Statistic_Clear();

// End Function
return(_Value);
Expand Down
8 changes: 3 additions & 5 deletions src/Environment.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@
#include <Arduino.h>
#endif

// Define Wire Library
#ifndef __Wire__
#include <Wire.h>
#endif

// Define I2C Functions Library
#ifndef __I2C_Functions__
#include <I2C_Functions.h>
#endif

// Define Statistical Library
#ifndef __Statistical__
#include <Statistical.h>
#endif

class Environment {

Expand Down

0 comments on commit c3b5b48

Please sign in to comment.