--no commit message

Imanol-Mikel Barba Sabariego
1 parent e98eb05a
Showing 17 changed files with 268 additions and 219 deletions
DUREX Vendor Control/Base.lproj/DatePickerViewController_iPad.xib
DUREX Vendor Control/Base.lproj/EMConnectingView_iPad.xib
DUREX Vendor Control/Base.lproj/Localizable.strings
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.pbxproj
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
DUREX Vendor Control/DUREX Vendor Control.xcodeproj/xcuserdata/imanol.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
DUREX Vendor Control/FirstAppExample/Base.lproj/MainStoryboard.storyboard
DUREX Vendor Control/FirstAppExample/EMDevicePickerViewController.m
DUREX Vendor Control/MenuTableViewController.h
DUREX Vendor Control/en.lproj/EMConnectingView_iPad.strings
DUREX Vendor Control/en.lproj/Localizable.strings
DUREX Vendor Control/es.lproj/EMConnectingView_iPad.strings
DUREX Vendor Control/es.lproj/Localizable.strings
DUREX tests/Base.lproj/PriceChangerViewController.xib
DUREX tests/DUREX test.xcodeproj/project.pbxproj
DUREX tests/DUREX test.xcodeproj/project.xcworkspace/xcuserdata/imanol.xcuserdatad/UserInterfaceState.xcuserstate
TODO
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="EMDevicePickerViewController">
+            <connections>
+                <outlet property="activityIndicator" destination="INd-ak-4J1" id="3hG-Tj-yiW"/>
+                <outlet property="connectingView" destination="iN0-l3-epB" id="ivw-u1-bhK"/>
+                <outlet property="popoverView" destination="JwP-k7-SK7" id="QP6-X7-vJ9"/>
+            </connections>
+        </placeholder>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <view contentMode="scaleToFill" id="iN0-l3-epB">
+            <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <subviews>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JwP-k7-SK7">
+                    <rect key="frame" x="234" y="450" width="300" height="123"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <subviews>
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Connecting to device" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZWE-GZ-XAB">
+                            <rect key="frame" x="34" y="15" width="232" height="43"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="INd-ak-4J1">
+                            <rect key="frame" x="132" y="66" width="37" height="37"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        </activityIndicatorView>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="123" id="874-2o-79j"/>
+                        <constraint firstAttribute="width" constant="300" id="k9c-2H-LjH"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="calibratedRGB"/>
+            <constraints>
+                <constraint firstAttribute="centerX" secondItem="JwP-k7-SK7" secondAttribute="centerX" id="56Z-d5-N1w"/>
+                <constraint firstAttribute="centerY" secondItem="JwP-k7-SK7" secondAttribute="centerY" constant="0.5" id="urL-Qy-KhU"/>
+            </constraints>
+            <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
+        </view>
+    </objects>
+</document>
@@ -13,29 +13,47 @@
 "Sending a Report" = "Sending a Report";
 "Sensors" = "Sensors";
 "Commands" = "Commands";
-"CH1 presence" = "CH1 presence";
-"CH2 presence" = "CH2 presence";
-"CH3 presence" = "CH3 presence";
-"CH4 presence" = "CH4 presence";
-"CH5 presence" = "CH5 presence";
-"CH6 presence" = "CH6 presence";
-"CH7 presence" = "CH7 presence";
-"CH8 presence" = "CH8 presence";
-"CH1 spin" = "CH1 spin";
-"CH2 spin" = "CH2 spin";
-"CH3 spin" = "CH3 spin";
-"CH4 spin" = "CH4 spin";
-"CH5 spin" = "CH5 spin";
-"CH6 spin" = "CH6 spin";
-"CH7 spin" = "CH7 spin";
-"CH8 spin" = "CH8 spin";
-"Door sensor" = "Door sensor";
-"Wall sensor" = "Wall sensor";
-"Oscillator" = "Oscillator";
-"1€ Coin presence" = "1€ Coin presence";
-"50c Coin presence" = "50c Coin presence";
-"1€ Coin spin" = "1€ Coin spin";
-"50c Coin spin" = "50c Coin spin";
+"Channels Present" = "Channels Present";
+"Channel 1" = "Channel 1";
+"Channel 2" = "Channel 2";
+"Channel 3" = "Channel 3";
+"Channel 4" = "Channel 4";
+"Channel 5" = "Channel 5";
+"Channel 6" = "Channel 6";
+"Channel 7" = "Channel 7";
+"Channel 8" = "Channel 8";
+"Channel 9" = "Channel 9";
+"Channel 10" = "Channel 10";
+"Channel 11" = "Channel 11";
+"Channel 12" = "Channel 12";
+"Channel 13" = "Channel 13";
+"Channel 14" = "Channel 14";
+"Channel 15" = "Channel 15";
+"Channel 16" = "Channel 16";
+"Product Present in Channel" = "Product Present in Channel";
+"Channel Engine Status" = "Channel Engine Status";
+"Door Sensor" = "Door Sensor";
+"Coil Sensor" = "Coil Sensor";
+"Money Collected" = "Money Collected";
+"Money Given" = "Money Given";
+"Products Sold" = "Products Sold";
+"Product 1" = "Product 1";
+"Product 2" = "Product 2";
+"Product 3" = "Product 3";
+"Product 4" = "Product 4";
+"Product 5" = "Product 5";
+"Product 6" = "Product 6";
+"Product 7" = "Product 7";
+"Product 8" = "Product 8";
+"Product 9" = "Product 9";
+"Product 10" = "Product 10";
+"Product 11" = "Product 11";
+"Product 12" = "Product 12";
+"Product 13" = "Product 13";
+"Product 14" = "Product 14";
+"Product 15" = "Product 15";
+"Product 16" = "Product 16";
+"Change Available" = "Change Available";
 "Sales log" = "Sales log";
 "Incident report" = "Incident report";
 "Send report" = "Send report";
@@ -10,9 +10,6 @@
 		3471866118070D9300FA0FB2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866018070D9300FA0FB2 /* Foundation.framework */; };
 		3471866318070D9300FA0FB2 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866218070D9300FA0FB2 /* CoreGraphics.framework */; };
 		3471866518070D9300FA0FB2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866418070D9300FA0FB2 /* UIKit.framework */; };
-		3471867A18070D9300FA0FB2 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471867918070D9300FA0FB2 /* XCTest.framework */; };
-		3471867B18070D9300FA0FB2 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866018070D9300FA0FB2 /* Foundation.framework */; };
-		3471867C18070D9300FA0FB2 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3471866418070D9300FA0FB2 /* UIKit.framework */; };
 		347186A618070E7200FA0FB2 /* libEMFramework.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 347186A518070E7200FA0FB2 /* libEMFramework.a */; };
 		347186AC18070FAB00FA0FB2 /* CoreBluetooth.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 347186AB18070FAB00FA0FB2 /* CoreBluetooth.framework */; };
 		34AAB883189804FF0019860D /* DUREXAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 34AAB877189804FF0019860D /* DUREXAppDelegate.m */; };
@@ -40,24 +37,14 @@
 		F98356E1192EC84700EA6821 /* MenuTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F98356E0192EC84700EA6821 /* MenuTableViewController.m */; };
 		F9A8EF7C192FE201009E7532 /* Stack.m in Sources */ = {isa = PBXBuildFile; fileRef = F9A8EF7B192FE201009E7532 /* Stack.m */; };
 		F9C77F50192CDE30002DBE8A /* system.json in Resources */ = {isa = PBXBuildFile; fileRef = F9C77F4F192CDE30002DBE8A /* system.json */; };
+		F9E4D8FD19B8FD32009A7359 /* EMConnectingView_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */; };
 /* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
-		3471867D18070D9300FA0FB2 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3471865518070D9300FA0FB2 /* Project object */;
-			proxyType = 1;
-			remoteGlobalIDString = 3471865C18070D9300FA0FB2;
-			remoteInfo = TestAppExample;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
 		3471865D18070D9300FA0FB2 /* DUREX Vendor Control.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "DUREX Vendor Control.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3471866018070D9300FA0FB2 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		3471866218070D9300FA0FB2 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		3471866418070D9300FA0FB2 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		3471867818070D9300FA0FB2 /* DUREX Vendor ControlTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "DUREX Vendor ControlTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		3471867918070D9300FA0FB2 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		3471869118070E6500FA0FB2 /* EMBluetoothLowEnergyConnectionType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMBluetoothLowEnergyConnectionType.h; sourceTree = "<group>"; };
 		3471869218070E6500FA0FB2 /* EMChecksum.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EMChecksum.h; sourceTree = "<group>"; };
@@ -131,6 +118,9 @@
 		F9A8EF7A192FE201009E7532 /* Stack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Stack.h; sourceTree = SOURCE_ROOT; };
 		F9A8EF7B192FE201009E7532 /* Stack.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Stack.m; sourceTree = SOURCE_ROOT; };
 		F9C77F4F192CDE30002DBE8A /* system.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = system.json; sourceTree = SOURCE_ROOT; };
+		F9E4D8FE19B8FD32009A7359 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/EMConnectingView_iPad.xib; sourceTree = "<group>"; };
+		F9E4D90119B8FD36009A7359 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/EMConnectingView_iPad.strings; sourceTree = "<group>"; };
+		F9E4D90319B8FD37009A7359 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/EMConnectingView_iPad.strings; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -146,16 +136,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3471867518070D9300FA0FB2 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				3471867A18070D9300FA0FB2 /* XCTest.framework in Frameworks */,
-				3471867C18070D9300FA0FB2 /* UIKit.framework in Frameworks */,
-				3471867B18070D9300FA0FB2 /* Foundation.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
@@ -172,7 +152,6 @@
 			isa = PBXGroup;
 			children = (
 				3471865D18070D9300FA0FB2 /* DUREX Vendor Control.app */,
-				3471867818070D9300FA0FB2 /* DUREX Vendor ControlTests.xctest */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -258,6 +237,7 @@
 			isa = PBXGroup;
 			children = (
 				F961D81B199A711300E9282C /* EMConnectingView.xib */,
+				F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */,
 				34AAB879189804FF0019860D /* EMDevicePickerViewController.h */,
 				34AAB87A189804FF0019860D /* EMDevicePickerViewController.m */,
 			);
@@ -334,24 +314,6 @@
 			productReference = 3471865D18070D9300FA0FB2 /* DUREX Vendor Control.app */;
 			productType = "com.apple.product-type.application";
 		};
-		3471867718070D9300FA0FB2 /* DUREX Vendor ControlTests */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 3471868C18070D9300FA0FB2 /* Build configuration list for PBXNativeTarget "DUREX Vendor ControlTests" */;
-			buildPhases = (
-				3471867418070D9300FA0FB2 /* Sources */,
-				3471867518070D9300FA0FB2 /* Frameworks */,
-				3471867618070D9300FA0FB2 /* Resources */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-				3471867E18070D9300FA0FB2 /* PBXTargetDependency */,
-			);
-			name = "DUREX Vendor ControlTests";
-			productName = TestAppExampleTests;
-			productReference = 3471867818070D9300FA0FB2 /* DUREX Vendor ControlTests.xctest */;
-			productType = "com.apple.product-type.bundle.unit-test";
-		};
 /* End PBXNativeTarget section */
 /* Begin PBXProject section */
@@ -361,11 +323,6 @@
 				CLASSPREFIX = EM;
 				LastUpgradeCheck = 0510;
 				ORGANIZATIONNAME = Emmoco;
-				TargetAttributes = {
-					3471867718070D9300FA0FB2 = {
-						TestTargetID = 3471865C18070D9300FA0FB2;
-					};
-				};
 			};
 			buildConfigurationList = 3471865818070D9300FA0FB2 /* Build configuration list for PBXProject "DUREX Vendor Control" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -382,7 +339,6 @@
 			projectRoot = "";
 			targets = (
 				3471865C18070D9300FA0FB2 /* DUREX Vendor Control */,
-				3471867718070D9300FA0FB2 /* DUREX Vendor ControlTests */,
 			);
 		};
 /* End PBXProject section */
@@ -394,6 +350,7 @@
 			files = (
 				F97B90CC19B859F500DDA9EF /* icon_delete.png in Resources */,
 				F9015D9019B73052006C7882 /* DatePickerViewController.xib in Resources */,
+				F9E4D8FD19B8FD32009A7359 /* EMConnectingView_iPad.xib in Resources */,
 				F98356D8192E906600EA6821 /* bluetooth.png in Resources */,
 				F9015D9719B7305E006C7882 /* DatePickerViewController_iPad.xib in Resources */,
 				F961D819199A711300E9282C /* EMConnectingView.xib in Resources */,
@@ -410,13 +367,6 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3471867618070D9300FA0FB2 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXSourcesBuildPhase section */
@@ -437,23 +387,8 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
-		3471867418070D9300FA0FB2 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 /* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
-		3471867E18070D9300FA0FB2 /* PBXTargetDependency */ = {
-			isa = PBXTargetDependency;
-			target = 3471865C18070D9300FA0FB2 /* DUREX Vendor Control */;
-			targetProxy = 3471867D18070D9300FA0FB2 /* PBXContainerItemProxy */;
-		};
-/* End PBXTargetDependency section */
-
 /* Begin PBXVariantGroup section */
 		F9015D9219B73052006C7882 /* DatePickerViewController.xib */ = {
 			isa = PBXVariantGroup;
@@ -557,6 +492,16 @@
 			path = FirstAppExample;
 			sourceTree = SOURCE_ROOT;
 		};
+		F9E4D8FF19B8FD32009A7359 /* EMConnectingView_iPad.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				F9E4D8FE19B8FD32009A7359 /* Base */,
+				F9E4D90119B8FD36009A7359 /* en */,
+				F9E4D90319B8FD37009A7359 /* es */,
+			);
+			name = EMConnectingView_iPad.xib;
+			sourceTree = SOURCE_ROOT;
+		};
 /* End PBXVariantGroup section */
 /* Begin XCBuildConfiguration section */
@@ -672,46 +617,6 @@
 			};
 			name = Release;
 		};
-		3471868D18070D9300FA0FB2 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/TestAppExample.app/TestAppExample";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-					"$(DEVELOPER_FRAMEWORKS_DIR)",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "TestAppExample/TestAppExample-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				INFOPLIST_FILE = "TestAppExampleTests/FirstAppTests-Info.plist";
-				PRODUCT_NAME = "DUREX Vendor ControlTests";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-				WRAPPER_EXTENSION = xctest;
-			};
-			name = Debug;
-		};
-		3471868E18070D9300FA0FB2 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/TestAppExample.app/TestAppExample";
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(SDKROOT)/Developer/Library/Frameworks",
-					"$(inherited)",
-					"$(DEVELOPER_FRAMEWORKS_DIR)",
-				);
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "TestAppExample/TestAppExample-Prefix.pch";
-				INFOPLIST_FILE = "TestAppExampleTests/FirstAppTests-Info.plist";
-				PRODUCT_NAME = "DUREX Vendor ControlTests";
-				TEST_HOST = "$(BUNDLE_LOADER)";
-				WRAPPER_EXTENSION = xctest;
-			};
-			name = Release;
-		};
 /* End XCBuildConfiguration section */
 /* Begin XCConfigurationList section */
@@ -733,15 +638,6 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		3471868C18070D9300FA0FB2 /* Build configuration list for PBXNativeTarget "DUREX Vendor ControlTests" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				3471868D18070D9300FA0FB2 /* Debug */,
-				3471868E18070D9300FA0FB2 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 3471865518070D9300FA0FB2 /* Project object */;
@@ -67,5 +67,21 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "FirstAppExample/EMDevicePickerViewController.m"
+            timestampString = "431555215.246709"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "107"
+            endingLineNumber = "107"
+            landmarkName = "-tableView:didSelectRowAtIndexPath:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="kWw-Rk-wD6">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="kWw-Rk-wD6">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
@@ -7,6 +7,7 @@
         <!--Device Picker View Controller - Select device-->
         <scene sceneID="ZOj-VY-rze">
             <objects>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="MD6-l6-Rrg" userLabel="First Responder" sceneMemberID="firstResponder"/>
                 <tableViewController id="0dd-lZ-pDC" customClass="EMDevicePickerViewController" sceneMemberID="viewController">
                     <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="jWc-kM-kFO">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
@@ -48,7 +49,6 @@
                         <segue destination="iNx-eR-wSX" kind="push" identifier="ConnectionSegue" id="3oK-BK-2Qs"/>
                     </connections>
                 </tableViewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="MD6-l6-Rrg" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="342" y="-9"/>
         </scene>
@@ -20,6 +20,7 @@
 @implementation EMDevicePickerViewController
+
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
     self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
@@ -33,24 +34,28 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView" owner:self options:nil];
-    [[[self popoverView] layer] setCornerRadius:10.0f];
-    [[self connectingView] setHidden:YES];
-    [[self connectingView] setFrame:[[self view] bounds]];
-    [[self view] addSubview:[self connectingView]];
 	[[EMConnectionListManager sharedManager] addObserver:self forKeyPath:@"devices" options:0 context:NULL];
 }
 -(void)_showConnectingView
 {
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad)
+    {
+        [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView_iPad" owner:self options:nil];
+    }
+    else
+    {
+        [[NSBundle mainBundle] loadNibNamed:@"EMConnectingView" owner:self options:nil];
+    }
+    [[[self popoverView] layer] setCornerRadius:10.0f];
+    [[self view] addSubview:[self connectingView]];
     [[self activityIndicator] startAnimating];
-    [[self connectingView] setHidden:NO];
 }
 -(void)_hideConnectingView
 {
     [[self activityIndicator] stopAnimating];
-    [[self connectingView] setHidden:YES];
+    [[self connectingView] removeFromSuperview];
 }
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
@@ -20,8 +20,8 @@
 #define MENU_CELLS_PER_SECTION          num(3)
 #define MENU_HEADERS                        nil
-#define MAINTENANCE_ELEMENTS            @"CH1 presence",@"CH2 presence",@"CH3 presence",@"CH4 presence",@"CH5 presence",@"CH6 presence",@"CH7 presence",@"CH8 presence",@"CH1 spin",@"CH2 spin",@"CH3 spin",@"CH4 spin",@"CH5 spin",@"CH6 spin",@"CH7 spin",@"CH8 spin",@"Door sensor",@"Wall sensor",@"Oscillator",@"1€ Coin presence",@"50c Coin presence",@"1€ Coin spin",@"50c Coin spin",@"Sales log",@"Incident report",@"Send report"
-#define MAINTENANCE_CELLS_PER_SECTION   num(23),num(3)
+#define MAINTENANCE_ELEMENTS            @"Channels Present",@"Product Present in Channel",@"Channel Engine Status",@"Door Sensor",@"Coil sensor",@"Money Collected",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Money given",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Products Sold",@"Change Available",@"1€ Coins",@"50c Coins",@"Sales log",@"Incident report",@"Send report"
+#define MAINTENANCE_CELLS_PER_SECTION   num(21),num(3)
 #define MAINTENANCE_HEADERS              NSLocalizedString(@"Sensors", nil),NSLocalizedString(@"Commands", nil)
 #define SALES_ELEMENTS            @"20€ Notes",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Channel",@"Product Code",@"Nominal Price",@"Discounted Price",@"1€ Change",@"50c Change",@"20€ Notes",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Channel",@"Product Code",@"Nominal Price",@"Discounted Price",@"1€ Change",@"50c Change",@"20€ Notes",@"10€ Notes",@"5€ Notes",@"2€ Coins",@"1€ Coins",@"50c Coins",@"Channel",@"Product Code",@"Nominal Price",@"Discounted Price",@"1€ Change",@"50c Change"
+
+/* Class = "IBUILabel"; text = "Connecting to device"; ObjectID = "ZWE-GZ-XAB"; */
+"ZWE-GZ-XAB.text" = "Connecting to device";
@@ -13,29 +13,47 @@
 "Sending a Report" = "Sending a Report";
 "Sensors" = "Sensors";
 "Commands" = "Commands";
