Skip to content

Commit

Permalink
Fixed missing defines
Browse files Browse the repository at this point in the history
  • Loading branch information
manosnismo committed Jun 16, 2017
1 parent 3f2f63d commit ecebebc
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 0 deletions.
5 changes: 5 additions & 0 deletions sw/airborne/modules/computer_vision/colorfilter.c
Expand Up @@ -29,6 +29,11 @@

#include "modules/computer_vision/lib/vision/image.h"

#ifndef COLORFILTER_FPS
#define COLORFILTER_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(COLORFILTER_FPS)

struct video_listener *listener = NULL;

// Filter Settings
Expand Down
5 changes: 5 additions & 0 deletions sw/airborne/modules/computer_vision/cv_blob_locator.c
Expand Up @@ -23,6 +23,11 @@
* Find a colored item and track its geo-location and update a waypoint to it
*/

#ifndef BLOB_LOCATOR_FPS
#define BLOB_LOCATOR_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(BLOB_LOCATOR_FPS)

#include "modules/computer_vision/cv_blob_locator.h"
#include "modules/computer_vision/cv.h"
#include "modules/computer_vision/blob/blob_finder.h"
Expand Down
4 changes: 4 additions & 0 deletions sw/airborne/modules/computer_vision/cv_opencvdemo.c
Expand Up @@ -27,6 +27,10 @@
#include "modules/computer_vision/cv_opencvdemo.h"
#include "modules/computer_vision/opencv_example.h"

#ifndef OPENCVDEMO_FPS
#define OPENCVDEMO_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(OPENCVDEMO_FPS)

// Function
struct image_t *opencv_func(struct image_t *img);
Expand Down
5 changes: 5 additions & 0 deletions sw/airborne/modules/computer_vision/detect_contour.c
Expand Up @@ -23,6 +23,11 @@
*
*/

#ifndef DETECT_CONTOUR_FPS
#define DETECT_CONTOUR_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(DETECT_CONTOUR_FPS)

#include "modules/computer_vision/cv.h"
#include "modules/computer_vision/detect_contour.h"
#include "modules/computer_vision/opencv_contour.h"
Expand Down
5 changes: 5 additions & 0 deletions sw/airborne/modules/computer_vision/detect_window.c
Expand Up @@ -27,6 +27,11 @@
#define RES 100
#define N_WINDOW_SIZES 1

#ifndef DETECT_WINDOW_FPS
#define DETECT_WINDOW_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(DETECT_WINDOW_FPS)

#include "cv.h"
#include "detect_window.h"
#include <stdio.h>
Expand Down
4 changes: 4 additions & 0 deletions sw/airborne/modules/computer_vision/opticflow_module.c
Expand Up @@ -61,6 +61,10 @@ PRINT_CONFIG_VAR(OPTICFLOW_BODY_TO_IMU_ID)
#endif
PRINT_CONFIG_VAR(OPTICFLOW_SEND_ABI_ID)

#ifndef OPTICFLOW_FPS
#define OPTICFLOW_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(OPTICFLOW_FPS)

/* The main opticflow variables */
struct opticflow_t opticflow; ///< Opticflow calculations
Expand Down
5 changes: 5 additions & 0 deletions sw/airborne/modules/computer_vision/qrcode/qr_code.c
Expand Up @@ -34,6 +34,11 @@
#endif
bool drawRectangleAroundQRCode = QRCODE_DRAW_RECTANGLE;

#ifndef QRCODE_FPS
#define QRCODE_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(QRCODE_FPS)

void qrcode_init(void)
{
// Add qrscan to the list of image processing tasks in video_thread
Expand Down
5 changes: 5 additions & 0 deletions sw/airborne/modules/computer_vision/video_capture.c
Expand Up @@ -46,6 +46,11 @@
#define VIDEO_CAPTURE_JPEG_QUALITY 99
#endif

#ifndef VIDEO_CAPTURE_FPS
#define VIDEO_CAPTURE_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(VIDEO_CAPTURE_FPS)

// Module settings
bool video_capture_take_shot = false;
int video_capture_index = 0;
Expand Down
5 changes: 5 additions & 0 deletions sw/airborne/modules/computer_vision/video_usb_logger.c
Expand Up @@ -43,6 +43,11 @@
#define VIDEO_USB_LOGGER_PATH /data/video/usb
#endif

#ifndef VIDEO_USB_LOGGER_FPS
#define VIDEO_USB_LOGGER_FPS 0 ///< Default FPS (zero means run at camera fps)
#endif
PRINT_CONFIG_VAR(VIDEO_USB_LOGGER_FPS)

/** The file pointer */
static FILE *video_usb_logger = NULL;
struct image_t img_jpeg_global;
Expand Down

0 comments on commit ecebebc

Please sign in to comment.