From aca2ce47b65fd8c333fe90bce68281ec687ce679 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 14 May 2013 16:29:39 -0700 Subject: [PATCH] add a V2 transmitter data packet for new iOS transmitter --- interface/src/Application.cpp | 11 ++++++++++- libraries/shared/src/PacketHeaders.h | 3 ++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index eaebaee9ff..e628188e28 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1961,10 +1961,19 @@ void* Application::networkReceive(void* args) { app->_bytesCount += bytesReceived; switch (app->_incomingPacket[0]) { - case PACKET_HEADER_TRANSMITTER_DATA: + case PACKET_HEADER_TRANSMITTER_DATA_V1: // Process UDP packets that are sent to the client from local sensor devices app->_myAvatar.processTransmitterData(app->_incomingPacket, bytesReceived); break; + case PACKET_HEADER_TRANSMITTER_DATA_V2: + float rotationRates[3]; + float accelerations[3]; + + memcpy(rotationRates, app->_incomingPacket + 2, sizeof(rotationRates)); + memcpy(accelerations, app->_incomingPacket + 3 + sizeof(rotationRates), sizeof(accelerations)); + + printf("The rotation: %f, %f, %f\n", rotationRates[0], rotationRates[1], rotationRates[2]); + break; case PACKET_HEADER_VOXEL_DATA: case PACKET_HEADER_VOXEL_DATA_MONOCHROME: case PACKET_HEADER_Z_COMMAND: diff --git a/libraries/shared/src/PacketHeaders.h b/libraries/shared/src/PacketHeaders.h index 49b2fe9d00..398a3e54ab 100644 --- a/libraries/shared/src/PacketHeaders.h +++ b/libraries/shared/src/PacketHeaders.h @@ -25,7 +25,8 @@ const PACKET_HEADER PACKET_HEADER_ERASE_VOXEL = 'E'; const PACKET_HEADER PACKET_HEADER_VOXEL_DATA = 'V'; const PACKET_HEADER PACKET_HEADER_VOXEL_DATA_MONOCHROME = 'v'; const PACKET_HEADER PACKET_HEADER_BULK_AVATAR_DATA = 'X'; -const PACKET_HEADER PACKET_HEADER_TRANSMITTER_DATA = 't'; +const PACKET_HEADER PACKET_HEADER_TRANSMITTER_DATA_V1 = 't'; +const PACKET_HEADER PACKET_HEADER_TRANSMITTER_DATA_V2 = 'T'; const PACKET_HEADER PACKET_HEADER_ENVIRONMENT_DATA = 'e'; const PACKET_HEADER PACKET_HEADER_DOMAIN_LIST_REQUEST = 'L'; const PACKET_HEADER PACKET_HEADER_DOMAIN_RFD = 'C';