From 3e1104eae865ee18c2c43eab96c20ee955a54b8f Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Fri, 9 Nov 2018 16:35:46 +0000
Subject: [PATCH 01/12] Add Japanese localization for Settings.bundle

---
 BoostRemote/Settings.bundle/ja.lproj/Root.strings | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 BoostRemote/Settings.bundle/ja.lproj/Root.strings

diff --git a/BoostRemote/Settings.bundle/ja.lproj/Root.strings b/BoostRemote/Settings.bundle/ja.lproj/Root.strings
new file mode 100644
index 0000000..2df1623
--- /dev/null
+++ b/BoostRemote/Settings.bundle/ja.lproj/Root.strings
@@ -0,0 +1,4 @@
+/* A single strings file, whose title is specified in your preferences schema. The strings files provide the localized content to display to the user for each of your preferences. */
+
+"Version" = "バージョン";
+"Licenses" = "ライセンス";

From 4c4b8670603a0fa164933012e06c88be8f1b0583 Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Fri, 9 Nov 2018 16:35:51 +0000
Subject: [PATCH 02/12] Fix project

---
 BoostRemote.xcodeproj/project.pbxproj | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/BoostRemote.xcodeproj/project.pbxproj b/BoostRemote.xcodeproj/project.pbxproj
index 210799f..4fb9df7 100644
--- a/BoostRemote.xcodeproj/project.pbxproj
+++ b/BoostRemote.xcodeproj/project.pbxproj
@@ -39,7 +39,6 @@
 		CBF9D2B91F3CACA800B97E11 /* MoveHubManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBF9D2B81F3CACA800B97E11 /* MoveHubManager.swift */; };
 		CBF9D2D61F3CB52800B97E11 /* MoveHubService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBF9D2D51F3CB52800B97E11 /* MoveHubService.swift */; };
 		CBF9D2F61F3CDAC700B97E11 /* Data+HexString.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBF9D2F51F3CDAC700B97E11 /* Data+HexString.swift */; };
-		DC1E38FB2111EE4900DA9522 /* Main.strings in Resources */ = {isa = PBXBuildFile; fileRef = DC1E38F92111EE4900DA9522 /* Main.strings */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -292,7 +291,6 @@
 		CBF9D2D51F3CB52800B97E11 /* MoveHubService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoveHubService.swift; sourceTree = "<group>"; };
 		CBF9D2F51F3CDAC700B97E11 /* Data+HexString.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+HexString.swift"; sourceTree = "<group>"; };
 		DC1E38F82111EE2D00DA9522 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		DC1E38FA2111EE4900DA9522 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
 		DC1E38FC2111EE8100DA9522 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
 		DCEE1D2B2111EDFC00FFCFAF /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -334,7 +332,6 @@
 			children = (
 				CB3BE8B01F2FF2F4000561F7 /* AppDelegate.swift */,
 				CB3BE8B41F2FF2F4000561F7 /* Main.storyboard */,
-				DC1E38F92111EE4900DA9522 /* Main.strings */,
 				CB8C7EB3201FEF6500274A09 /* SettingsViewController.swift */,
 				CB3BE8B21F2FF2F4000561F7 /* ControllerViewController.swift */,
 				CBC72DF9201AC35C00ABE096 /* Controller.swift */,
@@ -695,7 +692,6 @@
 				CB5891F9200D2DF300E15F92 /* InfoPlist.strings in Resources */,
 				CB3BE8BB1F2FF2F4000561F7 /* LaunchScreen.storyboard in Resources */,
 				CB3BE8B81F2FF2F4000561F7 /* Assets.xcassets in Resources */,
-				DC1E38FB2111EE4900DA9522 /* Main.strings in Resources */,
 				CB385A4A1F4E35210061EBE4 /* Settings.bundle in Resources */,
 				CB3BE8B61F2FF2F4000561F7 /* Main.storyboard in Resources */,
 			);
@@ -791,14 +787,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		DC1E38F92111EE4900DA9522 /* Main.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				DC1E38FA2111EE4900DA9522 /* de */,
-			);
-			name = Main.strings;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

From 55536924057a607c1d8afbea4ac09f30a7868392 Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Fri, 9 Nov 2018 17:16:08 +0000
Subject: [PATCH 03/12] Fix layout

---
 BoostRemote/Base.lproj/Main.storyboard | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/BoostRemote/Base.lproj/Main.storyboard b/BoostRemote/Base.lproj/Main.storyboard
index 94e4197..588055b 100644
--- a/BoostRemote/Base.lproj/Main.storyboard
+++ b/BoostRemote/Base.lproj/Main.storyboard
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="kVc-1C-KTk">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="kVc-1C-KTk">
     <device id="retina3_5" orientation="landscape">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -171,7 +169,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port A" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nxb-Sh-8Vf">
-                                                    <rect key="frame" x="16" y="12" width="48" height="21"/>
+                                                    <rect key="frame" x="16" y="11.5" width="48" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -207,7 +205,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port B" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="t51-4l-aJ5">
-                                                    <rect key="frame" x="16" y="12" width="48" height="21"/>
+                                                    <rect key="frame" x="16" y="11.5" width="48" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -243,7 +241,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port C" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QQF-LJ-BZe">
-                                                    <rect key="frame" x="16" y="12" width="49" height="21"/>
+                                                    <rect key="frame" x="16" y="11.5" width="49" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -279,7 +277,7 @@
                                                     </connections>
                                                 </segmentedControl>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Port D" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fYO-cN-YCM">
-                                                    <rect key="frame" x="8" y="12" width="49" height="21"/>
+                                                    <rect key="frame" x="8" y="11.5" width="49" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
@@ -306,14 +304,14 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="1 step (On / Off)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pYf-8e-0Vh">
-                                                    <rect key="frame" x="16" y="5" width="123" height="20.5"/>
+                                                    <rect key="frame" x="15" y="5" width="123" height="20.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="0 or 100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uoD-Hx-d61">
-                                                    <rect key="frame" x="16" y="25.5" width="47" height="14.5"/>
+                                                    <rect key="frame" x="15" y="25.5" width="47" height="14.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <nil key="textColor"/>
@@ -330,14 +328,14 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="2 steps" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pGG-TU-DN3">
-                                                    <rect key="frame" x="16" y="5" width="56.5" height="20.5"/>
+                                                    <rect key="frame" x="15" y="5" width="56.5" height="20.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="0, 50, 100" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Gs8-bZ-cWF">
-                                                    <rect key="frame" x="16" y="25.5" width="56.5" height="14.5"/>
+                                                    <rect key="frame" x="15" y="25.5" width="56.5" height="14.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <nil key="textColor"/>
@@ -554,10 +552,10 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="qSz-nm-d2I" firstAttribute="bottom" secondItem="Tce-Ul-WSQ" secondAttribute="bottomMargin" id="1qN-5F-y60"/>
+                            <constraint firstItem="qSz-nm-d2I" firstAttribute="bottom" secondItem="Tce-Ul-WSQ" secondAttribute="bottom" id="1qN-5F-y60"/>
                             <constraint firstItem="qSz-nm-d2I" firstAttribute="leading" secondItem="Tce-Ul-WSQ" secondAttribute="leading" id="AWk-rb-JI1"/>
                             <constraint firstAttribute="bottom" secondItem="bCh-Bk-bmk" secondAttribute="bottom" id="BP8-hV-zY5"/>
-                            <constraint firstItem="qSz-nm-d2I" firstAttribute="top" secondItem="Tce-Ul-WSQ" secondAttribute="topMargin" id="QLi-NF-hhy"/>
+                            <constraint firstItem="qSz-nm-d2I" firstAttribute="top" secondItem="Tce-Ul-WSQ" secondAttribute="top" id="QLi-NF-hhy"/>
                             <constraint firstAttribute="trailing" secondItem="bCh-Bk-bmk" secondAttribute="trailing" id="WJ3-7L-Y4l"/>
                             <constraint firstItem="bCh-Bk-bmk" firstAttribute="top" secondItem="Tce-Ul-WSQ" secondAttribute="top" id="dRg-ji-5d8"/>
                         </constraints>

From b6e303112b3663393c710edf601c248bc3c35627 Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Fri, 9 Nov 2018 18:54:02 +0000
Subject: [PATCH 04/12] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e2d75eb..e88dfb4 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Remote Control iOS app for LEGO® BOOST
 ## Requirements
 - iOS 9 or higher
 - iOS device supporting Bluetooth Low Energy (BLE)
-- LEGO® BOOST Move Hub
+- LEGO® BOOST Move Hub or Powered Up Hub
 
 ## App Store
 https://itunes.apple.com/us/app/boost-remote/id1270503610?ls=1&mt=8
@@ -19,7 +19,7 @@ https://itunes.apple.com/us/app/boost-remote/id1270503610?ls=1&mt=8
 https://youtu.be/WuvGT8WqLrQ
 
 ## How to build
-1. Install [Xcode 10](https://developer.apple.com/xcode/)
+1. Install [Xcode 10.1](https://developer.apple.com/xcode/)
 2. Clone this repository including submodules
 3. Open `BoostRemote.xcodeproj`
 4. Build `BoostRemote` scheme

From 630629f30e78bb156ad7037e9348e4c4de185883 Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Sun, 30 Jun 2019 01:38:12 +0900
Subject: [PATCH 05/12] Update libraries

---
 .gitmodules                                |   3 -
 BoostRemote.xcodeproj/project.pbxproj      | 136 +--------------------
 BoostRemote/Controller.swift               |   3 +-
 BoostRemote/JoystickViewController.swift   |  11 +-
 BoostRemote/StickView.swift                |   3 +-
 BoostRemote/TwinSticksViewController.swift |  11 +-
 Cartfile.resolved                          |   5 +-
 Carthage/Checkouts/ReSwift                 |   2 +-
 Carthage/Checkouts/ReactiveSwift           |   2 +-
 9 files changed, 17 insertions(+), 159 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 4b9c9fc..79cc05b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "Carthage/Checkouts/ReactiveSwift"]
 	path = Carthage/Checkouts/ReactiveSwift
 	url = https://github.com/ReactiveCocoa/ReactiveSwift.git
-[submodule "Carthage/Checkouts/Result"]
-	path = Carthage/Checkouts/Result
-	url = https://github.com/antitypical/Result.git
 [submodule "Carthage/Checkouts/BoostBLEKit"]
 	path = Carthage/Checkouts/BoostBLEKit
 	url = https://github.com/bricklife/BoostBLEKit.git
diff --git a/BoostRemote.xcodeproj/project.pbxproj b/BoostRemote.xcodeproj/project.pbxproj
index 4fb9df7..2ec998b 100644
--- a/BoostRemote.xcodeproj/project.pbxproj
+++ b/BoostRemote.xcodeproj/project.pbxproj
@@ -29,8 +29,6 @@
 		CBD2D09E217790ED0036C5C8 /* BoostBLEKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CBD2D037217790320036C5C8 /* BoostBLEKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		CBD2D0A1217790F20036C5C8 /* ReactiveSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBD2D061217790420036C5C8 /* ReactiveSwift.framework */; };
 		CBD2D0A2217790F20036C5C8 /* ReactiveSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CBD2D061217790420036C5C8 /* ReactiveSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		CBD2D0A5217790FD0036C5C8 /* Result.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBD2D079217790520036C5C8 /* Result.framework */; };
-		CBD2D0A6217790FD0036C5C8 /* Result.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CBD2D079217790520036C5C8 /* Result.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		CBD2D0A9217791060036C5C8 /* ReSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CBD2D08E217790580036C5C8 /* ReSwift.framework */; };
 		CBD2D0AA217791060036C5C8 /* ReSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = CBD2D08E217790580036C5C8 /* ReSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		CBD94E841F391B3F0037ED71 /* State.swift in Sources */ = {isa = PBXBuildFile; fileRef = CBD94E831F391B3F0037ED71 /* State.swift */; };
@@ -105,55 +103,6 @@
 			remoteGlobalIDString = 7DFBED031CDB8C9500EE435B;
 			remoteInfo = "ReactiveSwift-tvOSTests";
 		};
-		CBD2D074217790520036C5C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D45480571A9572F5009D7229;
-			remoteInfo = "Result-Mac";
-		};
-		CBD2D076217790520036C5C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D45480671A9572F5009D7229;
-			remoteInfo = "Result-MacTests";
-		};
-		CBD2D078217790520036C5C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D454807D1A957361009D7229;
-			remoteInfo = "Result-iOS";
-		};
-		CBD2D07A217790520036C5C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D45480871A957362009D7229;
-			remoteInfo = "Result-iOSTests";
-		};
-		CBD2D07C217790520036C5C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 57FCDE471BA280DC00130C48;
-			remoteInfo = "Result-tvOS";
-		};
-		CBD2D07E217790520036C5C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 57FCDE541BA280E000130C48;
-			remoteInfo = "Result-tvOSTests";
-		};
-		CBD2D080217790520036C5C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D03579A31B2B788F005D26AE;
-			remoteInfo = "Result-watchOS";
-		};
 		CBD2D08D217790580036C5C8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = CBD2D082217790570036C5C8 /* ReSwift.xcodeproj */;
@@ -224,13 +173,6 @@
 			remoteGlobalIDString = D047260B19E49F82006002AA;
 			remoteInfo = "ReactiveSwift-iOS";
 		};
-		CBD2D0A7217790FD0036C5C8 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-			proxyType = 1;
-			remoteGlobalIDString = D454807C1A957361009D7229;
-			remoteInfo = "Result-iOS";
-		};
 		CBD2D0AB217791060036C5C8 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = CBD2D082217790570036C5C8 /* ReSwift.xcodeproj */;
@@ -247,7 +189,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				CBD2D0A6217790FD0036C5C8 /* Result.framework in Embed Frameworks */,
 				CBD2D0AA217791060036C5C8 /* ReSwift.framework in Embed Frameworks */,
 				CBD2D09E217790ED0036C5C8 /* BoostBLEKit.framework in Embed Frameworks */,
 				CBD2D0A2217790F20036C5C8 /* ReactiveSwift.framework in Embed Frameworks */,