-"CH1 presence" = "CH1 presence";
-"CH2 presence" = "CH2 presence";
-"CH3 presence" = "CH3 presence";
-"CH4 presence" = "CH4 presence";
-"CH5 presence" = "CH5 presence";
-"CH6 presence" = "CH6 presence";
-"CH7 presence" = "CH7 presence";
-"CH8 presence" = "CH8 presence";
-"CH1 spin" = "CH1 spin";
-"CH2 spin" = "CH2 spin";
-"CH3 spin" = "CH3 spin";
-"CH4 spin" = "CH4 spin";
-"CH5 spin" = "CH5 spin";
-"CH6 spin" = "CH6 spin";
-"CH7 spin" = "CH7 spin";
-"CH8 spin" = "CH8 spin";
-"Door sensor" = "Door sensor";
-"Wall sensor" = "Wall sensor";
-"Oscillator" = "Oscillator";
-"1€ Coin presence" = "1€ Coin presence";
-"50c Coin presence" = "50c Coin presence";
-"1€ Coin spin" = "1€ Coin spin";
-"50c Coin spin" = "50c Coin spin";
+"Channels Present" = "Channels Present";
+"Channel 1" = "Channel 1";
+"Channel 2" = "Channel 2";
+"Channel 3" = "Channel 3";
+"Channel 4" = "Channel 4";
+"Channel 5" = "Channel 5";
+"Channel 6" = "Channel 6";
+"Channel 7" = "Channel 7";
+"Channel 8" = "Channel 8";
+"Channel 9" = "Channel 9";
+"Channel 10" = "Channel 10";
+"Channel 11" = "Channel 11";
+"Channel 12" = "Channel 12";
+"Channel 13" = "Channel 13";
+"Channel 14" = "Channel 14";
+"Channel 15" = "Channel 15";
+"Channel 16" = "Channel 16";
+"Product Present in Channel" = "Product Present in Channel";
+"Channel Engine Status" = "Channel Engine Status";
+"Door Sensor" = "Door Sensor";
+"Coil Sensor" = "Coil Sensor";
+"Money Collected" = "Money Collected";
+"Money Given" = "Money Given";
+"Products Sold" = "Products Sold";
+"Product 1" = "Product 1";
+"Product 2" = "Product 2";
+"Product 3" = "Product 3";
+"Product 4" = "Product 4";
+"Product 5" = "Product 5";
+"Product 6" = "Product 6";
+"Product 7" = "Product 7";
+"Product 8" = "Product 8";
+"Product 9" = "Product 9";
+"Product 10" = "Product 10";
+"Product 11" = "Product 11";
+"Product 12" = "Product 12";
+"Product 13" = "Product 13";
+"Product 14" = "Product 14";
+"Product 15" = "Product 15";
+"Product 16" = "Product 16";
+"Change Available" = "Change Available";
 "Sales log" = "Sales log";
 "Incident report" = "Incident report";
 "Send report" = "Send report";
+
+/* Class = "IBUILabel"; text = "Connecting to device"; ObjectID = "ZWE-GZ-XAB"; */
+"ZWE-GZ-XAB.text" = "Realizando conexión";
@@ -13,29 +13,47 @@
 "Sending a Report" = "Mandar un Informe";
 "Sensors" = "Sensores";
 "Commands" = "Comandos";
-"CH1 presence" = "Presencia CH1";
-"CH2 presence" = "Presencia CH2";
-"CH3 presence" = "Presencia CH3";
-"CH4 presence" = "Presencia CH4";
-"CH5 presence" = "Presencia CH5";
-"CH6 presence" = "Presencia CH6";
-"CH7 presence" = "Presencia CH7";
-"CH8 presence" = "Presencia CH8";
-"CH1 spin" = "Giro CH1";
-"CH2 spin" = "Giro CH2";
-"CH3 spin" = "Giro CH3";
-"CH4 spin" = "Giro CH4";
-"CH5 spin" = "Giro CH5";
-"CH6 spin" = "Giro CH6";
-"CH7 spin" = "Giro CH7";
-"CH8 spin" = "Giro CH8";
-"Door sensor" = "Sensor de puerta";
-"Wall sensor" = "Sensor de pared";
-"Oscillator" = "Oscilador";
-"1€ Coin presence" = "Presencia 1€";
-"50c Coin presence" = "Presencia 50c";
-"1€ Coin spin" = "Giro 1€";
-"50c Coin spin" = "Giro 50c";
+"Channels Present" = "Canales presentes";
+"Channel 1" = "Canal 1";
+"Channel 2" = "Canal 2";
+"Channel 3" = "Canal 3";
+"Channel 4" = "Canal 4";
+"Channel 5" = "Canal 5";
+"Channel 6" = "Canal 6";
+"Channel 7" = "Canal 7";
+"Channel 8" = "Canal 8";
+"Channel 9" = "Canal 9";
+"Channel 10" = "Canal 10";
+"Channel 11" = "Canal 11";
+"Channel 12" = "Canal 12";
+"Channel 13" = "Canal 13";
+"Channel 14" = "Canal 14";
+"Channel 15" = "Canal 15";
+"Channel 16" = "Canal 16";
+"Product Present in Channel" = "Producto presente en el canal";
+"Channel Engine Status" = "Estado de los motores";
+"Door Sensor" = "Sensor de puerta";
+"Coil Sensor" = "Sensor de bobina";
+"Money Collected" = "Recaudación efectuada";
+"Money Given" = "Efectivo devuelto";
+"Products Sold" = "Productos vendidos";
+"Product 1" = "Producto 1";
+"Product 2" = "Producto 2";
+"Product 3" = "Producto 3";
+"Product 4" = "Producto 4";
+"Product 5" = "Producto 5";
+"Product 6" = "Producto 6";
+"Product 7" = "Producto 7";
+"Product 8" = "Producto 8";
+"Product 9" = "Producto 9";
+"Product 10" = "Producto 10";
+"Product 11" = "Producto 11";
+"Product 12" = "Producto 12";
+"Product 13" = "Producto 13";
+"Product 14" = "Producto 14";
+"Product 15" = "Producto 15";
+"Product 16" = "Producto 16";
+"Change Available" = "Cambio disponible";
 "Sales log" = "Registro de ventas";
 "Incident report" = "Registro de incidencias";
 "Send report" = "Mandar informe";
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
     </dependencies>
@@ -18,49 +18,58 @@
             <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view contentMode="scaleToFill" ambiguous="YES" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lVw-3e-AU5">
-                    <rect key="frame" x="7" y="118" width="307" height="181"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lVw-3e-AU5">
+                    <rect key="frame" x="7" y="193" width="307" height="181"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <subviews>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="u9j-qH-tMP">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="u9j-qH-tMP">
                             <rect key="frame" x="190" y="20" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="xc0-bD-AX2"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ues-3Z-2xO">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ues-3Z-2xO">
                             <rect key="frame" x="190" y="59" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="t1R-PZ-6yo"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wCx-oE-aK9">
+                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wCx-oE-aK9">
                             <rect key="frame" x="190" y="97" width="97" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="97" id="JaM-Ca-N6c"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                             <textInputTraits key="textInputTraits"/>
                         </textField>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="btL-PO-K6a">
-                            <rect key="frame" x="20" y="24" width="66" height="21"/>
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Channel" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="btL-PO-K6a">
+                            <rect key="frame" x="20" y="24" width="64" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ngW-rD-Fgz">
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Product Code" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ngW-rD-Fgz">
                             <rect key="frame" x="20" y="63" width="107" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" misplaced="YES" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m7Z-ve-Gxr">
-                            <rect key="frame" x="20" y="101" width="82" height="21"/>
+                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Price" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m7Z-ve-Gxr">
+                            <rect key="frame" x="20" y="101" width="79" height="21"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3dU-vK-GGP">
-                            <rect key="frame" x="130" y="131" width="46" height="30"/>
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3dU-vK-GGP">
+                            <rect key="frame" x="135" y="131" width="37" height="30"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <state key="normal" title="Done">
                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
@@ -73,21 +82,28 @@
                     <color key="backgroundColor" white="1" alpha="0.94999999999999996" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="trailing" secondItem="wCx-oE-aK9" secondAttribute="trailing" constant="20" id="3zp-xP-h35"/>
-                        <constraint firstAttribute="bottom" secondItem="3dU-vK-GGP" secondAttribute="bottom" constant="20" id="E5P-sA-PAI"/>
+                        <constraint firstAttribute="height" constant="181" id="54z-8B-Ksu"/>
                         <constraint firstItem="ngW-rD-Fgz" firstAttribute="top" secondItem="btL-PO-K6a" secondAttribute="bottom" constant="18" id="Hna-F0-g8f"/>
