Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 13:33:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplified serial port init to not use baud.

Browse source
This commit is contained in:
Philip Rosedale 2013-05-13 18:52:43 -07:00
parent 87dfbf9f4f
commit 6b85d93aee
3 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
interface/src/SerialInterface.cpp
View file

@ -36,7 +36,7 @@ void SerialInterface::pair() {
char *serialPortname = new char[100];
sprintf(serialPortname, "/dev/%s", entry->d_name);
initializePort(serialPortname, 115200);
initializePort(serialPortname);
delete [] serialPortname;
}
@ -48,7 +48,7 @@ void SerialInterface::pair() {
}
// connect to the serial port
void SerialInterface::initializePort(char* portname, int baud) {
void SerialInterface::initializePort(char* portname) {
#ifdef __APPLE__
_serialDescriptor = open(portname, O_RDWR | O_NOCTTY | O_NDELAY);
@ -61,32 +61,15 @@ void SerialInterface::initializePort(char* portname, int baud) {
struct termios options;
tcgetattr(_serialDescriptor, &options);
switch(baud) {
case 9600: cfsetispeed(&options,B9600);
cfsetospeed(&options,B9600);
break;
case 19200: cfsetispeed(&options,B19200);
cfsetospeed(&options,B19200);
break;
case 38400: cfsetispeed(&options,B38400);
cfsetospeed(&options,B38400);
break;
case 115200: cfsetispeed(&options,B115200);
cfsetospeed(&options,B115200);
break;
default:cfsetispeed(&options,B9600);
cfsetospeed(&options,B9600);
break;
}
options.c_cflag |= (CLOCAL | CREAD);
options.c_cflag |= (CLOCAL | CREAD | CS8);
options.c_cflag &= ~PARENB;
options.c_cflag &= ~CSTOPB;
options.c_cflag &= ~CSIZE;
options.c_cflag |= CS8;
tcsetattr(_serialDescriptor, TCSANOW, &options);
cfsetispeed(&options,B115200);
cfsetospeed(&options,B115200);
if (USING_INVENSENSE_MPU9150) {
// block on invensense reads until there is data to read

2
interface/src/SerialInterface.h
View file

@ -60,7 +60,7 @@ public:
bool active;
private:
void initializePort(char* portname, int baud);
void initializePort(char* portname);
void resetSerial();
int _serialDescriptor;

4
interface/src/main.cpp
View file

@ -1812,7 +1812,7 @@ void idle(void) {
float deltaTime = 1.f/FPS;
// update behaviors for avatar hand movement: handControl takes mouse values as input,
// update behaviors for avatar hand movement: handControl takes mouse values as input,
// and gives back 3D values modulated for smooth transitioning between interaction modes.
handControl.update(mouseX, mouseY);
myAvatar.setHandMovementValues(handControl.getValues());
@ -1876,7 +1876,7 @@ void idle(void) {
// Read serial port interface devices
if (serialPort.active) {
serialPort.readData();
serialPort.readData();
}
// Sample hardware, update view frustum if needed, and send avatar data to mixer/agents