@@ -282,7 +223,6 @@
 		CBD2D02F217790160036C5C8 /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
 		CBD2D031217790310036C5C8 /* BoostBLEKit.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = BoostBLEKit.xcodeproj; path = Carthage/Checkouts/BoostBLEKit/BoostBLEKit.xcodeproj; sourceTree = "<group>"; };
 		CBD2D052217790420036C5C8 /* ReactiveSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactiveSwift.xcodeproj; path = Carthage/Checkouts/ReactiveSwift/ReactiveSwift.xcodeproj; sourceTree = "<group>"; };
-		CBD2D06A217790510036C5C8 /* Result.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Result.xcodeproj; path = Carthage/Checkouts/Result/Result.xcodeproj; sourceTree = "<group>"; };
 		CBD2D082217790570036C5C8 /* ReSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReSwift.xcodeproj; path = Carthage/Checkouts/ReSwift/ReSwift.xcodeproj; sourceTree = "<group>"; };
 		CBD94E831F391B3F0037ED71 /* State.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = State.swift; sourceTree = "<group>"; };
 		CBD94E851F391D7F0037ED71 /* Action.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Action.swift; sourceTree = "<group>"; };
@@ -300,7 +240,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CBD2D0A5217790FD0036C5C8 /* Result.framework in Frameworks */,
 				CBD2D0A9217791060036C5C8 /* ReSwift.framework in Frameworks */,
 				CBD2D09D217790ED0036C5C8 /* BoostBLEKit.framework in Frameworks */,
 				CBD2D0A1217790F20036C5C8 /* ReactiveSwift.framework in Frameworks */,
@@ -362,7 +301,6 @@
 				CBD2D02F217790160036C5C8 /* Cartfile */,
 				CBD2D031217790310036C5C8 /* BoostBLEKit.xcodeproj */,
 				CBD2D052217790420036C5C8 /* ReactiveSwift.xcodeproj */,
-				CBD2D06A217790510036C5C8 /* Result.xcodeproj */,
 				CBD2D082217790570036C5C8 /* ReSwift.xcodeproj */,
 			);
 			name = Carthage;
@@ -391,20 +329,6 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		CBD2D06B217790510036C5C8 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				CBD2D075217790520036C5C8 /* Result.framework */,
-				CBD2D077217790520036C5C8 /* Result-MacTests.xctest */,
-				CBD2D079217790520036C5C8 /* Result.framework */,
-				CBD2D07B217790520036C5C8 /* Result-iOSTests.xctest */,
-				CBD2D07D217790520036C5C8 /* Result.framework */,
-				CBD2D07F217790520036C5C8 /* Result-tvOSTests.xctest */,
-				CBD2D081217790520036C5C8 /* Result.framework */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		CBD2D083217790570036C5C8 /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -448,7 +372,6 @@
 			dependencies = (
 				CBD2D0A0217790ED0036C5C8 /* PBXTargetDependency */,
 				CBD2D0A4217790F20036C5C8 /* PBXTargetDependency */,
-				CBD2D0A8217790FD0036C5C8 /* PBXTargetDependency */,
 				CBD2D0AC217791060036C5C8 /* PBXTargetDependency */,
 			);
 			name = BoostRemote;
@@ -479,6 +402,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 				ja,
@@ -496,10 +420,6 @@
 					ProductGroup = CBD2D053217790420036C5C8 /* Products */;
 					ProjectRef = CBD2D052217790420036C5C8 /* ReactiveSwift.xcodeproj */;
 				},
-				{
-					ProductGroup = CBD2D06B217790510036C5C8 /* Products */;
-					ProjectRef = CBD2D06A217790510036C5C8 /* Result.xcodeproj */;
-				},
 				{
 					ProductGroup = CBD2D083217790570036C5C8 /* Products */;
 					ProjectRef = CBD2D082217790570036C5C8 /* ReSwift.xcodeproj */;
@@ -576,55 +496,6 @@
 			remoteRef = CBD2D068217790420036C5C8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		CBD2D075217790520036C5C8 /* Result.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Result.framework;
-			remoteRef = CBD2D074217790520036C5C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		CBD2D077217790520036C5C8 /* Result-MacTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Result-MacTests.xctest";
-			remoteRef = CBD2D076217790520036C5C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		CBD2D079217790520036C5C8 /* Result.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Result.framework;
-			remoteRef = CBD2D078217790520036C5C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		CBD2D07B217790520036C5C8 /* Result-iOSTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Result-iOSTests.xctest";
-			remoteRef = CBD2D07A217790520036C5C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		CBD2D07D217790520036C5C8 /* Result.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Result.framework;
-			remoteRef = CBD2D07C217790520036C5C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		CBD2D07F217790520036C5C8 /* Result-tvOSTests.xctest */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.cfbundle;
-			path = "Result-tvOSTests.xctest";
-			remoteRef = CBD2D07E217790520036C5C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-		CBD2D081217790520036C5C8 /* Result.framework */ = {
-			isa = PBXReferenceProxy;
-			fileType = wrapper.framework;
-			path = Result.framework;
-			remoteRef = CBD2D080217790520036C5C8 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		CBD2D08E217790580036C5C8 /* ReSwift.framework */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.framework;
@@ -738,11 +609,6 @@
 			name = "ReactiveSwift-iOS";
 			targetProxy = CBD2D0A3217790F20036C5C8 /* PBXContainerItemProxy */;
 		};
-		CBD2D0A8217790FD0036C5C8 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			name = "Result-iOS";
-			targetProxy = CBD2D0A7217790FD0036C5C8 /* PBXContainerItemProxy */;
-		};
 		CBD2D0AC217791060036C5C8 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = "ReSwift-iOS";
