Mirrors/SkyNX
2
0
Fork 0
mirror of https://github.com/DevL0rd/SkyNX synced 2024-11-21 18:43:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

ACTUALLY VERIFIED STREAM CORRECTLY!

Browse source
This commit is contained in:
devl0rd 2020-04-29 14:25:37 -06:00
parent 1d41a0348a
commit a3d4c7c46b
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SkyNX-Streamer/NxStreamingService/main.js
View file

@ -108,7 +108,7 @@ hidStreamClient.on('connect', function () {
var switchHidBuffer = new Buffer.alloc(0);
function parseInputStruct(buff) {
var input = Struct()
.word8('streamStart')
.word64Ule('streamStart')
.word32Ule('HeldKeys1')
.word32Sle('LJoyX1')
.word32Sle('LJoyY1')
@ -161,7 +161,7 @@ function parseInputStruct(buff) {
.floatle('gyroZ')
.word32Ule('controllerCount')
.word32Ule('frameRate')
.word8('streamEnd')
.word64Ule('streamEnd')
input._setBuff(buff);
return input;
};
@ -478,19 +478,21 @@ function handleGyroAndAccel(hid) {
GyroServ.sendMotionData(gyro, accel);
}
var fpsPrintTimer = 0;
var hidDataBuffer;
hidStreamClient.on('data', function (data) {
if (data.length < 208) {
if (data.length < 224) {
console.log("HID data too short. Data length: " + data.length)
return;
} //packet is 208 in length. anyless then the data is bad
if (data.length > 208) {
data.length = 208; //ignore extra data
// console.log(data.length / 208)
} //packet is 216 in length. anyless then the data is bad
if (data.length > 224) {
data.length = 224; //ignore extra data
//console.log("Duplicate Data: " + (data.length / 224))
}
switchHidBuffer = new Buffer.from(data);
var hid = parseInputStruct(switchHidBuffer)
if (!(hid.get("streamStart") === 255 && hid.get("streamEnd") === 255)) {
console.log("HID data malformed: " + data.length);
if (!(hid.get("streamStart") === "18446744073709551615" && hid.get("streamEnd") === "9223372036854775807")) {
console.log("HID Data malformed. Data length: " + data.length);
console.log(hid.get("streamStart") + " - " + hid.get("streamEnd"))
return;
}

8
SkyNX/source/input.c
View file

@ -29,10 +29,10 @@ void gamePadSend(JoyConSocket *connection)
controllersConnected++;
}
}
pkg.streamStart = 255;
pkg.streamEnd = 255;
pkg.frameRate = frameRate;
pkg.controllerCount = controllersConnected;
pkg.streamStart = (uint64_t)UINT64_MAX; //easy identifiers for the start and stop of tcp stream
pkg.streamEnd = (uint64_t)UINT64_MAX / 2;
pkg.frameRate = (uint32_t)frameRate;
pkg.controllerCount = (uint32_t)controllersConnected;
pkg.heldKeys1 = (uint32_t)hidKeysHeld(player1Id);
hidJoystickRead(&lJoy, player1Id, JOYSTICK_LEFT);

4
SkyNX/source/network.h
View file

@ -10,7 +10,7 @@
/* Data to send to server */
typedef struct
{
uint8_t streamStart;
uint64_t streamStart;
uint32_t heldKeys1;
int32_t lJoyX1;
int32_t lJoyY1;
@ -63,7 +63,7 @@ typedef struct
float_t gyroZ;
uint32_t controllerCount;
uint32_t frameRate;
uint8_t streamEnd;
uint64_t streamEnd;
} JoyPkg;
/* Init nx network and av network */