Skip to content

Commit

Permalink
#3 diable custom MIO HRM dual handling for generic Polar HRM - http:/…
Browse files Browse the repository at this point in the history
  • Loading branch information
obriensystems committed Oct 29, 2020
1 parent 8921c14 commit d3362f2
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 74 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
landmarkType = "7">
<Locations>
<Location
uuid = "DFFE692F-275B-4FC5-82FC-DBF209226F17 - 5ee387f477a8a472"
uuid = "DFFE692F-275B-4FC5-82FC-DBF209226F17 - b4e158539446a8eb"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
Expand All @@ -37,7 +37,7 @@
offsetFromSymbolStart = "362">
</Location>
<Location
uuid = "DFFE692F-275B-4FC5-82FC-DBF209226F17 - 5ee387f477a8a472"
uuid = "DFFE692F-275B-4FC5-82FC-DBF209226F17 - b4e158539446a8eb"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
Expand Down Expand Up @@ -87,38 +87,6 @@
endingLineNumber = "23"
landmarkName = "aView"
landmarkType = "24">
<Locations>
<Location
uuid = "F739EC19-67DC-4024-BBB7-76D384CE700B - f181d7bc9d5e543f"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[BMViewController aView]"
moduleName = "Biometric"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/michaelobrien/wse_github/biometric-ios/Biometric/BMViewController.h"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "23"
endingLineNumber = "23"
offsetFromSymbolStart = "20">
</Location>
<Location
uuid = "F739EC19-67DC-4024-BBB7-76D384CE700B - 1406f178cf0ad285"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
symbolName = "-[BMViewController setAView:]"
moduleName = "Biometric"
usesParentBreakpointCondition = "Yes"
urlString = "file:///Users/michaelobrien/wse_github/biometric-ios/Biometric/BMViewController.h"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "23"
endingLineNumber = "23"
offsetFromSymbolStart = "60">
</Location>
</Locations>
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
Expand Down Expand Up @@ -155,7 +123,7 @@
landmarkType = "7">
<Locations>
<Location
uuid = "2D57D84F-54DB-444F-A62E-AAC8DCC3B218 - e619be5439c79b4c"
uuid = "2D57D84F-54DB-444F-A62E-AAC8DCC3B218 - 18eeb3261a2cc523"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
Expand All @@ -171,7 +139,7 @@
offsetFromSymbolStart = "206">
</Location>
<Location
uuid = "2D57D84F-54DB-444F-A62E-AAC8DCC3B218 - e619be5439c79b4c"
uuid = "2D57D84F-54DB-444F-A62E-AAC8DCC3B218 - 18eeb3261a2cc523"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
Expand Down
15 changes: 8 additions & 7 deletions Biometric/BMViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -612,12 +612,13 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
hrMonitorsFound++;
}
// special handling for the less reliable MIO pulse watch - put it last
if(![peripheral.name isEqual: @"MIO GLOBAL"] && ![peripheral.name isEqual: @"MIO GLOBAL LINK"]
&& ![peripheral.name isEqual: @"RHYTHM+"]) {
hrMonitor1Found = true;
self.sensorManager.peripheral1 = peripheral;
self.deviceTextField.text = peripheral.name;
} else {
// 20201028 disabled mio handling in favor of 2 polar watches
//if(![peripheral.name isEqual: @"MIO GLOBAL"] && ![peripheral.name isEqual: @"MIO GLOBAL LINK"]
// && ![peripheral.name isEqual: @"RHYTHM+"]) {
// hrMonitor1Found = true;
// self.sensorManager.peripheral1 = peripheral;
// self.deviceTextField.text = peripheral.name;
//} else {
// handle 2 MIO watches
if(hrMonitorsFound == 1 && !hrMonitor1Found) {
hrMonitor1Found = true;
Expand All @@ -628,7 +629,7 @@ - (void)centralManager:(CBCentralManager *)central didDiscoverPeripheral:(CBPeri
self.sensorManager.peripheral2 = peripheral;
self.device2TextField.text = peripheral.name;
}
}
//}


[self.manager
Expand Down
18 changes: 12 additions & 6 deletions Biometric/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
<device id="retina5_9" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
<device id="retina5_9" orientation="portrait" appearance="light"/>
<dependencies>
<deployment version="2304" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
Expand All @@ -29,7 +28,7 @@
<fontDescription key="fontDescription" type="system" pointSize="24"/>
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nor-Pb-6QP">
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nor-Pb-6QP">
<rect key="frame" x="171" y="177" width="36" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="link">
Expand Down Expand Up @@ -377,6 +376,7 @@
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="smB-EL-47c">
<rect key="frame" x="53" y="274" width="69" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="textColor" systemColor="linkColor"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<textInputTraits key="textInputTraits"/>
</textField>
Expand All @@ -392,6 +392,7 @@
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="kaM-qv-8MK">
<rect key="frame" x="5" y="222" width="117" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="textColor" systemColor="linkColor"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
</textField>
Expand Down Expand Up @@ -471,4 +472,9 @@
<point key="canvasLocation" x="-45.600000000000001" y="-77.58620689655173"/>
</scene>
</scenes>
<resources>
<systemColor name="linkColor">
<color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
</resources>
</document>
45 changes: 30 additions & 15 deletions Biometric/Images.xcassets/AppIcon.appiconset/Contents.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,52 @@
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
"scale" : "2x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "3x"
"scale" : "3x",
"size" : "20x20"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
"scale" : "2x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "3x"
"scale" : "3x",
"size" : "29x29"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
"scale" : "2x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
"scale" : "3x",
"size" : "40x40"
},
{
"idiom" : "iphone",
"scale" : "2x",
"size" : "60x60"
},
{
"idiom" : "iphone",
"scale" : "3x",
"size" : "60x60"
},
{
"idiom" : "ios-marketing",
"scale" : "1x",
"size" : "1024x1024"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
21 changes: 11 additions & 10 deletions Biometric/Launch Screen.storyboard
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17126"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand All @@ -15,23 +16,23 @@
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" Copyright © 2016 Michael O'Brien. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<rect key="frame" x="20" y="559" width="560" height="21"/>
<rect key="frame" x="20" y="855" width="374" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Biometric" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
<rect key="frame" x="20" y="180" width="560" height="43"/>
<rect key="frame" x="20" y="278" width="374" height="43"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
<constraint firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
Expand Down

0 comments on commit d3362f2

Please sign in to comment.