Skip to content

Commit 21c0cef

Browse files
authored
Merge pull request #719 from KSauter/allow-tsp-v5-packes-without-name
TSL packages without name
2 parents a96a266 + 6aa001e commit 21c0cef

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/sources/SimplyLive.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ export class SimplyLivePSource extends TallyInput {
2121
this.server.bind(port);
2222

2323
this.server.on('message', (message) => {
24-
if (message.length > 12) {
24+
if (message.length >= 12) {
2525
let tallyobj: any = TSL5DataParser.parseTSL5Data(message)
26-
this.renameAddress(tallyobj.INDEX[0].toString(), tallyobj.INDEX[0].toString(), tallyobj.TEXT.toString().trim());
26+
27+
if (tallyobj.TEXT !== "") {
28+
this.renameAddress(tallyobj.INDEX[0].toString(), tallyobj.INDEX[0].toString(), tallyobj.TEXT.toString().trim());
29+
}
2730

2831
let inPreview: number = 0;
2932
let inProgram: number = 0;

src/sources/TSL.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -178,17 +178,19 @@ export class TSL5DataParser {
178178
var LENGTH = jspack.Unpack("<H", data, cursor)
179179
cursor += _LENGTH;
180180

181-
tallyobj.TEXT = jspack.Unpack("s".repeat(LENGTH), data, cursor)
181+
tallyobj.TEXT = jspack.Unpack("s".repeat(LENGTH), data, cursor).join("")
182182
return tallyobj;
183183
}
184184
}
185185

186186
class TSL5Base extends TallyInput {
187187
protected processTSL5Tally(data) {
188-
if (data.length > 12) {
188+
if (data.length >= 12) {
189189
let tallyobj: any = TSL5DataParser.parseTSL5Data(data)
190190

191-
this.renameAddress(tallyobj.INDEX[0].toString(), tallyobj.INDEX[0].toString(), tallyobj.TEXT.toString().trim());
191+
if (tallyobj.TEXT !== "") {
192+
this.renameAddress(tallyobj.INDEX[0].toString(), tallyobj.INDEX[0].toString(), tallyobj.TEXT.toString().trim());
193+
}
192194

193195
let inPreview = 0;
194196
let inProgram = 0;

0 commit comments

Comments
 (0)