Xose Pérez
6 years ago
58 changed files with 19340 additions and 18064 deletions
Unified View
Diff Options
-
+2 -2.github/stale.yml
-
+11 -7README.md
-
+2 -2code/espurna/alexa.ino
-
+1 -1code/espurna/button.ino
-
+1 -1code/espurna/config/all.h
-
+6 -0code/espurna/config/arduino.h
-
+138 -7code/espurna/config/defaults.h
-
+3 -0code/espurna/config/device.h
-
+85 -16code/espurna/config/general.h
-
+6 -0code/espurna/config/progmem.h
-
+3 -3code/espurna/config/prototypes.h
-
+29 -18code/espurna/config/sensors.h
-
+8 -0code/espurna/config/types.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
-
+60 -0code/espurna/device.ino
-
+1 -1code/espurna/domoticz.ino
-
+9 -0code/espurna/eeprom.ino
-
+156 -0code/espurna/encoder.ino
-
+19 -1code/espurna/espurna.ino
-
+19 -6code/espurna/homeassistant.ino
-
+7 -5code/espurna/influxdb.ino
-
+345 -41code/espurna/ir.ino
-
+3 -5code/espurna/led.ino
-
+90 -77code/espurna/light.ino
-
+15 -5code/espurna/mqtt.ino
-
+5 -4code/espurna/nofuss.ino
-
+4 -3code/espurna/ntp.ino
-
+3 -6code/espurna/ota.ino
-
+6 -4code/espurna/relay.ino
-
+4 -1code/espurna/rfm69.ino
-
+3 -3code/espurna/scheduler.ino
-
+36 -10code/espurna/sensor.ino
-
+4 -0code/espurna/sensors/PMSX003Sensor.h
-
+173 -0code/espurna/sensors/SDS011Sensor.h
-
+0 -2code/espurna/sensors/SI7021Sensor.h
-
+17 -6code/espurna/settings.ino
-
+3010 -3002code/espurna/static/index.all.html.gz.h
-
+2966 -2963code/espurna/static/index.light.html.gz.h
-
+2562 -2559code/espurna/static/index.rfbridge.html.gz.h
-
+4035 -4032code/espurna/static/index.rfm69.html.gz.h
-
+2616 -2608code/espurna/static/index.sensor.html.gz.h
-
+2521 -2517code/espurna/static/index.small.html.gz.h
-
+41 -3code/espurna/telnet.ino
-
+1 -1code/espurna/thinkspeak.ino
-
+109 -43code/espurna/utils.ino
-
+7 -2code/espurna/wifi.ino
-
+4 -16code/espurna/ws.ino
-
+55 -53code/html/custom.js
-
+21 -17code/html/index.html
-
+32 -1code/memanalyzer.py
-
+85 -7code/platformio.ini
-
BINimages/devices/itead-s26.jpg
-
+1 -3pre-commit
+ 2
- 2
.github/stale.yml
View File
+ 11
- 7
README.md
View File
+ 2
- 2
code/espurna/alexa.ino
View File
+ 1
- 1
code/espurna/button.ino
View File
+ 1
- 1
code/espurna/config/all.h
View File
+ 6
- 0
code/espurna/config/arduino.h
View File
+ 138
- 7
code/espurna/config/defaults.h
View File
+ 3
- 0
code/espurna/config/device.h
View File
+ 85
- 16
code/espurna/config/general.h
View File
+ 6
- 0
code/espurna/config/progmem.h
View File
+ 3
- 3
code/espurna/config/prototypes.h
View File
+ 29
- 18
code/espurna/config/sensors.h
View File
+ 8
- 0
code/espurna/config/types.h
View File
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
+ 60
- 0
code/espurna/device.ino
View File
+ 1
- 1
code/espurna/domoticz.ino
View File
+ 9
- 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) | |||||
+ 19
- 1
code/espurna/espurna.ino
View File
+ 19
- 6
code/espurna/homeassistant.ino
View File
+ 7
- 5
code/espurna/influxdb.ino
View File
+ 345
- 41
code/espurna/ir.ino
View File
+ 3
- 5
code/espurna/led.ino
View File
+ 90
- 77
code/espurna/light.ino
View File
+ 15
- 5
code/espurna/mqtt.ino
View File
+ 5
- 4
code/espurna/nofuss.ino
View File
+ 4
- 3
code/espurna/ntp.ino
View File
+ 3
- 6
code/espurna/ota.ino
View File
+ 6
- 4
code/espurna/relay.ino
View File
+ 4
- 1
code/espurna/rfm69.ino
View File
+ 3
- 3
code/espurna/scheduler.ino
View File
+ 36
- 10
code/espurna/sensor.ino
View File
+ 4
- 0
code/espurna/sensors/PMSX003Sensor.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
+ 17
- 6
code/espurna/settings.ino
View File
+ 3010
- 3002
code/espurna/static/index.all.html.gz.h
File diff suppressed because it is too large
View File
+ 2966
- 2963
code/espurna/static/index.light.html.gz.h
File diff suppressed because it is too large
View File
+ 2562
- 2559
code/espurna/static/index.rfbridge.html.gz.h
File diff suppressed because it is too large
View File
+ 4035
- 4032
code/espurna/static/index.rfm69.html.gz.h
File diff suppressed because it is too large
View File
+ 2616
- 2608
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
+ 1
- 1
code/espurna/thinkspeak.ino
View File
+ 109
- 43
code/espurna/utils.ino
View File
+ 7
- 2
code/espurna/wifi.ino
View File
+ 4
- 16
code/espurna/ws.ino
View File
+ 55
- 53
code/html/custom.js
View File
+ 21
- 17
code/html/index.html
View File
+ 32
- 1
code/memanalyzer.py
View File
+ 85
- 7
code/platformio.ini
View File
BIN
images/devices/itead-s26.jpg
View File
| Before | After |
|---|---|
|
|
| Width: 400 | Height: 400 | Size: 18 KiB |