mirror of https://github.com/arendst/Tasmota.git
update sps30
This commit is contained in:
parent
e26509f0de
commit
c3fd4b4cab
|
@ -346,6 +346,7 @@
|
|||
// #define USE_MGC3130 // Enable MGC3130 Electric Field Effect Sensor (I2C address 0x42) (+2k7 code, 0k3 mem)
|
||||
// #define USE_MAX44009 // Enable MAX44009 Ambient Light sensor (I2C addresses 0x4A and 0x4B) (+0k8 code)
|
||||
// #define USE_SCD30 // Enable Sensiron SCd30 CO2 sensor (I2C address 0x61) (+3k3 code)
|
||||
// #define USE_SPS30 // Enable Sensiron SPS30 particle sensor (I2C address 0x69) (+3k3 code)
|
||||
#define USE_ADE7953 // Enable ADE7953 Energy monitor as used on Shelly 2.5 (I2C address 0x38) (+1k5)
|
||||
|
||||
// #define USE_DISPLAY // Add I2C Display Support (+2k code)
|
||||
|
|
|
@ -139,17 +139,9 @@ void SPS30_Detect() {
|
|||
#define D_UNIT_NCPM "#/m3"
|
||||
|
||||
#ifdef USE_WEBSERVER
|
||||
const char HTTP_SNS_SPS30_a[] PROGMEM ="{s}SPS30 " "PM 1.0" "{m}%s " D_UNIT_PM "{e}";
|
||||
const char HTTP_SNS_SPS30_b[] PROGMEM ="{s}SPS30 " "PM 2.5" "{m}%s " D_UNIT_PM "{e}";
|
||||
const char HTTP_SNS_SPS30_c[] PROGMEM ="{s}SPS30 " "PM 4.0" "{m}%s " D_UNIT_PM "{e}";
|
||||
const char HTTP_SNS_SPS30_d[] PROGMEM ="{s}SPS30 " "PM 10" "{m}%s " D_UNIT_PM "{e}";
|
||||
const char HTTP_SNS_SPS30_e[] PROGMEM ="{s}SPS30 " "NCPM 0.5" "{m}%s " D_UNIT_NCPM "{e}";
|
||||
const char HTTP_SNS_SPS30_f[] PROGMEM ="{s}SPS30 " "NCPM 1.0" "{m}%s " D_UNIT_NCPM "{e}";
|
||||
const char HTTP_SNS_SPS30_g[] PROGMEM ="{s}SPS30 " "NCPM 2.5" "{m}%s " D_UNIT_NCPM "{e}";
|
||||
const char HTTP_SNS_SPS30_h[] PROGMEM ="{s}SPS30 " "NCPM 4.0" "{m}%s " D_UNIT_NCPM "{e}";
|
||||
const char HTTP_SNS_SPS30_i[] PROGMEM ="{s}SPS30 " "NCPM 10" "{m}%s " D_UNIT_NCPM "{e}";
|
||||
const char HTTP_SNS_SPS30_j[] PROGMEM ="{s}SPS30 " "TYPSIZ" "{m}%s " "um" "{e}";
|
||||
|
||||
const char HTTP_SNS_SPS30_a[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_PM "{e}";
|
||||
const char HTTP_SNS_SPS30_b[] PROGMEM ="{s}SPS30 " "%s" "{m}%s " D_UNIT_NCPM "{e}";
|
||||
const char HTTP_SNS_SPS30_c[] PROGMEM ="{s}SPS30 " "TYPSIZ" "{m}%s " "um" "{e}";
|
||||
#endif // USE_WEBSERVER
|
||||
|
||||
#define PMDP 2
|
||||
|
@ -225,25 +217,25 @@ void SPS30_Show(bool json) {
|
|||
#ifdef USE_WEBSERVER
|
||||
} else {
|
||||
dtostrfd(sps30_result.PM1_0,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_a,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 1.0",str);
|
||||
dtostrfd(sps30_result.PM2_5,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_b,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 2.5",str);
|
||||
dtostrfd(sps30_result.PM4_0,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_c,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 4.0",str);
|
||||
dtostrfd(sps30_result.PM10,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_d,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_a,"PM 10",str);
|
||||
dtostrfd(sps30_result.NCPM0_5,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_e,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 0.5",str);
|
||||
dtostrfd(sps30_result.NCPM1_0,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_f,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 1.0",str);
|
||||
dtostrfd(sps30_result.NCPM2_5,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_g,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 2.5",str);
|
||||
dtostrfd(sps30_result.NCPM4_0,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_h,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 4.0",str);
|
||||
dtostrfd(sps30_result.NCPM10,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_i,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_b,"NCPM 10",str);
|
||||
dtostrfd(sps30_result.TYPSIZ,PMDP,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_j,str);
|
||||
WSContentSend_PD(HTTP_SNS_SPS30_c,str);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue