Skip to content

Commit

Permalink
Admin and some fixes
Browse files Browse the repository at this point in the history
5.14.0a
 * Add KNX energy data (#2750)
 * Fix display selection of
un-available GPIO options in Module Configuration webpage (#2718)
 * Fix
IRSend not accepting data value of 0 (#2751)
  • Loading branch information
arendst committed May 17, 2018
1 parent 14ae3e1 commit 80ffea0
Show file tree
Hide file tree
Showing 6 changed files with 60 additions and 13 deletions.
3 changes: 3 additions & 0 deletions sonoff/_releasenotes.ino
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* 5.14.0a
* Add Eastron SDM630 energy meter (#2735)
* Add KNX communication enhancement (#2742)
* Add KNX energy data (#2750)
* Fix display selection of un-available GPIO options in Module Configuration webpage (#2718)
* Fix timer re-trigger within one minute after restart (#2744)
* Fix IRSend not accepting data value of 0 (#2751)
*
* 5.14.0 20180515
* Update language files
Expand Down
20 changes: 10 additions & 10 deletions sonoff/sonoff.h
Original file line number Diff line number Diff line change
Expand Up @@ -132,16 +132,16 @@ typedef unsigned long power_t; // Power (Relay) type
#define DAWN_ASTRONOMIC -18.0

// Sensor definition for KNX Driver
#define KNX_TEMPERATURE 17
#define KNX_HUMIDITY 18
#define KNX_ENERGY_VOLTAGE 19
#define KNX_ENERGY_CURRENT 20
#define KNX_ENERGY_POWER 21
#define KNX_TEMPERATURE 17
#define KNX_HUMIDITY 18
#define KNX_ENERGY_VOLTAGE 19
#define KNX_ENERGY_CURRENT 20
#define KNX_ENERGY_POWER 21
#define KNX_ENERGY_POWERFACTOR 22
#define KNX_ENERGY_DAILY 23
#define KNX_ENERGY_START 24
#define KNX_ENERGY_TOTAL 25
#define KNX_MAX_device_param 25
#define KNX_ENERGY_DAILY 23
#define KNX_ENERGY_START 24
#define KNX_ENERGY_TOTAL 25
#define KNX_MAX_device_param 25

/*********************************************************************************************\
* Enumeration
Expand Down Expand Up @@ -192,4 +192,4 @@ const uint8_t kDefaultRfCode[9] PROGMEM = { 0x21, 0x16, 0x01, 0x0E, 0x03, 0x48,

extern uint8_t light_device; // Light device number

#endif // _SONOFF_H_
#endif // _SONOFF_H_
44 changes: 44 additions & 0 deletions sonoff/webserver.ino
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,50 @@ boolean GetUsedInModule(byte val, uint8_t *arr)
#endif
#ifndef USE_IR_REMOTE
if (GPIO_IRSEND == val) { return true; }
#ifndef USE_IR_RECEIVE
if (GPIO_IRRECV == val) { return true; }
#endif
#endif
#ifndef USE_MHZ19
if (GPIO_MHZ_TXD == val) { return true; }
if (GPIO_MHZ_RXD == val) { return true; }
#endif
#ifndef USE_PZEM004T
if (GPIO_PZEM_TX == val) { return true; }
if (GPIO_PZEM_RX == val) { return true; }
#endif
#ifndef USE_SENSEAIR
if (GPIO_SAIR_TX == val) { return true; }
if (GPIO_SAIR_RX == val) { return true; }
#endif
#ifndef USE_SPI
if (GPIO_SPI_CS == val) { return true; }
if (GPIO_SPI_DC == val) { return true; }
#endif
#ifndef USE_DISPLAY
if (GPIO_BACKLIGHT == val) { return true; }
#endif
#ifndef USE_PMS5003
if (GPIO_PMS5003 == val) { return true; }
#endif
#ifndef USE_NOVA_SDS
if (GPIO_SDS0X1 == val) { return true; }
#endif
#ifndef USE_SERIAL_BRIDGE
if (GPIO_SBR_TX == val) { return true; }
if (GPIO_SBR_RX == val) { return true; }
#endif
#ifndef USE_SR04
if (GPIO_SR04_TRIG == val) { return true; }
if (GPIO_SR04_ECHO == val) { return true; }
#endif
#ifndef USE_SDM120
if (GPIO_SDM120_TX == val) { return true; }
if (GPIO_SDM120_RX == val) { return true; }
#endif
#ifndef USE_SDM630
if (GPIO_SDM630_TX == val) { return true; }
if (GPIO_SDM630_RX == val) { return true; }
#endif
if ((val >= GPIO_REL1) && (val < GPIO_REL1 + MAX_RELAYS)) {
offset = (GPIO_REL1_INV - GPIO_REL1);
Expand Down
2 changes: 1 addition & 1 deletion sonoff/xdrv_02_irremote.ino
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ boolean IrSendCommand()
}
#endif // USE_IR_HVAC
else serviced = false; // Unknown command

return serviced;
}

Expand Down
2 changes: 1 addition & 1 deletion sonoff/xdrv_03_energy.ino
Original file line number Diff line number Diff line change
Expand Up @@ -1187,4 +1187,4 @@ boolean Xsns03(byte function)
return result;
}

#endif // USE_ENERGY_SENSOR
#endif // USE_ENERGY_SENSOR
2 changes: 1 addition & 1 deletion sonoff/xdrv_11_knx.ino
Original file line number Diff line number Diff line change
Expand Up @@ -968,4 +968,4 @@ boolean Xdrv11(byte function)
return result;
}

#endif // USE_KNX
#endif // USE_KNX

0 comments on commit 80ffea0

Please sign in to comment.