Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1a8fa449b | ||
|
|
1da54f7416 | ||
|
|
eb4783c11e | ||
|
|
c06d910356 | ||
|
|
02871e4d66 | ||
|
|
edb59f01b6 | ||
|
|
ce30132f5f | ||
|
|
64c9020bcb | ||
|
|
a22628b0d0 | ||
|
|
64d74668cc | ||
|
|
e53529b9d4 | ||
|
|
ca399a405c |
@@ -65,7 +65,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
|
|||||||
Double l = Double.Parse(json["val"]["value"].ToString());
|
Double l = Double.Parse(json["val"]["value"].ToString());
|
||||||
if (t == "Power" && (l > 3660 || l < 0) ||
|
if (t == "Power" && (l > 3660 || l < 0) ||
|
||||||
t == "Temperature" && (l > 65 || l < -25) ||
|
t == "Temperature" && (l > 65 || l < -25) ||
|
||||||
(t == "Temperature" && this.Level >= 4 && l == 0)) {
|
(t == "Temperature" && this.Level >= 4 && Math.Abs(l) <= 0.1)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -89,6 +89,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
|
|||||||
return new List<Senml>() { new SenmlDouble("power", Senml.Units.Watt, this.Level) };
|
return new List<Senml>() { new SenmlDouble("power", Senml.Units.Watt, this.Level) };
|
||||||
} else if(this.Scale == "°C") {
|
} else if(this.Scale == "°C") {
|
||||||
return new List<Senml>() { new SenmlDouble("temperatur", Senml.Units.Celsius, this.Level) };
|
return new List<Senml>() { new SenmlDouble("temperatur", Senml.Units.Celsius, this.Level) };
|
||||||
|
} else if(this.Scale == "Lux") {
|
||||||
|
return new List<Senml>() { new SenmlDouble("luminiscence", Senml.Units.Lux, this.Level) };
|
||||||
}
|
}
|
||||||
return new List<Senml>() { };
|
return new List<Senml>() { };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ namespace BlubbFish.IoT.Zway.Interfaces {
|
|||||||
SwitchColor = 51,
|
SwitchColor = 51,
|
||||||
MeterPulse = 53,
|
MeterPulse = 53,
|
||||||
MeterTableMonitor = 61,
|
MeterTableMonitor = 61,
|
||||||
|
ThermostatOperatingState = 66,
|
||||||
CRC16 = 86,
|
CRC16 = 86,
|
||||||
AssociationGroupInformation = 89,
|
AssociationGroupInformation = 89,
|
||||||
DeviceResetLocally = 90,
|
DeviceResetLocally = 90,
|
||||||
@@ -31,12 +32,14 @@ namespace BlubbFish.IoT.Zway.Interfaces {
|
|||||||
DoorLock = 98,
|
DoorLock = 98,
|
||||||
ManufacturerSpecific = 114,
|
ManufacturerSpecific = 114,
|
||||||
PowerLevel = 115,
|
PowerLevel = 115,
|
||||||
|
InclusionController = 116,
|
||||||
Protection = 117,
|
Protection = 117,
|
||||||
NodeNaming = 119,
|
NodeNaming = 119,
|
||||||
FirmwareUpdate = 122,
|
FirmwareUpdate = 122,
|
||||||
Association = 133,
|
Association = 133,
|
||||||
Version = 134,
|
Version = 134,
|
||||||
Proprietary = 136,
|
Proprietary = 136,
|
||||||
|
TimeParameters = 139,
|
||||||
MultiChannelAssociation = 142,
|
MultiChannelAssociation = 142,
|
||||||
MultiCmd = 143,
|
MultiCmd = 143,
|
||||||
Security = 152
|
Security = 152
|
||||||
@@ -266,7 +269,7 @@ namespace BlubbFish.IoT.Zway.Interfaces {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String SenmlTopic() {
|
public String SenmlTopic() {
|
||||||
return "/LS/v2/ZGW/" + Guid.NewGuid().ToString();
|
return "LS/v2/ZGW/";
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
|||||||
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
|
||||||
// indem Sie "*" wie unten gezeigt eingeben:
|
// indem Sie "*" wie unten gezeigt eingeben:
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("1.4.1.0")]
|
[assembly: AssemblyVersion("1.4.4")]
|
||||||
[assembly: AssemblyFileVersion("1.4.1.0")]
|
[assembly: AssemblyFileVersion("1.4.4")]
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user