mirror of https://github.com/arendst/Tasmota.git
Add support for PMSx003T modules that have temperature+humidity
This commit is contained in:
Thomas Hargrove
parent
42f9090b71
commit
0e5592fbff
|
|
@ -173,6 +173,7 @@
|
|||
#endif
|
||||
#define USE_PMS5003 // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code)
|
||||
//#define PMS_MODEL_PMS3003 // Enable support of PMS3003 instead of PMS5003/PMS7003 (needs the USE_PMS5003 above)
|
||||
//#define PMS_MODEL_PMSx003T // Enable support for PMSx003T models that report temperature and humidity (needs the USE_PMS5003 above)
|
||||
#define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code)
|
||||
#define USE_HPMA // Add support for Honeywell HPMA115S0 particle concentration sensor
|
||||
#define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code)
|
||||
|
|
|
|||
|
|
@ -439,6 +439,7 @@
|
|||
#endif
|
||||
//#define USE_PMS5003 // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code)
|
||||
//#define PMS_MODEL_PMS3003 // Enable support of PMS3003 instead of PMS5003/PMS7003 (needs the USE_PMS5003 above)
|
||||
//#define PMS_MODEL_PMSx003T // Enable support for PMSx003T models that report temperature and humidity (needs the USE_PMS5003 above)
|
||||
//#define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code)
|
||||
//#define USE_HPMA // Add support for Honeywell HPMA115S0 particle concentration sensor
|
||||
//#define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code)
|
||||
|
|
@ -655,6 +656,7 @@
|
|||
#endif
|
||||
#define USE_PMS5003 // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code)
|
||||
//#define PMS_MODEL_PMS3003 // Enable support of PMS3003 instead of PMS5003/PMS7003 (needs the USE_PMS5003 above)
|
||||
//#define PMS_MODEL_PMSx003T // Enable support for PMSx003T models that report temperature and humidity (needs the USE_PMS5003 above)
|
||||
#define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+0k7 code)
|
||||
#define USE_HPMA // Add support for Honeywell HPMA115S0 particle concentration sensor
|
||||
#define USE_SR04 // Add support for HC-SR04 ultrasonic devices (+1k code)
|
||||
|
|
|
|||
|
|
@ -762,6 +762,7 @@
|
|||
#define CO2_HIGH 1200 // Above this CO2 value show red light (needs PWM or WS2812 RG(B) led and enable with SetOption18 1)
|
||||
//#define USE_PMS5003 // Add support for PMS5003 and PMS7003 particle concentration sensor (+1k3 code)
|
||||
//#define PMS_MODEL_PMS3003 // Enable support of PMS3003 instead of PMS5003/PMS7003 (needs the USE_PMS5003 above)
|
||||
//#define PMS_MODEL_PMSx003T // Enable support for PMSx003T models that report temperature and humidity (needs the USE_PMS5003 above)
|
||||
//#define USE_NOVA_SDS // Add support for SDS011 and SDS021 particle concentration sensor (+1k5 code)
|
||||
#define STARTING_OFFSET 30 // Turn on NovaSDS XX-seconds before tele_period is reached
|
||||
//#define USE_HPMA // Add support for Honeywell HPMA115S0 particle concentration sensor (+1k4)
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
* Hardware Serial will be selected if GPIO3 = [PMS5003]
|
||||
* You can either support PMS3003 or PMS5003-7003 at one time. To enable the PMS3003 support
|
||||
* you must enable the define PMS_MODEL_PMS3003 on your configuration file.
|
||||
* For PMSx003T models that report temperature and humidity define PMS_MODEL_PMSx003T
|
||||
\*********************************************************************************************/
|
||||
|
||||
#define XSNS_18 18
|
||||
|
|
@ -75,7 +76,12 @@ struct pmsX003data {
|
|||
#ifdef PMS_MODEL_PMS3003
|
||||
uint16_t reserved1, reserved2, reserved3;
|
||||
#else
|
||||
uint16_t particles_03um, particles_05um, particles_10um, particles_25um, particles_50um, particles_100um;
|
||||
uint16_t particles_03um, particles_05um, particles_10um, particles_25um;
|
||||
#ifdef PMS_MODEL_PMSx003T
|
||||
uint16_t temperature10x, humidity10x;
|
||||
#else
|
||||
uint16_t particles_50um, particles_100um;
|
||||
#endif
|
||||
uint16_t unused;
|
||||
#endif // PMS_MODEL_PMS3003
|
||||
uint16_t checksum;
|
||||
|
|
@ -289,24 +295,40 @@ const char HTTP_PMS5003_SNS[] PROGMEM =
|
|||
"{s}PMS5003 " D_PARTICALS_BEYOND " 0.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
|
||||
"{s}PMS5003 " D_PARTICALS_BEYOND " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
|
||||
"{s}PMS5003 " D_PARTICALS_BEYOND " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
|
||||
#ifdef PMS_MODEL_PMSx003T
|
||||
"{s}PMS5003 " D_TEMPERATURE "{m}%*_f " D_UNIT_DEGREE "%c{e}"
|
||||
"{s}PMS5003 " D_HUMIDITY "{m}%*_f " D_UNIT_PERCENT "{e}";
|
||||
#else
|
||||
"{s}PMS5003 " D_PARTICALS_BEYOND " 5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"
|
||||
"{s}PMS5003 " D_PARTICALS_BEYOND " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"; // {s} = <tr><th>, {m} = </th><td>, {e} = </td></tr>
|
||||
#endif // PMS_MODEL_PMSx003T
|
||||
#endif // PMS_MODEL_PMS3003
|
||||
#endif // USE_WEBSERVER
|
||||
|
||||
void PmsShow(bool json)
|
||||
{
|
||||
if (Pms.valid) {
|
||||
#ifdef PMS_MODEL_PMSx003T
|
||||
float temperature = ConvertTemp(pms_data.temperature10x/10.0);
|
||||
float humidity = ConvertHumidity(pms_data.humidity10x/10.0);
|
||||
#endif // PMS_MODEL_PMSx003T
|
||||
if (json) {
|
||||
#ifdef PMS_MODEL_PMS3003
|
||||
ResponseAppend_P(PSTR(",\"PMS3003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d}"),
|
||||
pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
|
||||
pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
|
||||
#else
|
||||
ResponseAppend_P(PSTR(",\"PMS5003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d,\"PB0.3\":%d,\"PB0.5\":%d,\"PB1\":%d,\"PB2.5\":%d,\"PB5\":%d,\"PB10\":%d}"),
|
||||
ResponseAppend_P(PSTR(",\"PMS5003\":{\"CF1\":%d,\"CF2.5\":%d,\"CF10\":%d,\"PM1\":%d,\"PM2.5\":%d,\"PM10\":%d,\"PB0.3\":%d,\"PB0.5\":%d,\"PB1\":%d,\"PB2.5\":%d,"),
|
||||
pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
|
||||
pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
|
||||
pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, pms_data.particles_50um, pms_data.particles_100um);
|
||||
pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um);
|
||||
#ifdef PMS_MODEL_PMSx003T
|
||||
ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%*_f,\"" D_JSON_HUMIDITY "\":%*_f}"),
|
||||
Settings->flag2.temperature_resolution, &temperature, Settings->flag2.humidity_resolution, &humidity);
|
||||
#else
|
||||
ResponseAppend_P(PSTR("\"PB5\":%d,\"PB10\":%d}"),
|
||||
pms_data.particles_50um, pms_data.particles_100um);
|
||||
#endif // PMS_MODEL_PMSx003T
|
||||
#endif // PMS_MODEL_PMS3003
|
||||
#ifdef USE_DOMOTICZ
|
||||
if (0 == TasmotaGlobal.tele_period) {
|
||||
|
|
@ -322,6 +344,10 @@ void PmsShow(bool json)
|
|||
WSContentSend_PD(HTTP_PMS3003_SNS,
|
||||
// pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
|
||||
pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env);
|
||||
#elif defined(PMS_MODEL_PMSx003T)
|
||||
WSContentSend_PD(HTTP_PMS5003_SNS,
|
||||
pms_data.pm10_env, pms_data.pm25_env, pms_data.pm100_env,
|
||||
pms_data.particles_03um, pms_data.particles_05um, pms_data.particles_10um, pms_data.particles_25um, Settings->flag2.temperature_resolution, &temperature, TempUnit(), Settings->flag2.humidity_resolution, &humidity);
|
||||
#else
|
||||
WSContentSend_PD(HTTP_PMS5003_SNS,
|
||||
// pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard,
|
||||
|
|
|
|||
Loading…
Reference in New Issue