Update of /cvsroot/playerstage/code/player/client_libs/libplayerc
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/client_libs/libplayerc
Modified Files:
client.c dev_actarray.c dev_audio.c dev_bumper.c dev_dio.c
dev_fiducial.c dev_gripper.c dev_health.c dev_ir.c dev_limb.c
dev_position3d.c dev_rfid.c dev_wsn.c
Log Message:
overhaul of the player interface definitions
interfaces are now defined with a very light weight IDL allowing them to be
edited in a single file
some subtype names were also modified as a side effect, making them more
consistent globally
Index: dev_bumper.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_bumper.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dev_bumper.c 5 Oct 2005 10:10:12 -0000 1.5
--- dev_bumper.c 20 Aug 2007 06:37:26 -0000 1.6
***************
*** 114,118 ****
}
else if((header->type == PLAYER_MSGTYPE_RESP_ACK) &&
! (header->subtype == PLAYER_BUMPER_GET_GEOM))
{
player_bumper_geom_t * bgeom = (player_bumper_geom_t *) data;
--- 114,118 ----
}
else if((header->type == PLAYER_MSGTYPE_RESP_ACK) &&
! (header->subtype == PLAYER_BUMPER_REQ_GET_GEOM))
{
player_bumper_geom_t * bgeom = (player_bumper_geom_t *) data;
***************
*** 133,139 ****
player_bumper_geom_t config;
! // config.subtype = PLAYER_BUMPER_GET_GEOM_REQ;
! if (playerc_client_request(device->info.client, &device->info,
PLAYER_BUMPER_GET_GEOM,
NULL, &config, sizeof(config)) < 0)
return -1;
--- 133,139 ----
player_bumper_geom_t config;
! // config.subtype = PLAYER_BUMPER_REQ_GET_GEOM;
! if (playerc_client_request(device->info.client, &device->info,
PLAYER_BUMPER_REQ_GET_GEOM,
NULL, &config, sizeof(config)) < 0)
return -1;
Index: dev_gripper.c
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc/dev_gripper.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dev_gripper.c 10 Jul 2006 16:55:37 -0000 1.7
--- dev_gripper.c 20 Aug 2007 06:37:26 -0000 1.8
***************
*** 110,114 ****
int playerc_gripper_open_cmd (playerc_gripper_t *device)
{
! player_gripper_cmd_open_t cmd;
memset (&cmd, 0, sizeof (cmd));
--- 110,114 ----
int playerc_gripper_open_cmd (playerc_gripper_t *device)
{
! player_null_t cmd;
memset (&cmd, 0, sizeof (cmd));
***************
*** 119,123 ****
int playerc_gripper_close_cmd (playerc_gripper_t *device)
{
! player_gripper_cmd_close_t cmd;
memset (&cmd, 0, sizeof (cmd));
--- 119,123 ----
int playerc_gripper_close_cmd (playerc_gripper_t *device)
{
! player_null_t cmd;
memset (&cmd, 0, sizeof (cmd));
***************
*** 128,132 ****
int playerc_gripper_stop_cmd (playerc_gripper_t *device)
{
! player_gripper_cmd_stop_t cmd;
memset (&cmd, 0, sizeof (cmd));
--- 128,132 ----
int playerc_gripper_stop_cmd (playerc_gripper_t *device)
{
! player_null_t cmd;
memset (&cmd, 0, sizeof (cmd));
***************
*** 137,141 ****
int playerc_gripper_store_cmd (playerc_gripper_t *device)
{
! player_gripper_cmd_store_t cmd;
memset (&cmd, 0, sizeof (cmd));
--- 137,141 ----
int playerc_gripper_store_cmd (playerc_gripper_t *device)
{
! player_null_t cmd;
memset (&cmd, 0, sizeof (cmd));
***************
*** 146,150 ****
int playerc_gripper_retrieve_cmd (playerc_gripper_t *device)
{
! player_gripper_cmd_retrieve_t cmd;
memset (&cmd, 0, sizeof (cmd));
--- 146,150 ----
int playerc_gripper_retrieve_cmd (playerc_gripper_t *device)
{
! player_null_t cmd;
memset (&cmd, 0, sizeof (cmd));
Index: client.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/client.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** client.c 9 Jul 2007 16:55:27 -0000 1.78
--- client.c 20 Aug 2007 06:37:25 -0000 1.79
***************
*** 509,513 ****
playerc_client_requestdata(playerc_client_t* client)
{
! player_device_data_req_t req;
// req.subtype = htons(PLAYER_PLAYER_DATA_REQ);
--- 509,513 ----
playerc_client_requestdata(playerc_client_t* client)
{
! player_null_t req;
// req.subtype = htons(PLAYER_PLAYER_DATA_REQ);
Index: dev_rfid.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_rfid.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dev_rfid.c 14 Mar 2007 16:41:51 -0000 1.3
--- dev_rfid.c 20 Aug 2007 06:37:26 -0000 1.4
***************
*** 81,85 ****
if((header->type == PLAYER_MSGTYPE_DATA) &&
! (header->subtype == PLAYER_RFID_DATA))
{
player_rfid_data_t* rfid_data = (player_rfid_data_t*)data;
--- 81,85 ----
if((header->type == PLAYER_MSGTYPE_DATA) &&
! (header->subtype == PLAYER_RFID_DATA_TAGS))
{
player_rfid_data_t* rfid_data = (player_rfid_data_t*)data;
Index: dev_audio.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_audio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dev_audio.c 14 Mar 2007 16:41:51 -0000 1.5
--- dev_audio.c 20 Aug 2007 06:37:26 -0000 1.6
***************
*** 85,89 ****
uint8_t *data, size_t len)
{
! if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_AUDIO_WAV_REC_DATA))
{
assert(header->size > 0);
--- 85,89 ----
uint8_t *data, size_t len)
{
! if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_AUDIO_DATA_WAV_REC))
{
assert(header->size > 0);
***************
*** 100,104 ****
}
}
! else if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_AUDIO_SEQ_DATA))
{
assert(header->size > 0);
--- 100,104 ----
}
}
! else if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_AUDIO_DATA_SEQ))
{
assert(header->size > 0);
***************
*** 107,111 ****
memcpy(device->seq_data.tones, sdata->tones, sdata->tones_count *
sizeof(device->seq_data.tones[0]));
}
! else if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_AUDIO_MIXER_CHANNEL_DATA))
{
assert(header->size > 0);
--- 107,111 ----
memcpy(device->seq_data.tones, sdata->tones, sdata->tones_count *
sizeof(device->seq_data.tones[0]));
}
! else if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_AUDIO_DATA_MIXER_CHANNEL))
{
assert(header->size > 0);
***************
*** 114,118 ****
memcpy(device->mixer_data.channels, wdata->channels,
wdata->channels_count * sizeof(device->mixer_data.channels[0]));
}
! else if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_AUDIO_STATE_DATA))
{
assert(header->size > 0);
--- 114,118 ----
memcpy(device->mixer_data.channels, wdata->channels,
wdata->channels_count * sizeof(device->mixer_data.channels[0]));
}
! else if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_AUDIO_DATA_STATE))
{
assert(header->size > 0);
***************
*** 136,140 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_WAV_PLAY_CMD,
&wave_data, NULL);
}
--- 136,140 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_CMD_WAV_PLAY,
&wave_data, NULL);
}
***************
*** 146,150 ****
cmd.state = state;
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_WAV_STREAM_REC_CMD,
&cmd, NULL);
}
--- 146,150 ----
cmd.state = state;
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_CMD_WAV_STREAM_REC,
&cmd, NULL);
}
***************
*** 157,161 ****
cmd.index = index;
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_SAMPLE_PLAY_CMD,
&cmd, NULL);
}
--- 157,161 ----
cmd.index = index;
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_CMD_SAMPLE_PLAY,
&cmd, NULL);
}
***************
*** 165,169 ****
{
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_SEQ_PLAY_CMD,
tones, NULL);
}
--- 165,169 ----
{
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_CMD_SEQ_PLAY,
tones, NULL);
}
***************
*** 173,177 ****
{
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_MIXER_CHANNEL_CMD,
levels, NULL);
}
--- 173,177 ----
{
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_CMD_MIXER_CHANNEL,
levels, NULL);
}
***************
*** 188,192 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_MIXER_CHANNEL_CMD,
&cmd, NULL);
}
--- 188,192 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_AUDIO_CMD_MIXER_CHANNEL,
&cmd, NULL);
}
***************
*** 200,204 ****
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_WAV_REC_REQ,
NULL, (void*)&device->wav_data,
sizeof(device->wav_data))) < 0)
return result;
--- 200,204 ----
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_REQ_WAV_REC,
NULL, (void*)&device->wav_data,
sizeof(device->wav_data))) < 0)
return result;
***************
*** 219,223 ****
req.index = index;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_SAMPLE_LOAD_REQ, &req, NULL, 0)) < 0)
return result;
--- 219,223 ----
req.index = index;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_REQ_SAMPLE_LOAD, &req, NULL, 0)) < 0)
return result;
***************
*** 234,238 ****
req.index = index;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_SAMPLE_RETRIEVE_REQ,
&req, &req, sizeof(req))) < 0)
return result;
--- 234,238 ----
req.index = index;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_REQ_SAMPLE_RETRIEVE,
&req, &req, sizeof(req))) < 0)
return result;
***************
*** 262,266 ****
req.length = length;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_SAMPLE_REC_REQ,
&req, &rep, sizeof
(player_audio_sample_rec_req_t))) < 0)
return result;
--- 262,266 ----
req.length = length;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_REQ_SAMPLE_REC,
&req, &rep, sizeof
(player_audio_sample_rec_req_t))) < 0)
return result;
***************
*** 278,282 ****
player_audio_mixer_channel_list_t req;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_MIXER_CHANNEL_LEVEL_REQ ,
NULL, &req, sizeof(req))) < 0)
return result;
--- 278,282 ----
player_audio_mixer_channel_list_t req;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_REQ_MIXER_CHANNEL_LEVEL ,
NULL, &req, sizeof(req))) < 0)
return result;
***************
*** 296,300 ****
player_audio_mixer_channel_list_detail_t req;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_MIXER_CHANNEL_LIST_REQ ,
NULL, &req, sizeof(req))) < 0)
return result;
--- 296,300 ----
player_audio_mixer_channel_list_detail_t req;
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_AUDIO_REQ_MIXER_CHANNEL_LIST ,
NULL, &req, sizeof(req))) < 0)
return result;
Index: dev_wsn.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_wsn.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dev_wsn.c 14 Mar 2007 16:41:51 -0000 1.3
--- dev_wsn.c 20 Aug 2007 06:37:26 -0000 1.4
***************
*** 81,85 ****
if((header->type == PLAYER_MSGTYPE_DATA) &&
! (header->subtype == PLAYER_WSN_DATA))
{
player_wsn_data_t* wsn_data = (player_wsn_data_t*)data;
--- 81,85 ----
if((header->type == PLAYER_MSGTYPE_DATA) &&
! (header->subtype == PLAYER_WSN_DATA_STATE))
{
player_wsn_data_t* wsn_data = (player_wsn_data_t*)data;
Index: dev_position3d.c
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc/dev_position3d.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dev_position3d.c 14 Mar 2007 16:41:51 -0000 1.13
--- dev_position3d.c 20 Aug 2007 06:37:26 -0000 1.14
***************
*** 171,179 ****
memset(&config, 0, sizeof(config));
! // config.request = PLAYER_POSITION3D_MOTOR_POWER_REQ;
config.state = enable;
return playerc_client_request(device->info.client, &device->info,
! PLAYER_POSITION3D_MOTOR_POWER,
&config,
&config, sizeof(config));
--- 171,179 ----
memset(&config, 0, sizeof(config));
! // config.request = PLAYER_POSITION3D_REQ_MOTOR_POWER;
config.state = enable;
return playerc_client_request(device->info.client, &device->info,
! PLAYER_POSITION3D_REQ_MOTOR_POWER,
&config,
&config, sizeof(config));
***************
*** 193,197 ****
len = playerc_client_request(device->info.client, &device->info,
! PLAYER_POSITION3D_GET_GEOM,
NULL, &config, sizeof(config));
if (len < 0)
--- 193,197 ----
len = playerc_client_request(device->info.client, &device->info,
! PLAYER_POSITION3D_REQ_GET_GEOM,
NULL, &config, sizeof(config));
if (len < 0)
***************
*** 298,302 ****
return playerc_client_request(device->info.client,
&device->info,
! PLAYER_POSITION3D_VELOCITY_MODE,
&config,
&config,
--- 298,302 ----
return playerc_client_request(device->info.client,
&device->info,
! PLAYER_POSITION3D_REQ_VELOCITY_MODE,
&config,
&config,
***************
*** 323,327 ****
return playerc_client_request(device->info.client,
&device->info,
! PLAYER_POSITION3D_SET_ODOM,
&config,
&config,
--- 323,327 ----
return playerc_client_request(device->info.client,
&device->info,
! PLAYER_POSITION3D_REQ_SET_ODOM,
&config,
&config,
***************
*** 340,344 ****
return playerc_client_request(device->info.client,
&device->info,
! PLAYER_POSITION3D_RESET_ODOM,
&config,
&config,
--- 340,344 ----
return playerc_client_request(device->info.client,
&device->info,
! PLAYER_POSITION3D_REQ_RESET_ODOM,
&config,
&config,
Index: dev_fiducial.c
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc/dev_fiducial.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dev_fiducial.c 14 Mar 2007 16:41:51 -0000 1.15
--- dev_fiducial.c 20 Aug 2007 06:37:26 -0000 1.16
***************
*** 159,163 ****
player_fiducial_geom_t config;
! // config.subtype = PLAYER_FIDUCIAL_GET_GEOM;
len = playerc_client_request(device->info.client,
--- 159,163 ----
player_fiducial_geom_t config;
! // config.subtype = PLAYER_FIDUCIAL_REQ_GET_GEOM;
len = playerc_client_request(device->info.client,
Index: dev_health.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_health.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dev_health.c 14 Mar 2007 16:41:51 -0000 1.2
--- dev_health.c 20 Aug 2007 06:37:26 -0000 1.3
***************
*** 81,85 ****
if((header->type == PLAYER_MSGTYPE_DATA) &&
! (header->subtype == PLAYER_HEALTH_DATA))
{
device->cpu_usage.idle = data->cpu_usage.idle;
--- 81,85 ----
if((header->type == PLAYER_MSGTYPE_DATA) &&
! (header->subtype == PLAYER_HEALTH_DATA_STATE))
{
device->cpu_usage.idle = data->cpu_usage.idle;
Index: dev_dio.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_dio.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dev_dio.c 26 Jan 2006 08:43:41 -0000 1.5
--- dev_dio.c 20 Aug 2007 06:37:26 -0000 1.6
***************
*** 98,114 ****
{
device->count = data->count;
! device->digin = data->digin;
}
}
/* Set the output for the dio device. */
! int playerc_dio_set_output(playerc_dio_t *device, uint8_t output_count,
uint32_t digout)
{
! player_dio_cmd_t cmd;
memset(&cmd, 0, sizeof(cmd));
cmd.count = output_count;
! cmd.digout = digout;
return playerc_client_write(device->info.client,
--- 98,114 ----
{
device->count = data->count;
! device->digin = data->bits;
}
}
/* Set the output for the dio device. */
! int playerc_dio_set_output(playerc_dio_t *device, uint8_t output_count,
uint32_t bits)
{
! player_dio_data_t cmd;
memset(&cmd, 0, sizeof(cmd));
cmd.count = output_count;
! cmd.bits = bits;
return playerc_client_write(device->info.client,
Index: dev_actarray.c
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc/dev_actarray.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** dev_actarray.c 14 Mar 2007 16:41:51 -0000 1.10
--- dev_actarray.c 20 Aug 2007 06:37:26 -0000 1.11
***************
*** 112,117 ****
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_GET_GEOM_REQ,
! NULL, (void*)&geom, sizeof(geom))) < 0)
return result;
--- 112,116 ----
if((result = playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_REQ_GET_GEOM, NULL, (void*)&geom, sizeof(geom))) < 0)
return result;
***************
*** 148,152 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_POS_CMD,
&cmd, NULL);
}
--- 147,151 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_CMD_POS,
&cmd, NULL);
}
***************
*** 162,166 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_MULTI_POS_CMD,
&cmd, NULL);
}
--- 161,165 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_CMD_MULTI_POS,
&cmd, NULL);
}
***************
*** 177,181 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_SPEED_CMD,
&cmd, NULL);
}
--- 176,180 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_CMD_SPEED,
&cmd, NULL);
}
***************
*** 192,196 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_MULTI_SPEED_CMD,
&cmd, NULL);
}
--- 191,195 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_CMD_MULTI_SPEED,
&cmd, NULL);
}
***************
*** 206,210 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_HOME_CMD,
&cmd, NULL);
}
--- 205,209 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_CMD_HOME,
&cmd, NULL);
}
***************
*** 220,224 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_CURRENT_CMD,
&cmd, NULL);
}
--- 219,223 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_CMD_CURRENT,
&cmd, NULL);
}
***************
*** 234,238 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_MULTI_CURRENT_CMD,
&cmd, NULL);
}
--- 233,237 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_ACTARRAY_CMD_MULTI_CURRENT,
&cmd, NULL);
}
***************
*** 246,250 ****
return playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_POWER_REQ,
&config, NULL, 0);
}
--- 245,249 ----
return playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_REQ_POWER,
&config, NULL, 0);
}
***************
*** 258,262 ****
return playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_BRAKES_REQ,
&config, NULL, 0);
}
--- 257,261 ----
return playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_REQ_BRAKES,
&config, NULL, 0);
}
***************
*** 271,275 ****
return playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_SPEED_REQ,
&config, NULL, 0);
}
--- 270,274 ----
return playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_REQ_SPEED,
&config, NULL, 0);
}
***************
*** 284,288 ****
return playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_ACCEL_REQ,
&config, NULL, 0);
}
--- 283,287 ----
return playerc_client_request(device->info.client, &device->info,
! PLAYER_ACTARRAY_REQ_ACCEL,
&config, NULL, 0);
}
Index: dev_limb.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_limb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dev_limb.c 14 Mar 2007 16:41:51 -0000 1.5
--- dev_limb.c 20 Aug 2007 06:37:26 -0000 1.6
***************
*** 85,89 ****
player_limb_data_t *data, size_t len)
{
! if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_LIMB_DATA))
{
device->data.position.px = data->position.px;
--- 85,89 ----
player_limb_data_t *data, size_t len)
{
! if((header->type == PLAYER_MSGTYPE_DATA) && (header->subtype ==
PLAYER_LIMB_DATA_STATE))
{
device->data.position.px = data->position.px;
***************
*** 112,116 ****
if(playerc_client_request(device->info.client, &device->info,
! PLAYER_LIMB_GEOM_REQ,
NULL, (void*)&geom, sizeof(geom)) < 0)
return -1;
--- 112,116 ----
if(playerc_client_request(device->info.client, &device->info,
! PLAYER_LIMB_REQ_GEOM,
NULL, (void*)&geom, sizeof(geom)) < 0)
return -1;
***************
*** 126,135 ****
int playerc_limb_home_cmd(playerc_limb_t *device)
{
! player_limb_home_cmd_t cmd;
memset(&cmd, 0, sizeof(cmd));
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_HOME_CMD,
&cmd, NULL);
}
--- 126,135 ----
int playerc_limb_home_cmd(playerc_limb_t *device)
{
! player_null_t cmd;
memset(&cmd, 0, sizeof(cmd));
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_CMD_HOME,
&cmd, NULL);
}
***************
*** 138,147 ****
int playerc_limb_stop_cmd(playerc_limb_t *device)
{
! player_limb_stop_cmd_t cmd;
memset(&cmd, 0, sizeof(cmd));
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_STOP_CMD,
&cmd, NULL);
}
--- 138,147 ----
int playerc_limb_stop_cmd(playerc_limb_t *device)
{
! player_null_t cmd;
memset(&cmd, 0, sizeof(cmd));
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_CMD_STOP,
&cmd, NULL);
}
***************
*** 158,162 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_SETPOSE_CMD,
&cmd, NULL);
}
--- 158,162 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_CMD_SETPOSE,
&cmd, NULL);
}
***************
*** 173,177 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_SETPOSITION_CMD,
&cmd, NULL);
}
--- 173,177 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_CMD_SETPOSITION,
&cmd, NULL);
}
***************
*** 189,193 ****
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_VECMOVE_CMD,
&cmd, NULL);
}
--- 189,193 ----
return playerc_client_write(device->info.client, &device->info,
! PLAYER_LIMB_CMD_VECMOVE,
&cmd, NULL);
}
***************
*** 201,205 ****
return playerc_client_request(device->info.client, &device->info,
! PLAYER_LIMB_POWER_REQ,
&config, NULL, 0);
}
--- 201,205 ----
return playerc_client_request(device->info.client, &device->info,
! PLAYER_LIMB_REQ_POWER,
&config, NULL, 0);
}
***************
*** 213,217 ****
return playerc_client_request(device->info.client, &device->info,
! PLAYER_LIMB_BRAKES_REQ,
&config, NULL, 0);
}
--- 213,217 ----
return playerc_client_request(device->info.client, &device->info,
! PLAYER_LIMB_REQ_BRAKES,
&config, NULL, 0);
}
***************
*** 225,229 ****
return playerc_client_request(device->info.client, &device->info,
! PLAYER_LIMB_SPEED_REQ,
&config, NULL, 0);
}
--- 225,229 ----
return playerc_client_request(device->info.client, &device->info,
! PLAYER_LIMB_REQ_SPEED,
&config, NULL, 0);
}
Index: dev_ir.c
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc/dev_ir.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** dev_ir.c 12 May 2006 22:59:59 -0000 1.6
--- dev_ir.c 20 Aug 2007 06:37:26 -0000 1.7
***************
*** 116,120 ****
int playerc_ir_get_geom(playerc_ir_t *device)
{
! return playerc_client_request(device->info.client,
&device->info,PLAYER_IR_POSE,
0, &device->poses, sizeof(device->poses));
}
--- 116,120 ----
int playerc_ir_get_geom(playerc_ir_t *device)
{
! return playerc_client_request(device->info.client,
&device->info,PLAYER_IR_REQ_POSE,
0, &device->poses, sizeof(device->poses));
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
