Browse Source

Merge branch 'sync_first' of https://github.com/foxel/espurna into foxel-sync_first

rules-rpn
Xose Pérez 5 years ago
parent
commit
f40b621637
20 changed files with 21609 additions and 21510 deletions
  1. +2
    -2
      README.md
  2. +1
    -0
      code/espurna/config/types.h
  3. BIN
      code/espurna/data/index.all.html.gz
  4. BIN
      code/espurna/data/index.light.html.gz
  5. BIN
      code/espurna/data/index.lightfox.html.gz
  6. BIN
      code/espurna/data/index.rfbridge.html.gz
  7. BIN
      code/espurna/data/index.rfm69.html.gz
  8. BIN
      code/espurna/data/index.sensor.html.gz
  9. BIN
      code/espurna/data/index.small.html.gz
  10. BIN
      code/espurna/data/index.thermostat.html.gz
  11. +8
    -0
      code/espurna/relay.ino
  12. +3208
    -3168
      code/espurna/static/index.all.html.gz.h
  13. +2712
    -2711
      code/espurna/static/index.light.html.gz.h
  14. +2305
    -2304
      code/espurna/static/index.lightfox.html.gz.h
  15. +2348
    -2346
      code/espurna/static/index.rfbridge.html.gz.h
  16. +3670
    -3668
      code/espurna/static/index.rfm69.html.gz.h
  17. +2411
    -2409
      code/espurna/static/index.sensor.html.gz.h
  18. +2305
    -2304
      code/espurna/static/index.small.html.gz.h
  19. +2638
    -2598
      code/espurna/static/index.thermostat.html.gz.h
  20. +1
    -0
      code/html/index.html

+ 2
- 2
README.md View File

@ -4,9 +4,9 @@ ESPurna ("spark" in Catalan) is a custom firmware for ESP8285/ESP8266 based smar
It uses the Arduino Core for ESP8266 framework and a number of 3rd party libraries.
[![version](https://img.shields.io/badge/version-1.13.6--dev-brightgreen.svg)](CHANGELOG.md)
[![branch](https://img.shields.io/badge/branch-dev-orange.svg)](https://github.com/xoseperez/espurna/tree/dev/)
[![branch](https://img.shields.io/badge/branch-foxel--sync_first-orange.svg)](https://github.com/xoseperez/espurna/tree/foxel-sync_first/)
[![license](https://img.shields.io/github/license/xoseperez/espurna.svg)](LICENSE)
[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=dev)](https://travis-ci.org/xoseperez/espurna)
[![travis](https://travis-ci.org/xoseperez/espurna.svg?branch=foxel-sync_first)](https://travis-ci.org/xoseperez/espurna)
[![codacy](https://api.codacy.com/project/badge/Grade/c9496e25cf07434cba786b462cb15f49)](https://www.codacy.com/app/xoseperez/espurna/dashboard)
[![downloads](https://img.shields.io/github/downloads/xoseperez/espurna/total.svg)](https://github.com/xoseperez/espurna/releases)
<br />


+ 1
- 0
code/espurna/config/types.h View File

@ -85,6 +85,7 @@
#define RELAY_SYNC_NONE_OR_ONE 1
#define RELAY_SYNC_ONE 2
#define RELAY_SYNC_SAME 3
#define RELAY_SYNC_FIRST 4
#define RELAY_PULSE_NONE 0
#define RELAY_PULSE_OFF 1


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.lightfox.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


BIN
code/espurna/data/index.thermostat.html.gz View File


+ 8
- 0
code/espurna/relay.ino View File

@ -372,6 +372,14 @@ void relaySync(unsigned char id) {
if (i != id) relayStatus(i, status);
}
// If RELAY_SYNC_FIRST all relays should have the same state as first if first changes
} else if (relaySync == RELAY_SYNC_FIRST) {
if (id == 0) {
for (unsigned short i=1; i<_relays.size(); i++) {
relayStatus(i, status);
}
}
// If NONE_OR_ONE or ONE and setting ON we should set OFF all the others
} else if (status) {
if (relaySync != RELAY_SYNC_ANY) {


+ 3208
- 3168
code/espurna/static/index.all.html.gz.h
File diff suppressed because it is too large
View File


+ 2712
- 2711
code/espurna/static/index.light.html.gz.h
File diff suppressed because it is too large
View File


+ 2305
- 2304
code/espurna/static/index.lightfox.html.gz.h
File diff suppressed because it is too large
View File


+ 2348
- 2346
code/espurna/static/index.rfbridge.html.gz.h
File diff suppressed because it is too large
View File


+ 3670
- 3668
code/espurna/static/index.rfm69.html.gz.h
File diff suppressed because it is too large
View File


+ 2411
- 2409
code/espurna/static/index.sensor.html.gz.h
File diff suppressed because it is too large
View File


+ 2305
- 2304
code/espurna/static/index.small.html.gz.h
File diff suppressed because it is too large
View File


+ 2638
- 2598
code/espurna/static/index.thermostat.html.gz.h
File diff suppressed because it is too large
View File


+ 1
- 0
code/html/index.html View File

@ -449,6 +449,7 @@
<option value="1">Zero or one switches active</option>
<option value="2">One and just one switch active</option>
<option value="3">All synchronised</option>
<option value="4">Switch #0 controls other switches</option>
</select>
<div class="pure-u-0 pure-u-lg-1-4"></div>
<div class="pure-u-1 pure-u-lg-3-4 hint">Define how the different switches should be synchronized.</div>


Loading…
Cancel
Save