Commit a9c1c7fbceb47ca020d047ef5572b99b5f923586

Authored by Calvin Bulla
1 parent 5b75382f
Exists in master and in 1 other branch dev

Stable Setup for Communication

app/res/settings/_dev_tty.usbmodem411.xml
1 1 <Settings>
2   - <Color>100, 100, 140, 255</Color>
  2 + <Color>173, 100, 140, 255</Color>
3 3 </Settings>
... ...
app/res/settings/_dev_tty.usbmodem641.xml 0 → 100644
... ... @@ -0,0 +1,3 @@
  1 +<Settings>
  2 + <Color>100, 100, 140, 255</Color>
  3 +</Settings>
... ...
app/src/inoChannel.cpp
... ... @@ -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));
... ...
app/src/inoChannel.h
... ... @@ -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  
... ...
app/src/inoCommand.h
... ... @@ -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   -}