From 0834e091780aebe20c87b8da66ba7d72417dcdd8 Mon Sep 17 00:00:00 2001
From: BlubbFish <git@blubbfish.net>
Date: Tue, 19 Dec 2017 20:18:30 +0000
Subject: [PATCH] [BF] v1.3.4.0 Fixing Json Names [NF] v1.2.2.0 Mqtt can now
 get and set values

---
 Zway/Devices/CommandClasses/Battery.cs        |   2 +-
 Zway/Devices/CommandClasses/CentralScene.cs   |   4 ++--
 .../CommandClassSubs/Configurationsub.cs      |   4 ++--
 .../CommandClassSubs/MeterSub.cs              |   6 +++---
 .../CommandClassSubs/SensorMultilevelSub.cs   |   6 +++---
 .../CommandClassSubs/ThermostatSetPointSub.cs |  12 ++++++------
 Zway/Devices/CommandClasses/Indicator.cs      |   2 +-
 Zway/Devices/CommandClasses/SwitchBinary.cs   |   2 +-
 .../CommandClasses/SwitchMultilevel.cs        |   2 +-
 Zway/Devices/CommandClasses/ThermostatMode.cs |   4 ++--
 Zway/Devices/CommandClasses/Wakeup.cs         |  14 +++++++-------
 Zway/Properties/AssemblyInfo.cs               |   4 ++--
 Zway/bin/Release/Zway.dll                     | Bin 49664 -> 49664 bytes
 13 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/Zway/Devices/CommandClasses/Battery.cs b/Zway/Devices/CommandClasses/Battery.cs
index 459fe8e..71f5f1b 100644
--- a/Zway/Devices/CommandClasses/Battery.cs
+++ b/Zway/Devices/CommandClasses/Battery.cs
@@ -54,7 +54,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
+        { "Level", this.Level },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CentralScene.cs b/Zway/Devices/CommandClasses/CentralScene.cs
index 8ab5db7..55e475f 100644
--- a/Zway/Devices/CommandClasses/CentralScene.cs
+++ b/Zway/Devices/CommandClasses/CentralScene.cs
@@ -78,8 +78,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "scene", this.Scene },
-        { "key", this.Key },
+        { "Scene", this.Scene },
+        { "Key", this.Key },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
index 00571b7..bcc3b89 100644
--- a/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
+++ b/Zway/Devices/CommandClasses/CommandClassSubs/Configurationsub.cs
@@ -61,8 +61,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "size", this.Size },
+        { "Level", this.Level },
+        { "Size", this.Size },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
index 5e96d75..562510d 100644
--- a/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
+++ b/Zway/Devices/CommandClasses/CommandClassSubs/MeterSub.cs
@@ -52,9 +52,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
index de1104e..0423e02 100644
--- a/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
+++ b/Zway/Devices/CommandClasses/CommandClassSubs/SensorMultilevelSub.cs
@@ -52,9 +52,9 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs b/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
index 50d970d..cb9c139 100644
--- a/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
+++ b/Zway/Devices/CommandClasses/CommandClassSubs/ThermostatSetPointSub.cs
@@ -82,12 +82,12 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses.CommandClassSubs {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "type", this.Type },
-        { "scale", this.Scale },
-        { "tempmax", this.TempMax },
-        { "tempmin", this.TempMin },
-        { "hasminmax", this.HasMinMax },
+        { "Level", this.Level },
+        { "Type", this.Type },
+        { "Scale", this.Scale },
+        { "TempMax", this.TempMax },
+        { "TempMin", this.TempMin },
+        { "HasMinMax", this.HasMinMax },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/Indicator.cs b/Zway/Devices/CommandClasses/Indicator.cs
index f0444b2..6ffc536 100644
--- a/Zway/Devices/CommandClasses/Indicator.cs
+++ b/Zway/Devices/CommandClasses/Indicator.cs
@@ -50,7 +50,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level },
+        { "Level", this.Level },
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/SwitchBinary.cs b/Zway/Devices/CommandClasses/SwitchBinary.cs
index f965b02..2dedcfa 100644
--- a/Zway/Devices/CommandClasses/SwitchBinary.cs
+++ b/Zway/Devices/CommandClasses/SwitchBinary.cs
@@ -51,7 +51,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level }
+        { "Level", this.Level }
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/SwitchMultilevel.cs b/Zway/Devices/CommandClasses/SwitchMultilevel.cs
index c42caf4..d663771 100644
--- a/Zway/Devices/CommandClasses/SwitchMultilevel.cs
+++ b/Zway/Devices/CommandClasses/SwitchMultilevel.cs
@@ -54,7 +54,7 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        { "level", this.Level }
+        { "Level", this.Level }
       };
     }
   }
