mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-04-19 21:46:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix debug message in video2 and comment out servo_status ... is not used yet

Browse Source
This commit is contained in:
AngelCarpintero
2008-12-26 21:21:51 +00:00
parent 00f6e2ce73
commit 42c63ef9bc
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for motion trunk-r440.
# Generated by GNU Autoconf 2.61 for motion trunk-r441.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='motion'
PACKAGE_TARNAME='motion'
PACKAGE_VERSION='trunk-r440'
PACKAGE_STRING='motion trunk-r440'
PACKAGE_VERSION='trunk-r441'
PACKAGE_STRING='motion trunk-r441'
PACKAGE_BUGREPORT=''
ac_unique_file="motion.c"
@@ -1177,7 +1177,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures motion trunk-r440 to adapt to many kinds of systems.
\`configure' configures motion trunk-r441 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1238,7 +1238,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of motion trunk-r440:";;
short | recursive ) echo "Configuration of motion trunk-r441:";;
esac
cat <<\_ACEOF
@@ -1376,7 +1376,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
motion configure trunk-r440
motion configure trunk-r441
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1390,7 +1390,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by motion $as_me trunk-r440, which was
It was created by motion $as_me trunk-r441, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -8230,7 +8230,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by motion $as_me trunk-r440, which was
This file was extended by motion $as_me trunk-r441, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8279,7 +8279,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
motion config.status trunk-r440
motion config.status trunk-r441
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

3
track.c
View File

@@ -558,11 +558,12 @@ static unsigned short int servo_move(struct context *cnt, struct coord *cent,
return cnt->track.move_wait;
}
#if 0
static unsigned short int servo_status(struct context *cnt, unsigned short int motor)
{
return servo_command(cnt, motor, SERVO_COMMAND_STATUS, 0);
}
#endif
/*
* servo_center()

6
video2.c
View File

@@ -272,7 +272,7 @@ static int v4l2_select_input(src_v4l2_t * vid_source, int in, int norm, unsigned
if (xioctl(vid_source->fd, VIDIOC_S_STD, &std_id) == -1)
motion_log(LOG_ERR, 1, "%s: Error selecting standard method %d VIDIOC_S_STD",
__FUNCTION__, std_id);
__FUNCTION__, (int)std_id);
}
@@ -464,7 +464,7 @@ static int v4l2_set_mmap(src_v4l2_t * vid_source)
if (xioctl(vid_source->fd, VIDIOC_REQBUFS, &vid_source->req) == -1) {
motion_log(LOG_ERR, 1, "%s: Error requesting buffers %d for memory map. VIDIOC_REQBUFS",
vid_source->req.count ,__FUNCTION__);
__FUNCTION__, vid_source->req.count);
return -1;
}
@@ -472,7 +472,7 @@ static int v4l2_set_mmap(src_v4l2_t * vid_source)
if (vid_source->req.count < MIN_MMAP_BUFFERS) {
motion_log(LOG_ERR, 1, "%s: Insufficient buffer memory %d < MIN_MMAP_BUFFERS.",
vid_source->req.count, __FUNCTION__);
__FUNCTION__, vid_source->req.count);
return -1;
}