+                        <constraint firstAttribute="width" constant="307" id="Mmh-pE-3dD"/>
+                        <constraint firstItem="btL-PO-K6a" firstAttribute="top" secondItem="lVw-3e-AU5" secondAttribute="top" constant="24" id="NxS-Fl-f7d"/>
                         <constraint firstItem="btL-PO-K6a" firstAttribute="leading" secondItem="lVw-3e-AU5" secondAttribute="leading" constant="20" id="W9y-rd-KTp"/>
                         <constraint firstItem="m7Z-ve-Gxr" firstAttribute="top" secondItem="ngW-rD-Fgz" secondAttribute="bottom" constant="17" id="Xka-5C-qGa"/>
+                        <constraint firstAttribute="centerX" secondItem="3dU-vK-GGP" secondAttribute="centerX" constant="0.5" id="aLD-fM-V8k"/>
                         <constraint firstItem="ngW-rD-Fgz" firstAttribute="leading" secondItem="lVw-3e-AU5" secondAttribute="leading" constant="20" id="cty-k1-JpR"/>
                         <constraint firstAttribute="trailing" secondItem="ues-3Z-2xO" secondAttribute="trailing" constant="20" id="e4X-d3-oPg"/>
+                        <constraint firstItem="u9j-qH-tMP" firstAttribute="top" secondItem="lVw-3e-AU5" secondAttribute="top" constant="20" id="h6g-4I-UPT"/>
+                        <constraint firstItem="wCx-oE-aK9" firstAttribute="top" secondItem="ues-3Z-2xO" secondAttribute="bottom" constant="8" id="hw6-3f-aML"/>
                         <constraint firstAttribute="trailing" secondItem="u9j-qH-tMP" secondAttribute="trailing" constant="20" id="lWw-tP-pX0"/>
+                        <constraint firstItem="ues-3Z-2xO" firstAttribute="top" secondItem="u9j-qH-tMP" secondAttribute="bottom" constant="9" id="r28-qa-pPT"/>
                         <constraint firstItem="m7Z-ve-Gxr" firstAttribute="leading" secondItem="lVw-3e-AU5" secondAttribute="leading" constant="20" id="r8p-Ts-QQ3"/>
+                        <constraint firstAttribute="bottom" secondItem="3dU-vK-GGP" secondAttribute="bottom" constant="20" id="uC1-MC-V0P"/>
                     </constraints>
                 </view>
             </subviews>
             <color key="backgroundColor" red="0.023529414089999999" green="0.0039215688589999999" blue="0.0039215688589999999" alpha="0.5" colorSpace="deviceRGB"/>
             <constraints>
-                <constraint firstAttribute="centerY" secondItem="lVw-3e-AU5" secondAttribute="centerY" constant="75" id="U8g-QI-YN9"/>
                 <constraint firstAttribute="centerX" secondItem="lVw-3e-AU5" secondAttribute="centerX" constant="-0.5" id="hza-Ts-3fP"/>
+                <constraint firstAttribute="centerY" secondItem="lVw-3e-AU5" secondAttribute="centerY" constant="0.5" id="nkS-3I-I3D"/>
             </constraints>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
             <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
@@ -269,9 +269,9 @@
 		3471865518070D9300FA0FB2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				CLASSPREFIX = EM;
+				CLASSPREFIX = DUREX;
 				LastUpgradeCheck = 0510;
-				ORGANIZATIONNAME = Emmoco;
+				ORGANIZATIONNAME = UPC;
 				TargetAttributes = {
 					3471867718070D9300FA0FB2 = {
 						TestTargetID = 3471865C18070D9300FA0FB2;
@@ -3,12 +3,18 @@ BUGS:
 - On date change, response is overwritten by previous query, trimming needed according to numBytes
 TODO:
+- Sensors class
 - A4 command
+- A4 parser
+- Dropdown cells
+
 - Sale class
-- Sale parser
 - A2 command
+- Sale parser
+
 - Implement sensor status logging and sending to remote server
 - Lewis infrastructure for data viewing (SQL, Webpage, CSV parser)
+
 - Incident class
 - Incident parser
 - A3 command