diff --git a/Zway/Devices/CommandClasses/ThermostatMode.cs b/Zway/Devices/CommandClasses/ThermostatMode.cs
index 75cc9f4..b83a4bd 100644
--- a/Zway/Devices/CommandClasses/ThermostatMode.cs
+++ b/Zway/Devices/CommandClasses/ThermostatMode.cs
@@ -71,8 +71,8 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
         modes.Add(item.Key.ToString(), item.Value);
       }
       Dictionary<String, Object> json = new Dictionary<String, Object> {
-        { "level", this.Level },
-        { "modes", modes }
+        { "Level", this.Level },
+        { "ValidModes", modes }
       };
       return json;
     }
diff --git a/Zway/Devices/CommandClasses/Wakeup.cs b/Zway/Devices/CommandClasses/Wakeup.cs
index 8f1b197..509505b 100644
--- a/Zway/Devices/CommandClasses/Wakeup.cs
+++ b/Zway/Devices/CommandClasses/Wakeup.cs
@@ -124,13 +124,13 @@ namespace BlubbFish.IoT.Zway.Devices.CommandClasses {
 
     public override Dictionary<String, Object> ToDictionary() {
       return new Dictionary<String, Object> {
-        {"interval", this.Interval },
-        {"againstnode", this.AgainstNode },
-        { "wakeupmin", this.WakeupMin },
-        { "wakeupmax", this.WakeupMax },
-        { "wakeupdefault", this.WakeupDefault },
-        { "lastwakeup", this.LastWakeup.ToString() },
-        { "lastsleep", this.LastSleep.ToString() }
+        { "Interval", this.Interval },
+        { "AgainstNode", this.AgainstNode },
+        { "WakeupMin", this.WakeupMin },
+        { "WakeupMax", this.WakeupMax },
+        { "WakeupDefault", this.WakeupDefault },
+        { "LastWakeup", this.LastWakeup.ToString() },
+        { "LastSleep", this.LastSleep.ToString() }
       };
     }
   }
