Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-06 01:03:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug with hang on serial turned off and no device.

Browse source
This commit is contained in:
Philip Rosedale 2012-10-13 12:09:43 -07:00
parent df2347d8e9
commit 9507824986
3 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
interface.xcodeproj/project.xcworkspace/xcuserdata/philip.xcuserdatad/UserInterfaceState.xcuserstate generated
View file

Binary file not shown.

19
interface.xcodeproj/xcuserdata/philip.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
View file

@ -19,24 +19,11 @@
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "main.cpp"
timestampString = "371023726.882878"
timestampString = "371847418.921205"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "309"
endingLineNumber = "309"
landmarkName = "init(void)"
landmarkType = "7">
</FileBreakpoint>
<FileBreakpoint
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "main.cpp"
timestampString = "371023726.882878"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "314"
endingLineNumber = "314"
startingLineNumber = "312"
endingLineNumber = "312"
landmarkName = "init(void)"
landmarkType = "7">
</FileBreakpoint>

41
main.cpp
View file

@ -176,7 +176,6 @@ double diffclock(timeval clock1,timeval clock2)
void Timer(int extra)
{
char title[100];
gettimeofday(&timer_end, NULL);
FPS = (float)framecount / ((float)diffclock(timer_start,timer_end) / 1000.f);
@ -230,6 +229,8 @@ void initDisplay(void)
void init(void)
{
Audio::init();
printf( "Audio started.\n" );
avg_adc_channels[0] = avg_adc_channels[1] = avg_adc_channels[2] = avg_adc_channels[3] = 0.f;
@ -240,6 +241,8 @@ void init(void)
// Initialize Field values
field_init();
printf( "Field Initilialized.\n" );
/*
const float FIELD_SCALE = 0.00005;
@ -308,15 +311,21 @@ void init(void)
twiddles[i*3 + 2] = (randFloat() - 0.5)*TWIDDLE_SCALE;
}
// Call readsensors for a while to get stable initial values on sensors
gettimeofday(&timer_start, NULL);
read_sensors(1, &avg_adc_channels[0], &adc_channels[0]);
int done = 0;
while (!done)
if (serial_on)
{
read_sensors(0, &avg_adc_channels[0], &adc_channels[0]);
gettimeofday(&timer_end, NULL);
if (diffclock(timer_start,timer_end) > 1000) done = 1;
// Call readsensors for a while to get stable initial values on sensors
printf( "Stabilizing sensors... " );
gettimeofday(&timer_start, NULL);
read_sensors(1, &avg_adc_channels[0], &adc_channels[0]);
int done = 0;
while (!done)
{
read_sensors(0, &avg_adc_channels[0], &adc_channels[0]);
gettimeofday(&timer_end, NULL);
if (diffclock(timer_start,timer_end) > 1000) done = 1;
}
printf( "Done.\n" );
}
gettimeofday(&timer_start, NULL);
@ -428,7 +437,7 @@ void reset_sensors()
head_mouse_x = WIDTH/2;
head_mouse_y = HEIGHT/2;
myHead.reset();
read_sensors(1, &avg_adc_channels[0], &adc_channels[0]);
if (serial_on) read_sensors(1, &avg_adc_channels[0], &adc_channels[0]);
}
void update_pos(float frametime)
@ -744,7 +753,7 @@ void idle(void)
{
if (!step_on) glutPostRedisplay();
read_network();
samplecount += read_sensors(0, &avg_adc_channels[0], &adc_channels[0]);
if (serial_on) samplecount += read_sensors(0, &avg_adc_channels[0], &adc_channels[0]);
update_pos(1.f/FPS);
update_tris();
myHead.simulate(1.f/FPS);
@ -838,13 +847,12 @@ int main(int argc, char** argv)
}
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
glutInitWindowSize(RIGHT_MARGIN + WIDTH, BOTTOM_MARGIN + HEIGHT);
glutCreateWindow("Interface Test");
printf( "Created Display Window.\n" );
initDisplay();
glutDisplayFunc(display);
@ -854,9 +862,14 @@ int main(int argc, char** argv)
glutMouseFunc(mouseFunc);
glutIdleFunc(idle);
printf( "Initialized Display.\n" );
init();
printf( "Init() complete.\n" );
glutTimerFunc(1000,Timer,0);
glutMainLoop();
::terminate();