From 2e048125ef4342f09989ca8561d4b93942c0d888 Mon Sep 17 00:00:00 2001 From: "james.goppert" Date: Thu, 11 Nov 2010 04:31:04 +0000 Subject: [PATCH] Fixed some bincomm errors. git-svn-id: https://arducopter.googlecode.com/svn/trunk@826 f9c3cf11-9bcb-44bc-f272-b75c42450872 --- libraries/APM_BinComm/protocol/protocol.def | 8 +-- libraries/APM_BinComm/protocol/protocol.h | 70 +-------------------- 2 files changed, 4 insertions(+), 74 deletions(-) diff --git a/libraries/APM_BinComm/protocol/protocol.def b/libraries/APM_BinComm/protocol/protocol.def index ab43a8dc05..287595c092 100644 --- a/libraries/APM_BinComm/protocol/protocol.def +++ b/libraries/APM_BinComm/protocol/protocol.def @@ -253,12 +253,6 @@ message 0xa0 MSG_EEPROM_REQUEST message 0xa1 MSG_EEPROM_SET uint16_t UNSPECIFIED -message 0xb0 MSG_EEPROM_SET - uint16_t UNSPECIFIED - -message 0xb1 MSG_EEPROM_SET - uint16_t UNSPECIFIED - # # Navigation Augmentation # @@ -282,4 +276,4 @@ message 0xb2 MSG_POSITION_SET message 0xb3 MSG_ATTITUDE_SET int16_t roll int16_t pitch - unt16_t yaw + uint16_t yaw diff --git a/libraries/APM_BinComm/protocol/protocol.h b/libraries/APM_BinComm/protocol/protocol.h index c396f392be..c19aa7ca97 100644 --- a/libraries/APM_BinComm/protocol/protocol.h +++ b/libraries/APM_BinComm/protocol/protocol.h @@ -1247,70 +1247,6 @@ unpack_msg_eeprom_set( }; //@} -////////////////////////////////////////////////////////////////////// -/// @name MSG_EEPROM_SET -//@{ - -/// Structure describing the payload section of the MSG_EEPROM_SET message -struct msg_eeprom_set { - uint16_t UNSPECIFIED; -}; - -/// Send a MSG_EEPROM_SET message -inline void -send_msg_eeprom_set( - const uint16_t UNSPECIFIED) -{ - uint8_t *__p = &_encodeBuf.payload[0]; - _pack(__p, UNSPECIFIED); - _encodeBuf.header.length = 2; - _encodeBuf.header.messageID = MSG_EEPROM_SET; - _encodeBuf.header.messageVersion = MSG_VERSION_1; - _sendMessage(); -}; - -/// Unpack a MSG_EEPROM_SET message -inline void -unpack_msg_eeprom_set( - uint16_t &UNSPECIFIED) -{ - uint8_t *__p = &_decodeBuf.payload[0]; - _unpack(__p, UNSPECIFIED); -}; -//@} - -////////////////////////////////////////////////////////////////////// -/// @name MSG_EEPROM_SET -//@{ - -/// Structure describing the payload section of the MSG_EEPROM_SET message -struct msg_eeprom_set { - uint16_t UNSPECIFIED; -}; - -/// Send a MSG_EEPROM_SET message -inline void -send_msg_eeprom_set( - const uint16_t UNSPECIFIED) -{ - uint8_t *__p = &_encodeBuf.payload[0]; - _pack(__p, UNSPECIFIED); - _encodeBuf.header.length = 2; - _encodeBuf.header.messageID = MSG_EEPROM_SET; - _encodeBuf.header.messageVersion = MSG_VERSION_1; - _sendMessage(); -}; - -/// Unpack a MSG_EEPROM_SET message -inline void -unpack_msg_eeprom_set( - uint16_t &UNSPECIFIED) -{ - uint8_t *__p = &_decodeBuf.payload[0]; - _unpack(__p, UNSPECIFIED); -}; -//@} - ////////////////////////////////////////////////////////////////////// /// @name MSG_POSITION_CORRECT //@{ @@ -1455,7 +1391,7 @@ unpack_msg_position_set( struct msg_attitude_set { int16_t roll; int16_t pitch; - unt16_t yaw; + uint16_t yaw; }; /// Send a MSG_ATTITUDE_SET message @@ -1463,7 +1399,7 @@ inline void send_msg_attitude_set( const int16_t roll, const int16_t pitch, - const unt16_t yaw) + const uint16_t yaw) { uint8_t *__p = &_encodeBuf.payload[0]; _pack(__p, roll); @@ -1480,7 +1416,7 @@ inline void unpack_msg_attitude_set( int16_t &roll, int16_t &pitch, - unt16_t &yaw) + uint16_t &yaw) { uint8_t *__p = &_decodeBuf.payload[0]; _unpack(__p, roll);