Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-28 04:07:47 +00:00
Code Issues Releases Activity

[PMSx003] Add option to split counted data in bins

Browse Source 
Count values reported by the sensor represent particles of at least the given size.
However, it makes more sense to have the values representing their binned values.
For example, `cnt1.0` should represent counted particles of size 1.0 ... 2.5 micron.
This commit is contained in:
TD-er
2021-10-14 13:09:08 +02:00
parent 38604e5e03
commit de7bb5dd81
3 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/_P053_PMSx003.ino
+35 -8
View File
@@ -203,7 +203,18 @@ boolean Plugin_053(uint8_t function, struct EventStruct *event, String& string)
static_cast<int>(PMSx003_event_datatype::Event_All) };
addFormSelector(F("Events for non-output values"), F("p053_events"), 4, eventOptions, eventOptionValues,
PLUGIN_053_EVENT_OUT_SELECTOR);
addFormNote(F("Only generates the 'missing' events, (taskname#temp/humi/hcho, taskname#pm1.0/pm2.5/pm10, taskname#cnt0.3/cnt0.5/cnt1.0/cnt2.5/cnt5/cnt10)."));
addFormNote(F(
"Only generates the 'missing' events, (taskname#temp/humi/hcho, taskname#pm1.0/pm2.5/pm10, taskname#cnt0.3/cnt0.5/cnt1.0/cnt2.5/cnt5/cnt10)."));
}
{
addFormSubHeader(F("Data Processing"));
addFormNumericBox(F("Averaging Window Size"), F("p053_avgsize"), PLUGIN_053_AVG_WINDOW_SIZE, 1, 255);
addFormNote(F("Typical sample duration: 2300 msec"));
addFormCheckBox(F("Split 'count/0.1L' Bins"), F("p053_split_bins"),
bitRead(PLUGIN_053_DATA_PROCESSING_FLAGS, PLUGIN_053_SPLIT_CNT_BINS_BIT));
addFormNote(F("Subtract next bin counts to get counts per bin, not all greater than."));
}
# endif // ifdef PLUGIN_053_ENABLE_EXTRA_SENSORS
success = true;
@@ -223,6 +234,13 @@ boolean Plugin_053(uint8_t function, struct EventStruct *event, String& string)
PLUGIN_053_SENSOR_MODEL_SELECTOR = getFormItemInt(F("p053_model"));
PLUGIN_053_OUTPUT_SELECTOR = getFormItemInt(F("p053_output"));
PLUGIN_053_EVENT_OUT_SELECTOR = getFormItemInt(F("p053_events"));
PLUGIN_053_AVG_WINDOW_SIZE = getFormItemInt(F("p053_avgsize"));
if (isFormItemChecked(F("p053_split_bins"))) {
bitSet(PLUGIN_053_DATA_PROCESSING_FLAGS, PLUGIN_053_SPLIT_CNT_BINS_BIT);
} else {
bitClear(PLUGIN_053_DATA_PROCESSING_FLAGS, PLUGIN_053_SPLIT_CNT_BINS_BIT);
}
switch (GET_PLUGIN_053_SENSOR_MODEL_SELECTOR) {
case PMSx003_type::PMS1003_5003_7003:
@@ -231,12 +249,13 @@ boolean Plugin_053(uint8_t function, struct EventStruct *event, String& string)
if (GET_PLUGIN_053_OUTPUT_SELECTOR == PMSx003_output_selection::PM2_5_TempHum_Formaldehyde) {
PLUGIN_053_OUTPUT_SELECTOR = static_cast<int>(PMSx003_output_selection::Particles_ug_m3);
}
if (GET_PLUGIN_053_EVENT_OUT_SELECTOR == PMSx003_event_datatype::Event_PMxx_TempHum_Formaldehyde) {
PLUGIN_053_EVENT_OUT_SELECTOR = static_cast<int>(PMSx003_event_datatype::Event_None);
}
break;
case PMSx003_type::PMS2003_3003:
PLUGIN_053_OUTPUT_SELECTOR = static_cast<int>(PMSx003_output_selection::Particles_ug_m3);
PLUGIN_053_OUTPUT_SELECTOR = static_cast<int>(PMSx003_output_selection::Particles_ug_m3);
PLUGIN_053_EVENT_OUT_SELECTOR = static_cast<int>(PMSx003_event_datatype::Event_None);
break;
default:
@@ -245,8 +264,9 @@ boolean Plugin_053(uint8_t function, struct EventStruct *event, String& string)
if (oldOutputSelector != PLUGIN_053_OUTPUT_SELECTOR) {
struct EventStruct TempEvent(event->TaskIndex);
// Do not clear ExtraTaskSettings, leave formula fields in tact.
//ExtraTaskSettings.clear();
// ExtraTaskSettings.clear();
ExtraTaskSettings.TaskIndex = event->TaskIndex;
String dummy;
PluginCall(PLUGIN_GET_DEVICEVALUENAMES, &TempEvent, dummy);
@@ -258,11 +278,9 @@ boolean Plugin_053(uint8_t function, struct EventStruct *event, String& string)
case PLUGIN_INIT:
{
int8_t rxPin = CONFIG_PIN1;
int8_t txPin = CONFIG_PIN2;
const int8_t rxPin = CONFIG_PIN1;
const int8_t txPin = CONFIG_PIN2;
const ESPEasySerialPort port = static_cast<ESPEasySerialPort>(CONFIG_PORT);
int8_t resetPin = PLUGIN_053_RST_PIN;
int8_t pwrPin = PLUGIN_053_PWR_PIN;
PMSx003_type Plugin_053_sensortype = PMSx003_type::PMS1003_5003_7003;
@@ -270,7 +288,16 @@ boolean Plugin_053(uint8_t function, struct EventStruct *event, String& string)
Plugin_053_sensortype = GET_PLUGIN_053_SENSOR_MODEL_SELECTOR;
# endif // ifdef PLUGIN_053_ENABLE_EXTRA_SENSORS
initPluginTaskData(event->TaskIndex, new (std::nothrow) P053_data_struct(rxPin, txPin, port, resetPin, pwrPin, Plugin_053_sensortype));
initPluginTaskData(
event->TaskIndex,
new (std::nothrow) P053_data_struct(
rxPin, txPin, port,
PLUGIN_053_RST_PIN,
PLUGIN_053_PWR_PIN,
Plugin_053_sensortype,
PLUGIN_053_AVG_WINDOW_SIZE,
bitRead(PLUGIN_053_DATA_PROCESSING_FLAGS, PLUGIN_053_SPLIT_CNT_BINS_BIT)
));
P053_data_struct *P053_data =
static_cast<P053_data_struct *>(getPluginTaskData(event->TaskIndex));
src/src/PluginStructs/P053_data_struct.cpp
+21 -5
View File
@@ -43,8 +43,12 @@ P053_data_struct::P053_data_struct(
const ESPEasySerialPort port,
int8_t resetPin,
int8_t pwrPin,
PMSx003_type sensortype)
: _sensortype(sensortype), _resetPin(resetPin), _pwrPin(pwrPin) {
PMSx003_type sensortype,
uint32_t avgWindowSize,
bool splitCntBins)
: _sensortype(sensortype), _avgWindowSize(avgWindowSize),
_resetPin(resetPin), _pwrPin(pwrPin),
_splitCntBins(splitCntBins) {
# ifndef BUILD_NO_DEBUG
if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
@@ -60,8 +64,6 @@ P053_data_struct::P053_data_struct(
}
# endif // ifndef BUILD_NO_DEBUG
// Hardware serial is RX on 3 and TX on 1
if (port == ESPEasySerialPort::software) {
addLog(LOG_LEVEL_INFO, F("PMSx003 : using software serial"));
} else {
@@ -85,7 +87,6 @@ P053_data_struct::P053_data_struct(
P053_data_struct::~P053_data_struct() {
if (_easySerial != nullptr) {
// Regardless the set pins, the software serial must be deleted.
delete _easySerial;
_easySerial = nullptr;
}
@@ -533,10 +534,25 @@ bool P053_data_struct::getValue(const uint16_t data[], uint8_t index, float& val
if (!hasFormaldehyde()) { return false; }
value = static_cast<float>(data[index]) / 1000.0f;
break;
case PMS_cnt0_3_100ml:
case PMS_cnt0_5_100ml:
case PMS_cnt1_0_100ml:
case PMS_cnt2_5_100ml:
case PMS_cnt5_0_100ml:
value = static_cast<float>(data[index]);
if (_splitCntBins) {
value -= static_cast<float>(data[index + 1]);
if (value < 0.0f) { value = 0.0f; }
}
break;
default:
value = static_cast<float>(data[index]);
break;
}
bitSet(_value_mask, index);
return true;
}
src/src/PluginStructs/P053_data_struct.h
+11 -1
View File
@@ -63,6 +63,12 @@ const __FlashStringHelper* toString(PMSx003_event_datatype selection);
# define PLUGIN_053_RST_PIN CONFIG_PIN3
# define PLUGIN_053_PWR_PIN PCONFIG(3)
# define PLUGIN_053_AVG_WINDOW_SIZE PCONFIG_LONG(0)
# define PLUGIN_053_DATA_PROCESSING_FLAGS PCONFIG(4)
// Bits for data processing flags
# define PLUGIN_053_SPLIT_CNT_BINS_BIT 0
// Helper defines to make code a bit more readable.
# define GET_PLUGIN_053_SENSOR_MODEL_SELECTOR static_cast<PMSx003_type>(PLUGIN_053_SENSOR_MODEL_SELECTOR)
# define GET_PLUGIN_053_OUTPUT_SELECTOR static_cast<PMSx003_output_selection>(PLUGIN_053_OUTPUT_SELECTOR)
@@ -110,7 +116,9 @@ public:
const ESPEasySerialPort port,
int8_t resetPin,
int8_t pwrPin,
PMSx003_type sensortype);
PMSx003_type sensortype,
uint32_t avgWindowSize,
bool splitCntBins);
P053_data_struct() = delete;
@@ -177,10 +185,12 @@ private:
ESPeasySerial *_easySerial = nullptr;
const PMSx003_type _sensortype;
const uint32_t _avgWindowSize = 0;
uint32_t _value_mask = 0; // Keeping track of values already sent.
uint16_t _last_checksum = 0; // To detect duplicate messages
const int8_t _resetPin = -1;
const int8_t _pwrPin = -1;
const bool _splitCntBins = false;
bool _values_received = false;
bool _activeReadingModeEnabled = true;
};