add fix for myo.framework handling, fix version number

remove myo sdk link
nok · Apr 6, 2015 · 876aed2 · 876aed2
1 parent e765503
commit 876aed2
Show file tree

Hide file tree

Showing 25 changed files with 90 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Myo for Processing
 
-Library to use the [Myo](https://www.thalmic.com) [SDK](https://developer.thalmic.com/docs/api_reference/platform/index.html) in [Processing](http://processing.org/).
+Library to use the [Myo](https://www.thalmic.com) in [Processing](http://processing.org/).
 
 
 ## Table of Contents
@@ -23,9 +23,9 @@ The [Myo](https://www.thalmic.com) armband lets you use the electrical activity
 
 ## Download
 
-- [Myo for Processing v0.8.2.1](download/MyoForProcessing.zip?raw=true)
+- [Myo for Processing v0.8.1.2](download/MyoForProcessing.zip?raw=true)
 
-Note: If you are interested in the newest **beta** implementation, so have a look at the **dev branch**.
+Note: If you are interested in the newest **development** implementation, so have a look at the [dev branch](https://github.com/nok/myo-processing/tree/dev).
 
 
 ## Installation

diff --git a/download/MyoForProcessing.txt b/download/MyoForProcessing.txt
@@ -46,7 +46,7 @@ version = 12
 
 # The version as the user will see it. If blank, the version attribute will be 
 # used here.
-prettyVersion = 0.8.2.1
+prettyVersion = 0.8.1.2
 
 # The min and max revision of Processing compatible with your library.
 # Note that these fields use the revision and not the version of Processing, 

diff --git a/download/MyoForProcessing.zip b/download/MyoForProcessing.zip
diff --git a/library/MyoForProcessing.jar b/library/MyoForProcessing.jar
diff --git a/reference/allclasses-frame.html b/reference/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>All Classes (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/allclasses-noframe.html b/reference/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>All Classes (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/constant-values.html b/reference/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Constant Field Values (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/Arm.Type.html b/reference/de/voidplus/myo/Arm.Type.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Arm.Type (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/Arm.html b/reference/de/voidplus/myo/Arm.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:31 CEST 2015 -->
 <title>Arm (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/Collector.html b/reference/de/voidplus/myo/Collector.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Collector (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/Myo.Event.html b/reference/de/voidplus/myo/Myo.Event.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Myo.Event (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/Myo.LockingPolicy.html b/reference/de/voidplus/myo/Myo.LockingPolicy.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Myo.LockingPolicy (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/Myo.Unlock.html b/reference/de/voidplus/myo/Myo.Unlock.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Myo.Unlock (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/Myo.html b/reference/de/voidplus/myo/Myo.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Myo (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -96,6 +96,8 @@ <h2 title="Class Myo" class="title">Class Myo</h2>
 <br>
 <pre>public class <span class="strong">Myo</span>
 extends <a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
+<dl><dt><span class="strong">Author:</span></dt>
+  <dd>Darius Morawiec</dd></dl>
 </li>
 </ul>
 </div>

diff --git a/reference/de/voidplus/myo/Pose.Type.html b/reference/de/voidplus/myo/Pose.Type.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Pose.Type (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/Pose.html b/reference/de/voidplus/myo/Pose.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Pose (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/package-frame.html b/reference/de/voidplus/myo/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>de.voidplus.myo (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/package-summary.html b/reference/de/voidplus/myo/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>de.voidplus.myo (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/de/voidplus/myo/package-tree.html b/reference/de/voidplus/myo/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>de.voidplus.myo Class Hierarchy (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -81,11 +81,11 @@ <h2 title="Enum Hierarchy">Enum Hierarchy</h2>
 <ul>
 <li type="circle">java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="strong">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="http://docs.oracle.com/javase/7/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="http://docs.oracle.com/javase/7/docs/api/java/io/Serializable.html?is-external=true" title="class or interface in java.io">Serializable</a>)
 <ul>
-<li type="circle">de.voidplus.myo.<a href="../../../de/voidplus/myo/Pose.Type.html" title="enum in de.voidplus.myo"><span class="strong">Pose.Type</span></a></li>
-<li type="circle">de.voidplus.myo.<a href="../../../de/voidplus/myo/Arm.Type.html" title="enum in de.voidplus.myo"><span class="strong">Arm.Type</span></a></li>
-<li type="circle">de.voidplus.myo.<a href="../../../de/voidplus/myo/Myo.Event.html" title="enum in de.voidplus.myo"><span class="strong">Myo.Event</span></a></li>
 <li type="circle">de.voidplus.myo.<a href="../../../de/voidplus/myo/Myo.Unlock.html" title="enum in de.voidplus.myo"><span class="strong">Myo.Unlock</span></a></li>
+<li type="circle">de.voidplus.myo.<a href="../../../de/voidplus/myo/Arm.Type.html" title="enum in de.voidplus.myo"><span class="strong">Arm.Type</span></a></li>
 <li type="circle">de.voidplus.myo.<a href="../../../de/voidplus/myo/Myo.LockingPolicy.html" title="enum in de.voidplus.myo"><span class="strong">Myo.LockingPolicy</span></a></li>
+<li type="circle">de.voidplus.myo.<a href="../../../de/voidplus/myo/Myo.Event.html" title="enum in de.voidplus.myo"><span class="strong">Myo.Event</span></a></li>
+<li type="circle">de.voidplus.myo.<a href="../../../de/voidplus/myo/Pose.Type.html" title="enum in de.voidplus.myo"><span class="strong">Pose.Type</span></a></li>
 </ul>
 </li>
 </ul>

diff --git a/reference/deprecated-list.html b/reference/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Deprecated List (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/help-doc.html b/reference/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>API Help (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/index-all.html b/reference/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Index (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/reference/index.html b/reference/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Javadocs: MyoForProcessing</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;

diff --git a/reference/overview-tree.html b/reference/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="en">
 <head>
-<!-- Generated by javadoc (version 1.7.0_71) on Sat Feb 28 22:53:37 CET 2015 -->
+<!-- Generated by javadoc (version 1.7.0_71) on Mon Apr 06 19:36:32 CEST 2015 -->
 <title>Class Hierarchy (Javadocs: MyoForProcessing)</title>
-<meta name="date" content="2015-02-28">
+<meta name="date" content="2015-04-06">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>

diff --git a/src/de/voidplus/myo/Myo.java b/src/de/voidplus/myo/Myo.java
@@ -10,6 +10,12 @@
 import processing.core.PApplet;
 import processing.core.PVector;
 
+/**
+ * 
+ * @author Darius Morawiec
+ * @version 0.8.1.2
+ *
+ */
 public class Myo {
 
 	// Processing
@@ -38,32 +44,15 @@ public class Myo {
 	protected boolean withEmg;
 
 	private final static String NAME = "Myo";
-	private final static String VERSION = "0.8.2.1";
+	private final static String VERSION = "0.8.1.2";
 	private final static String MYO_SDK_VERSION = "0.8.1";
 	private final static String MYO_FIRMWARE_VERSION = "1.1.755";
 	private final static String MYO_FIRMWARE_VERSION_ALPHA = "1.1.5";
 	private final static String REPOSITORY = "https://github.com/nok/myo-processing";
 
 	public Myo(PApplet parent) {
 		PApplet.println("# "+Myo.NAME+" v"+Myo.VERSION+" - Support: Myo SDK v"+Myo.MYO_SDK_VERSION+", Firmware v"+Myo.MYO_FIRMWARE_VERSION+", Alpha Firmware v"+Myo.MYO_FIRMWARE_VERSION_ALPHA+" - "+Myo.REPOSITORY);
-
-		// Add myo.framework to Java library path manually
-		if (System.getProperty("os.name").toLowerCase().contains("mac")) {
-			try {
-				String framework = new File(Myo.class.getProtectionDomain()
-						.getCodeSource().getLocation().toURI()).getParentFile()
-						.toString()
-						+ File.separator
-						+ "macosx"
-						+ File.separator
-						+ "myo.framework";
-				System.setProperty("java.library.path", framework);
-//				stream = System.err;
-//				System.setErr(new PrintStream(new ByteArrayOutputStream()));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
+		this.checkDependencies();
 
 		parent.registerMethod("pre", this);
 //		parent.registerMethod("post", this);
@@ -108,7 +97,40 @@ public void run() {
 		this.gyroscope = new PVector();
 	}
 
-
+
+	// ------------------------------------------------------------------------------
+	// Dependencies
+
+	private void checkDependencies() {
+		// MAC
+		if (System.getProperty("os.name").toLowerCase().contains("mac")) {
+			// Add 'libraries/macosx' path to the 'java.library.path' to load 'myo.framework' manually
+			try {
+				String pLibPath = new File(Myo.class.getProtectionDomain()
+						.getCodeSource().getLocation().toURI()).getParentFile()
+						.toString()
+						+ File.separator
+						+ "macosx"
+						+ File.separator;
+				File pLibDir = new File(pLibPath);
+				if (pLibDir.exists() && pLibDir.isDirectory()) {
+					File myoLibFile = new File(pLibDir.getAbsoluteFile()
+							+ File.separator + "myo.framework");
+					if (myoLibFile.exists() && myoLibFile.isDirectory()) {
+						String libPath = System
+								.getProperty("java.library.path")
+								+ ":"
+								+ pLibDir.getAbsolutePath();
+						System.setProperty("java.library.path", libPath);
+					}
+				}
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+
 	// ------------------------------------------------------------------------------
 	// Lifecycle of PApplet sketch