From b60ccddfe6574ad7b06ad32d28ac0bb1e6153c58 Mon Sep 17 00:00:00 2001 From: arendst Date: Sun, 28 Jan 2018 12:42:42 +0100 Subject: [PATCH] Update PMS5003 naming --- sonoff/_releasenotes.ino | 2 +- sonoff/language/de-DE.h | 6 +++--- sonoff/language/en-GB.h | 6 +++--- sonoff/language/es-AR.h | 6 +++--- sonoff/language/fr-FR.h | 6 +++--- sonoff/language/it-IT.h | 6 +++--- sonoff/language/nl-NL.h | 6 +++--- sonoff/language/pl-PL.h | 6 +++--- sonoff/language/zh-CN.h | 4 ++-- sonoff/xsns_18_pms5003.ino | 33 +++++++++++++++++---------------- 10 files changed, 41 insertions(+), 40 deletions(-) diff --git a/sonoff/_releasenotes.ino b/sonoff/_releasenotes.ino index 00d2ad660..eee381749 100644 --- a/sonoff/_releasenotes.ino +++ b/sonoff/_releasenotes.ino @@ -1,5 +1,5 @@ /* 5.11.1g - * Add support for PMS5003 particle concentration sensor + * Add support for PMS5003 and PMS7003 particle concentration sensor * Reinstate console weblog to 20 lines after some webpage rewrite * Add command SetOption20 to allow update of Dimmer/Color/Ct without turning power on (#1719) * Update language files nl-NL (#1723) and es-AR (#1722) diff --git a/sonoff/language/de-DE.h b/sonoff/language/de-DE.h index 3e749f1b4..55710e89c 100644 --- a/sonoff/language/de-DE.h +++ b/sonoff/language/de-DE.h @@ -376,9 +376,9 @@ #define D_SHT1X_FOUND "SHT1X gefunden" // xsns_18_pms5003.ino -#define D_STANDARD_CONCENTRATION "Std Concentration" -#define D_ENVIRONMENTAL_CONCENTRATION "Env Concentration" -#define D_PARTICALS_BEYOND "Particals beyond" +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Particals" // sonoff_template.h // Max string length is 8 characters including suffixes diff --git a/sonoff/language/en-GB.h b/sonoff/language/en-GB.h index 0204dd882..e5ccdaed6 100644 --- a/sonoff/language/en-GB.h +++ b/sonoff/language/en-GB.h @@ -376,9 +376,9 @@ #define D_SHT1X_FOUND "SHT1X found" // xsns_18_pms5003.ino -#define D_STANDARD_CONCENTRATION "Std Concentration" -#define D_ENVIRONMENTAL_CONCENTRATION "Env Concentration" -#define D_PARTICALS_BEYOND "Particals beyond" +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Particals" // sonoff_template.h // Max string length is 8 characters including suffixes diff --git a/sonoff/language/es-AR.h b/sonoff/language/es-AR.h index a9f1964ff..0ef008469 100644 --- a/sonoff/language/es-AR.h +++ b/sonoff/language/es-AR.h @@ -376,9 +376,9 @@ #define D_SHT1X_FOUND "SHT1X encontrado" // xsns_18_pms5003.ino -#define D_STANDARD_CONCENTRATION "Concentración Standard" -#define D_ENVIRONMENTAL_CONCENTRATION "Concentración en Medio Ambiente" -#define D_PARTICALS_BEYOND "Partículas sobre" +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Partículas" // sonoff_template.h // Max string length is 8 characters including suffixes diff --git a/sonoff/language/fr-FR.h b/sonoff/language/fr-FR.h index 8d130f8f3..7e655c21c 100644 --- a/sonoff/language/fr-FR.h +++ b/sonoff/language/fr-FR.h @@ -376,9 +376,9 @@ #define D_SHT1X_FOUND "SHT1X found" // xsns_18_pms5003.ino -#define D_STANDARD_CONCENTRATION "Concentration standard" -#define D_ENVIRONMENTAL_CONCENTRATION "Concentration environmentale" -#define D_PARTICALS_BEYOND "Particules au-delà" +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Particules" // sonoff_template.h // Max string length is 8 characters including suffixes diff --git a/sonoff/language/it-IT.h b/sonoff/language/it-IT.h index e97a61895..59ae8533d 100644 --- a/sonoff/language/it-IT.h +++ b/sonoff/language/it-IT.h @@ -376,9 +376,9 @@ #define D_SHT1X_FOUND "SHT1X trovato" // xsns_18_pms5003.ino -#define D_STANDARD_CONCENTRATION "Concentrazione Standard" -#define D_ENVIRONMENTAL_CONCENTRATION "Concentrazione Ambientale" -#define D_PARTICALS_BEYOND "Particelle oltre" +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Particelle" // sonoff_template.h // Max string length is 8 characters including suffixes diff --git a/sonoff/language/nl-NL.h b/sonoff/language/nl-NL.h index 14c32755b..f33646579 100644 --- a/sonoff/language/nl-NL.h +++ b/sonoff/language/nl-NL.h @@ -376,9 +376,9 @@ #define D_SHT1X_FOUND "SHT1X gevonden" // xsns_18_pms5003.ino -#define D_STANDARD_CONCENTRATION "Std concentratie" -#define D_ENVIRONMENTAL_CONCENTRATION "Omg concentratie" -#define D_PARTICALS_BEYOND "Deeltjes groter dan" +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Stofdeeltjes" // sonoff_template.h // Max string length is 8 characters including suffixes diff --git a/sonoff/language/pl-PL.h b/sonoff/language/pl-PL.h index 6c9679e2e..c449da210 100644 --- a/sonoff/language/pl-PL.h +++ b/sonoff/language/pl-PL.h @@ -376,9 +376,9 @@ #define D_SHT1X_FOUND "SHT1X znaleziony" // xsns_18_pms5003.ino -#define D_STANDARD_CONCENTRATION "Standard Concentration" -#define D_ENVIRONMENTAL_CONCENTRATION "Environmental Concentration" -#define D_PARTICALS_BEYOND "Particals beyond" +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter +#define D_PARTICALS_BEYOND "Particals" // sonoff_template.h // Max string length is 8 characters including suffixes diff --git a/sonoff/language/zh-CN.h b/sonoff/language/zh-CN.h index 510f96f51..929da46d5 100644 --- a/sonoff/language/zh-CN.h +++ b/sonoff/language/zh-CN.h @@ -376,8 +376,8 @@ #define D_SHT1X_FOUND "发现 SHT1X 传感器" // xsns_18_pms5003.ino -#define D_STANDARD_CONCENTRATION "标准颗粒物浓度" -#define D_ENVIRONMENTAL_CONCENTRATION "大气环境下浓度" +#define D_STANDARD_CONCENTRATION "CF-1 PM" // Standard Particle CF-1 Particle Matter +#define D_ENVIRONMENTAL_CONCENTRATION "PM" // Environmetal Particle Matter #define D_PARTICALS_BEYOND "颗粒物直径大于" // sonoff_template.h diff --git a/sonoff/xsns_18_pms5003.ino b/sonoff/xsns_18_pms5003.ino index 3d73729f0..ab000eab2 100644 --- a/sonoff/xsns_18_pms5003.ino +++ b/sonoff/xsns_18_pms5003.ino @@ -1,5 +1,5 @@ /* - xsns_18_pms5003.ino - PMS5003 particle concentration sensor support for Sonoff-Tasmota + xsns_18_pms5003.ino - PMS5003-7003 particle concentration sensor support for Sonoff-Tasmota Copyright (C) 2018 Theo Arends @@ -19,7 +19,8 @@ #ifdef USE_PMS5003 /*********************************************************************************************\ - * PlanTower PMS5003 particle concentration sensor + * PlanTower PMS5003 and PMS7003 particle concentration sensor + * For background information see http://aqicn.org/sensor/pms5003-7003/ \*********************************************************************************************/ #include @@ -105,32 +106,32 @@ void PmsInit() #ifdef USE_WEBSERVER const char HTTP_PMS5003_SNS[] PROGMEM = "%s" - "{s}" D_STANDARD_CONCENTRATION " 1" D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" - "{s}" D_STANDARD_CONCENTRATION " 2" D_DECIMAL_SEPARATOR "5" D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" - "{s}" D_STANDARD_CONCENTRATION " 10" D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" - "{s}" D_ENVIRONMENTAL_CONCENTRATION " 1" D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" - "{s}" D_ENVIRONMENTAL_CONCENTRATION " 2" D_DECIMAL_SEPARATOR "5" D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" - "{s}" D_ENVIRONMENTAL_CONCENTRATION " 10" D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" - "{s}" D_PARTICALS_BEYOND " 0" D_DECIMAL_SEPARATOR "3" D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}" - "{s}" D_PARTICALS_BEYOND " 0" D_DECIMAL_SEPARATOR "5" D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}" - "{s}" D_PARTICALS_BEYOND " 1" D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}" - "{s}" D_PARTICALS_BEYOND " 2" D_DECIMAL_SEPARATOR "5" D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}" - "{s}" D_PARTICALS_BEYOND " 5" D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}" - "{s}" D_PARTICALS_BEYOND " 10" D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}"; // {s} = , {m} = , {e} = +// "{s}PMS5003 " D_STANDARD_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" +// "{s}PMS5003 " D_STANDARD_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" +// "{s}PMS5003 " D_STANDARD_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" + "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 1 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" + "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 2.5 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" + "{s}PMS5003 " D_ENVIRONMENTAL_CONCENTRATION " 10 " D_UNIT_MICROMETER "{m}%d " D_UNIT_MICROGRAM_PER_CUBIC_METER "{e}" + "{s}PMS5003 " D_PARTICALS_BEYOND " 0.3 " D_UNIT_MICROMETER "{m}%d " D_UNIT_PARTS_PER_DECILITER "{e}" + "{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}" + "{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} = , {m} = , {e} = #endif // USE_WEBSERVER void PmsShow(boolean json) { if (pms_valid) { if (json) { - snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"PMS5003\":{\"SC1\":%d,\"SC2.5\":%d,\"SC10\":%d,\"EC1\":%d,\"EC2.5\":%d,\"EC10\":%d,\"PB0.3\":%d,\"PB0.5\":%d,\"PB1\":%d,\"PB2.5\":%d,\"PB5\":%d,\"PB10\":%d}"), mqtt_data, + snprintf_P(mqtt_data, sizeof(mqtt_data), PSTR("%s,\"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}"), mqtt_data, 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); #ifdef USE_WEBSERVER } else { snprintf_P(mqtt_data, sizeof(mqtt_data), HTTP_PMS5003_SNS, mqtt_data, - pms_data.pm10_standard, pms_data.pm25_standard, pms_data.pm100_standard, +// 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); #endif // USE_WEBSERVER