diff --git a/Zway/Properties/AssemblyInfo.cs b/Zway/Properties/AssemblyInfo.cs
index 3902101..e206ba6 100644
--- a/Zway/Properties/AssemblyInfo.cs
+++ b/Zway/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]
diff --git a/Zway/bin/Release/Zway.dll b/Zway/bin/Release/Zway.dll
index 5af08107fb3d22dfbc89723d0e23102968b14467..875a364208a00b626527197cb18287a6c04dd245 100644
GIT binary patch
delta 1518
zcmZ9Me@s(X6vxlKuav$bc9fLD0H-0uZgd6+P@fq=p{Q62#TFTC#F*)b5iJ&VQ)dbr
z$$sb}-HCCFF%12~DTBJ*CF@WEOSWuTvMnSgbJ>rK#BB4A#gN6!g)Hpc_gYHY<h^^|
z=brOD-+S+S9U4)FMwHPvcw#X2);jiU?0OeFhm38^3f%=L!42Gv-E1Sfhr=w&=8*CH
ztXK8|F#KrRBLe(Vb@XsH3~<+b0OoU>X(Aj0u$D)nI=z%ZFY5Gi2A$C9SO%Td>39bH
zNvBtdTJ7K(1yHTYj*B>0yTr3BI8fKhD#T2k!dM4>?s3rl2hS#JhXn@0TgjY?Rqc*!
zG6CjD2l_V`TElU|?$gHO6<bVZz9iAJ=19zf<JE=5GDy}(Y)Ue6mviD+rMYYqt7|4w
zH9D0&GioNNrW6yJ#=o@S(Wlnq_bwGnw$wQnNQS#^W-R(Iad69<3VSI2u2)!5u9~uU
zLWwN$l&f5oj5=+B3|8Av&S~oThALj9%3dPgP|SF(ibLMV#qV2H=J2fu?lP<T7Darz
z7#26K;S|ny7GOi8+t$01xXm2t)l<xJ3n-lLbmCC82|sSE;C*@@TyDI;UdIbf_t`^?
zde5-S_@DP3=_S_ekOR5J+2*w}OjXZ$v+zN40iQ7xXjeq#c0ZRM#-7>47R1!fxWcon
z`kqBwJ-o~+60LnKZ)FMEeL7bq;={_eF8e~tuQsgH1*7TBHj}X`Cw|-J=0vH#u(#*1
zymZB<Mg{2<mcA?Fut%O_y3uP!BSZ33;K`(p`iKsXlLJHb=Rh6fPaB5iA=mHzpuN*7
z4|$pLlCSPw9sH99hjj3-d<{bBZ|by8mon&CQ4?%Y_?XdSY){Z`=&LNPFHBwa3ZG2d
z=<nH;OmnVE!>@ZnMR%+KWt~A7rOuDh8q0Qcws>iLU(`O=UCB)1{8{G{tW{jQ(Ziy7
zEpP;m!2yWC3D^hy0M2dDN6|szgEZ3yVc1Xekl#i05Jksf0Q~xVCff%u0~D{$^HTnc
zRCk<|j{!JZDVD0K9Get_{1gu2nGgTS4Z;glc0@MK_TkaVbu0%*CQq($?4jy@>bxKP
zxI8&(QG@hw3J&1gQx#1iI7wPmlOyY8BE_~4-4E-Ab#tqp<pLppr*6ntjvtq%G&{gI
z=RIit;*Kv~dT%_@aK$gY@mH;^2EY2O*PR&DdT1|!(^bL%2JX@|4X``t4Qh*_==J8d
z?Kgh;^O3g5Pz0te%>K!bGT-=pC*$?84F&X1JbbGg*WMmdO`re?fk|Avtua<3=4YB{
XK*y|y?*7?Z{5MVH%{^eT%IyCEz4eRj

delta 1498
zcmZ8hZ%kWN6hHSqXn92`ZByC}P!_V#X(5ztbX_2wrMR&GB`e6l8Q18X#CEL(+$Pa>
ziiv+_Mt4G#5rfPR>N5UhSL0wKY~M7|EPQfCjWIJO`!p9ms38W=eXj-5ChxxUe)sn~
z=XcJ1ujx@GJ*teo%bPkf??1+_WWMZWN0G6b!m7If6}W@Dv5(cTc|6Bb>^w4VD?Ic(
z0K?xGy`qaxHl$_@kl?Nf0K@rxv=Pq$n06*(Mu|@5q3>wuCwb_EhEC<7Ga5RbhkmD_
zpAl-Zf@=&wHDxRQhJ$<8_^J^TjqPlkSZY)l^W$x=oz@?{btZoiB;p6ioQj^1-AE?D
zko056KBp-@N3eTDf4po?N#<z@9W^9VML6ByESEu6pEN7k$i0&jjvk-OJh4?Xk<)0X
zteK~oAWbD+_xZRe!dIWD!aFV%EA}@!?ob-;n$K(cXECt<J%!y9tIY~?T4><9z1NiF
zL!NVG!D)}Pq$>{!+3=v>#w`Xs=J)V5t(utgmox5AF&*44{yd;Ed###FdDx(8LrT`F
z)VBl61CMYDS9;3OA8?!f8^ot*S{lV5hd|*<j|0;U1$Zs+ByUr-uGRzNYyihw?z4NC
z3ckUH@xS0j=_S)@XPRGJZY_~f$f;>>1q<;(YZ)Kc^)wYx|8xhJ4yKyw*n*fnG^g-i
z_1#pvmsc9Z_4bp@veAI=KAo$Qti}4yUh6{6t?!(MF6ceYcNXY9Iq-*0Hz$<53u~yD
zSvD2l=nBf?to&HUaj!hb%|dVMh4hrKckRmNQU9UC<K#fk`b$?M<7*r3VDphLLe(aD
z$m_(*zPhy<@b@O*(|~{FYtX&<O|@z0S{~Xb_JrFM9y4hppL!;2)$^-tGruV4ZC3b*
zPLc0gwEu9H=Ga2RZ~MEqeQE-z?g_&&s$5DvRv+wX3(`F*_CDKJ&lGXt1IObmDn7r`
z&r*&EoP-Drz$qAnAzI_`BAfuQohI}ZiiRNpF>OB|i@+Ix@~u3ne2H|!5T#sTk5VkN
zZsmY2hYk`8FJAqlY7kx^;VD_xC`+CNaMY2F2uUMQ2Y7krEH92>&FmQ7p54_lM2v)F
z7fWS?(ok$3qBW+O)r@U<md%0fWzCG<N(^h~e5LO1FP%94W>M(F;gO}|tB;z*nYp)2
zY&WhgJm+re@b%NofYVjM0GjU7wFqz|91I77t?|-@hn-(}x?}6xuT6^4#Uf@+|0MbP
z?~;tGGCRuXANT7UefZbn9xS<;Ruxcyl7S*Vy6IzVw^&(fp&Qzly|i{L-{4n$!gA{Y
I%hVhH2as5TR{#J2