Colin Shorts
6 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
85 changed files with 20238 additions and 18270 deletions
Unified View
Diff Options
-
+2 -2.github/stale.yml
-
+39 -0CHANGELOG.md
-
+29 -14README.md
-
+7 -2code/build.sh
-
+1 -1code/eagle.flash.1m0m1s.ld
-
+3 -3code/eagle.flash.1m0m2s.ld
-
+20 -0code/eagle.flash.2m1m4s.ld
-
+1 -1code/eagle.flash.4m1m4s.ld
-
+1 -1code/eagle.flash.4m3m4e.ld
-
+1 -1code/eagle.flash.512k0m1s.ld
-
+73 -32code/espurna/alexa.ino
-
+2 -1code/espurna/config/all.h
-
+10 -0code/espurna/config/arduino.h
-
+139 -3code/espurna/config/defaults.h
-
+0 -51code/espurna/config/dependencies.h
-
+80 -13code/espurna/config/general.h
-
+230 -11code/espurna/config/hardware.h
-
+6 -0code/espurna/config/progmem.h
-
+3 -4code/espurna/config/prototypes.h
-
+39 -20code/espurna/config/sensors.h
-
+8 -0code/espurna/config/types.h
-
+1 -1code/espurna/config/version.h
-
+73 -0code/espurna/config/webui.h
-
BINcode/espurna/data/index.all.html.gz
-
BINcode/espurna/data/index.light.html.gz
-
BINcode/espurna/data/index.rfbridge.html.gz
-
BINcode/espurna/data/index.rfm69.html.gz
-
BINcode/espurna/data/index.sensor.html.gz
-
BINcode/espurna/data/index.small.html.gz
-
+6 -1code/espurna/domoticz.ino
-
+4 -0code/espurna/eeprom.ino
-
+156 -0code/espurna/encoder.ino
-
+16 -2code/espurna/espurna.ino
-
+40 -0code/espurna/filters/LastFilter.h
-
+22 -10code/espurna/homeassistant.ino
-
+10 -5code/espurna/influxdb.ino
-
+341 -35code/espurna/ir.ino
-
+2 -2code/espurna/led.ino
-
+90 -77code/espurna/light.ino
-
+102 -0code/espurna/migrate.ino
-
+14 -6code/espurna/mqtt.ino
-
+2 -2code/espurna/nofuss.ino
-
+2 -2code/espurna/ntp.ino
-
+4 -7code/espurna/ota.ino
-
+19 -17code/espurna/pwm.c
-
+4 -3code/espurna/relay.ino
-
+2 -2code/espurna/rfm69.ino
-
+2 -2code/espurna/scheduler.ino
-
+131 -36code/espurna/sensor.ino
-
+2 -2code/espurna/sensors/CSE7766Sensor.h
-
+10 -2code/espurna/sensors/DHTSensor.h
-
+15 -0code/espurna/sensors/ECH1560Sensor.h
-
+5 -0code/espurna/sensors/EmonSensor.h
-
+4 -2code/espurna/sensors/HLW8012Sensor.h
-
+3 -0code/espurna/sensors/PMSX003Sensor.h
-
+12 -1code/espurna/sensors/PZEM004TSensor.h
-
+173 -0code/espurna/sensors/SDS011Sensor.h
-
+0 -2code/espurna/sensors/SI7021Sensor.h
-
+21 -6code/espurna/sensors/V9261FSensor.h
-
+1 -5code/espurna/settings.ino
-
+3105 -3046code/espurna/static/index.all.html.gz.h
-
+2966 -2962code/espurna/static/index.light.html.gz.h
-
+2562 -2558code/espurna/static/index.rfbridge.html.gz.h
-
+4035 -4031code/espurna/static/index.rfm69.html.gz.h
-
+2616 -2601code/espurna/static/index.sensor.html.gz.h
-
+2521 -2517code/espurna/static/index.small.html.gz.h
-
+41 -3code/espurna/telnet.ino
-
+2 -2code/espurna/thinkspeak.ino
-
+71 -45code/espurna/utils.ino
-
+2 -2code/espurna/web.ino
-
+16 -5code/espurna/wifi.ino
-
+2 -17code/espurna/ws.ino
-
+0 -4code/extra_scripts.py
-
+3 -3code/gulpfile.js
-
+60 -53code/html/custom.js
-
+38 -22code/html/index.html
-
+8 -2code/ota.py
-
+206 -4code/platformio.ini
-
BINimages/devices/ag-l4.jpg
-
BINimages/devices/allterco-shelly1.jpg
-
BINimages/devices/blitzwolf-bw-shp2.jpg
-
BINimages/devices/homecube-16a.jpg
-
BINimages/devices/itead-s26.jpg
-
BINimages/devices/lohas-9w.jpg
-
+1 -3pre-commit
+ 2
- 2
.github/stale.yml
View File
+ 39
- 0
CHANGELOG.md
View File
+ 29
- 14
README.md
View File
+ 7
- 2
code/build.sh
View File
+ 1
- 1
code/eagle.flash.1m0m1s.ld
View File
+ 3
- 3
code/eagle.flash.1m0m2s.ld
View File
+ 20
- 0
code/eagle.flash.2m1m4s.ld
View File
| @ -0,0 +1,20 @@ | |||||
| /* Flash Split for 2M chips, ~1M SPIFFS, 4 sectors for EEPROM */ | |||||
| /* sketch 1019KB */ | |||||
| /* spiffs 992KB */ | |||||
| /* eeprom 16KB */ | |||||
| /* reserved 16KB */ | |||||
| MEMORY | |||||
| { | |||||
| dport0_0_seg : org = 0x3FF00000, len = 0x10 | |||||
| dram0_0_seg : org = 0x3FFE8000, len = 0x14000 | |||||
| iram1_0_seg : org = 0x40100000, len = 0x8000 | |||||
| irom0_0_seg : org = 0x40201010, len = 0xfeff0 | |||||
| } | |||||
| PROVIDE ( _SPIFFS_start = 0x40300000 ); | |||||
| PROVIDE ( _SPIFFS_end = 0x403F8000 ); | |||||
| PROVIDE ( _SPIFFS_page = 0x100 ); | |||||
| PROVIDE ( _SPIFFS_block = 0x2000 ); | |||||
| INCLUDE "../ld/eagle.app.v6.common.ld" | |||||
+ 1
- 1
code/eagle.flash.4m1m4s.ld
View File
+ 1
- 1
code/eagle.flash.4m3m4e.ld
View File
+ 1
- 1
code/eagle.flash.512k0m1s.ld
View File
+ 73
- 32
code/espurna/alexa.ino
View File
+ 2
- 1
code/espurna/config/all.h
View File
+ 10
- 0
code/espurna/config/arduino.h
View File
+ 139
- 3
code/espurna/config/defaults.h
View File
+ 0
- 51
code/espurna/config/dependencies.h
View File
+ 80
- 13
code/espurna/config/general.h
View File
+ 230
- 11
code/espurna/config/hardware.h
View File
+ 6
- 0
code/espurna/config/progmem.h
View File
+ 3
- 4
code/espurna/config/prototypes.h
View File
+ 39
- 20
code/espurna/config/sensors.h
View File
+ 8
- 0
code/espurna/config/types.h
View File
+ 1
- 1
code/espurna/config/version.h
View File
| @ -1,5 +1,5 @@ | |||||
| #define APP_NAME "ESPURNA" | #define APP_NAME "ESPURNA" | ||||
| #define APP_VERSION "1.13.2b" | |||||
| #define APP_VERSION "1.13.3a" | |||||
| #define APP_AUTHOR "xose.perez@gmail.com" | #define APP_AUTHOR "xose.perez@gmail.com" | ||||
| #define APP_WEBSITE "http://tinkerman.cat" | #define APP_WEBSITE "http://tinkerman.cat" | ||||
| #define CFG_VERSION 3 | #define CFG_VERSION 3 | ||||
+ 73
- 0
code/espurna/config/webui.h
View File
| @ -0,0 +1,73 @@ | |||||
| // ----------------------------------------------------------------------------- | |||||
| // WEB UI IMAGE | |||||
| // ----------------------------------------------------------------------------- | |||||
| #define WEBUI_IMAGE_SMALL 0 | |||||
| #define WEBUI_IMAGE_LIGHT 1 | |||||
| #define WEBUI_IMAGE_SENSOR 2 | |||||
| #define WEBUI_IMAGE_RFBRIDGE 4 | |||||
| #define WEBUI_IMAGE_RFM69 8 | |||||
| #define WEBUI_IMAGE_FULL 15 | |||||
| #if LIGHT_PROVIDER != LIGHT_PROVIDER_NONE | |||||
| #ifdef WEBUI_IMAGE | |||||
| #undef WEBUI_IMAGE | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_FULL | |||||
| #else | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_LIGHT | |||||
| #endif | |||||
| #endif | |||||
| #if SENSOR_SUPPORT == 1 | |||||
| #ifndef WEBUI_IMAGE | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_SENSOR | |||||
| #else | |||||
| #undef WEBUI_IMAGE | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_FULL | |||||
| #endif | |||||
| #endif | |||||
| #if defined(ITEAD_SONOFF_RFBRIDGE) | |||||
| #ifndef WEBUI_IMAGE | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_RFBRIDGE | |||||
| #else | |||||
| #undef WEBUI_IMAGE | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_FULL | |||||
| #endif | |||||
| #endif | |||||
| #if RFM69_SUPPORT == 1 | |||||
| #ifndef WEBUI_IMAGE | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_RFM69 | |||||
| #else | |||||
| #undef WEBUI_IMAGE | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_FULL | |||||
| #endif | |||||
| #endif | |||||
| #ifndef WEBUI_IMAGE | |||||
| #define WEBUI_IMAGE WEBUI_IMAGE_SMALL | |||||
| #endif | |||||
| #include <pgmspace.h> | |||||
| PROGMEM const char espurna_webui[] = | |||||
| #if WEBUI_IMAGE == WEBUI_IMAGE_SMALL | |||||
| "SMALL" | |||||
| #endif | |||||
| #if WEBUI_IMAGE == WEBUI_IMAGE_LIGHT | |||||
| "LIGHT" | |||||
| #endif | |||||
| #if WEBUI_IMAGE == WEBUI_IMAGE_SENSOR | |||||
| "SENSOR" | |||||
| #endif | |||||
| #if WEBUI_IMAGE == WEBUI_IMAGE_RFBRIDGE | |||||
| "RFBRIDGE" | |||||
| #endif | |||||
| #if WEBUI_IMAGE == WEBUI_IMAGE_RFM69 | |||||
| "RFM69" | |||||
| #endif | |||||
| #if WEBUI_IMAGE == WEBUI_IMAGE_FULL | |||||
| "FULL" | |||||
| #endif | |||||
| ""; | |||||
BIN
code/espurna/data/index.all.html.gz
View File
BIN
code/espurna/data/index.light.html.gz
View File
BIN
code/espurna/data/index.rfbridge.html.gz
View File
BIN
code/espurna/data/index.rfm69.html.gz
View File
BIN
code/espurna/data/index.sensor.html.gz
View File
BIN
code/espurna/data/index.small.html.gz
View File
+ 6
- 1
code/espurna/domoticz.ino
View File
+ 4
- 0
code/espurna/eeprom.ino
View File
+ 156
- 0
code/espurna/encoder.ino
View File
| @ -0,0 +1,156 @@ | |||||
| /* | |||||
| ENCODER MODULE | |||||
| Copyright (C) 2018 by Xose Pérez <xose dot perez at gmail dot com> | |||||
| */ | |||||
| #if ENCODER_SUPPORT && (LIGHT_PROVIDER != LIGHT_PROVIDER_NONE) | |||||
| #include <Encoder.h> | |||||
| #include <vector> | |||||
| typedef struct { | |||||
| Encoder * encoder; | |||||
| unsigned char button_pin; | |||||
| unsigned char button_logic; | |||||
| unsigned char button_mode; | |||||
| unsigned char mode; | |||||
| unsigned char channel1; // default | |||||
| unsigned char channel2; // only if button defined and pressed | |||||
| } encoder_t; | |||||
| std::vector<encoder_t> _encoders; | |||||
| void _encoderConfigure() { | |||||
| // Clean previous encoders | |||||
| for (unsigned char i=0; i<_encoders.size(); i++) { | |||||
| free(_encoders[i].encoder); | |||||
| } | |||||
| _encoders.clear(); | |||||
| // Load encoders | |||||
| #if (ENCODER1_PIN1 != GPIO_NONE) && (ENCODER1_PIN2 != GPIO_NONE) | |||||
| { | |||||
| _encoders.push_back({ | |||||
| new Encoder(ENCODER1_PIN1, ENCODER1_PIN2), | |||||
| ENCODER1_BUTTON_PIN, ENCODER1_BUTTON_LOGIC, ENCODER1_BUTTON_MODE, ENCODER1_MODE, | |||||
| ENCODER1_CHANNEL1, ENCODER1_CHANNEL2 | |||||
| }); | |||||
| } | |||||
| #endif | |||||
| #if (ENCODER2_PIN1 != GPIO_NONE) && (ENCODER2_PIN2 != GPIO_NONE) | |||||
| { | |||||
| _encoders.push_back({ | |||||
| new Encoder(ENCODER2_PIN1, ENCODER2_PIN2), | |||||
| ENCODER2_BUTTON_PIN, ENCODER2_BUTTON_LOGIC, ENCODER2_BUTTON_MODE, ENCODER2_MODE, | |||||
| ENCODER2_CHANNEL1, ENCODER2_CHANNEL2 | |||||
| }); | |||||
| } | |||||
| #endif | |||||
| #if (ENCODER3_PIN1 != GPIO_NONE) && (ENCODER3_PIN2 != GPIO_NONE) | |||||
| { | |||||
| _encoders.push_back({ | |||||
| new Encoder(ENCODER3_PIN1, ENCODER3_PIN2), | |||||
| ENCODER3_BUTTON_PIN, ENCODER3_BUTTON_LOGIC, ENCODER3_BUTTON_MODE, ENCODER3_MODE, | |||||
| ENCODER3_CHANNEL1, ENCODER3_CHANNEL2 | |||||
| }); | |||||
| } | |||||
| #endif | |||||
| #if (ENCODER4_PIN1 != GPIO_NONE) && (ENCODER4_PIN2 != GPIO_NONE) | |||||
| { | |||||
| _encoders.push_back({ | |||||
| new Encoder(ENCODER4_PIN1, ENCODER4_PIN2), | |||||
| ENCODER4_BUTTON_PIN, ENCODER4_BUTTON_LOGIC, ENCODER4_BUTTON_MODE, ENCODER4_MODE, | |||||
| ENCODER4_CHANNEL1, ENCODER4_CHANNEL2 | |||||
| }); | |||||
| } | |||||
| #endif | |||||
| #if (ENCODER5_PIN1 != GPIO_NONE) && (ENCODER5_PIN2 != GPIO_NONE) | |||||
| { | |||||
| _encoders.push_back({ | |||||
| new Encoder(ENCODER5_PIN1, ENCODER5_PIN2), | |||||
| ENCODER5_BUTTON_PIN, ENCODER5_BUTTON_LOGIC, ENCODER5_BUTTON_MODE, ENCODER5_MODE, | |||||
| ENCODER5_CHANNEL1, ENCODER5_CHANNEL2 | |||||
| }); | |||||
| } | |||||
| #endif | |||||
| // Setup encoders | |||||
| for (unsigned char i=0; i<_encoders.size(); i++) { | |||||
| if (GPIO_NONE != _encoders[i].button_pin) { | |||||
| pinMode(_encoders[i].button_pin, _encoders[i].button_mode); | |||||
| } | |||||
| } | |||||
| } | |||||
| void _encoderLoop() { | |||||
| // for each encoder | |||||
| for (unsigned char i=0; i<_encoders.size(); i++) { | |||||
| // get encoder | |||||
| encoder_t encoder = _encoders[i]; | |||||
| // read encoder | |||||
| long delta = encoder.encoder->read(); | |||||
| encoder.encoder->write(0); | |||||
| if (0 == delta) continue; | |||||
| DEBUG_MSG_P(PSTR("[ENCODER] Delta: %d\n"), delta); | |||||
| // action | |||||
| if (encoder.button_pin == GPIO_NONE) { | |||||
| // if there is no button, the encoder driver the CHANNEL1 | |||||
| lightChannelStep(encoder.channel1, delta); | |||||
| } else { | |||||
| // check if button is pressed | |||||
| bool pressed = (digitalRead(encoder.button_pin) != encoder.button_logic); | |||||
| if (ENCODER_MODE_CHANNEL == encoder.mode) { | |||||
| // the button controls what channel we are changing | |||||
| lightChannelStep(pressed ? encoder.channel2 : encoder.channel1, delta); | |||||
| } if (ENCODER_MODE_RATIO == encoder.mode) { | |||||
| // the button controls if we are changing the channel ratio or the overall brightness | |||||
| if (pressed) { | |||||
| lightChannelStep(encoder.channel1, delta); | |||||
| lightChannelStep(encoder.channel2, -delta); | |||||
| } else { | |||||
| lightBrightnessStep(delta); | |||||
| } | |||||
| } | |||||
| } | |||||
| lightUpdate(true, true); | |||||
| } | |||||
| } | |||||
| // ----------------------------------------------------------------------------- | |||||
| void encoderSetup() { | |||||
| // Configure encoders | |||||
| _encoderConfigure(); | |||||
| // Main callbacks | |||||
| espurnaRegisterLoop(_encoderLoop); | |||||
| espurnaRegisterReload(_encoderConfigure); | |||||
| DEBUG_MSG_P(PSTR("[ENCODER] Number of encoders: %u\n"), _encoders.size()); | |||||
| } | |||||
| #endif // ENCODER_SUPPORT && (LIGHT_PROVIDER != LIGHT_PROVIDER_NONE) | |||||
+ 16
- 2
code/espurna/espurna.ino
View File
+ 40
- 0
code/espurna/filters/LastFilter.h
View File
| @ -0,0 +1,40 @@ | |||||
| // ----------------------------------------------------------------------------- | |||||
| // Last Filter | |||||
| // Copyright (C) 2017-2018 by Xose Pérez <xose dot perez at gmail dot com> | |||||
| // ----------------------------------------------------------------------------- | |||||
| #if SENSOR_SUPPORT | |||||
| #pragma once | |||||
| #include "BaseFilter.h" | |||||
| class LastFilter : public BaseFilter { | |||||
| public: | |||||
| void add(double value) { | |||||
| _value = value; | |||||
| } | |||||
| unsigned char count() { | |||||
| return 1; | |||||
| } | |||||
| void reset() { | |||||
| _value = 0; | |||||
| } | |||||
| double result() { | |||||
| return _value; | |||||
| } | |||||
| void resize(unsigned char size) {} | |||||
| protected: | |||||
| double _value = 0; | |||||
| }; | |||||
| #endif // SENSOR_SUPPORT | |||||
+ 22
- 10
code/espurna/homeassistant.ino
View File
+ 10
- 5
code/espurna/influxdb.ino
View File
+ 341
- 35
code/espurna/ir.ino
View File
+ 2
- 2
code/espurna/led.ino
View File
+ 90
- 77
code/espurna/light.ino
View File
+ 102
- 0
code/espurna/migrate.ino
View File
+ 14
- 6
code/espurna/mqtt.ino
View File
+ 2
- 2
code/espurna/nofuss.ino
View File
+ 2
- 2
code/espurna/ntp.ino
View File
+ 4
- 7
code/espurna/ota.ino
View File
+ 19
- 17
code/espurna/pwm.c
View File
+ 4
- 3
code/espurna/relay.ino
View File
+ 2
- 2
code/espurna/rfm69.ino
View File
+ 2
- 2
code/espurna/scheduler.ino
View File
+ 131
- 36
code/espurna/sensor.ino
View File
+ 2
- 2
code/espurna/sensors/CSE7766Sensor.h
View File
+ 10
- 2
code/espurna/sensors/DHTSensor.h
View File
+ 15
- 0
code/espurna/sensors/ECH1560Sensor.h
View File
+ 5
- 0
code/espurna/sensors/EmonSensor.h
View File
+ 4
- 2
code/espurna/sensors/HLW8012Sensor.h
View File
+ 3
- 0
code/espurna/sensors/PMSX003Sensor.h
View File
+ 12
- 1
code/espurna/sensors/PZEM004TSensor.h
View File
+ 173
- 0
code/espurna/sensors/SDS011Sensor.h
View File
| @ -0,0 +1,173 @@ | |||||
| // ----------------------------------------------------------------------------- | |||||
| // SDS011 particulates sensor | |||||
| // Based on: https://github.com/ricki-z/SDS011 | |||||
| // | |||||
| // Uses SoftwareSerial library | |||||
| // Copyright (C) 2018 by Lucas Pleß <hello at lucas-pless dot com> | |||||
| // ----------------------------------------------------------------------------- | |||||
| #if SENSOR_SUPPORT && SDS011_SUPPORT | |||||
| #pragma once | |||||
| #include "Arduino.h" | |||||
| #include "BaseSensor.h" | |||||
| #include <SoftwareSerial.h> | |||||
| class SDS011Sensor : public BaseSensor { | |||||
| public: | |||||
| // --------------------------------------------------------------------- | |||||
| // Public | |||||
| // --------------------------------------------------------------------- | |||||
| SDS011Sensor(): BaseSensor() { | |||||
| _count = 2; | |||||
| _sensor_id = SENSOR_SDS011_ID; | |||||
| } | |||||
| ~SDS011Sensor() { | |||||
| if (_serial) delete _serial; | |||||
| } | |||||
| // --------------------------------------------------------------------- | |||||
| void setRX(unsigned char pin_rx) { | |||||
| if (_pin_rx == pin_rx) return; | |||||
| _pin_rx = pin_rx; | |||||
| _dirty = true; | |||||
| } | |||||
| void setTX(unsigned char pin_tx) { | |||||
| if (_pin_tx == pin_tx) return; | |||||
| _pin_tx = pin_tx; | |||||
| _dirty = true; | |||||
| } | |||||
| // --------------------------------------------------------------------- | |||||
| unsigned char getRX() { | |||||
| return _pin_rx; | |||||
| } | |||||
| unsigned char getTX() { | |||||
| return _pin_tx; | |||||
| } | |||||
| // --------------------------------------------------------------------- | |||||
| // Sensor API | |||||
| // --------------------------------------------------------------------- | |||||
| // Initialization method, must be idempotent | |||||
| void begin() { | |||||
| if (!_dirty) return; | |||||
| if (_serial) delete _serial; | |||||
| _serial = new SoftwareSerial(_pin_rx, _pin_tx); | |||||
| _serial->begin(9600); | |||||
| _ready = true; | |||||
| _dirty = false; | |||||
| } | |||||
| // Descriptive name of the sensor | |||||
| String description() { | |||||
| char buffer[28]; | |||||
| snprintf(buffer, sizeof(buffer), "SDS011 @ SwSerial(%u,%u)", _pin_rx, _pin_tx); | |||||
| return String(buffer); | |||||
| } | |||||
| // Descriptive name of the slot # index | |||||
| String slot(unsigned char index) { | |||||
| return description(); | |||||
| }; | |||||
| // Address of the sensor (it could be the GPIO or I2C address) | |||||
| String address(unsigned char index) { | |||||
| char buffer[6]; | |||||
| snprintf(buffer, sizeof(buffer), "%u:%u", _pin_rx, _pin_tx); | |||||
| return String(buffer); | |||||
| } | |||||
| // Type for slot # index | |||||
| unsigned char type(unsigned char index) { | |||||
| if (index == 0) return MAGNITUDE_PM2dot5; | |||||
| if (index == 1) return MAGNITUDE_PM10; | |||||
| return MAGNITUDE_NONE; | |||||
| } | |||||
| void pre() { | |||||
| _read(); | |||||
| } | |||||
| // Current value for slot # index | |||||
| double value(unsigned char index) { | |||||
| if (index == 0) return _p2dot5; | |||||
| if (index == 1) return _p10; | |||||
| return 0; | |||||
| } | |||||
| protected: | |||||
| // --------------------------------------------------------------------- | |||||
| // Protected | |||||
| // --------------------------------------------------------------------- | |||||
| void _read() { | |||||
| byte buffer; | |||||
| int value; | |||||
| int len = 0; | |||||
| int pm10_serial = 0; | |||||
| int pm25_serial = 0; | |||||
| int checksum_is; | |||||
| int checksum_ok = 0; | |||||
| while ((_serial->available() > 0) && (_serial->available() >= (10-len))) { | |||||
| buffer = _serial->read(); | |||||
| value = int(buffer); | |||||
| switch (len) { | |||||
| case (0): if (value != 170) { len = -1; }; break; | |||||
| case (1): if (value != 192) { len = -1; }; break; | |||||
| case (2): pm25_serial = value; checksum_is = value; break; | |||||
| case (3): pm25_serial += (value << 8); checksum_is += value; break; | |||||
| case (4): pm10_serial = value; checksum_is += value; break; | |||||
| case (5): pm10_serial += (value << 8); checksum_is += value; break; | |||||
| case (6): checksum_is += value; break; | |||||
| case (7): checksum_is += value; break; | |||||
| case (8): if (value == (checksum_is % 256)) { checksum_ok = 1; } else { len = -1; }; break; | |||||
| case (9): if (value != 171) { len = -1; }; break; | |||||
| } | |||||
| len++; | |||||
| if (len == 10) { | |||||
| if(checksum_ok == 1) { | |||||
| _p10 = (float)pm10_serial/10.0; | |||||
| _p2dot5 = (float)pm25_serial/10.0; | |||||
| len = 0; checksum_ok = 0; pm10_serial = 0.0; pm25_serial = 0.0; checksum_is = 0; | |||||
| _error = SENSOR_ERROR_OK; | |||||
| } else { | |||||
| _error = SENSOR_ERROR_CRC; | |||||
| } | |||||
| } | |||||
| yield(); | |||||
| } | |||||
| } | |||||
| double _p2dot5 = 0; | |||||
| double _p10 = 0; | |||||
| unsigned int _pin_rx; | |||||
| unsigned int _pin_tx; | |||||
| SoftwareSerial * _serial = NULL; | |||||
| }; | |||||
| #endif // SENSOR_SUPPORT && SDS011_SUPPORT | |||||
+ 0
- 2
code/espurna/sensors/SI7021Sensor.h
View File
+ 21
- 6
code/espurna/sensors/V9261FSensor.h
View File
+ 1
- 5
code/espurna/settings.ino
View File
+ 3105
- 3046
code/espurna/static/index.all.html.gz.h
File diff suppressed because it is too large
View File
+ 2966
- 2962
code/espurna/static/index.light.html.gz.h
File diff suppressed because it is too large
View File
+ 2562
- 2558
code/espurna/static/index.rfbridge.html.gz.h
File diff suppressed because it is too large
View File
+ 4035
- 4031
code/espurna/static/index.rfm69.html.gz.h
File diff suppressed because it is too large
View File
+ 2616
- 2601
code/espurna/static/index.sensor.html.gz.h
File diff suppressed because it is too large
View File
+ 2521
- 2517
code/espurna/static/index.small.html.gz.h
File diff suppressed because it is too large
View File
+ 41
- 3
code/espurna/telnet.ino
View File
+ 2
- 2
code/espurna/thinkspeak.ino
View File
+ 71
- 45
code/espurna/utils.ino
View File
+ 2
- 2
code/espurna/web.ino
View File
+ 16
- 5
code/espurna/wifi.ino
View File
+ 2
- 17
code/espurna/ws.ino
View File
+ 0
- 4
code/extra_scripts.py
View File
+ 3
- 3
code/gulpfile.js
View File
+ 60
- 53
code/html/custom.js
View File
+ 38
- 22
code/html/index.html
View File
+ 8
- 2
code/ota.py
View File
+ 206
- 4
code/platformio.ini
View File
BIN
images/devices/ag-l4.jpg
View File
| Before | After |
|---|---|
|
|
| Width: 400 | Height: 400 | Size: 81 KiB |
BIN
images/devices/allterco-shelly1.jpg
View File
| Before | After |
|---|---|
|
|
| Width: 400 | Height: 400 | Size: 42 KiB |
BIN
images/devices/blitzwolf-bw-shp2.jpg
View File
| Before | After |
|---|---|
|
|
| Width: 400 | Height: 400 | Size: 15 KiB | Width: 400 | Height: 400 | Size: 28 KiB |
BIN
images/devices/homecube-16a.jpg
View File
| Before | After |
|---|---|
|
|
| Width: 400 | Height: 400 | Size: 19 KiB |
BIN
images/devices/itead-s26.jpg
View File
| Before | After |
|---|---|
|
|
| Width: 400 | Height: 400 | Size: 18 KiB |
BIN
images/devices/lohas-9w.jpg
View File
| Before | After |
|---|---|
|
|
| Width: 400 | Height: 400 | Size: 14 KiB |