diff --git a/BoostRemote.xcodeproj/project.pbxproj b/BoostRemote.xcodeproj/project.pbxproj index 8a649dc..dc42101 100644 --- a/BoostRemote.xcodeproj/project.pbxproj +++ b/BoostRemote.xcodeproj/project.pbxproj @@ -741,11 +741,11 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 31; + CURRENT_PROJECT_VERSION = 32; DEVELOPMENT_TEAM = UV6TAX3ANB; INFOPLIST_FILE = BoostRemote/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.9.2; + MARKETING_VERSION = 1.9.3; PRODUCT_BUNDLE_IDENTIFIER = "com.bricklife.ios.boost-remote"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; @@ -757,11 +757,11 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CURRENT_PROJECT_VERSION = 31; + CURRENT_PROJECT_VERSION = 32; DEVELOPMENT_TEAM = UV6TAX3ANB; INFOPLIST_FILE = BoostRemote/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 1.9.2; + MARKETING_VERSION = 1.9.3; PRODUCT_BUNDLE_IDENTIFIER = "com.bricklife.ios.boost-remote"; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; diff --git a/BoostRemote/ControllerViewController.swift b/BoostRemote/ControllerViewController.swift index bae1684..8f2f30c 100644 --- a/BoostRemote/ControllerViewController.swift +++ b/BoostRemote/ControllerViewController.swift @@ -79,7 +79,7 @@ class ControllerViewController: UIViewController { .withLatest(from: settingsState.signal.map { $0.directions[port] ?? true }) .map { (power: Int8, direction: Bool) in direction ? power : -power } .observeValues { [weak self] (value) in - self?.sendCommand(port: port, power: value) + self?.sendStartPowerCommand(port: port, power: value) } } } @@ -93,7 +93,7 @@ class ControllerViewController: UIViewController { private var timers: [BoostBLEKit.Port: Timer] = [:] private var waitingCommands: [BoostBLEKit.Port: Command] = [:] - private func sendCommand(port: BoostBLEKit.Port, power: Int8) { + private func sendStartPowerCommand(port: BoostBLEKit.Port, power: Int8) { guard let command = connectedHub?.motorStartPowerCommand(port: port, power: power) else { return } if timers[port] != nil { diff --git a/BoostRemote/MoveHubManager.swift b/BoostRemote/MoveHubManager.swift index c3277a4..98fe77e 100644 --- a/BoostRemote/MoveHubManager.swift +++ b/BoostRemote/MoveHubManager.swift @@ -58,7 +58,9 @@ class MoveHubManager: NSObject { self.connectedHub = Duplo.TrainBase() case .controlPlus: self.connectedHub = ControlPlus.SmartHub() - case .remoteControl: + case .spikeEssential: + self.connectedHub = Spike.EssentialHub() + default: return false } diff --git a/BoostRemote/Settings.bundle/Root.plist b/BoostRemote/Settings.bundle/Root.plist index 3954875..1e9c5e8 100644 --- a/BoostRemote/Settings.bundle/Root.plist +++ b/BoostRemote/Settings.bundle/Root.plist @@ -16,7 +16,7 @@ Type PSTitleValueSpecifier DefaultValue - 1.9.2 + 1.9.3 Title Version Key diff --git a/BoostRemote/State.swift b/BoostRemote/State.swift index 3378269..f7601b0 100644 --- a/BoostRemote/State.swift +++ b/BoostRemote/State.swift @@ -10,7 +10,7 @@ import Foundation import ReSwift import BoostBLEKit -struct State: StateType { +struct State { var connectionState: ConnectionState var portState: PortState diff --git a/Cartfile.resolved b/Cartfile.resolved index 4d282cd..4a69d83 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,3 +1,3 @@ -github "ReSwift/ReSwift" "5.0.0" -github "ReactiveCocoa/ReactiveSwift" "6.5.0" -github "bricklife/BoostBLEKit" "3.4.0" +github "ReSwift/ReSwift" "6.1.0" +github "ReactiveCocoa/ReactiveSwift" "6.7.0" +github "bricklife/BoostBLEKit" "3.5.0" diff --git a/Carthage/Checkouts/BoostBLEKit b/Carthage/Checkouts/BoostBLEKit index dd01e0c..04f0cb8 160000 --- a/Carthage/Checkouts/BoostBLEKit +++ b/Carthage/Checkouts/BoostBLEKit @@ -1 +1 @@ -Subproject commit dd01e0cc61c82fb42eca5e57c1138ab48e231128 +Subproject commit 04f0cb8284adbf972e19b93def9b23a1d98692be diff --git a/Carthage/Checkouts/ReSwift b/Carthage/Checkouts/ReSwift index b92762b..96146a2 160000 --- a/Carthage/Checkouts/ReSwift +++ b/Carthage/Checkouts/ReSwift @@ -1 +1 @@ -Subproject commit b92762b5aa85c5e94053d942fbd37124ee939e5b +Subproject commit 96146a29f394ae4c79be025fcec194e5b0d9c3b6 diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift index e03cda8..c43bae3 160000 --- a/Carthage/Checkouts/ReactiveSwift +++ b/Carthage/Checkouts/ReactiveSwift @@ -1 +1 @@ -Subproject commit e03cda84105ba707de039b757e2b2de868c65a3e +Subproject commit c43bae3dac73fdd3cb906bd5a1914686ca71ed3c