Stable Setup for Communication

Calvin Bulla
1 parent 5b75382f
Showing 5 changed files with 5 additions and 11 deletions Show diff stats
app/res/settings/_dev_tty.usbmodem411.xml
app/res/settings/_dev_tty.usbmodem641.xml
app/src/inoChannel.cpp
app/src/inoChannel.h
app/src/inoCommand.h
 <Settings>
-	<Color>100, 100, 140, 255</Color>
+	<Color>173, 100, 140, 255</Color>
 </Settings>
@@ -0,0 +1,3 @@
+<Settings>
+	<Color>100, 100, 140, 255</Color>
+</Settings>
@@ -27,7 +27,6 @@ void inoChannel::stopStream() {
 }
  
 void inoChannel::threadedFunction() {
-  lock();
   serial.setup(device, 115200);
   serial.flush();
   while(isThreadRunning() && !(serial.available() >= 4));
@@ -7,10 +7,10 @@ public:
   void setup(string device);
   void exit();
   void threadedFunction();
+
   void identify();
   void startStream();
   void stopStream();
-  int getVersion();
  
   ofEvent<string> statusChange;
  
@@ -1,8 +0,0 @@
-#pragma once
-
-#include "ofMain.h"
-
-class inoCommand {
-public:
-  virtual void send(ofSerial serial) = 0;
-}
1	1	<Settings>
2		- <Color>100, 100, 140, 255</Color>
	2	+ <Color>173, 100, 140, 255</Color>
3	3	</Settings>
...	...
...	...	@@ -0,0 +1,3 @@
	1	+<Settings>
	2	+ <Color>100, 100, 140, 255</Color>
	3	+</Settings>
...	...
...	...	@@ -27,7 +27,6 @@ void inoChannel::stopStream() {
27	27	}
28	28
29	29	void inoChannel::threadedFunction() {
30		- lock();
31	30	serial.setup(device, 115200);
32	31	serial.flush();
33	32	while(isThreadRunning() && !(serial.available() >= 4));
...	...
...	...	@@ -7,10 +7,10 @@ public:
7	7	void setup(string device);
8	8	void exit();
9	9	void threadedFunction();
	10	+
10	11	void identify();
11	12	void startStream();
12	13	void stopStream();
13		- int getVersion();
14	14
15	15	ofEvent<string> statusChange;
16	16
...	...
...	...	@@ -1,8 +0,0 @@
1		-#pragma once
2		-
3		-#include "ofMain.h"
4		-
5		-class inoCommand {
6		-public:
7		- virtual void send(ofSerial serial) = 0;
8		-}