|
From: Ivan D. <idr...@us...> - 2006-06-13 20:44:12
|
Update of /cvsroot/terk/embed/src/terkapi In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv15314/src/terkapi Modified Files: Client.cpp MotorControllerI.cpp vidserv.cpp vidserv_util.cpp Log Message: recoverd, seperated embed from cirrus trees Index: MotorControllerI.cpp =================================================================== RCS file: /cvsroot/terk/embed/src/terkapi/MotorControllerI.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MotorControllerI.cpp 6 Jun 2006 05:45:08 -0000 1.2 --- MotorControllerI.cpp 13 Jun 2006 20:44:06 -0000 1.3 *************** *** 72,83 **** void MotorControllerI::startMotorBufferRecord(const BooleanArray& motorMask, const Ice::Current&) { - //FIXME: consider motorMask - motors->Record(); } void MotorControllerI::stopMotorBufferRecord(const BooleanArray& motorMask, const Ice::Current&) { ! //FIXME: consider motorMask ! motors->RStop(); } --- 72,83 ---- void MotorControllerI::startMotorBufferRecord(const BooleanArray& motorMask, const Ice::Current&) { } void MotorControllerI::stopMotorBufferRecord(const BooleanArray& motorMask, const Ice::Current&) { ! int i; ! ! for (i = 0; i < QEMOT_NUM_MOTORS; i++) ! buffers[i].values.resize(0); } *************** *** 101,112 **** void MotorControllerI::setMotorBuffer(const BooleanArray& motorMask, const MotorBufferArray& motorBuffers, const Ice::Current&) { - unsigned int i, nmotors; - - nmotors = MIN(QEMOT_NUM_MOTORS,motorMask.size()); - - for (i = 0; i < nmotors; i++) { - if (motorMask[i]) - buffers[i].values = motorBuffers[i].values; - } } --- 101,104 ---- Index: Client.cpp =================================================================== RCS file: /cvsroot/terk/embed/src/terkapi/Client.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Client.cpp 6 Jun 2006 20:08:53 -0000 1.19 --- Client.cpp 13 Jun 2006 20:44:06 -0000 1.20 *************** *** 852,857 **** gpio = new CQEGpioInt(); hardware = new CQwerkHardware(NULL); - hardware->SetLED(0,true); - hardware->SetLED(1,true); leds = new CQELEDController(hardware); --- 852,855 ---- *************** *** 911,917 **** leds->LEDoff(3); leds->LEDoff(4); ! leds->LEDon(0); ! leds->LEDon(1); ! delete leds; delete hardware; --- 909,913 ---- leds->LEDoff(3); leds->LEDoff(4); ! delete leds; delete hardware; *************** *** 920,925 **** delete motors; - //if( status == EXIT_FAILURE ) - // system("/opt/scripts/reconnect.sh"); //try to connect and run terk server again return status; } --- 916,919 ---- Index: vidserv.cpp =================================================================== RCS file: /cvsroot/terk/embed/src/terkapi/vidserv.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** vidserv.cpp 8 Jun 2006 15:32:01 -0000 1.5 --- vidserv.cpp 13 Jun 2006 20:44:06 -0000 1.6 *************** *** 161,165 **** state->height = videowin.height; state->width = videowin.width; ! state->framesize = state->depth*state->width*state->height; printf("resolution = %dx%d\n", state->width, state->height); printf("depth = %d\n", state->depth); --- 161,165 ---- state->height = videowin.height; state->width = videowin.width; ! state->framesize = state->depth*state->width*state->height+512; printf("resolution = %dx%d\n", state->width, state->height); printf("depth = %d\n", state->depth); *************** *** 223,227 **** gettimeofday(&start, NULL); while (1) { ! gettimeofday(&startframe, NULL); if (!state->grabbing) break; --- 223,227 ---- gettimeofday(&start, NULL); while (1) { ! gettimeofday(&startframe, NULL); if (!state->grabbing) break; *************** *** 256,260 **** if (outfile) { fwrite(state->currframe, state->currframesize, 1, outfile); ! fclose(outfile); } } --- 256,260 ---- if (outfile) { fwrite(state->currframe, state->currframesize, 1, outfile); ! fclose(outfile); } } Index: vidserv_util.cpp =================================================================== RCS file: /cvsroot/terk/embed/src/terkapi/vidserv_util.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** vidserv_util.cpp 8 Jun 2006 15:32:01 -0000 1.3 --- vidserv_util.cpp 13 Jun 2006 20:44:06 -0000 1.4 *************** *** 108,112 **** break; case VIDEO_PALETTE_RAW: ! depth = 1; break; case VIDEO_PALETTE_YUV420P: --- 108,112 ---- break; case VIDEO_PALETTE_RAW: ! depth = 1; break; case VIDEO_PALETTE_YUV420P: *************** *** 140,146 **** int find = -1; int size = 0; ! /* Spca506 return more with channel video, cut it */ ! /* return Bridge otherwhise -1 */ for (i = 0; i < MAX_BRIDGE -1; i++) --- 140,146 ---- int find = -1; int size = 0; ! /* Spca506 return more with channel video, cut it */ ! /* return Bridge otherwhise -1 */ for (i = 0; i < MAX_BRIDGE -1; i++) *************** *** 178,182 **** case BRIDGE_CX11646: case BRIDGE_SN9CXXX: ! case BRIDGE_MR97311: type = JPEG; break; --- 178,182 ---- case BRIDGE_CX11646: case BRIDGE_SN9CXXX: ! case BRIDGE_MR97311: type = JPEG; break; |