Permalink
Browse files

updated help, disabled bluetooth

  • Loading branch information...
1 parent 115f183 commit fd61583f88279502219bd97154f5cf4ef89a8f65 @dustinrue committed Jul 29, 2011
Showing with 17,025 additions and 17,498 deletions.
  1. BIN ControlPlane Help/ControlPlane Help.helpindex
  2. 0 {MarcoPolo Help → ControlPlane Help}/css/accessPage.css
  3. 0 {MarcoPolo Help → ControlPlane Help}/css/genlist.html
  4. 0 {MarcoPolo Help → ControlPlane Help}/css/genlist_style.css
  5. 0 {MarcoPolo Help → ControlPlane Help}/css/indexPage.css
  6. 0 {MarcoPolo Help → ControlPlane Help}/css/topicPage.css
  7. BIN ControlPlane Help/gfx/control-plane-logo-big.png
  8. BIN {MarcoPolo Help → ControlPlane Help}/gfx/equation-0.png
  9. BIN {MarcoPolo Help → ControlPlane Help}/gfx/equation-1.png
  10. BIN ControlPlane Help/gfx/icon.png
  11. BIN ControlPlane Help/gfx/iconSmall.png
  12. BIN {MarcoPolo Help → ControlPlane Help}/gfx/orngbullet.gif
  13. BIN ControlPlane Help/gfx/splashScreenshot.png
  14. +15 −15 {MarcoPolo Help → ControlPlane Help}/index.html
  15. +10 −10 {MarcoPolo Help → ControlPlane Help}/pages/actions.html
  16. +8 −8 {MarcoPolo Help → ControlPlane Help}/pages/advanced.html
  17. +18 −18 {MarcoPolo Help → ControlPlane Help}/pages/config.html
  18. +9 −9 {MarcoPolo Help → ControlPlane Help}/pages/discover.html
  19. +9 −9 {MarcoPolo Help → ControlPlane Help}/pages/maths.html
  20. +11 −11 {MarcoPolo Help → ControlPlane Help}/pages/rules.html
  21. +7 −7 {MarcoPolo Help → ControlPlane Help}/pages/tips.html
  22. +19 −30 ControlPlane.xcodeproj/project.pbxproj
  23. +16,645 −16,822 ...lPlane.xcodeproj/project.xcworkspace/xcuserdata/dustin.xcuserdatad/UserInterfaceState.xcuserstate
  24. +25 −15 ControlPlane.xcodeproj/xcuserdata/dustin.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
  25. +1 −1 ControlPlane.xcodeproj/xcuserdata/dustin.xcuserdatad/xcschemes/xcschememanagement.plist
  26. +2 −2 HACKING.html
  27. +25 −7 Info.plist
  28. +6 −6 LOCALISATION.html
  29. BIN MarcoPolo Help/gfx/icon.png
  30. BIN MarcoPolo Help/gfx/iconSmall.png
  31. BIN MarcoPolo Help/gfx/splashScreenshot.png
  32. +2 −7 NOTES.txt
  33. +33 −88 Resources/AboutPanel.nib/designable.nib
  34. BIN Resources/AboutPanel.nib/keyedobjects.nib
  35. +20 −0 Resources/dsa_pub.pem
  36. +49 −8 Resources/oui.txt
  37. +10 −12 Resources/usb-vendors.txt
  38. +62 −406 en.lproj/MainMenu.nib/designable.nib
  39. BIN en.lproj/MainMenu.nib/keyedobjects.nib
  40. BIN graphics/038392-glossy-black-icon-transport-travel-transportation-airplane4.zip
  41. +12 −3 make_disk_image.sh
  42. +2 −0 src/BluetoothEvidenceSource.h
  43. +7 −0 src/BluetoothEvidenceSource.m
  44. +2 −1 src/Common.m
  45. +3 −0 src/CoreWLANEvidenceSource.m
  46. +8 −1 src/EvidenceSource.m
  47. +4 −1 src/MPController.m
  48. +1 −1 src/PrefsWindowController.m
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -6,10 +6,10 @@
<head>
<meta http-equiv="content-type" content=
"text/html; charset=us-ascii" />
-<title>MarcoPolo Help</title>
-<meta name="AppleTitle" content="MarcoPolo Help" />
+<title>ControlPlane Help</title>
+<meta name="AppleTitle" content="ControlPlane Help" />
<!-- Make sure you use the above value for CFBundleHelpBookName in the Info.plist file -->
-<meta name="AppleIcon" content="MarcoPolo Help/gfx/iconSmall.png" />
+<meta name="AppleIcon" content="ControlPlane Help/gfx/iconSmall.png" />
<!-- The iconSmall.png should be 16x16. This icon will represent your app in the Help Viewer menus. Substitute whatever's in CFBundleHelpBookFolder for "YOURAPP Help" in the AppleIcon path if you've named your help book folder differently. -->
<meta name="robots" content="anchors" />
<link href="css/accessPage.css" rel="stylesheet" media="all" type=
@@ -18,34 +18,34 @@
<body>
<div id="frame"><a name="access" id="access"></a>
<div id="contentleft">
-<center><img src="gfx/splashScreenshot.png" alt="MarcoPolo logo" />
+<center><img src="gfx/control-plane-logo-big.png" alt="ControlPlane logo" />
<!-- splashScreenshot.png should be ~200x200 or smaller. -->
-<h1>MarcoPolo</h1>
-<h4><a href="http://www.symonds.id.au/marcopolo/">www.symonds.id.au/marcopolo/</a></h4>
+<h1>ControlPlane</h1>
+<h4><a href="http://controlplane.dustinrue.com/">controlplan.dustinrue.com</a></h4>
</center>
</div>
<div id="contentcenter"></div>
<div id="contentright">
<!-- These are just ideas; feel free to stick other useful links in this area. -->
-<h2>Discover MarcoPolo</h2>
-<p><a href="pages/discover.html">An introduction to MarcoPolo.</a></p>
+<h2>Discover ControlPlane</h2>
+<p><a href="pages/discover.html">An introduction to ControlPlane.</a></p>
-<h2>Configuring MarcoPolo</h2>
-<p><a href="pages/config.html">How to configure MarcoPolo.</a></p>
+<h2>Configuring ControlPlane</h2>
+<p><a href="pages/config.html">How to configure ControlPlane.</a></p>
-<h2>Setting up MarcoPolo's rules</h2>
+<h2>Setting up ControlPlane's rules</h2>
<p><a href="pages/rules.html">How to configure rules for switching.</a></p>
-<h2>Setting up MarcoPolo's actions</h2>
+<h2>Setting up ControlPlane's actions</h2>
<p><a href="pages/actions.html">How to configure triggered actions.</a></p>
<h2>Tips and Tricks</h2>
-<p><a href="pages/tips.html">Getting the most out of MarcoPolo.</a></p>
+<p><a href="pages/tips.html">Getting the most out of ControlPlane.</a></p>
<h2>Advanced settings</h2>
-<p><a href="pages/advanced.html">Tweaking some of MarcoPolo's internals.</a></p>
+<p><a href="pages/advanced.html">Tweaking some of ControlPlane's internals.</a></p>
-<h2>The maths behind MarcoPolo</h2>
+<h2>The maths behind ControlPlane</h2>
<p><a href="pages/maths.html">Understanding what's going on.</a></p>
</div>
@@ -1,26 +1,26 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>Setting up MarcoPolo's actions</title>
+ <title>Setting up ControlPlane's actions</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="actions triggers">
- <meta name="description" content="Learn how to set up MarcoPolo's actions.">
+ <meta name="description" content="Learn how to set up ControlPlane's actions.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
- <h1>Setting up MarcoPolo's actions</h1>
+ <h1>Setting up ControlPlane's actions</h1>
</div>
- <p><i>Actions</i> are triggered when MarcoPolo decides to
+ <p><i>Actions</i> are triggered when ControlPlane decides to
change your context.
</p>
<p>Each action has the following properties:
@@ -36,9 +36,9 @@ <h1>Setting up MarcoPolo's actions</h1>
</ul>
<p>Most actions will be Arrival actions; that is, they will be
- triggered when MarcoPolo switches <em>to</em> that context.
+ triggered when ControlPlane switches <em>to</em> that context.
The alternative is a Departure action, which is triggered when
- MarcoPolo switches <em>away</em> from that action's context.
+ ControlPlane switches <em>away</em> from that action's context.
In this case, the <i>delay</i> parameter will be the length of
time from the action being triggered until the context is
switched.
@@ -84,7 +84,7 @@ <h2><em>NetworkLocation</em> actions</h2>
<h2><em>Open</em> actions</h2>
<p>Actions of type <em>Open</em> are the most general actions.
- Upon triggering, MarcoPolo will open that file: if it
+ Upon triggering, ControlPlane will open that file: if it
is an application, it will be launched; if it is an
AppleScript, it will be executed; otherwise, it will be opened
with that file's default application. This is roughly
@@ -127,7 +127,7 @@ <h2><em>VPN</em> actions</h2>
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="rules.html">Setting up MarcoPolo's rules</a><br />
+ <a href="rules.html">Setting up ControlPlane's rules</a><br />
<a href="tips.html">Tips and tricks</a><br />
</p>
</div>
@@ -1,34 +1,34 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>Setting up MarcoPolo's rules</title>
+ <title>Setting up ControlPlane's rules</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="advanced configuration tuning">
- <meta name="description" content="Advanced settings for MarcoPolo.">
+ <meta name="description" content="Advanced settings for ControlPlane.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
<!-- The above links back to the index page -->
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
<h1>Advanced settings</h1>
</div>
<p>This section details the advanced configuration options of
- MarcoPolo. <b>Please be aware that changing these settings could
+ ControlPlane. <b>Please be aware that changing these settings could
have a detrimental effect on your computer's performance, as
- well as MarcoPolo's performance.</b>
+ well as ControlPlane's performance.</b>
</p>
<h2>Time interval between re-evaluating rules</h2>
- <p>The main MarcoPolo thread runs in a loop, gathering evidence
+ <p>The main ControlPlane thread runs in a loop, gathering evidence
from each evidence source, evaluating it against all the rules,
and computing the correct context. This setting controls the
length of time to pause between these cycles.
@@ -47,7 +47,7 @@ <h2>WiFi always scans, even when associated</h2>
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="config.html">Configuring MarcoPolo</a><br />
+ <a href="config.html">Configuring ControlPlane</a><br />
</p>
</div>
</body>
@@ -1,34 +1,34 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>Setting up MarcoPolo's rules</title>
+ <title>Setting up ControlPlane's rules</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="config configuration">
- <meta name="description" content="Overall settings for MarcoPolo.">
+ <meta name="description" content="Overall settings for ControlPlane.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
<!-- The above links back to the index page -->
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
- <h1>Configuring MarcoPolo</h1>
+ <h1>Configuring ControlPlane</h1>
</div>
<p>This section deals with the overall configuration of
- MarcoPolo; it doesn't cover <a href="rules.html">rules</a> or
+ ControlPlane; it doesn't cover <a href="rules.html">rules</a> or
<a href="actions.html">actions</a>.
</p>
- <p>MarcoPolo runs from the <em>status bar</em> (the right-hand
+ <p>ControlPlane runs from the <em>status bar</em> (the right-hand
portion of the menu bar containing icons), and does not show in
- the Dock. You can access MarcoPolo's preferences and other
- features through the MarcoPolo icon.
+ the Dock. You can access ControlPlane's preferences and other
+ features through the ControlPlane icon.
</p>
<h2>Enabling automatic switching</h2>
@@ -40,46 +40,46 @@ <h2>Enabling automatic switching</h2>
<h2>Hiding from status bar</h2>
<p>If the 'Hide from status bar' option is checked in the
- General preferences, the MarcoPolo icon in the status bar will
+ General preferences, the ControlPlane icon in the status bar will
disappear about 10 seconds after launching (or after enabling
this option). To restore the icon to access preferences,
- simply relaunch MarcoPolo, and the icon will be visible again
+ simply relaunch ControlPlane, and the icon will be visible again
for another 10 seconds.
</p>
<h2>Switch Smoothing</h2>
- <p>Some evidence sources in MarcoPolo can occasionally return
+ <p>Some evidence sources in ControlPlane can occasionally return
spurious data, either due to bad hardware (such as USB), or
fundamentally unreliable physical circumstances (such as WiFi).
- This can sometimes cause MarcoPolo to momentarily switch away
+ This can sometimes cause ControlPlane to momentarily switch away
from the current (correct) context, and then switch back once
the evidence source corrects itself.
</p>
<p>If you check the 'Use switch smoothing' option in the
- General preferences, MarcoPolo will delay all context
+ General preferences, ControlPlane will delay all context
switching until two consecutive rule evaluations both yield the
same guess. The interval between rule evaluations defaults to
five seconds, so using switch smoothing will delay legitimate
context changes by this length of time.
</p>
<h2>Default Context</h2>
- <p>Sometimes MarcoPolo doesn't have enough evidence to make a
+ <p>Sometimes ControlPlane doesn't have enough evidence to make a
confident enough guess as to your correct context. You can
specify a <em>default context</em> to be used in these
situations.
</p>
<h2>Confidence required</h2>
- <p>After MarcoPolo has combined all the matching rules, it
+ <p>After ControlPlane has combined all the matching rules, it
arrives at a confidence for each possible context. The
minimum confidence threshold is configurable via this slider.
</p>
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="rules.html">Setting up MarcoPolo's rules</a><br />
- <a href="actions.html">Setting up MarcoPolo's actions</a><br />
+ <a href="rules.html">Setting up ControlPlane's rules</a><br />
+ <a href="actions.html">Setting up ControlPlane's actions</a><br />
<a href="advanced.html">Advanced settings</a><br />
</p>
</div>
@@ -2,31 +2,31 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html;charset=utf-8">
- <title>Discover MarcoPolo</title>
+ <title>Discover ControlPlane</title>
<meta name="robots" content="anchors">
<link href="../css/topicPage.css" type="text/css" rel="stylesheet" media="all">
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img src="../gfx/icon.png" alt="MarcoPolo icon">
+ <img src="../gfx/icon.png" alt="ControlPlane icon">
</div>
<div id="pagetitle">
- <h1>Discover MarcoPolo</h1>
+ <h1>Discover ControlPlane</h1>
</div>
-<p>MarcoPolo brings context-aware computing to your portable Mac computer.
+<p>ControlPlane brings context-aware computing to your portable Mac computer.
It allows your computer to determine its context through gathering evidence
from your environment (<b>evidence sources</b>), using flexible rule-based
fuzzy matching to make an educated guess (<b>rules</b>), and then
performing arbitrary actions upon changing context (<b>actions</b>).
</p>
-<p>MarcoPolo's concept of <em>contexts</em> is a generalisation of a location,
+<p>ControlPlane's concept of <em>contexts</em> is a generalisation of a location,
and encompasses more than just where your computer is. A context might
represent what you are doing, or what else is going on around you.
</p>
@@ -64,9 +64,9 @@ <h1>Discover MarcoPolo</h1>
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="config.html">Configuring MarcoPolo</a><br />
- <a href="rules.html">Setting up MarcoPolo's rules</a><br />
- <a href="actions.html">Setting up MarcoPolo's actions</a><br />
+ <a href="config.html">Configuring ControlPlane</a><br />
+ <a href="rules.html">Setting up ControlPlane's rules</a><br />
+ <a href="actions.html">Setting up ControlPlane's actions</a><br />
</p>
</body>
</html>
@@ -1,39 +1,39 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/sgml/loosedtd.html">
<html>
<head>
- <title>The maths behind MarcoPolo</title>
+ <title>The maths behind ControlPlane</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="keywords" content="maths details">
- <meta name="description" content="Learn how MarcoPolo works behind-the-scenes.">
+ <meta name="description" content="Learn how ControlPlane works behind-the-scenes.">
<link media="all" rel="stylesheet" href="../css/topicPage.css" />
</head>
<body>
<div id="banner">
<div id="machelp">
- <a class="bread" href="help:anchor='access' bookID=MarcoPolo Help">MarcoPolo Help</a>
+ <a class="bread" href="help:anchor='access' bookID=ControlPlane Help">ControlPlane Help</a>
<!-- The above links back to the index page -->
</div>
</div>
<div id="mainbox">
<div id="caticon">
- <img class="icon" src="../gfx/icon.png" alt="MarcoPolo Icon" />
+ <img class="icon" src="../gfx/icon.png" alt="ControlPlane Icon" />
</div>
<div id="pagetitle">
- <h1>The maths behind MarcoPolo</h1>
+ <h1>The maths behind ControlPlane</h1>
</div>
<p style="font-style: italic;">Note: this is fairly technical,
and is aimed at an undergraduate mathematics level. It is not
- necessary to understand the following content to use MarcoPolo;
+ necessary to understand the following content to use ControlPlane;
it is provided for the curious.
</p>
- <p>MarcoPolo doesn't use traditional "fuzzy logic" handling,
+ <p>ControlPlane doesn't use traditional "fuzzy logic" handling,
but rather combines fuzzy sets with a more traditional
confidence combination method. The fuzzy sets are implicit, and
represent each possible context: a given rule indicates that a
piece of evidence is in a certain context set with a certain
membership value (the confidence).
</p>
- <p>Every time MarcoPolo decides to evaluate the best guess, it
+ <p>Every time ControlPlane decides to evaluate the best guess, it
finds all the rules that match, groups them based on the
context that they provide evidence for, and then aggregates
the confidence values for each context. The context with the
@@ -56,7 +56,7 @@ <h1>The maths behind MarcoPolo</h1>
<h2 class="seealso">See also</h2>
<p class="seealso">
- <a href="rules.html">Setting up MarcoPolo's rules</a><br />
+ <a href="rules.html">Setting up ControlPlane's rules</a><br />
</p>
</div>
</body>
Oops, something went wrong.

0 comments on commit fd61583

Please sign in to comment.