Some fixes, formatting
parent
fc469e0fa3
commit
5a764293fc
|
|
@ -23,12 +23,10 @@ SLIPDecoder {
|
|||
// Buffer for OSC bundles/messages
|
||||
const bufferSize = 4096;
|
||||
|
||||
var <>deviceName, <>rate, <>prepend, <port, decode, trace, stop, <reader;
|
||||
var <>deviceName, <>rate, <>prepend, <port, <>trace = false, <running = false, <reader;
|
||||
|
||||
*new { |deviceName="/dev/ttyUSB0", rate=115200, prepend=""|
|
||||
deviceName.postln;
|
||||
//^super.newCopyArgs(deviceName, rate, prepend).init;
|
||||
^super.newCopyArgs(deviceName, rate, prepend);//.init;
|
||||
^super.newCopyArgs(deviceName, rate, prepend);
|
||||
}
|
||||
|
||||
readInt32 { |byteArr|
|
||||
|
|
@ -43,11 +41,10 @@ SLIPDecoder {
|
|||
// Return array [string, strlen (bytes)]
|
||||
readNextString { |byteArr|
|
||||
var str = "", idx = 0;
|
||||
while({ (idx + 4) <= byteArr.size },
|
||||
{
|
||||
while({ (idx + 4) <= byteArr.size }, {
|
||||
str = str ++ String.newFrom(
|
||||
byteArr[(idx..(idx + 3))]
|
||||
.removeEvery([0])
|
||||
.removeEvery([0, nil])
|
||||
.collect({|x| x.asAscii})
|
||||
);
|
||||
|
||||
|
|
@ -55,10 +52,8 @@ SLIPDecoder {
|
|||
if ( isNil(byteArr[idx + 3]) || (byteArr[idx + 3] == 0), {
|
||||
^[str, idx + 4]
|
||||
});
|
||||
|
||||
idx = idx + 4;
|
||||
}
|
||||
);
|
||||
});
|
||||
|
||||
// If end of byteArr, return
|
||||
^[str, idx];
|
||||
|
|
@ -68,67 +63,51 @@ SLIPDecoder {
|
|||
// ce je stevilo, v razponu crk, stevk in znakov, vrni char, sicer kar cifro
|
||||
if (x.isInteger && (x >= 0x20) && (x <= 0x7E),
|
||||
{ ^x.asAscii },
|
||||
{ ^x })
|
||||
{ ^x }
|
||||
);
|
||||
}
|
||||
|
||||
init {
|
||||
"init".postln;
|
||||
dump(this);
|
||||
deviceName.postln;
|
||||
rate.postln;
|
||||
port = SerialPort(deviceName, rate);
|
||||
trace = false;
|
||||
stop = false;
|
||||
"init done".postln;
|
||||
}
|
||||
|
||||
trace { |val|
|
||||
trace = val;
|
||||
val;
|
||||
}
|
||||
|
||||
traceMsg { |...msg|
|
||||
if (trace, { "> ".post; msg.join(' ').postln; });
|
||||
if ((trace), { "> ".post; msg.join(' ').postln; });
|
||||
}
|
||||
|
||||
// Function for decoding the properly-SLIP-decoded message.
|
||||
decode { |data|
|
||||
// Is it a bundle? (read header from first 8 bytes)
|
||||
var header = data.at((0..7));
|
||||
|
||||
if (header == oscBundleHeader,
|
||||
// Is it a bundle? (read header from first 8 bytes)
|
||||
if ((header == oscBundleHeader), {
|
||||
// OSC bundle
|
||||
{
|
||||
var timetag, nextMsgLen, nextMsgStart, nextMsgEnd, bundlePart;
|
||||
|
||||
var nextMsgLen, nextMsgStart, nextMsgEnd, bundlePart;
|
||||
this.traceMsg("BUNDLE");
|
||||
|
||||
// Next 8 bytes are a time tag (or null)
|
||||
/* @TODO handle timetags!
|
||||
timetag = data.at((8..15));
|
||||
var timetag = data.at((8..15));
|
||||
*/
|
||||
|
||||
// First message starts after the time tag
|
||||
nextMsgStart = 16;
|
||||
|
||||
// Loop for each message
|
||||
while({ nextMsgStart < data.size },
|
||||
{
|
||||
while({ nextMsgStart < data.size }, {
|
||||
// Further 4 bytes hold the next message length
|
||||
nextMsgLen = this.readInt32(data.at((nextMsgStart..(nextMsgStart + 3))));
|
||||
nextMsgStart = nextMsgStart + 4;
|
||||
nextMsgEnd = nextMsgStart + nextMsgLen - 1;
|
||||
nextMsgEnd = min(nextMsgStart + nextMsgLen - 1, data.size - 1);
|
||||
bundlePart = data.at((nextMsgStart..nextMsgEnd));
|
||||
|
||||
// Recursively decode; each bundle part can be another bundle
|
||||
this.decode(bundlePart);
|
||||
|
||||
nextMsgStart = nextMsgEnd + 1;
|
||||
}
|
||||
);
|
||||
},
|
||||
});
|
||||
}, {
|
||||
// OSC message
|
||||
{
|
||||
var nextString, index, address, type, args = [];
|
||||
|
||||
// Message Address
|
||||
|
|
@ -162,25 +141,23 @@ SLIPDecoder {
|
|||
|
||||
// Send OSC message to the engine
|
||||
NetAddr.localAddr.sendMsg(prepend ++ address, *args);
|
||||
}
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
start {
|
||||
this.traceMsg("Starting...");
|
||||
dump(this);
|
||||
// TODO fix restart
|
||||
if ((port == nil), {this.init;});
|
||||
if (port.isOpen.not, {this.init;});
|
||||
|
||||
this.traceMsg("opened");
|
||||
running = true;
|
||||
|
||||
reader = fork {
|
||||
var serialByte, buffer, firstRead;
|
||||
firstRead = true;
|
||||
|
||||
// Skip data before the first END character
|
||||
while({stop.not && firstRead}, {
|
||||
while({running && firstRead}, {
|
||||
serialByte = port.read;
|
||||
|
||||
//this.traceMsg("Read byte");
|
||||
|
|
@ -190,13 +167,13 @@ SLIPDecoder {
|
|||
buffer = Int8Array(maxSize: bufferSize);
|
||||
firstRead = false;
|
||||
}, {
|
||||
//this.traceMsg("Skip...")
|
||||
this.traceMsg("Skip...")
|
||||
});
|
||||
});
|
||||
|
||||
// Start reading data
|
||||
this.traceMsg("First read!");
|
||||
while({stop.not}, {
|
||||
while({running}, {
|
||||
serialByte = port.read;
|
||||
//this.traceMsg("Checking", serialByte.asInteger, serialByte.asAscii);
|
||||
serialByte.switch(
|
||||
|
|
@ -214,18 +191,11 @@ SLIPDecoder {
|
|||
slipESC, {
|
||||
serialByte = port.read;
|
||||
serialByte.switch(
|
||||
slipESC_END, {
|
||||
//this.traceMsg("SLIP ESC and ESC_END");
|
||||
buffer.add(slipEND)
|
||||
},
|
||||
slipESC_ESC, {
|
||||
//this.traceMsg("SLIP ESC and ESC_ESC");
|
||||
buffer.add(slipESC)
|
||||
},
|
||||
slipESC_END, { buffer.add(slipEND) },
|
||||
slipESC_ESC, { buffer.add(slipESC) },
|
||||
{"SLIP encoding error.".error }
|
||||
);
|
||||
},
|
||||
{
|
||||
}, {
|
||||
// Otherwise just add the byte
|
||||
//this.traceMsg(buffer);
|
||||
buffer.add(serialByte);
|
||||
|
|
@ -236,7 +206,8 @@ SLIPDecoder {
|
|||
|
||||
stop {
|
||||
this.traceMsg("Stopping...");
|
||||
stop = true;
|
||||
running = false;
|
||||
port.close;
|
||||
this.reader.free;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue