diff --git a/patterns/a.bmp b/patterns/a.bmp new file mode 100644 index 0000000000000000000000000000000000000000..34a902cd2b1f907b86e3f1a863e9ef9f66bc8d67 Binary files /dev/null and b/patterns/a.bmp differ diff --git a/patterns/board-center.png b/patterns/board-center.png new file mode 100644 index 0000000000000000000000000000000000000000..59d7ebf7e5d7346c7ab400bbbe7d5697fd482403 Binary files /dev/null and b/patterns/board-center.png differ diff --git a/patterns/board-left.png b/patterns/board-left.png new file mode 100644 index 0000000000000000000000000000000000000000..9026eea200f975bb453b6c0c538c41e97eb8b9c8 Binary files /dev/null and b/patterns/board-left.png differ diff --git a/patterns/board-right.png b/patterns/board-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6d21644cc8b6d5f79606e4945d75f4cc7972d6f7 Binary files /dev/null and b/patterns/board-right.png differ diff --git a/patterns/einstein.bmp b/patterns/einstein.bmp new file mode 100644 index 0000000000000000000000000000000000000000..ee30094cfd507445ddf6078984fb29958f6d601d Binary files /dev/null and b/patterns/einstein.bmp differ diff --git a/media/face1.png b/patterns/face1.png similarity index 100% rename from media/face1.png rename to patterns/face1.png diff --git a/patterns/face1_fisheye.png b/patterns/face1_fisheye.png new file mode 100644 index 0000000000000000000000000000000000000000..2d078e155ac848ae661175f11f365c26c3b3cf3d Binary files /dev/null and b/patterns/face1_fisheye.png differ diff --git a/patterns/face1_light.png b/patterns/face1_light.png new file mode 100644 index 0000000000000000000000000000000000000000..8ef441620019d68b714fd573f14f53d1f2cd79a9 Binary files /dev/null and b/patterns/face1_light.png differ diff --git a/patterns/face1_noise.png b/patterns/face1_noise.png new file mode 100644 index 0000000000000000000000000000000000000000..8d6eae061d1ba74921681f9ab7b7ebd9cf129470 Binary files /dev/null and b/patterns/face1_noise.png differ diff --git a/patterns/face1_noise_fisheye.png b/patterns/face1_noise_fisheye.png new file mode 100644 index 0000000000000000000000000000000000000000..1c1e678a5eee2fad868d0a33fbbb4c24710c6de6 Binary files /dev/null and b/patterns/face1_noise_fisheye.png differ diff --git a/patterns/face1_noise_light.png b/patterns/face1_noise_light.png new file mode 100644 index 0000000000000000000000000000000000000000..817520fc53fd0c9382cce78031e659d8a5f65c93 Binary files /dev/null and b/patterns/face1_noise_light.png differ diff --git a/patterns/face1_noise_light_fisheye.png b/patterns/face1_noise_light_fisheye.png new file mode 100644 index 0000000000000000000000000000000000000000..247e26372a5f983430b5cbab8b871feeb695197c Binary files /dev/null and b/patterns/face1_noise_light_fisheye.png differ diff --git a/media/face2.png b/patterns/face2.png similarity index 100% rename from media/face2.png rename to patterns/face2.png diff --git a/media/face3.png b/patterns/face3.png similarity index 100% rename from media/face3.png rename to patterns/face3.png diff --git a/patterns/face3_perspect1.png b/patterns/face3_perspect1.png new file mode 100644 index 0000000000000000000000000000000000000000..5d1be767d2d2fb6b42216458dd17cb9796877605 Binary files /dev/null and b/patterns/face3_perspect1.png differ diff --git a/patterns/face3_perspect2.png b/patterns/face3_perspect2.png new file mode 100644 index 0000000000000000000000000000000000000000..ff24a14fcd1462122ec306eaf95627203efe5949 Binary files /dev/null and b/patterns/face3_perspect2.png differ diff --git a/patterns/face3_perspect3.png b/patterns/face3_perspect3.png new file mode 100644 index 0000000000000000000000000000000000000000..72fbd8ef620775a5ac118afcec4a777555be216c Binary files /dev/null and b/patterns/face3_perspect3.png differ diff --git a/media/face4.png b/patterns/face4.png similarity index 100% rename from media/face4.png rename to patterns/face4.png diff --git a/patterns/face4_treshold1.png b/patterns/face4_treshold1.png new file mode 100644 index 0000000000000000000000000000000000000000..c133f17fd13512354571fbcf7cac8dcf84d25c6e Binary files /dev/null and b/patterns/face4_treshold1.png differ diff --git a/patterns/face4_treshold2.png b/patterns/face4_treshold2.png new file mode 100644 index 0000000000000000000000000000000000000000..3fb48b68458be4ad1718df1473690599b3a95747 Binary files /dev/null and b/patterns/face4_treshold2.png differ diff --git a/media/face5.png b/patterns/face5.png similarity index 100% rename from media/face5.png rename to patterns/face5.png diff --git a/patterns/face5_perspect1.png b/patterns/face5_perspect1.png new file mode 100644 index 0000000000000000000000000000000000000000..e7b183531f7f46344f0580cb3823bd32ba0bbb27 Binary files /dev/null and b/patterns/face5_perspect1.png differ diff --git a/patterns/face5_threshold.png b/patterns/face5_threshold.png new file mode 100644 index 0000000000000000000000000000000000000000..b997043cdfae8d2b2659ba42d07db5ba2e556d8f Binary files /dev/null and b/patterns/face5_threshold.png differ diff --git a/patterns/floors1.png b/patterns/floors1.png new file mode 100644 index 0000000000000000000000000000000000000000..90023f3faa63fdd7a1659674083510e0dbaf20c2 Binary files /dev/null and b/patterns/floors1.png differ diff --git a/patterns/floors2.png b/patterns/floors2.png new file mode 100644 index 0000000000000000000000000000000000000000..3f1051de6e004cd3a2f47c837d4d2cd9ae057c89 Binary files /dev/null and b/patterns/floors2.png differ diff --git a/patterns/floors5.png b/patterns/floors5.png new file mode 100644 index 0000000000000000000000000000000000000000..8316e972058c1820661ef216190c25fef85ea998 Binary files /dev/null and b/patterns/floors5.png differ diff --git a/patterns/floors6.png b/patterns/floors6.png new file mode 100644 index 0000000000000000000000000000000000000000..92e6121f404d28d897b653cd4d09959ee8ee6f35 Binary files /dev/null and b/patterns/floors6.png differ diff --git a/patterns/frame_2010-03-17_2_rect.bmp b/patterns/frame_2010-03-17_2_rect.bmp new file mode 100644 index 0000000000000000000000000000000000000000..bdb9178ce8c82935fda1f161dada6e3466a3d66c Binary files /dev/null and b/patterns/frame_2010-03-17_2_rect.bmp differ diff --git a/patterns/frame_2010-03-17_3_rect.bmp b/patterns/frame_2010-03-17_3_rect.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8a02375941b5b74210b465d6485765f5ad61c9a3 Binary files /dev/null and b/patterns/frame_2010-03-17_3_rect.bmp differ diff --git a/patterns/frog.bmp b/patterns/frog.bmp new file mode 100644 index 0000000000000000000000000000000000000000..8de068b7a51d429080d25e48208ae929b046d882 Binary files /dev/null and b/patterns/frog.bmp differ diff --git a/media/letterB.png b/patterns/letterB.png similarity index 100% rename from media/letterB.png rename to patterns/letterB.png diff --git a/media/letterD.png b/patterns/letterD.png similarity index 100% rename from media/letterD.png rename to patterns/letterD.png diff --git a/media/letterP.png b/patterns/letterP.png similarity index 100% rename from media/letterP.png rename to patterns/letterP.png diff --git a/patterns/letterP_light.png b/patterns/letterP_light.png new file mode 100644 index 0000000000000000000000000000000000000000..976e6f38c6a29d16cd4dfcba368b5543f503213a Binary files /dev/null and b/patterns/letterP_light.png differ diff --git a/patterns/letterP_noise.png b/patterns/letterP_noise.png new file mode 100644 index 0000000000000000000000000000000000000000..cdb9da9a1a10f20fcbc783f3571706c7ae88ff16 Binary files /dev/null and b/patterns/letterP_noise.png differ diff --git a/media/letterR.png b/patterns/letterR.png similarity index 100% rename from media/letterR.png rename to patterns/letterR.png diff --git a/patterns/letterR_strongnoise.png b/patterns/letterR_strongnoise.png new file mode 100644 index 0000000000000000000000000000000000000000..eaa1b9e3ca54905d6a1c9b7eb7dc19418efa44d4 Binary files /dev/null and b/patterns/letterR_strongnoise.png differ diff --git a/media/letterS.png b/patterns/letterS.png similarity index 100% rename from media/letterS.png rename to patterns/letterS.png diff --git a/patterns/santa-delft.png b/patterns/santa-delft.png new file mode 100644 index 0000000000000000000000000000000000000000..c3a30e662e853199d63e7390ef8cac102d671f64 Binary files /dev/null and b/patterns/santa-delft.png differ diff --git a/patterns/stereo_left01.png b/patterns/stereo_left01.png new file mode 100644 index 0000000000000000000000000000000000000000..6fc657c9d5a057fa419bd9b236903c05bcba49b4 Binary files /dev/null and b/patterns/stereo_left01.png differ diff --git a/patterns/stereo_right01.png b/patterns/stereo_right01.png new file mode 100644 index 0000000000000000000000000000000000000000..5680912e725e98f3231bfe7f229c9e5de7d1b9f2 Binary files /dev/null and b/patterns/stereo_right01.png differ diff --git a/patterns/white.png b/patterns/white.png new file mode 100644 index 0000000000000000000000000000000000000000..0fbbc057e184b0227da45ee8df7a027f43906524 Binary files /dev/null and b/patterns/white.png differ diff --git a/src/ui/ObjectDetectionView.cc b/src/ui/ObjectDetectionView.cc index e9c3c7eb99aeae3b5858dc6d29aa1b1029fbfc2b..7b4d9be521b860497eb4ecd7bba9274116fc1ff1 100644 --- a/src/ui/ObjectDetectionView.cc +++ b/src/ui/ObjectDetectionView.cc @@ -38,6 +38,8 @@ This file is part of the PIXHAWK project #include +#include "MG.h" + ObjectDetectionView::ObjectDetectionView(QString folder, QWidget *parent) : QWidget(parent), patternList(), @@ -90,8 +92,9 @@ void ObjectDetectionView::newDetection(int uasId, QString patternPath, int x1, i { if (patternList.contains(patternPath)) { - qDebug() << "REDETECTED"; + //qDebug() << "REDETECTED"; + /* QList actions = m_ui->listWidget->actions(); // Find action and update it foreach (QAction* act, actions) @@ -112,6 +115,7 @@ void ObjectDetectionView::newDetection(int uasId, QString patternPath, int x1, i // Set name and label m_ui->nameLabel->setText(patternName); + */ } else { @@ -120,7 +124,11 @@ void ObjectDetectionView::newDetection(int uasId, QString patternPath, int x1, i patternList.insert(patternPath, confidence); patternCount.insert(patternPath, 1); - QPixmap image = QPixmap(patternFolder + "/" + patternPath); + + QString filePath = MG::DIR::getSupportFilesDirectory() + "/" + patternFolder + "/" + patternPath.split("/").last(); + + qDebug() << "Loading:" << filePath; + QPixmap image = QPixmap(filePath); QIcon ico(image); QAction* act = new QAction(ico, patternPath + separator + "(#" + QString::number(1) + ")" + separator + QString::number(confidence), this); connect(act, SIGNAL(triggered()), this, SLOT(takeAction())); diff --git a/src/ui/ObjectDetectionView.h b/src/ui/ObjectDetectionView.h index 5492dcacbf5e0b5d9334d55e556c6b3cec6c489b..910e748972250ab83575b147e3d63143d0090a08 100644 --- a/src/ui/ObjectDetectionView.h +++ b/src/ui/ObjectDetectionView.h @@ -48,7 +48,7 @@ class ObjectDetectionView : public QWidget { Q_OBJECT Q_DISABLE_COPY(ObjectDetectionView) public: - explicit ObjectDetectionView(QString folder="test", QWidget *parent = 0); + explicit ObjectDetectionView(QString folder="patterns", QWidget *parent = 0); virtual ~ObjectDetectionView(); /** @brief Resize widget contents */ diff --git a/test/generated/mavlink_message_attitude.h b/test/generated/mavlink_message_attitude.h deleted file mode 100644 index 5070d762af9b8f701ddbd8dad9b22479f299b5da..0000000000000000000000000000000000000000 --- a/test/generated/mavlink_message_attitude.h +++ /dev/null @@ -1,56 +0,0 @@ -// MESSAGE ATTITUDE PACKING - -#define MESSAGE_ID_ATTITUDE 90 - -/** - * @brief Send a attitude message - * - * @param roll Roll angle (rad) - * @param pitch Pitch angle (rad) - * @param yaw Yaw angle (rad) - * @return length of the message in bytes (excluding serial stream start sign) - */ -static inline uint16_t message_attitude_pack(uint8_t system_id, CommMessage_t* msg, float roll, float pitch, float yaw) -{ - msg->msgid = MESSAGE_ID_ATTITUDE; - uint16_t i = 0; - - i += put_float_by_index(roll, i, msg->payload); //Roll angle (rad) - i += put_float_by_index(pitch, i, msg->payload); //Pitch angle (rad) - i += put_float_by_index(yaw, i, msg->payload); //Yaw angle (rad) - - return finalize_message(msg, system_id, i); -} - -// MESSAGE ATTITUDE UNPACKING - -/** - * @brief Get field roll from attitude message - * - * @return Roll angle (rad) - */ -static inline float message_attitude_get_roll(CommMessage_t* msg) -{ - return *((float*) (void*)msg->payload); -} - -/** - * @brief Get field pitch from attitude message - * - * @return Pitch angle (rad) - */ -static inline float message_attitude_get_pitch(CommMessage_t* msg) -{ - return *((float*) (void*)msg->payload+sizeof(float)); -} - -/** - * @brief Get field yaw from attitude message - * - * @return Yaw angle (rad) - */ -static inline float message_attitude_get_yaw(CommMessage_t* msg) -{ - return *((float*) (void*)msg->payload+sizeof(float)+sizeof(float)); -} - diff --git a/test/generated/mavlink_message_attitude2.h b/test/generated/mavlink_message_attitude2.h deleted file mode 100644 index 2e2a9c48b6fc1a4af6c8db5390e43a81c17103d5..0000000000000000000000000000000000000000 --- a/test/generated/mavlink_message_attitude2.h +++ /dev/null @@ -1,89 +0,0 @@ -// MESSAGE ATTITUDE2 PACKING - -#define MESSAGE_ID_ATTITUDE2 90 - -typedef struct __attitude2_t -{ - float roll; ///< Roll angle (rad) - float pitch; ///< Pitch angle (rad) - float yaw; ///< Yaw angle (rad) - -} attitude2_t; - -/** - * @brief Send a attitude2 message - * - * @param roll Roll angle (rad) - * @param pitch Pitch angle (rad) - * @param yaw Yaw angle (rad) - * @return length of the message in bytes (excluding serial stream start sign) - */ -static inline uint16_t message_attitude2_pack(uint8_t system_id, CommMessage_t* msg, float roll, float pitch, float yaw) -{ - msg->msgid = MESSAGE_ID_ATTITUDE2; - uint16_t i = 0; - - i += put_float_by_index(roll, i, msg->payload); //Roll angle (rad) - i += put_float_by_index(pitch, i, msg->payload); //Pitch angle (rad) - i += put_float_by_index(yaw, i, msg->payload); //Yaw angle (rad) - - return finalize_message(msg, system_id, i); -} - -static inline uint16_t message_attitude2_encode(uint8_t system_id, CommMessage_t* msg, const attitude2_t* attitude2) -{ - message_attitude2_pack(system_id, msg, attitude2->roll, attitude2->pitch, attitude2->yaw); -} -// MESSAGE ATTITUDE2 UNPACKING - -/** - * @brief Get field roll from attitude2 message - * - * @return Roll angle (rad) - */ -static inline float message_attitude2_get_roll(CommMessage_t* msg) -{ - generic_32bit r; - r.b[3] = (msg->payload)[0]; - r.b[2] = (msg->payload)[1]; - r.b[1] = (msg->payload)[2]; - r.b[0] = (msg->payload)[3]; - return (float)r.f; -} - -/** - * @brief Get field pitch from attitude2 message - * - * @return Pitch angle (rad) - */ -static inline float message_attitude2_get_pitch(CommMessage_t* msg) -{ - generic_32bit r; - r.b[3] = (msg->payload+sizeof(float))[0]; - r.b[2] = (msg->payload+sizeof(float))[1]; - r.b[1] = (msg->payload+sizeof(float))[2]; - r.b[0] = (msg->payload+sizeof(float))[3]; - return (float)r.f; -} - -/** - * @brief Get field yaw from attitude2 message - * - * @return Yaw angle (rad) - */ -static inline float message_attitude2_get_yaw(CommMessage_t* msg) -{ - generic_32bit r; - r.b[3] = (msg->payload+sizeof(float)+sizeof(float))[0]; - r.b[2] = (msg->payload+sizeof(float)+sizeof(float))[1]; - r.b[1] = (msg->payload+sizeof(float)+sizeof(float))[2]; - r.b[0] = (msg->payload+sizeof(float)+sizeof(float))[3]; - return (float)r.f; -} - -static inline void message_attitude2_decode(CommMessage_t* msg, attitude2_t* attitude2) -{ - attitude2->roll = message_attitude2_get_roll(msg); - attitude2->pitch = message_attitude2_get_pitch(msg); - attitude2->yaw = message_attitude2_get_yaw(msg); -} diff --git a/test/generated/mavlink_message_boot.h b/test/generated/mavlink_message_boot.h deleted file mode 100644 index df60f49ebb043850fd4db9cb8626d6455b596aba..0000000000000000000000000000000000000000 --- a/test/generated/mavlink_message_boot.h +++ /dev/null @@ -1,32 +0,0 @@ -// MESSAGE BOOT PACKING - -#define MESSAGE_ID_BOOT 1 - -/** - * @brief Send a boot message - * - * @param version The onboard software version - * @return length of the message in bytes (excluding serial stream start sign) - */ -static inline uint16_t message_boot_pack(uint8_t system_id, CommMessage_t* msg, uint32 version) -{ - msg->msgid = MESSAGE_ID_BOOT; - uint16_t i = 0; - - i += put_uint32_by_index(version, i, msg->payload); //The onboard software version - - return finalize_message(msg, system_id, i); -} - -// MESSAGE BOOT UNPACKING - -/** - * @brief Get field version from boot message - * - * @return The onboard software version - */ -static inline uint32 message_boot_get_version(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload); -} - diff --git a/test/generated/mavlink_message_boot2.h b/test/generated/mavlink_message_boot2.h deleted file mode 100644 index 06e3f3b65d4b15bd71ab5523beeef2e6da729a2e..0000000000000000000000000000000000000000 --- a/test/generated/mavlink_message_boot2.h +++ /dev/null @@ -1,46 +0,0 @@ -// MESSAGE BOOT2 PACKING - -#define MESSAGE_ID_BOOT2 1 - -typedef struct __boot2_t -{ - uint32 version; ///< The onboard software version - -} boot2_t; - -/** - * @brief Send a boot2 message - * - * @param version The onboard software version - * @return length of the message in bytes (excluding serial stream start sign) - */ -static inline uint16_t message_boot2_pack(uint8_t system_id, CommMessage_t* msg, uint32 version) -{ - msg->msgid = MESSAGE_ID_BOOT2; - uint16_t i = 0; - - i += put_uint32_by_index(version, i, msg->payload); //The onboard software version - - return finalize_message(msg, system_id, i); -} - -static inline uint16_t message_boot2_encode(uint8_t system_id, CommMessage_t* msg, const boot2_t* boot2) -{ - message_boot2_pack(system_id, msg, boot2->version); -} -// MESSAGE BOOT2 UNPACKING - -/** - * @brief Get field version from boot2 message - * - * @return The onboard software version - */ -static inline uint32 message_boot2_get_version(CommMessage_t* msg) -{ - -} - -static inline void message_boot2_decode(CommMessage_t* msg, boot2_t* boot2) -{ - boot2->version = message_boot2_get_version(msg); -} diff --git a/test/generated/mavlink_message_heartbeat.h b/test/generated/mavlink_message_heartbeat.h deleted file mode 100644 index 5a2bf611fdba9ffe567e46aadf0464592414fc27..0000000000000000000000000000000000000000 --- a/test/generated/mavlink_message_heartbeat.h +++ /dev/null @@ -1,32 +0,0 @@ -// MESSAGE HEARTBEAT PACKING - -#define MESSAGE_ID_HEARTBEAT 0 - -/** - * @brief Send a heartbeat message - * - * @param type Type of the MAV (quadrotor, helicopter, etc.) - * @return length of the message in bytes (excluding serial stream start sign) - */ -static inline uint16_t message_heartbeat_pack(uint8_t system_id, CommMessage_t* msg, uint8 type) -{ - msg->msgid = MESSAGE_ID_HEARTBEAT; - uint16_t i = 0; - - i += put_uint8_by_index(type, i, msg->payload); //Type of the MAV (quadrotor, helicopter, etc.) - - return finalize_message(msg, system_id, i); -} - -// MESSAGE HEARTBEAT UNPACKING - -/** - * @brief Get field type from heartbeat message - * - * @return Type of the MAV (quadrotor, helicopter, etc.) - */ -static inline uint8 message_heartbeat_get_type(CommMessage_t* msg) -{ - return *((uint8*) (void*)msg->payload); -} - diff --git a/test/generated/mavlink_message_heartbeat2.h b/test/generated/mavlink_message_heartbeat2.h deleted file mode 100644 index 70233dad9eee76ccfdd047aa9c5635d22b1344a2..0000000000000000000000000000000000000000 --- a/test/generated/mavlink_message_heartbeat2.h +++ /dev/null @@ -1,46 +0,0 @@ -// MESSAGE HEARTBEAT2 PACKING - -#define MESSAGE_ID_HEARTBEAT2 0 - -typedef struct __heartbeat2_t -{ - uint8 type; ///< Type of the MAV (quadrotor, helicopter, etc.) - -} heartbeat2_t; - -/** - * @brief Send a heartbeat2 message - * - * @param type Type of the MAV (quadrotor, helicopter, etc.) - * @return length of the message in bytes (excluding serial stream start sign) - */ -static inline uint16_t message_heartbeat2_pack(uint8_t system_id, CommMessage_t* msg, uint8 type) -{ - msg->msgid = MESSAGE_ID_HEARTBEAT2; - uint16_t i = 0; - - i += put_uint8_by_index(type, i, msg->payload); //Type of the MAV (quadrotor, helicopter, etc.) - - return finalize_message(msg, system_id, i); -} - -static inline uint16_t message_heartbeat2_encode(uint8_t system_id, CommMessage_t* msg, const heartbeat2_t* heartbeat2) -{ - message_heartbeat2_pack(system_id, msg, heartbeat2->type); -} -// MESSAGE HEARTBEAT2 UNPACKING - -/** - * @brief Get field type from heartbeat2 message - * - * @return Type of the MAV (quadrotor, helicopter, etc.) - */ -static inline uint8 message_heartbeat2_get_type(CommMessage_t* msg) -{ - -} - -static inline void message_heartbeat2_decode(CommMessage_t* msg, heartbeat2_t* heartbeat2) -{ - heartbeat2->type = message_heartbeat2_get_type(msg); -} diff --git a/test/generated/mavlink_message_sensraw.h b/test/generated/mavlink_message_sensraw.h deleted file mode 100644 index 814d8a1438f129c30d078639b0c04eb83722ed0e..0000000000000000000000000000000000000000 --- a/test/generated/mavlink_message_sensraw.h +++ /dev/null @@ -1,164 +0,0 @@ -// MESSAGE SENSRAW PACKING - -#define MESSAGE_ID_SENSRAW 100 - -/** - * @brief Send a sensraw message - * - * @param xacc X acceleration (mg raw) - * @param yacc Y acceleration (mg raw) - * @param zacc Z acceleration (mg raw) - * @param xgyro Angular speed around X axis (adc units) - * @param ygyro Angular speed around Y axis (adc units) - * @param zgyro Angular speed around Z axis (adc units) - * @param xmag - * @param ymag - * @param zmag - * @param baro - * @param gdist - * @param temp - * @return length of the message in bytes (excluding serial stream start sign) - */ -static inline uint16_t message_sensraw_pack(uint8_t system_id, CommMessage_t* msg, uint32 xacc, uint32 yacc, uint32 zacc, uint32 xgyro, uint32 ygyro, uint32 zgyro, uint32 xmag, uint32 ymag, uint32 zmag, int32 baro, uint32 gdist, int32 temp) -{ - msg->msgid = MESSAGE_ID_SENSRAW; - uint16_t i = 0; - - i += put_uint32_by_index(xacc, i, msg->payload); //X acceleration (mg raw) - i += put_uint32_by_index(yacc, i, msg->payload); //Y acceleration (mg raw) - i += put_uint32_by_index(zacc, i, msg->payload); //Z acceleration (mg raw) - i += put_uint32_by_index(xgyro, i, msg->payload); //Angular speed around X axis (adc units) - i += put_uint32_by_index(ygyro, i, msg->payload); //Angular speed around Y axis (adc units) - i += put_uint32_by_index(zgyro, i, msg->payload); //Angular speed around Z axis (adc units) - i += put_uint32_by_index(xmag, i, msg->payload); // - i += put_uint32_by_index(ymag, i, msg->payload); // - i += put_uint32_by_index(zmag, i, msg->payload); // - i += put_int32_by_index(baro, i, msg->payload); // - i += put_uint32_by_index(gdist, i, msg->payload); // - i += put_int32_by_index(temp, i, msg->payload); // - - return finalize_message(msg, system_id, i); -} - -// MESSAGE SENSRAW UNPACKING - -/** - * @brief Get field xacc from sensraw message - * - * @return X acceleration (mg raw) - */ -static inline uint32 message_sensraw_get_xacc(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload); -} - -/** - * @brief Get field yacc from sensraw message - * - * @return Y acceleration (mg raw) - */ -static inline uint32 message_sensraw_get_yacc(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)); -} - -/** - * @brief Get field zacc from sensraw message - * - * @return Z acceleration (mg raw) - */ -static inline uint32 message_sensraw_get_zacc(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)); -} - -/** - * @brief Get field xgyro from sensraw message - * - * @return Angular speed around X axis (adc units) - */ -static inline uint32 message_sensraw_get_xgyro(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)); -} - -/** - * @brief Get field ygyro from sensraw message - * - * @return Angular speed around Y axis (adc units) - */ -static inline uint32 message_sensraw_get_ygyro(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)); -} - -/** - * @brief Get field zgyro from sensraw message - * - * @return Angular speed around Z axis (adc units) - */ -static inline uint32 message_sensraw_get_zgyro(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)); -} - -/** - * @brief Get field xmag from sensraw message - * - * @return - */ -static inline uint32 message_sensraw_get_xmag(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)); -} - -/** - * @brief Get field ymag from sensraw message - * - * @return - */ -static inline uint32 message_sensraw_get_ymag(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)); -} - -/** - * @brief Get field zmag from sensraw message - * - * @return - */ -static inline uint32 message_sensraw_get_zmag(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)); -} - -/** - * @brief Get field baro from sensraw message - * - * @return - */ -static inline int32 message_sensraw_get_baro(CommMessage_t* msg) -{ - return *((int32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)); -} - -/** - * @brief Get field gdist from sensraw message - * - * @return - */ -static inline uint32 message_sensraw_get_gdist(CommMessage_t* msg) -{ - return *((uint32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(int32)); -} - -/** - * @brief Get field temp from sensraw message - * - * @return - */ -static inline int32 message_sensraw_get_temp(CommMessage_t* msg) -{ - return *((int32*) (void*)msg->payload+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(uint32)+sizeof(int32)+sizeof(uint32)); -} - diff --git a/test/generated/mavlink_message_sensraw2.h b/test/generated/mavlink_message_sensraw2.h deleted file mode 100644 index d130047cc9a1a6093c957a7331ac4cd5b031177e..0000000000000000000000000000000000000000 --- a/test/generated/mavlink_message_sensraw2.h +++ /dev/null @@ -1,200 +0,0 @@ -// MESSAGE SENSRAW2 PACKING - -#define MESSAGE_ID_SENSRAW2 100 - -typedef struct __sensraw2_t -{ - uint32 xacc; ///< X acceleration (mg raw) - uint32 yacc; ///< Y acceleration (mg raw) - uint32 zacc; ///< Z acceleration (mg raw) - uint32 xgyro; ///< Angular speed around X axis (adc units) - uint32 ygyro; ///< Angular speed around Y axis (adc units) - uint32 zgyro; ///< Angular speed around Z axis (adc units) - uint32 xmag; ///< - uint32 ymag; ///< - uint32 zmag; ///< - int32 baro; ///< - uint32 gdist; ///< - int32 temp; ///< - -} sensraw2_t; - -/** - * @brief Send a sensraw2 message - * - * @param xacc X acceleration (mg raw) - * @param yacc Y acceleration (mg raw) - * @param zacc Z acceleration (mg raw) - * @param xgyro Angular speed around X axis (adc units) - * @param ygyro Angular speed around Y axis (adc units) - * @param zgyro Angular speed around Z axis (adc units) - * @param xmag - * @param ymag - * @param zmag - * @param baro - * @param gdist - * @param temp - * @return length of the message in bytes (excluding serial stream start sign) - */ -static inline uint16_t message_sensraw2_pack(uint8_t system_id, CommMessage_t* msg, uint32 xacc, uint32 yacc, uint32 zacc, uint32 xgyro, uint32 ygyro, uint32 zgyro, uint32 xmag, uint32 ymag, uint32 zmag, int32 baro, uint32 gdist, int32 temp) -{ - msg->msgid = MESSAGE_ID_SENSRAW2; - uint16_t i = 0; - - i += put_uint32_by_index(xacc, i, msg->payload); //X acceleration (mg raw) - i += put_uint32_by_index(yacc, i, msg->payload); //Y acceleration (mg raw) - i += put_uint32_by_index(zacc, i, msg->payload); //Z acceleration (mg raw) - i += put_uint32_by_index(xgyro, i, msg->payload); //Angular speed around X axis (adc units) - i += put_uint32_by_index(ygyro, i, msg->payload); //Angular speed around Y axis (adc units) - i += put_uint32_by_index(zgyro, i, msg->payload); //Angular speed around Z axis (adc units) - i += put_uint32_by_index(xmag, i, msg->payload); // - i += put_uint32_by_index(ymag, i, msg->payload); // - i += put_uint32_by_index(zmag, i, msg->payload); // - i += put_int32_by_index(baro, i, msg->payload); // - i += put_uint32_by_index(gdist, i, msg->payload); // - i += put_int32_by_index(temp, i, msg->payload); // - - return finalize_message(msg, system_id, i); -} - -static inline uint16_t message_sensraw2_encode(uint8_t system_id, CommMessage_t* msg, const sensraw2_t* sensraw2) -{ - message_sensraw2_pack(system_id, msg, sensraw2->xacc, sensraw2->yacc, sensraw2->zacc, sensraw2->xgyro, sensraw2->ygyro, sensraw2->zgyro, sensraw2->xmag, sensraw2->ymag, sensraw2->zmag, sensraw2->baro, sensraw2->gdist, sensraw2->temp); -} -// MESSAGE SENSRAW2 UNPACKING - -/** - * @brief Get field xacc from sensraw2 message - * - * @return X acceleration (mg raw) - */ -static inline uint32 message_sensraw2_get_xacc(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field yacc from sensraw2 message - * - * @return Y acceleration (mg raw) - */ -static inline uint32 message_sensraw2_get_yacc(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field zacc from sensraw2 message - * - * @return Z acceleration (mg raw) - */ -static inline uint32 message_sensraw2_get_zacc(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field xgyro from sensraw2 message - * - * @return Angular speed around X axis (adc units) - */ -static inline uint32 message_sensraw2_get_xgyro(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field ygyro from sensraw2 message - * - * @return Angular speed around Y axis (adc units) - */ -static inline uint32 message_sensraw2_get_ygyro(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field zgyro from sensraw2 message - * - * @return Angular speed around Z axis (adc units) - */ -static inline uint32 message_sensraw2_get_zgyro(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field xmag from sensraw2 message - * - * @return - */ -static inline uint32 message_sensraw2_get_xmag(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field ymag from sensraw2 message - * - * @return - */ -static inline uint32 message_sensraw2_get_ymag(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field zmag from sensraw2 message - * - * @return - */ -static inline uint32 message_sensraw2_get_zmag(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field baro from sensraw2 message - * - * @return - */ -static inline int32 message_sensraw2_get_baro(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field gdist from sensraw2 message - * - * @return - */ -static inline uint32 message_sensraw2_get_gdist(CommMessage_t* msg) -{ - -} - -/** - * @brief Get field temp from sensraw2 message - * - * @return - */ -static inline int32 message_sensraw2_get_temp(CommMessage_t* msg) -{ - -} - -static inline void message_sensraw2_decode(CommMessage_t* msg, sensraw2_t* sensraw2) -{ - sensraw2->xacc = message_sensraw2_get_xacc(msg); - sensraw2->yacc = message_sensraw2_get_yacc(msg); - sensraw2->zacc = message_sensraw2_get_zacc(msg); - sensraw2->xgyro = message_sensraw2_get_xgyro(msg); - sensraw2->ygyro = message_sensraw2_get_ygyro(msg); - sensraw2->zgyro = message_sensraw2_get_zgyro(msg); - sensraw2->xmag = message_sensraw2_get_xmag(msg); - sensraw2->ymag = message_sensraw2_get_ymag(msg); - sensraw2->zmag = message_sensraw2_get_zmag(msg); - sensraw2->baro = message_sensraw2_get_baro(msg); - sensraw2->gdist = message_sensraw2_get_gdist(msg); - sensraw2->temp = message_sensraw2_get_temp(msg); -} diff --git a/test/mavlink.h b/test/mavlink.h deleted file mode 100644 index 2fd7063d99507aaad1f7a51a099fc466362f0f5e..0000000000000000000000000000000000000000 --- a/test/mavlink.h +++ /dev/null @@ -1,19 +0,0 @@ -/** @file - * @brief MAVLink comm protocol. - * @see http://pixhawk.ethz.ch/software/mavlink - * Generated on Sonntag, März 21 2010, 14:05 UTC - */ -#ifndef MAVLINK_H -#define MAVLINK_H - -#include "protocol.h" - -// TO BE REMOVED: -#include "generated/messages.h" - - -#include "generated/mavlink_message_heartbeat2.h" -#include "generated/mavlink_message_boot2.h" -#include "generated/mavlink_message_sensraw2.h" -#include "generated/mavlink_message_attitude2.h" -#endif \ No newline at end of file diff --git a/test/mavlink.lcm b/test/mavlink.lcm deleted file mode 100644 index 30d76427baeefe1a32808fe270b63cee616863a3..0000000000000000000000000000000000000000 --- a/test/mavlink.lcm +++ /dev/null @@ -1,37 +0,0 @@ - -typedef struct __heartbeat2_t -{ - uint8 type; ///< Type of the MAV (quadrotor, helicopter, etc.) - -} heartbeat2_t; - -typedef struct __boot2_t -{ - uint32 version; ///< The onboard software version - -} boot2_t; - -typedef struct __sensraw2_t -{ - uint32 xacc; ///< X acceleration (mg raw) - uint32 yacc; ///< Y acceleration (mg raw) - uint32 zacc; ///< Z acceleration (mg raw) - uint32 xgyro; ///< Angular speed around X axis (adc units) - uint32 ygyro; ///< Angular speed around Y axis (adc units) - uint32 zgyro; ///< Angular speed around Z axis (adc units) - uint32 xmag; ///< - uint32 ymag; ///< - uint32 zmag; ///< - int32 baro; ///< - uint32 gdist; ///< - int32 temp; ///< - -} sensraw2_t; - -typedef struct __attitude2_t -{ - float roll; ///< Roll angle (rad) - float pitch; ///< Pitch angle (rad) - float yaw; ///< Yaw angle (rad) - -} attitude2_t; diff --git a/test/mavlink.xml b/test/mavlink.xml deleted file mode 100644 index bc20e784979f095db41748c990113a7e43a110b3..0000000000000000000000000000000000000000 --- a/test/mavlink.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - Type of the MAV (quadrotor, helicopter, etc.) - - - - The onboard software version - - - - X acceleration (mg raw) - Y acceleration (mg raw) - Z acceleration (mg raw) - Angular speed around X axis (adc units) - Angular speed around Y axis (adc units) - Angular speed around Z axis (adc units) - X Magnetic field (milli tesla) - Y Magnetic field (milli tesla) - Z Magnetic field (milli tesla) - Barometric pressure (hecto Pascal) - Ground distance (meters) - Temperature (degrees celcius) - - - - Roll angle (rad) - Pitch angle (rad) - Yaw angle (rad) - Roll angular speed (rad/s) - Pitch angular speed (rad/s) - Yaw angular speed (rad/s) - - - \ No newline at end of file diff --git a/test/media/face1.png b/test/media/face1.png deleted file mode 100644 index 2656b50e83aa28dd7c33c6df7d0a99487e239e9b..0000000000000000000000000000000000000000 Binary files a/test/media/face1.png and /dev/null differ diff --git a/test/media/face2.png b/test/media/face2.png deleted file mode 100644 index 63a87d5cfee4d00e8e3ba5c1a6f2a95bf34d3515..0000000000000000000000000000000000000000 Binary files a/test/media/face2.png and /dev/null differ diff --git a/test/media/face3.png b/test/media/face3.png deleted file mode 100644 index 1c61d580271d2553ef5f17da08fd5963d601e50f..0000000000000000000000000000000000000000 Binary files a/test/media/face3.png and /dev/null differ diff --git a/test/media/face4.png b/test/media/face4.png deleted file mode 100644 index b18858f7c3635f4cccd20afd7b38ca346327bcc9..0000000000000000000000000000000000000000 Binary files a/test/media/face4.png and /dev/null differ diff --git a/test/media/face5.png b/test/media/face5.png deleted file mode 100644 index b42231e5da8b46f492e58f22f24fe2e96ca55bd7..0000000000000000000000000000000000000000 Binary files a/test/media/face5.png and /dev/null differ diff --git a/test/media/letterB.png b/test/media/letterB.png deleted file mode 100644 index de8dec9cf8d4b7ff09031ab77b19a5d637b65549..0000000000000000000000000000000000000000 Binary files a/test/media/letterB.png and /dev/null differ diff --git a/test/media/letterD.png b/test/media/letterD.png deleted file mode 100644 index f96b3e8fe696a9e3164923779125d37101ca57bf..0000000000000000000000000000000000000000 Binary files a/test/media/letterD.png and /dev/null differ diff --git a/test/media/letterP.png b/test/media/letterP.png deleted file mode 100644 index 4ee1a56ad59ebb9de8cc7ef7429d867858ce7419..0000000000000000000000000000000000000000 Binary files a/test/media/letterP.png and /dev/null differ diff --git a/test/media/letterR.png b/test/media/letterR.png deleted file mode 100644 index 2329f1464f23bd6ecd2d3b39f73c6392266c53ba..0000000000000000000000000000000000000000 Binary files a/test/media/letterR.png and /dev/null differ diff --git a/test/media/letterS.png b/test/media/letterS.png deleted file mode 100644 index 4cb14b1b69909e6d943e471d3a0c6ae4086706b0..0000000000000000000000000000000000000000 Binary files a/test/media/letterS.png and /dev/null differ