mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sps30 stop, run (0,1) added

This commit is contained in:
gemu2015 2019-06-14 18:54:40 +02:00
parent e43aa0be18
commit 2dd4750bb7
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
sonoff/xsns_44_sps30.ino
View File

@ -28,6 +28,8 @@
#include <twi.h> #include <twi.h>
uint8_t sps30_ready = 0; uint8_t sps30_ready = 0;
uint8_t sps30_running;
struct SPS30 { struct SPS30 {
float PM1_0; float PM1_0;
float PM2_5; float PM2_5;
@ -69,6 +71,7 @@ uint8_t sps30_calc_CRC(uint8_t *data) {
return crc; return crc;
} }
void CmdClean(void);
unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned int len, unsigned char sendStop); unsigned char twi_readFrom(unsigned char address, unsigned char* buf, unsigned int len, unsigned char sendStop);
@ -132,6 +135,7 @@ void SPS30_Detect() {
sps30_get_data(SPS_CMD_GET_SERIAL,dcode,sizeof(dcode)); sps30_get_data(SPS_CMD_GET_SERIAL,dcode,sizeof(dcode));
AddLog_P2(LOG_LEVEL_DEBUG, PSTR("sps30 found with serial: %s"),dcode); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("sps30 found with serial: %s"),dcode);
sps30_cmd(SPS_CMD_START_MEASUREMENT); sps30_cmd(SPS_CMD_START_MEASUREMENT);
sps30_running = 1;
sps30_ready = 1; sps30_ready = 1;
} }
@ -153,6 +157,8 @@ const char HTTP_SNS_SPS30_c[] PROGMEM ="{s}SPS30 " "TYPSIZ" "{m}%s " "um" "{e}";
void SPS30_Every_Second() { void SPS30_Every_Second() {
if (!sps30_ready) return; if (!sps30_ready) return;
if (!sps30_running) return;
if (uptime%10==0) { if (uptime%10==0) {
uint8_t vars[sizeof(float)*10]; uint8_t vars[sizeof(float)*10];
@ -179,7 +185,7 @@ void SPS30_Every_Second() {
// so count hours, should be in Settings // so count hours, should be in Settings
SPS30_HOURS++; SPS30_HOURS++;
if (SPS30_HOURS>(7*24)) { if (SPS30_HOURS>(7*24)) {
sps30_cmd(SPS_CMD_CLEAN); CmdClean();
SPS30_HOURS=0; SPS30_HOURS=0;
} }
} }
@ -192,6 +198,10 @@ void SPS30_Show(bool json) {
return; return;
} }
if (!sps30_running) {
return;
}
if (json) { if (json) {
dtostrfd(sps30_result.PM1_0,PMDP,str); dtostrfd(sps30_result.PM1_0,PMDP,str);
ResponseAppend_P(PSTR(",\"SPS30\":{\"" "PM1_0" "\":%s"), str); ResponseAppend_P(PSTR(",\"SPS30\":{\"" "PM1_0" "\":%s"), str);
@ -241,22 +251,29 @@ void SPS30_Show(bool json) {
} }
void CmdClean(void) {
sps30_cmd(SPS_CMD_CLEAN);
Response_P(PSTR("{\"" D_JSON_TIME "\":\"%s\""), GetDateAndTime(DT_LOCAL).c_str());
ResponseAppend_P(PSTR(",\"SPS30\":{\"CFAN\":\"true\"}}"));
MqttPublishPrefixTopic_P(TELE, PSTR(D_RSLT_SENSOR), Settings.flag.mqtt_sensor_retain);
}
bool XSNS_44_cmd(void) { bool SPS30_cmd(void) {
boolean serviced = true; bool serviced = true;
const char S_JSON_SPS30[] = "{\"" D_CMND_SENSOR "%d\":%s}";
if (XdrvMailbox.data_len > 0) { if (XdrvMailbox.data_len > 0) {
char *cp=XdrvMailbox.data; char *cp=XdrvMailbox.data;
if (*cp=='c') { if (*cp=='c') {
// clean cmd // clean cmd
sps30_cmd(SPS_CMD_CLEAN); CmdClean();
cp++; } else if (*cp=='0' || *cp=='1') {
snprintf_P(mqtt_data, sizeof(mqtt_data), S_JSON_SPS30, XSNS_44,"clean_fan"); sps30_running=*cp&1;
sps30_cmd(sps30_running?SPS_CMD_START_MEASUREMENT:SPS_CMD_STOP_MEASUREMENT);
} else { } else {
serviced=false; serviced=false;
} }
} }
Response_P(PSTR("{\"SPS30\":\"%s\"}"), sps30_running?"running":"stopped");
return serviced; return serviced;
} }
@ -282,7 +299,7 @@ bool Xsns44(byte function)
break; break;
case FUNC_COMMAND_SENSOR: case FUNC_COMMAND_SENSOR:
if (XSNS_44 == XdrvMailbox.index) { if (XSNS_44 == XdrvMailbox.index) {
result = XSNS_44_cmd(); result = SPS30_cmd();
} }
break; break;
#ifdef USE_WEBSERVER #ifdef USE_WEBSERVER