Migrated from JVCocoa to JVSwift

TheMisfit68 · Jan 4, 2024 · b445697 · b445697
1 parent 0815014
commit b445697
Show file tree

Hide file tree

Showing 34 changed files with 346 additions and 266 deletions.
diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/CirtcuitEnabler.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/CirtcuitEnabler.swift
@@ -11,7 +11,7 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 
 // MARK: - PLC level class
 class CirtcuitEnabler:PLCClassAccessoryDelegate, PulsOperatedCircuit, Simulateable{

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/DimmableLight.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/DimmableLight.swift
@@ -11,21 +11,14 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 
 // MARK: - PLC level class
-class DimmableLight:PLCClassAccessoryDelegate, DimmedLight{
+class DimmableLight:PLCClassAccessoryDelegate{
 
 	// MARK: - Accessory binding
     typealias AccessorySubclass = Accessory.Lightbulb
     var characteristicChanged: Bool = false
-
-	var brightnessTimer: BrightnessTimer!
-
-	override init(){
-		super.init()
-		self.brightnessTimer = BrightnessTimer(dimmer: self)
-	}
 
     // MARK: - State
     var powerState:Bool? = nil

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/DoorLock.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/DoorLock.swift
@@ -11,7 +11,7 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 
 // MARK: - PLC level class
 class Doorlock:PLCClassAccessoryDelegate, PulsOperatedCircuit{

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/FunctionKey.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/FunctionKey.swift
@@ -13,7 +13,7 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 
 
 class FunctionKey:PLCClassAccessoryDelegate{

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/GarageDoor.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/GarageDoor.swift
@@ -11,7 +11,7 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 
 // MARK: - PLC level class
 class GarageDoor:PLCClassAccessoryDelegate, PulsOperatedCircuit{

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/Light.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/Light.swift
@@ -11,7 +11,7 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 import OSLog
 
 // MARK: - PLC level class

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/Outlet.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/Outlet.swift
@@ -11,7 +11,7 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 
 // MARK: - PLC level class
 class Outlet:PLCClassAccessoryDelegate{

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/SmartSprinkler.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/SmartSprinkler.swift
@@ -11,8 +11,9 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 import WeatherKit
+import JVWeather
 import CoreLocation
 import OSLog
 

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/ToggleableOutlet.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/ToggleableOutlet.swift
@@ -11,7 +11,7 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 
 // MARK: - PLC level class
 class ToggleableOutlet:PLCClassAccessoryDelegate, PulsOperatedCircuit, Simulateable{

diff --git a/Accessory Delegates/ PLCClassAccessoryDelegates/WindowCovering.swift b/Accessory Delegates/ PLCClassAccessoryDelegates/WindowCovering.swift
@@ -11,7 +11,7 @@ import HAP
 import SoftPLC
 import ModbusDriver
 import IOTypes
-import JVCocoa
+import JVSwift
 
 // MARK: - PLC level class
 class WindowCovering:PLCClassAccessoryDelegate, PulsOperatedCircuit, Simulateable{

diff --git a/Accessory Delegates/AccessoryDelegate.swift b/Accessory Delegates/AccessoryDelegate.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import HAP
-import JVCocoa
+import JVSwift
 import SoftPLC
 import OSLog
 

diff --git a/Accessory Delegates/LeafAccessoryDelegate.swift b/Accessory Delegates/LeafAccessoryDelegate.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import HAP
-import JVCocoa
+import JVSwift
 import LeafDriver
 import OSLog
 

diff --git a/Accessory Delegates/MilightAccessoryDelegate.swift b/Accessory Delegates/MilightAccessoryDelegate.swift
@@ -8,16 +8,15 @@
 
 import Foundation
 import HAP
-import JVCocoa
+import JVSwift
 import MilightDriver
 import OSLog
 
 /// Handles characteristic changes for a Homekit Accessory.
 /// It uses the MilightDriver to pass those changes to  the hardware
 
-class MilightAccessoryDelegate:MilightDriverV6, AccessoryDelegate, DimmedLight {
+class MilightAccessoryDelegate:MilightDriverV6, AccessoryDelegate{
 
-	var brightnessTimer: BrightnessTimer!
 
     let zone:MilightDriver.Zone
     var name: String{
@@ -27,7 +26,6 @@ class MilightAccessoryDelegate:MilightDriverV6, AccessoryDelegate, DimmedLight {
     init(ipAddress: String, zone:MilightDriver.Zone){
         self.zone = zone
         super.init(ipAddress: ipAddress)
-		self.brightnessTimer = BrightnessTimer(dimmer: self)
     }
 
     var characteristicChanged: Bool = false
@@ -85,9 +83,7 @@ class MilightAccessoryDelegate:MilightDriverV6, AccessoryDelegate, DimmedLight {
 
         case CharacteristicType.brightness:
 
-//            brightness = characteristic.value as! Int
-			self.brightnessTimer.timeFor100percentChange = 1800
-			self.brightnessTimer.targetBrightness = (characteristic.value as! Int)
+            brightness = characteristic.value as! Int
 
         case CharacteristicType.hue:
 

diff --git a/Accessory Delegates/PLCAccessoryDelegate.swift b/Accessory Delegates/PLCAccessoryDelegate.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import HAP
-import JVCocoa
+import JVSwift
 import SoftPLC
 import OSLog
 

diff --git a/Accessory Delegates/TizenAccessoryDelegate.swift b/Accessory Delegates/TizenAccessoryDelegate.swift
@@ -8,7 +8,7 @@
 
 import Foundation
 import HAP
-import JVCocoa
+import JVSwift
 import TizenDriver
 import OSLog
 

diff --git a/HAP Extensions/Accessory/Accessory.swift b/HAP Extensions/Accessory/Accessory.swift
@@ -9,7 +9,7 @@
 import Foundation
 import SoftPLC
 import HAP
-import JVCocoa
+import JVSwift
 
 extension HAP.Accessory{
 

diff --git a/HAP Extensions/Bridge(Device]/Bridge.swift b/HAP Extensions/Bridge(Device]/Bridge.swift
@@ -7,7 +7,7 @@
     //
 
 import Foundation
-import JVCocoa
+import JVSwift
 import OSLog
 import HAP
 import SoftPLC

diff --git a/HAP Extensions/Custom Accessories/ElectricCarAccessory.swift b/HAP Extensions/Custom Accessories/ElectricCarAccessory.swift
@@ -11,8 +11,7 @@ import HAP
 
 extension Accessory {
 
-    class ElectricCar: Accessory{
-
+    class ElectricCar:Accessory{
 
         let primaryService:Service.Battery = Service.Battery(characteristics: [.name(String(localized: "Battery status",table: "ServiceNames")),
                                                                                AnyCharacteristic(GenericCharacteristic<Double>(