diff --git a/BoostRemote/Controller.swift b/BoostRemote/Controller.swift
index 3e9b2c3..d177ac6 100644
--- a/BoostRemote/Controller.swift
+++ b/BoostRemote/Controller.swift
@@ -8,12 +8,11 @@
 
 import Foundation
 import ReactiveSwift
-import Result
 import BoostBLEKit
 
 protocol Controller {
     
-    var signals: [BoostBLEKit.Port: Signal<Double, NoError>] { get }
+    var signals: [BoostBLEKit.Port: Signal<Double, Never>] { get }
     
     func setEnable(_ enable: Bool, port: BoostBLEKit.Port)
 }
diff --git a/BoostRemote/JoystickViewController.swift b/BoostRemote/JoystickViewController.swift
index 52283ce..51d2cc3 100644
--- a/BoostRemote/JoystickViewController.swift
+++ b/BoostRemote/JoystickViewController.swift
@@ -8,7 +8,6 @@
 
 import UIKit
 import ReactiveSwift
-import Result
 import BoostBLEKit
 
 class JoystickViewController: UIViewController, Controller {
@@ -18,15 +17,15 @@ class JoystickViewController: UIViewController, Controller {
     @IBOutlet private weak var stickC: StickView!
     @IBOutlet private weak var stickD: StickView!
     
-    private let (signalA, observerA) = Signal<Double, NoError>.pipe()
-    private let (signalB, observerB) = Signal<Double, NoError>.pipe()
-    private let (signalC, observerC) = Signal<Double, NoError>.pipe()
-    private let (signalD, observerD) = Signal<Double, NoError>.pipe()
+    private let (signalA, observerA) = Signal<Double, Never>.pipe()
+    private let (signalB, observerB) = Signal<Double, Never>.pipe()
+    private let (signalC, observerC) = Signal<Double, Never>.pipe()
+    private let (signalD, observerD) = Signal<Double, Never>.pipe()
     
     private var isEnableA: Bool = true
     private var isEnableB: Bool = true
     
-    lazy var signals: [BoostBLEKit.Port: Signal<Double, NoError>] = [
+    lazy var signals: [BoostBLEKit.Port: Signal<Double, Never>] = [
         .A: self.signalA,
         .B: self.signalB,
         .C: self.signalC,
diff --git a/BoostRemote/StickView.swift b/BoostRemote/StickView.swift
index e21ae56..75764d2 100644
--- a/BoostRemote/StickView.swift
+++ b/BoostRemote/StickView.swift
@@ -8,12 +8,11 @@
 
 import UIKit
 import ReactiveSwift
-import Result
 import BoostBLEKit
 
 class StickView: UIView {
     
-    let (signal, observer) = Signal<Double, NoError>.pipe()
+    let (signal, observer) = Signal<Double, Never>.pipe()
     
     var port: BoostBLEKit.Port? {
         didSet {
diff --git a/BoostRemote/TwinSticksViewController.swift b/BoostRemote/TwinSticksViewController.swift
index dacad44..deb7e6c 100644
--- a/BoostRemote/TwinSticksViewController.swift
+++ b/BoostRemote/TwinSticksViewController.swift
@@ -8,7 +8,6 @@
 
 import UIKit
 import ReactiveSwift
-import Result
 import BoostBLEKit
 
 class TwinSticksViewController: UIViewController, Controller {
@@ -18,12 +17,12 @@ class TwinSticksViewController: UIViewController, Controller {
     @IBOutlet private weak var stickC: StickView!
     @IBOutlet private weak var stickD: StickView!
     
-    private let (signalA, observerA) = Signal<Double, NoError>.pipe()
-    private let (signalB, observerB) = Signal<Double, NoError>.pipe()
-    private let (signalC, observerC) = Signal<Double, NoError>.pipe()
-    private let (signalD, observerD) = Signal<Double, NoError>.pipe()
+    private let (signalA, observerA) = Signal<Double, Never>.pipe()
+    private let (signalB, observerB) = Signal<Double, Never>.pipe()
+    private let (signalC, observerC) = Signal<Double, Never>.pipe()
+    private let (signalD, observerD) = Signal<Double, Never>.pipe()
     
-    lazy var signals: [BoostBLEKit.Port: Signal<Double, NoError>] = [
+    lazy var signals: [BoostBLEKit.Port: Signal<Double, Never>] = [
         .A: self.signalA,
         .B: self.signalB,
         .C: self.signalC,
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 6828482..d15c0b3 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,4 +1,3 @@
-github "ReSwift/ReSwift" "4.0.1"
-github "ReactiveCocoa/ReactiveSwift" "4.0.0"
-github "antitypical/Result" "4.0.0"
+github "ReSwift/ReSwift" "4.1.1"
+github "ReactiveCocoa/ReactiveSwift" "6.1.0"
 github "bricklife/BoostBLEKit" "2.1.0"
diff --git a/Carthage/Checkouts/ReSwift b/Carthage/Checkouts/ReSwift
index d4cb424..8b840e3 160000
--- a/Carthage/Checkouts/ReSwift
+++ b/Carthage/Checkouts/ReSwift
@@ -1 +1 @@
-Subproject commit d4cb4248a51ad90e6f64a6962aefc4302720028f
+Subproject commit 8b840e3c234bc91f1a6a2720ea20ecf019509b1b
diff --git a/Carthage/Checkouts/ReactiveSwift b/Carthage/Checkouts/ReactiveSwift
index 4f6a12a..b772fa0 160000
--- a/Carthage/Checkouts/ReactiveSwift
+++ b/Carthage/Checkouts/ReactiveSwift
@@ -1 +1 @@
-Subproject commit 4f6a12ae6762e825b0e19a4f7076eafa43847e6e
+Subproject commit b772fa0b624926e6e2f21acbb79297736a05c585

From f032335674aea8a921d98ddd052049fda17fdc68 Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Mon, 1 Jul 2019 16:10:01 +0900
Subject: [PATCH 06/12] Update BoostBLEKit

---
 BoostRemote/MoveHubManager.swift | 4 ++++
 Cartfile.resolved                | 2 +-
 Carthage/Checkouts/BoostBLEKit   | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/BoostRemote/MoveHubManager.swift b/BoostRemote/MoveHubManager.swift
index f1832eb..fe4be35 100644
--- a/BoostRemote/MoveHubManager.swift
+++ b/BoostRemote/MoveHubManager.swift
@@ -49,8 +49,12 @@ class MoveHubManager: NSObject {
         switch hubType {
         case .boost:
             self.connectedHub = Boost.MoveHub()
+        case .boostV1:
+            self.connectedHub = Boost.MoveHubV1()
         case .poweredUp:
             self.connectedHub = PoweredUp.SmartHub()
+        case .duploTrain:
+            self.connectedHub = Duplo.TrainBase()
         }
         
         self.peripheral = peripheral
diff --git a/Cartfile.resolved b/Cartfile.resolved
index d15c0b3..7ae973c 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
 github "ReSwift/ReSwift" "4.1.1"
 github "ReactiveCocoa/ReactiveSwift" "6.1.0"
-github "bricklife/BoostBLEKit" "2.1.0"
+github "bricklife/BoostBLEKit" "2.2.0"
diff --git a/Carthage/Checkouts/BoostBLEKit b/Carthage/Checkouts/BoostBLEKit
index e9e5537..c3f11c4 160000
--- a/Carthage/Checkouts/BoostBLEKit
+++ b/Carthage/Checkouts/BoostBLEKit
@@ -1 +1 @@
-Subproject commit e9e55374bd71f9e7bdb97eafd1bf521d4d4ac7ba
+Subproject commit c3f11c4090630c12e9af2c3f0521e36df71bf174

From 3e6ce44ca52b17645ac3fad5e6f5f8424a5ead00 Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Mon, 1 Jul 2019 16:10:16 +0900
Subject: [PATCH 07/12] Use Swift 5

---
 BoostRemote.xcodeproj/project.pbxproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BoostRemote.xcodeproj/project.pbxproj b/BoostRemote.xcodeproj/project.pbxproj
index 2ec998b..3919b2a 100644
--- a/BoostRemote.xcodeproj/project.pbxproj
+++ b/BoostRemote.xcodeproj/project.pbxproj
@@ -392,7 +392,7 @@
 					CB3BE8AC1F2FF2F4000561F7 = {
 						CreatedOnToolsVersion = 8.3.3;
 						DevelopmentTeam = UV6TAX3ANB;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -712,7 +712,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -765,7 +765,7 @@
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};

From 57235084b7aa286b8639ce804c59b02119747d6f Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Thu, 4 Jul 2019 01:22:56 +0900
Subject: [PATCH 08/12] Fix warnings

---
 BoostRemote.xcodeproj/project.pbxproj | 5 ++---
 BoostRemote/Action.swift              | 7 ++-----
 BoostRemote/Data+HexString.swift      | 2 +-
 BoostRemote/MoveHubManager.swift      | 2 ++
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/BoostRemote.xcodeproj/project.pbxproj b/BoostRemote.xcodeproj/project.pbxproj
index 3919b2a..d249ac5 100644
--- a/BoostRemote.xcodeproj/project.pbxproj
+++ b/BoostRemote.xcodeproj/project.pbxproj
@@ -399,10 +399,9 @@
 			};
 			buildConfigurationList = CB3BE8A81F2FF2F4000561F7 /* Build configuration list for PBXProject "BoostRemote" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
 				en,
 				Base,
 				ja,
@@ -442,7 +441,7 @@
 		};
 		CBD2D039217790320036C5C8 /* BoostBLEKitTests.xctest */ = {
 			isa = PBXReferenceProxy;
-			fileType = file;
+			fileType = wrapper.cfbundle;
 			path = BoostBLEKitTests.xctest;
 			remoteRef = CBD2D038217790320036C5C8 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
diff --git a/BoostRemote/Action.swift b/BoostRemote/Action.swift
index 31b33cc..0a5ed49 100644
--- a/BoostRemote/Action.swift
+++ b/BoostRemote/Action.swift
@@ -34,11 +34,8 @@ enum SettingsAction: Action {
 struct ActionCenter {
     
     static func startScan() {
-        let action: Store<State>.ActionCreator = { state, store in
-            MoveHubManager.shared.startScan()
-            return ConnectAction.scan
-        }
-        StoreCenter.store.dispatch(action)
+        MoveHubManager.shared.startScan()
+        StoreCenter.store.dispatch(ConnectAction.scan)
     }
     
     static func stopScan() {
diff --git a/BoostRemote/Data+HexString.swift b/BoostRemote/Data+HexString.swift
index 2709073..d0a1a84 100644
--- a/BoostRemote/Data+HexString.swift
+++ b/BoostRemote/Data+HexString.swift
@@ -21,7 +21,7 @@ extension Data {
         
         let bytes = zip(even, odd).compactMap { UInt8(String([$0.0, $0.1]), radix: 16) }
         
-        self.init(bytes: bytes)
+        self.init(bytes)
     }
     
     public var hexString: String {
diff --git a/BoostRemote/MoveHubManager.swift b/BoostRemote/MoveHubManager.swift
index fe4be35..3356c7c 100644
--- a/BoostRemote/MoveHubManager.swift
+++ b/BoostRemote/MoveHubManager.swift
@@ -103,6 +103,8 @@ extension MoveHubManager: CBCentralManagerDelegate {
             StoreCenter.store.dispatch(ConnectAction.unsupported)
         case .unsupported:
             StoreCenter.store.dispatch(ConnectAction.unsupported)
+        @unknown default:
+            StoreCenter.store.dispatch(ConnectAction.unsupported)
         }
     }
     

From 986b8a8aec5634f213877d3ba6a16535f7d6f73a Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Thu, 4 Jul 2019 02:00:39 +0900
Subject: [PATCH 09/12] Improve connection handling

---
 BoostRemote/MoveHubManager.swift | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/BoostRemote/MoveHubManager.swift b/BoostRemote/MoveHubManager.swift
index 3356c7c..373ba39 100644
--- a/BoostRemote/MoveHubManager.swift
+++ b/BoostRemote/MoveHubManager.swift
@@ -21,6 +21,7 @@ class MoveHubManager: NSObject {
     private var characteristic: CBCharacteristic?
     
     private var connectedHub: Hub?
+    private var isInitializingHub = false
     
     override init() {
         super.init()
@@ -57,6 +58,7 @@ class MoveHubManager: NSObject {
             self.connectedHub = Duplo.TrainBase()
         }
         
+        self.isInitializingHub = true
         self.peripheral = peripheral
         centralManager.connect(peripheral, options: nil)
         
@@ -64,12 +66,15 @@ class MoveHubManager: NSObject {
     }
     
     func disconnect() {
-        if let peripheral = peripheral {
-            centralManager.cancelPeripheralConnection(peripheral)
-            self.peripheral = nil
-            self.characteristic = nil
-            self.connectedHub = nil
-        }
+        write(data: Data([0x04, 0x00, 0x02, 0x01])) // Switch Off Hub
+        reset()
+    }
+    
+    func reset() {
+        self.peripheral = nil
+        self.characteristic = nil
+        self.connectedHub = nil
+        self.isInitializingHub = false
     }
     
     func set(characteristic: CBCharacteristic) {
@@ -120,10 +125,12 @@ extension MoveHubManager: CBCentralManagerDelegate {
     }
     
     func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) {
+        reset()
         StoreCenter.store.dispatch(ConnectAction.disconnect)
     }
     
     func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) {
+        reset()
         StoreCenter.store.dispatch(ConnectAction.disconnect)
     }
 }
@@ -154,6 +161,12 @@ extension MoveHubManager: CBPeripheralDelegate {
             default:
                 break
             }
+            
+            if isInitializingHub {
+                isInitializingHub = false
+                write(data: HubPropertiesCommand(property: .batteryVoltage, operation: .enableUpdates).data)
+            }
+
         }
     }
 }

From d625a57210b342208d6708f6235540b373dc30bb Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Thu, 4 Jul 2019 03:04:15 +0900
Subject: [PATCH 10/12] Refactoring

---
 BoostRemote/MoveHubManager.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/BoostRemote/MoveHubManager.swift b/BoostRemote/MoveHubManager.swift
index 373ba39..5f232c6 100644
--- a/BoostRemote/MoveHubManager.swift
+++ b/BoostRemote/MoveHubManager.swift
@@ -67,7 +67,6 @@ class MoveHubManager: NSObject {
     
     func disconnect() {
         write(data: Data([0x04, 0x00, 0x02, 0x01])) // Switch Off Hub
-        reset()
     }
     
     func reset() {

From c7db135b136aca7ed2b8e1ef4cff9f5ff8455225 Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Sat, 6 Jul 2019 04:17:13 +0900
Subject: [PATCH 11/12] Improve operability (#19)

* Use the latest libraries

* Add a rate limit to each port
---
 BoostRemote/ControllerViewController.swift | 20 +++++++++++++++++++-
 Cartfile.resolved                          |  4 ++--
 Carthage/Checkouts/BoostBLEKit             |  2 +-
 Carthage/Checkouts/ReSwift                 |  2 +-
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/BoostRemote/ControllerViewController.swift b/BoostRemote/ControllerViewController.swift
index a13c061..16323f3 100644
--- a/BoostRemote/ControllerViewController.swift
+++ b/BoostRemote/ControllerViewController.swift
@@ -93,12 +93,30 @@ class ControllerViewController: UIViewController {
         }
     }
     
+    private var timers: [BoostBLEKit.Port: Timer] = [:]
+    private var waitingCommands: [BoostBLEKit.Port: Command] = [:]
+    
     private func sendCommand(port: BoostBLEKit.Port, power: Int8) {
-        if let command = connectedHub?.motorPowerCommand(port: port, power: power) {
+        guard let command = connectedHub?.motorStartPowerCommand(port: port, power: power) else { return }
+        
+        if timers[port] != nil {
+            waitingCommands[port] = command
+        } else {
             ActionCenter.send(command: command)
+            timers[port] = Timer.scheduledTimer(timeInterval: 0.1, target: self, selector: #selector(sendWaitingCommand), userInfo: port, repeats: false)
         }
     }
     
+    @objc private func sendWaitingCommand(_ timer: Timer) {
+        guard let port = timer.userInfo as? BoostBLEKit.Port else { return }
+        timers[port] = nil
+        
+        guard let command = waitingCommands[port] else { return }
+        waitingCommands[port] = nil
+        
+        ActionCenter.send(command: command)
+    }
+    
     private func alert(message: String) {
         let alert = UIAlertController(title: NSLocalizedString("CAUTION", comment: "CAUTION"), message: message, preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
diff --git a/Cartfile.resolved b/Cartfile.resolved
index 7ae973c..c72f561 100644
--- a/Cartfile.resolved
+++ b/Cartfile.resolved
@@ -1,3 +1,3 @@
-github "ReSwift/ReSwift" "4.1.1"
+github "ReSwift/ReSwift" "5.0.0"
 github "ReactiveCocoa/ReactiveSwift" "6.1.0"
-github "bricklife/BoostBLEKit" "2.2.0"
+github "bricklife/BoostBLEKit" "3.0.0"
diff --git a/Carthage/Checkouts/BoostBLEKit b/Carthage/Checkouts/BoostBLEKit
index c3f11c4..3411b0e 160000
--- a/Carthage/Checkouts/BoostBLEKit
+++ b/Carthage/Checkouts/BoostBLEKit
@@ -1 +1 @@
-Subproject commit c3f11c4090630c12e9af2c3f0521e36df71bf174
+Subproject commit 3411b0eb6b1373c0bb96399b46164f01a9097b53
diff --git a/Carthage/Checkouts/ReSwift b/Carthage/Checkouts/ReSwift
index 8b840e3..b92762b 160000
--- a/Carthage/Checkouts/ReSwift
+++ b/Carthage/Checkouts/ReSwift
@@ -1 +1 @@
-Subproject commit 8b840e3c234bc91f1a6a2720ea20ecf019509b1b
+Subproject commit b92762b5aa85c5e94053d942fbd37124ee939e5b

From fb5566bc6c631dd5de04461e7ea72a327aff655d Mon Sep 17 00:00:00 2001
From: Shinichiro Oba <ooba@bricklife.com>
Date: Sat, 6 Jul 2019 04:23:20 +0900
Subject: [PATCH 12/12] Update the version to 1.8.4 (25)

---
 BoostRemote/Info.plist                 | 4 ++--
 BoostRemote/Settings.bundle/Root.plist | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/BoostRemote/Info.plist b/BoostRemote/Info.plist
index 7ba9c30..cc7c210 100644
--- a/BoostRemote/Info.plist
+++ b/BoostRemote/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.3</string>
+	<string>1.8.4</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>25</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothPeripheralUsageDescription</key>
diff --git a/BoostRemote/Settings.bundle/Root.plist b/BoostRemote/Settings.bundle/Root.plist
index b38d62a..62af3e3 100644
--- a/BoostRemote/Settings.bundle/Root.plist
+++ b/BoostRemote/Settings.bundle/Root.plist
@@ -16,7 +16,7 @@
 			<key>Type</key>
 			<string>PSTitleValueSpecifier</string>
 			<key>DefaultValue</key>
-			<string>1.8.3</string>
+			<string>1.8.4</string>
 			<key>Title</key>
 			<string>Version</string>
 			<key>Key</key>