Update of /cvsroot/playerstage/code/player/libplayercore/interfaces
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9713/libplayercore/interfaces
Modified Files:
Tag: b_thjc_dynamic_arrays
005_sonar.def 006_laser.def 007_blobfinder.def 008_ptz.def
009_audio.def 010_fiducial.def 012_speech.def 014_bumper.def
021_aio.def 022_ir.def 023_wifi.def 025_localize.def
026_mcom.def 031_simulation.def 040_camera.def 042_map.def
044_planner.def 050_speech_recognition.def 051_opaque.def
053_actarray.def 055_graphics2d.def 056_rfid.def
058_graphics3d.def 061_pointcloud3d.def
Log Message:
static array sizes removed from player
client library updated to use dynamic arrays
Index: 023_wifi.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/023_wifi.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 023_wifi.def 20 Aug 2007 06:37:26 -0000 1.1
--- 023_wifi.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 18,25 ****
message { DATA, STATE, 1, player_wifi_data_t };
-
- /** The maximum number of remote hosts to report on */
- #define PLAYER_WIFI_MAX_LINKS 32
-
/** link quality is in dBm */
#define PLAYER_WIFI_QUAL_DBM 1
--- 18,21 ----
***************
*** 82,86 ****
uint32_t links_count;
/** A list of links */
! player_wifi_link_t links[PLAYER_WIFI_MAX_LINKS];
/** mysterious throughput calculated by driver */
uint32_t throughput;
--- 78,82 ----
uint32_t links_count;
/** A list of links */
! player_wifi_link_t *links;
/** mysterious throughput calculated by driver */
uint32_t throughput;
Index: 044_planner.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/044_planner.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 044_planner.def 20 Aug 2007 06:37:26 -0000 1.1
--- 044_planner.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 18,24 ****
- /** maximum number of waypoints in a single plan */
- #define PLAYER_PLANNER_MAX_WAYPOINTS 128
-
/** @brief Data: state (@ref PLAYER_PLANNER_DATA_STATE)
--- 18,21 ----
***************
*** 64,68 ****
uint32_t waypoints_count;
/** The waypoints */
! player_pose2d_t waypoints[PLAYER_PLANNER_MAX_WAYPOINTS];
} player_planner_waypoints_req_t;
--- 61,65 ----
uint32_t waypoints_count;
/** The waypoints */
! player_pose2d_t *waypoints;
} player_planner_waypoints_req_t;
Index: 031_simulation.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/031_simulation.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 031_simulation.def 20 Aug 2007 06:37:26 -0000 1.1
--- 031_simulation.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 30,39 ****
- /** The maximum length of a string indentifying a simulation object or
- object property. */
- #define PLAYER_SIMULATION_IDENTIFIER_MAXLEN 64 // 64 bytes - change as needed
- /** The maximum length of a blob of data for a property */
- #define PLAYER_SIMULATION_PROPERTY_DATA_MAXLEN 32767 // 32K - change as
needed
-
/** @brief Data
--- 30,33 ----
***************
*** 68,72 ****
uint32_t name_count;
/** the identifier of the object we want to locate */
! char name[PLAYER_SIMULATION_IDENTIFIER_MAXLEN];
/** the desired pose in (m, m, rad) */
player_pose2d_t pose;
--- 62,66 ----
uint32_t name_count;
/** the identifier of the object we want to locate */
! char *name;
/** the desired pose in (m, m, rad) */
player_pose2d_t pose;
***************
*** 84,88 ****
uint32_t name_count;
/** the identifier of the object we want to locate */
! char name[PLAYER_SIMULATION_IDENTIFIER_MAXLEN];
/** the desired pose in (m, m, m, rad, rad, rad) */
player_pose3d_t pose;
--- 78,82 ----
uint32_t name_count;
/** the identifier of the object we want to locate */
! char *name;
/** the desired pose in (m, m, m, rad, rad, rad) */
player_pose3d_t pose;
***************
*** 118,130 ****
uint32_t name_count;
/** The identifier of the object we want to locate */
! char name[PLAYER_SIMULATION_IDENTIFIER_MAXLEN];
/** Length of property identifier */
uint32_t prop_count;
/** The identifier of the property we want to get/set */
! char prop[PLAYER_SIMULATION_IDENTIFIER_MAXLEN];
/** The length of the value data in bytes */
uint32_t value_count;
/** The value of the property */
! char value[PLAYER_SIMULATION_PROPERTY_DATA_MAXLEN];
} player_simulation_property_req_t;
--- 112,124 ----
uint32_t name_count;
/** The identifier of the object we want to locate */
! char *name;
/** Length of property identifier */
uint32_t prop_count;
/** The identifier of the property we want to get/set */
! char *prop;
/** The length of the value data in bytes */
uint32_t value_count;
/** The value of the property */
! char *value;
} player_simulation_property_req_t;
Index: 009_audio.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/009_audio.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 009_audio.def 20 Aug 2007 06:37:26 -0000 1.1
--- 009_audio.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 81,98 ****
message { REQ, MIXER_CHANNEL_LEVEL, 6, player_audio_mixer_channel_list_t };
- /** Raw WAV data buffer size */
- #define PLAYER_AUDIO_WAV_BUFFER_SIZE 1048576
-
- /** Mixer channel name length */
- #define PLAYER_AUDIO_MIXER_CHANNEL_NAME_SIZE 64
-
- /** Mixer channel list length */
- #define PLAYER_AUDIO_MIXER_CHANNEL_LIST_SIZE 64
-
- /** Sequencer sequence length */
- #define PLAYER_AUDIO_SEQ_LENGTH 64
-
-
-
/** Driver states */
--- 81,84 ----
***************
*** 181,185 ****
uint32_t tones_count;
/** the tones*/
! player_audio_seq_item_t tones[PLAYER_AUDIO_SEQ_LENGTH];
} player_audio_seq_t;
--- 167,171 ----
uint32_t tones_count;
/** the tones*/
! player_audio_seq_item_t *tones;
} player_audio_seq_t;
***************
*** 212,216 ****
uint32_t channels_count;
/** the channels*/
! player_audio_mixer_channel_t channels[PLAYER_AUDIO_MIXER_CHANNEL_LIST_SIZE];
} player_audio_mixer_channel_list_t;
--- 198,202 ----
uint32_t channels_count;
/** the channels*/
! player_audio_mixer_channel_t *channels;
} player_audio_mixer_channel_list_t;
***************
*** 234,238 ****
uint32_t name_count;
/** Descriptive channel name */
! char name[PLAYER_AUDIO_MIXER_CHANNEL_NAME_SIZE];
/** Channel type (input, output or special)*/
uint8_t caps;
--- 220,224 ----
uint32_t name_count;
/** Descriptive channel name */
! char *name;
/** Channel type (input, output or special)*/
uint8_t caps;
***************
*** 251,255 ****
uint32_t details_count;
/** the tones*/
! player_audio_mixer_channel_detail_t
details[PLAYER_AUDIO_MIXER_CHANNEL_LIST_SIZE];
/** default output channel (-1 for none) */
int32_t default_output;
--- 237,241 ----
uint32_t details_count;
/** the tones*/
! player_audio_mixer_channel_detail_t *details;
/** default output channel (-1 for none) */
int32_t default_output;
Index: 021_aio.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/021_aio.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 021_aio.def 20 Aug 2007 06:37:26 -0000 1.1
--- 021_aio.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 8,16 ****
message { DATA, STATE, 1, player_aio_data_t };
- /** The maximum number of analog I/O samples */
- #define PLAYER_AIO_MAX_INPUTS 8
- /** The maximum number of analog I/O samples */
- #define PLAYER_AIO_MAX_OUTPUTS 8
-
/** @brief Data: state (@ref PLAYER_AIO_DATA_STATE)
--- 8,11 ----
***************
*** 22,26 ****
uint32_t voltages_count;
/** the samples [V] */
! float voltages[PLAYER_AIO_MAX_INPUTS];
} player_aio_data_t;
--- 17,21 ----
uint32_t voltages_count;
/** the samples [V] */
! float *voltages;
} player_aio_data_t;
Index: 058_graphics3d.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/058_graphics3d.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 058_graphics3d.def 20 Aug 2007 06:37:26 -0000 1.1
--- 058_graphics3d.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 26,33 ****
- /** The maximum number of points that can be described in a packet. */
- #define PLAYER_GRAPHICS3D_MAX_POINTS 256 // 1024 (i think this is too big -
rtv)
-
-
/** Drawmode: enumeration that defines the drawing mode */
typedef enum player_graphics3d_draw_mode
--- 26,29 ----
***************
*** 60,64 ****
uint32_t points_count;
/** Array of points. */
! player_point_3d_t points[PLAYER_GRAPHICS3D_MAX_POINTS];
/** Color in which the points should be drawn. */
player_color_t color;
--- 56,60 ----
uint32_t points_count;
/** Array of points. */
! player_point_3d_t *points;
/** Color in which the points should be drawn. */
player_color_t color;
Index: 056_rfid.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/056_rfid.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 056_rfid.def 20 Aug 2007 06:37:26 -0000 1.1
--- 056_rfid.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 19,27 ****
message { REQ, LOCKTAG, 4, player_null_t };
- /** The maximum nr of tags that can be detected in the RF field in total. */
- #define PLAYER_RFID_MAX_TAGS 30
- /** The maximum number of digits one RFID tag can have. */
- #define PLAYER_RFID_MAX_GUID 8
-
/** @brief Structure describing a single RFID tag. */
--- 19,22 ----
***************
*** 33,37 ****
uint32_t guid_count;
/** The Globally Unique IDentifier (GUID) of the tag. */
! char guid[PLAYER_RFID_MAX_GUID];
} player_rfid_tag_t;
--- 28,32 ----
uint32_t guid_count;
/** The Globally Unique IDentifier (GUID) of the tag. */
! char *guid;
} player_rfid_tag_t;
***************
*** 44,47 ****
uint32_t tags_count;
/** The list of RFID tags. */
! player_rfid_tag_t tags[PLAYER_RFID_MAX_TAGS];
} player_rfid_data_t;
--- 39,42 ----
uint32_t tags_count;
/** The list of RFID tags. */
! player_rfid_tag_t *tags;
} player_rfid_data_t;
Index: 026_mcom.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/026_mcom.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 026_mcom.def 20 Aug 2007 06:37:26 -0000 1.1
--- 026_mcom.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 28,41 ****
! /** size of the data field in messages */
! #define MCOM_DATA_LEN 128
! /** number of buffers to keep per channel */
! #define MCOM_N_BUFS 10
! /** size of channel name */
! #define MCOM_CHANNEL_LEN 8
/** returns this if empty */
#define MCOM_EMPTY_STRING "(EMPTY)"
- /** ?? */
- #define MCOM_COMMAND_BUFFER_SIZE (sizeof(player_mcom_config_t))
/** @brief A piece of data. */
--- 28,34 ----
!
/** returns this if empty */
#define MCOM_EMPTY_STRING "(EMPTY)"
/** @brief A piece of data. */
***************
*** 47,51 ****
uint32_t data_count;
/** the data */
! char data[MCOM_DATA_LEN];
} player_mcom_data_t;
--- 40,44 ----
uint32_t data_count;
/** the data */
! char *data;
} player_mcom_data_t;
***************
*** 60,64 ****
uint32_t channel_count;
/** The name of the channel. */
! char channel[MCOM_CHANNEL_LEN];
/** The data. */
player_mcom_data_t data;
--- 53,57 ----
uint32_t channel_count;
/** The name of the channel. */
! char *channel;
/** The data. */
player_mcom_data_t data;
***************
*** 73,77 ****
uint32_t channel_count;
/** The name of the channel. */
! char channel[MCOM_CHANNEL_LEN];
/** The data. */
player_mcom_data_t data;
--- 66,70 ----
uint32_t channel_count;
/** The name of the channel. */
! char *channel;
/** The data. */
player_mcom_data_t data;
Index: 014_bumper.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/014_bumper.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 014_bumper.def 20 Aug 2007 06:37:26 -0000 1.1
--- 014_bumper.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 11,20 ****
message { REQ, GET_GEOM, 1, player_bumper_geom_t };
- /** Compatability defs */
- #define PLAYER_BUMPER_GET_GEOM PLAYER_BUMPER_REQ_GET_GEOM
-
- /** Maximum number of bumper samples */
- #define PLAYER_BUMPER_MAX_SAMPLES 32
-
/** @brief Data: state (@ref PLAYER_BUMPER_DATA_GEOM)
--- 11,14 ----
***************
*** 25,29 ****
uint32_t bumpers_count;
/** array of bumper values */
! uint8_t bumpers[PLAYER_BUMPER_MAX_SAMPLES];
} player_bumper_data_t;
--- 19,23 ----
uint32_t bumpers_count;
/** array of bumper values */
! uint8_t *bumpers;
} player_bumper_data_t;
***************
*** 42,46 ****
To query the geometry of a bumper array, send a null
! @ref PLAYER_BUMPER_REQ_GET_GEOM request. The response will be in this form.
This
message may also be sent as data with the subtype @ref PLAYER_BUMPER_DATA_GEOM
(e.g., from a robot whose bumper can move with respect to its body)
--- 36,40 ----
To query the geometry of a bumper array, send a null
! @ref PLAYER_BUMPER_GET_GEOM request. The response will be in this form. This
message may also be sent as data with the subtype @ref PLAYER_BUMPER_DATA_GEOM
(e.g., from a robot whose bumper can move with respect to its body)
***************
*** 51,55 ****
uint32_t bumper_def_count;
/** geometry of each bumper */
! player_bumper_define_t bumper_def[PLAYER_BUMPER_MAX_SAMPLES];
} player_bumper_geom_t;
--- 45,49 ----
uint32_t bumper_def_count;
/** geometry of each bumper */
! player_bumper_define_t *bumper_def;
} player_bumper_geom_t;
Index: 050_speech_recognition.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/050_speech_recognition.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 050_speech_recognition.def 20 Aug 2007 06:37:26 -0000 1.1
--- 050_speech_recognition.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 6,12 ****
}
- /** Maximum length of string to recognize */
- #define PLAYER_SPEECH_RECOGNITION_TEXT_LEN 256
-
/** Data subtype: recognized string */
message { DATA, STRING, 1, player_speech_recognition_data_t };
--- 6,9 ----
***************
*** 20,24 ****
uint32_t text_count;
/** Recognized text */
! char text[PLAYER_SPEECH_RECOGNITION_TEXT_LEN];
} player_speech_recognition_data_t;
--- 17,21 ----
uint32_t text_count;
/** Recognized text */
! char *text;
} player_speech_recognition_data_t;
Index: 022_ir.def
===================================================================
RCS file: /cvsroot/playerstage/code/player/libplayercore/interfaces/022_ir.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 022_ir.def 20 Aug 2007 06:37:26 -0000 1.1
--- 022_ir.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 14,20 ****
message { DATA, RANGES, 1, player_ir_data_t };
- /** Maximum number of samples */
- #define PLAYER_IR_MAX_SAMPLES 32
-
/** @brief Data: ranges (@ref PLAYER_IR_DATA_RANGES)
--- 14,17 ----
***************
*** 25,38 ****
uint32_t voltages_count;
/** voltages [V] */
! float voltages[PLAYER_IR_MAX_SAMPLES];
/** number of samples */
uint32_t ranges_count;
/** ranges [m] */
! float ranges[PLAYER_IR_MAX_SAMPLES];
} player_ir_data_t;
/** @brief Request/reply: get pose
! To query the pose of the IRs, send a null @ref PLAYER_REQ_IR_POSE request.*/
typedef struct player_ir_pose
{
--- 22,35 ----
uint32_t voltages_count;
/** voltages [V] */
! float *voltages;
/** number of samples */
uint32_t ranges_count;
/** ranges [m] */
! float *ranges;
} player_ir_data_t;
/** @brief Request/reply: get pose
! To query the pose of the IRs, send a null @ref PLAYER_IR_POSE request.*/
typedef struct player_ir_pose
{
***************
*** 40,49 ****
uint32_t poses_count;
/** the pose of each IR detector on this robot */
! player_pose3d_t poses[PLAYER_IR_MAX_SAMPLES];
} player_ir_pose_t;
/** @brief Request/reply: set power
! To turn IR power on and off, send a @ref PLAYER_IR_REQ_POWER request.
Null response. */
typedef struct player_ir_power_req
--- 37,46 ----
uint32_t poses_count;
/** the pose of each IR detector on this robot */
! player_pose3d_t *poses;
} player_ir_pose_t;
/** @brief Request/reply: set power
! To turn IR power on and off, send a @ref PLAYER_IR_POWER request.
Null response. */
typedef struct player_ir_power_req
Index: 005_sonar.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/005_sonar.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 005_sonar.def 20 Aug 2007 06:37:26 -0000 1.1
--- 005_sonar.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 16,23 ****
message { DATA, GEOM, 2, player_sonar_geom_t };
- /** maximum number of sonar samples in a data packet */
- #define PLAYER_SONAR_MAX_SAMPLES 64
-
-
/** @brief Data: ranges (@ref PLAYER_SONAR_DATA_RANGES)
--- 16,19 ----
***************
*** 29,33 ****
uint32_t ranges_count;
/** The range readings [m] */
! float ranges[PLAYER_SONAR_MAX_SAMPLES];
} player_sonar_data_t;
--- 25,29 ----
uint32_t ranges_count;
/** The range readings [m] */
! float *ranges;
} player_sonar_data_t;
***************
*** 43,47 ****
uint32_t poses_count;
/** Pose of each sonar, in robot cs */
! player_pose3d_t poses[PLAYER_SONAR_MAX_SAMPLES];
} player_sonar_geom_t;
--- 39,43 ----
uint32_t poses_count;
/** Pose of each sonar, in robot cs */
! player_pose3d_t *poses;
} player_sonar_geom_t;
Index: 006_laser.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/006_laser.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 006_laser.def 20 Aug 2007 06:37:26 -0000 1.1
--- 006_laser.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 18,24 ****
}
- /** The maximum number of laser range values */
- #define PLAYER_LASER_MAX_SAMPLES 1024
-
/** Data subtype: scan */
message { DATA, SCAN, 1, player_laser_data_t };
--- 18,21 ----
***************
*** 62,70 ****
uint32_t ranges_count;
/** Range readings [m]. */
! float ranges[PLAYER_LASER_MAX_SAMPLES];
/** Number of intensity readings */
uint32_t intensity_count;
/** Intensity readings. */
! uint8_t intensity[PLAYER_LASER_MAX_SAMPLES];
/** A unique, increasing, ID for the scan */
uint32_t id;
--- 59,67 ----
uint32_t ranges_count;
/** Range readings [m]. */
! float *ranges;
/** Number of intensity readings */
uint32_t intensity_count;
/** Intensity readings. */
! uint8_t *intensity;
/** A unique, increasing, ID for the scan */
uint32_t id;
Index: 008_ptz.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/008_ptz.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 008_ptz.def 20 Aug 2007 06:37:26 -0000 1.1
--- 008_ptz.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 24,31 ****
- /** Maximum command length for use with @ref PLAYER_PTZ_REQ_GENERIC request;
- based on the Sony EVID30 camera right now. */
- #define PLAYER_PTZ_MAX_CONFIG_LEN 32
-
/** Control mode, for use with @ref PLAYER_PTZ_REQ_CONTROL_MODE */
#define PLAYER_PTZ_VELOCITY_CONTROL 0
--- 24,27 ----
***************
*** 102,106 ****
uint32_t config_count;
/** Buffer for command/reply */
! uint32_t config[PLAYER_PTZ_MAX_CONFIG_LEN];
} player_ptz_req_generic_t;
--- 98,102 ----
uint32_t config_count;
/** Buffer for command/reply */
! uint32_t *config;
} player_ptz_req_generic_t;
Index: 053_actarray.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/053_actarray.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 053_actarray.def 20 Aug 2007 06:37:26 -0000 1.1
--- 053_actarray.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 22,28 ****
- /** Maximum number of actuators */
- #define PLAYER_ACTARRAY_NUM_ACTUATORS 16
-
/** Idle state code */
#define PLAYER_ACTARRAY_ACTSTATE_IDLE 1
--- 22,25 ----
***************
*** 63,67 ****
uint32_t actuators_count;
/** The actuator data. */
! player_actarray_actuator_t actuators[PLAYER_ACTARRAY_NUM_ACTUATORS];
/** power state */
uint8_t motor_state;
--- 60,64 ----
uint32_t actuators_count;
/** The actuator data. */
! player_actarray_actuator_t *actuators;
/** power state */
uint8_t motor_state;
***************
*** 107,111 ****
uint32_t actuators_count;
/** The geometry information for each actuator in the array. */
! player_actarray_actuatorgeom_t actuators[PLAYER_ACTARRAY_NUM_ACTUATORS];
/** The position of the base of the actarray. This should always be the
position of the first actuator in the array. */
--- 104,108 ----
uint32_t actuators_count;
/** The geometry information for each actuator in the array. */
! player_actarray_actuatorgeom_t *actuators;
/** The position of the base of the actarray. This should always be the
position of the first actuator in the array. */
***************
*** 136,140 ****
uint32_t positions_count;
/** The positions for each joint/actuator. */
! float positions[PLAYER_ACTARRAY_NUM_ACTUATORS];
} player_actarray_multi_position_cmd_t;
--- 133,137 ----
uint32_t positions_count;
/** The positions for each joint/actuator. */
! float *positions;
} player_actarray_multi_position_cmd_t;
***************
*** 158,162 ****
uint32_t speeds_count;
/** The speed to move with. */
! float speeds[PLAYER_ACTARRAY_NUM_ACTUATORS];
} player_actarray_multi_speed_cmd_t;
--- 155,159 ----
uint32_t speeds_count;
/** The speed to move with. */
! float *speeds;
} player_actarray_multi_speed_cmd_t;
***************
*** 189,193 ****
uint32_t currents_count;
/** The current for the motors of the whole array */
! float currents[PLAYER_ACTARRAY_NUM_ACTUATORS];
} player_actarray_multi_current_cmd_t;
--- 186,190 ----
uint32_t currents_count;
/** The current for the motors of the whole array */
! float *currents;
} player_actarray_multi_current_cmd_t;
Index: 025_localize.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/025_localize.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 025_localize.def 20 Aug 2007 06:37:26 -0000 1.1
--- 025_localize.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 19,29 ****
message { REQ, GET_PARTICLES, 2, player_localize_get_particles_t };
-
- /** The maximum number of pose hypotheses. */
- #define PLAYER_LOCALIZE_MAX_HYPOTHS 10
- /** The maximum number of particles (for particle-based localization
- * algorithms) */
- #define PLAYER_LOCALIZE_PARTICLES_MAX 100
-
/** @brief Hypothesis format.
--- 19,22 ----
***************
*** 54,58 ****
uint32_t hypoths_count;
/** The array of the hypotheses. */
! player_localize_hypoth_t hypoths[PLAYER_LOCALIZE_MAX_HYPOTHS];
} player_localize_data_t;
--- 47,51 ----
uint32_t hypoths_count;
/** The array of the hypotheses. */
! player_localize_hypoth_t *hypoths;
} player_localize_data_t;
***************
*** 93,96 ****
uint32_t particles_count;
/** The particles */
! player_localize_particle_t particles[PLAYER_LOCALIZE_PARTICLES_MAX];
} player_localize_get_particles_t;
--- 86,89 ----
uint32_t particles_count;
/** The particles */
! player_localize_particle_t *particles;
} player_localize_get_particles_t;
Index: 042_map.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/042_map.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 042_map.def 20 Aug 2007 06:37:26 -0000 1.1
--- 042_map.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 23,39 ****
- /** The maximum size of a grid map tile, in cells
-
- (max_payload - 12 (zlib header)) / 1.001 (zlib overhead) - 20 (tile
meta-data)
- */
- #define PLAYER_MAP_MAX_TILE_SIZE (((int)((PLAYER_MAX_PAYLOAD_SIZE-12)/1.001))
- 20 - 1)
-
- /** The maximum number of segments in a vector map
-
- (2097152 - 30 (msg header) - 20 (meta-data to accompany the lines)) /
- 16 (size of each line) = 131068 */
- #define PLAYER_MAP_MAX_SEGMENTS 131068
-
-
/** @brief Data AND Request/reply: Map information.
--- 23,26 ----
***************
*** 76,80 ****
uint32_t data_count;
/** Cell occupancy value (empty = -1, unknown = 0, occupied = +1). */
! int8_t data[PLAYER_MAP_MAX_TILE_SIZE];
} player_map_data_t;
--- 63,67 ----
uint32_t data_count;
/** Cell occupancy value (empty = -1, unknown = 0, occupied = +1). */
! int8_t *data;
} player_map_data_t;
***************
*** 96,100 ****
uint32_t segments_count;
/** Line segments */
! player_segment_t segments[PLAYER_MAP_MAX_SEGMENTS];
} player_map_data_vector_t;
--- 83,87 ----
uint32_t segments_count;
/** Line segments */
! player_segment_t *segments;
} player_map_data_vector_t;
Index: 010_fiducial.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/010_fiducial.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 010_fiducial.def 20 Aug 2007 06:37:26 -0000 1.1
--- 010_fiducial.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 16,22 ****
- /** The maximum number of fiducials that can be detected at one time. */
- #define PLAYER_FIDUCIAL_MAX_SAMPLES 32
-
/** @brief Info on a single detected fiducial
--- 16,19 ----
***************
*** 43,47 ****
uint32_t fiducials_count;
/** List of detected fiducials */
! player_fiducial_item_t fiducials[PLAYER_FIDUCIAL_MAX_SAMPLES];
} player_fiducial_data_t;
--- 40,44 ----
uint32_t fiducials_count;
/** List of detected fiducials */
! player_fiducial_item_t *fiducials;
} player_fiducial_data_t;
Index: 055_graphics2d.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/055_graphics2d.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 055_graphics2d.def 20 Aug 2007 06:37:26 -0000 1.1
--- 055_graphics2d.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 17,23 ****
message { CMD, POLYGON, 4, player_graphics2d_cmd_polygon_t };
- /** The maximum number of points that can be described in a packet. */
- #define PLAYER_GRAPHICS2D_MAX_POINTS 64
-
/** @brief Data: This interface produces no data. */
--- 17,20 ----
***************
*** 32,36 ****
uint32_t points_count;
/** Array of points. */
! player_point_2d_t points[PLAYER_GRAPHICS2D_MAX_POINTS];
/** Color in which the points should be drawn. */
player_color_t color;
--- 29,33 ----
uint32_t points_count;
/** Array of points. */
! player_point_2d_t *points;
/** Color in which the points should be drawn. */
player_color_t color;
***************
*** 45,49 ****
uint32_t points_count;
/** Array of points to be joined by lines. */
! player_point_2d_t points[PLAYER_GRAPHICS2D_MAX_POINTS];
/** Color in which the line should be drawn. */
player_color_t color;
--- 42,46 ----
uint32_t points_count;
/** Array of points to be joined by lines. */
! player_point_2d_t *points;
/** Color in which the line should be drawn. */
player_color_t color;
***************
*** 58,62 ****
uint32_t points_count;
/** array of points defining the polygon. */
! player_point_2d_t points[PLAYER_GRAPHICS2D_MAX_POINTS];
/** Color in which the outline should be drawn. */
player_color_t color;
--- 55,59 ----
uint32_t points_count;
/** array of points defining the polygon. */
! player_point_2d_t *points;
/** Color in which the outline should be drawn. */
player_color_t color;
Index: 007_blobfinder.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/007_blobfinder.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 007_blobfinder.def 20 Aug 2007 06:37:26 -0000 1.1
--- 007_blobfinder.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 12,18 ****
message { REQ, SET_IMAGER_PARAMS, 2, player_blobfinder_imager_config_t };
- /** The maximum number of blobs in total. */
- #define PLAYER_BLOBFINDER_MAX_BLOBS 256
-
/** @brief Structure describing a single blob. */
--- 12,15 ----
***************
*** 54,58 ****
uint32_t blobs_count;
/** The list of blobs */
! player_blobfinder_blob_t blobs[PLAYER_BLOBFINDER_MAX_BLOBS];
} player_blobfinder_data_t;
--- 51,55 ----
uint32_t blobs_count;
/** The list of blobs */
! player_blobfinder_blob_t *blobs;
} player_blobfinder_data_t;
Index: 061_pointcloud3d.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/061_pointcloud3d.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 061_pointcloud3d.def 20 Aug 2007 06:37:26 -0000 1.1
--- 061_pointcloud3d.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 9,15 ****
message { DATA, STATE, 1, player_pointcloud3d_data_t };
- /** Maximum number of points that can be included in a data packet */
- #define PLAYER_POINTCLOUD3D_MAX_POINTS 32768
-
/** @brief 3D Pointcloud element structure
* An element as stored in a 3D pointcloud, containing a 3D position
--- 9,12 ----
***************
*** 27,31 ****
* amounts of data per point */
//uint32_t data_count;
! //uchar data[PLAYER_3DPOINTCLOUD_MAX_DATA]
} player_pointcloud3d_element_t;
--- 24,28 ----
* amounts of data per point */
//uint32_t data_count;
! //uchar data;
} player_pointcloud3d_element_t;
***************
*** 36,40 ****
{
uint32_t points_count;
! player_pointcloud3d_element_t points[PLAYER_POINTCLOUD3D_MAX_POINTS];
} player_pointcloud3d_data_t;
--- 33,37 ----
{
uint32_t points_count;
! player_pointcloud3d_element_t *points;
} player_pointcloud3d_data_t;
Index: 051_opaque.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/051_opaque.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 051_opaque.def 20 Aug 2007 06:37:26 -0000 1.1
--- 051_opaque.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 21,27 ****
#define PLAYER_OPAQUE_CMD PLAYER_OPAQUE_CMD_DATA
- /** Maximum message size is 1 MB */
- #define PLAYER_OPAQUE_MAX_SIZE 1048576
-
/** @brief data */
typedef struct player_opaque_data
--- 21,24 ----
***************
*** 30,34 ****
uint32_t data_count;
/** The data we will be sending */
! uint8_t data[PLAYER_OPAQUE_MAX_SIZE];
} player_opaque_data_t;
--- 27,31 ----
uint32_t data_count;
/** The data we will be sending */
! uint8_t *data;
} player_opaque_data_t;
Index: 040_camera.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/040_camera.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 040_camera.def 20 Aug 2007 06:37:26 -0000 1.1
--- 040_camera.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 11,21 ****
message { DATA, STATE, 1, player_camera_data_t };
- /** Maximum image width, in pixels */
- #define PLAYER_CAMERA_IMAGE_WIDTH 1920
- /** Maximum image height, in pixels */
- #define PLAYER_CAMERA_IMAGE_HEIGHT 1080
- /** Maximum image size, in pixels */
- #define PLAYER_CAMERA_IMAGE_SIZE (PLAYER_CAMERA_IMAGE_WIDTH *
PLAYER_CAMERA_IMAGE_HEIGHT * 4)
-
/** Image format : 8-bit monochrome. */
#define PLAYER_CAMERA_FORMAT_MONO8 1
--- 11,14 ----
***************
*** 55,58 ****
Multi-byte image formats (such as MONO16) must be converted
to network byte ordering. */
! uint8_t image[PLAYER_CAMERA_IMAGE_SIZE];
} player_camera_data_t;
--- 48,51 ----
Multi-byte image formats (such as MONO16) must be converted
to network byte ordering. */
! uint8_t *image;
} player_camera_data_t;
Index: 012_speech.def
===================================================================
RCS file:
/cvsroot/playerstage/code/player/libplayercore/interfaces/012_speech.def,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** 012_speech.def 20 Aug 2007 06:37:26 -0000 1.1
--- 012_speech.def 10 Sep 2007 04:11:00 -0000 1.1.2.1
***************
*** 5,11 ****
}
- /** Maximum string length */
- #define PLAYER_SPEECH_MAX_STRING_LEN 256
-
/** Command subtype: say a string */
message { CMD, SAY, 1, player_speech_cmd_t };
--- 5,8 ----
***************
*** 20,24 ****
uint32_t string_count;
/** The string to say */
! char string[PLAYER_SPEECH_MAX_STRING_LEN];
} player_speech_cmd_t;
--- 17,21 ----
uint32_t string_count;
/** The string to say */
! char *string;
} player_speech_cmd_t;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
