From aefe3ab30ba598e0ada0be861c4249d292726bea Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Fri, 19 Jan 2024 01:58:36 +0100
Subject: [PATCH] JsonConverter fix OpenShockHttp, add PiShockHttp

---
 CShocker/CShocker.csproj                  |  2 +-
 CShocker/Shockers/ShockerJsonConverter.cs | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CShocker/CShocker.csproj b/CShocker/CShocker.csproj
index f19cafa..15e112e 100644
--- a/CShocker/CShocker.csproj
+++ b/CShocker/CShocker.csproj
@@ -7,7 +7,7 @@
         <Authors>Glax</Authors>
         <RepositoryUrl>https://github.com/C9Glax/CShocker</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>1.2.1</Version>
+        <Version>1.2.2</Version>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/CShocker/Shockers/ShockerJsonConverter.cs b/CShocker/Shockers/ShockerJsonConverter.cs
index 663a6a2..0ee9554 100644
--- a/CShocker/Shockers/ShockerJsonConverter.cs
+++ b/CShocker/Shockers/ShockerJsonConverter.cs
@@ -25,11 +25,20 @@ public class ShockerJsonConverter : JsonConverter
                     jo.SelectToken("ShockerIds")!.ToObject<List<string>>()!,
                     jo.SelectToken("IntensityRange")!.ToObject<IntensityRange>()!,
                     jo.SelectToken("DurationRange")!.ToObject<DurationRange>()!,
-                    jo.SelectToken("Endpoint")!.Value<string>()!,
-                    jo.SelectToken("ApiKey")!.Value<string>()!
+                    jo.SelectToken("ApiKey")!.Value<string>()!,
+                    jo.SelectToken("Endpoint")!.Value<string>()!
                 );
             case ShockerApi.OpenShockSerial:
             case ShockerApi.PiShockHttp:
+                return new PiShockHttp(
+                    jo.SelectToken("ShockerIds")!.ToObject<List<string>>()!,
+                    jo.SelectToken("IntensityRange")!.ToObject<IntensityRange>()!,
+                    jo.SelectToken("DurationRange")!.ToObject<DurationRange>()!,
+                    jo.SelectToken("ApiKey")!.Value<string>()!,
+                    jo.SelectToken("Username")!.Value<string>()!,
+                    jo.SelectToken("ShareCode")!.Value<string>()!,
+                    jo.SelectToken("Endpoint")!.Value<string>()!
+                );
             case ShockerApi.PiShockSerial:
                 throw new NotImplementedException();
             default: