modify for Hydro version
Fork of rosserial_mbed_lib by
Diff: std_msgs/UInt16MultiArray.h
- Revision:
- 1:ff0ec969dad1
- Parent:
- 0:77afd7560544
- Child:
- 3:1cf99502f396
--- a/std_msgs/UInt16MultiArray.h Fri Aug 19 09:06:30 2011 +0000 +++ b/std_msgs/UInt16MultiArray.h Sun Oct 16 07:19:36 2011 +0000 @@ -15,8 +15,8 @@ public: std_msgs::MultiArrayLayout layout; unsigned char data_length; - unsigned short st_data; - unsigned short * data; + uint16_t st_data; + uint16_t * data; virtual int serialize(unsigned char *outbuffer) { @@ -28,8 +28,8 @@ *(outbuffer + offset++) = 0; for( unsigned char i = 0; i < data_length; i++){ union { - unsigned short real; - unsigned short base; + uint16_t real; + uint16_t base; } u_datai; u_datai.real = this->data[i]; *(outbuffer + offset + 0) = (u_datai.base >> (8 * 0)) & 0xFF; @@ -45,20 +45,20 @@ offset += this->layout.deserialize(inbuffer + offset); unsigned char data_lengthT = *(inbuffer + offset++); if(data_lengthT > data_length) - this->data = (unsigned int*)realloc(this->data, data_lengthT * sizeof(unsigned int)); + this->data = (uint16_t*)realloc(this->data, data_lengthT * sizeof(uint16_t)); offset += 3; data_length = data_lengthT; for( unsigned char i = 0; i < data_length; i++){ union { - unsigned short real; - unsigned short base; + uint16_t real; + uint16_t base; } u_st_data; u_st_data.base = 0; u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 0))) << (8 * 0); u_st_data.base |= ((typeof(u_st_data.base)) (*(inbuffer + offset + 1))) << (8 * 1); this->st_data = u_st_data.real; offset += sizeof(this->st_data); - memcpy( &(this->data[i]), &(this->st_data), sizeof(unsigned int)); + memcpy( &(this->data[i]), &(this->st_data), sizeof(uint16_t)); } return offset; }