Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restructure Measurements class #256

Merged
merged 30 commits into from
Oct 22, 2024
Merged

Restructure Measurements class #256

merged 30 commits into from
Oct 22, 2024

Conversation

samuelbles07
Copy link
Collaborator

@samuelbles07 samuelbles07 commented Oct 20, 2024 •
edited
Loading

Changes

Main changes is restructuring Measurement class on AgValue files. Each measurements has average value that are always calculated based on max period length (calculateMaxPeriod()) set for moving average calculation.

Other includes

  1. Every measurements data from each sensor have an average value which are sent to AirGradient server, MQTT and Local Server fetch. On oled display and led bar indication still using last reading value.
  2. Relative humidity now is in float 2 decimals precision (except showing on oled display)
  3. Remove ESP restart when PM sensor read failed on X times
  4. Interval for SHT sensor reading now set to 6s
  5. Optional debug every reading interval to serial monitor. Sensor debug to serial monitor is the moving average value
  6. PMSBase::compensate using float data type for arguments and return (previously int).
    • Directly return 0 when PM value is 0
  7. Send indication when consecutively update invalid value

@samuelbles07
First init the data structure
60d01c0
@samuelbles07
The data structure and update value function
9c09b82
@samuelbles07
updateValue return bool to indicate max average is set or not
2a5cf78 
Add more comments
Update naming
@samuelbles07
Tidy up
467b3e8
@samuelbles07
New function to set max update before averaging
ea91cf9 
Rename enum member
@samuelbles07
Provide channel for neccessary ValueType
6925b1a 
To support OA that have 2 PMS sensor
@samuelbles07
Get value from each data type
751d4e8
@samuelbles07
validate measurement type channel
ac838ef
@samuelbles07
validateChannel implementation
a2c1943
@samuelbles07
First test, console
e145d32 
Working average from main only
@samuelbles07
Fix missing line when commit
2082a2f
@samuelbles07
measurement toString
ed344d3 
Tested on I-9PSL monitor
Update OneOpenAir post and mqtt to use new measurement toString
@samuelbles07
Fix rhum precission on buildIndoor measurements
76a2f33
@samuelbles07
Rename AgValueType to MeasurementType
0ccf46c 
Just use plain enum instead of enum class
Remove unecessary legacy variables and function
@samuelbles07
maxUpdate
2e4f464
@samuelbles07
Other related class use new AgValue structure
399b4ca
@samuelbles07
Switch to moving average for sensor data
f36f860 
average value to floating points
@samuelbles07
Move average member value to update struct
84884d0
@samuelbles07
get and getFloat function specific for latest value
43ca0a2 
Update functions comments
@samuelbles07
get value function consume
f478dd1
@samuelbles07
Set proper max period for moving average based on update interval
7de2d0c 
SHT read set to 6s
@samuelbles07
set measurement max period as function
2cda36e
@samuelbles07
Reduce update interval for max period to 50%
2ffe0a6
@samuelbles07
Rename function
f7e1363
@samuelbles07
Optional to debug every measurement update value
8548d3e
@samuelbles07
Compensate function use float data type
63bb5f8
@samuelbles07
Fix calculation PPT compensated PM2.5
c3068be
@samuelbles07
Handle consecutive invalid value update
8a87b86 
Set measurements type average value to invalid when invalidCounter reached max period
@samuelbles07
Apply for other monitor series
83aa6a4
@samuelbles07 samuelbles07 marked this pull request as ready for review October 22, 2024 05:35
@samuelbles07 samuelbles07 merged commit eb76eff into develop Oct 22, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@samuelbles07