Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3c48c8c1
Commit
3c48c8c1
authored
Jan 11, 2016
by
nopeppermint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change back correction on thirdParty libs
parent
6dbae4d4
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
33 additions
and
33 deletions
+33
-33
fetchUpstream
libs/thirdParty/fetchUpstream
+1
-1
README
libs/thirdParty/libxbee/README
+1
-1
api.c
libs/thirdParty/libxbee/api.c
+13
-13
libxbee.3.html
libs/thirdParty/libxbee/doc/man/man3/libxbee.3.html
+1
-1
xbee_getpacket.3.html
libs/thirdParty/libxbee/doc/man/man3/xbee_getpacket.3.html
+3
-3
xbee_newcon.3.html
libs/thirdParty/libxbee/doc/man/man3/xbee_newcon.3.html
+8
-8
xbee_pkt.3.html
libs/thirdParty/libxbee/doc/man/man3/xbee_pkt.3.html
+3
-3
xbee_senddata.3.html
libs/thirdParty/libxbee/doc/man/man3/xbee_senddata.3.html
+1
-1
xbee_setup.3.html
libs/thirdParty/libxbee/doc/man/man3/xbee_setup.3.html
+1
-1
v1-v2.txt
libs/thirdParty/libxbee/notes/v1-v2.txt
+1
-1
No files found.
libs/thirdParty/fetchUpstream
View file @
3c48c8c1
...
@@ -50,7 +50,7 @@ function processLib
...
@@ -50,7 +50,7 @@ function processLib
exit
0
exit
0
;;
;;
*
)
*
)
echo
unknown lib, possib
i
lities are:
$libList
echo
unknown lib, possiblities are:
$libList
exit
1
exit
1
esac
esac
REPLY
=
REPLY
=
...
...
libs/thirdParty/libxbee/README
View file @
3c48c8c1
...
@@ -7,7 +7,7 @@ site, and I will get to it ASAP:
...
@@ -7,7 +7,7 @@ site, and I will get to it ASAP:
http://code.google.com/p/libxbee/issues/list
http://code.google.com/p/libxbee/issues/list
Documentation is ava
il
able via the man page system once you have installed the
Documentation is ava
li
able via the man page system once you have installed the
library, or as HTML in the 'doc' directory.
library, or as HTML in the 'doc' directory.
$ man libxbee
$ man libxbee
...
...
libs/thirdParty/libxbee/api.c
View file @
3c48c8c1
...
@@ -267,7 +267,7 @@ static int xbee_sendATdelay(xbee_hnd xbee, int guardTime, char *command, char *r
...
@@ -267,7 +267,7 @@ static int xbee_sendATdelay(xbee_hnd xbee, int guardTime, char *command, char *r
/* terminate the string */
/* terminate the string */
retBuf
[
bufi
]
=
'\0'
;
retBuf
[
bufi
]
=
'\0'
;
xbee_log
(
"sendATdelay: Rec
ei
ved '%s'"
,
retBuf
);
xbee_log
(
"sendATdelay: Rec
ie
ved '%s'"
,
retBuf
);
return
0
;
return
0
;
}
}
...
@@ -999,7 +999,7 @@ int _xbee_vsenddata(xbee_hnd xbee, xbee_con *con, char *format, va_list ap) {
...
@@ -999,7 +999,7 @@ int _xbee_vsenddata(xbee_hnd xbee, xbee_con *con, char *format, va_list ap) {
}
}
/* returns:
/* returns:
1 - if NAC was rec
ei
ved
1 - if NAC was rec
ie
ved
0 - if packet was successfully sent (or just sent if waitforACK is off)
0 - if packet was successfully sent (or just sent if waitforACK is off)
-1 - if there was an error building the packet
-1 - if there was an error building the packet
-2 - if the connection type was unknown */
-2 - if the connection type was unknown */
...
@@ -1226,14 +1226,14 @@ xbee_pkt *_xbee_getpacket(xbee_hnd xbee, xbee_con *con) {
...
@@ -1226,14 +1226,14 @@ xbee_pkt *_xbee_getpacket(xbee_hnd xbee, xbee_con *con) {
if
((
p
=
xbee
->
pktlist
)
==
NULL
)
{
if
((
p
=
xbee
->
pktlist
)
==
NULL
)
{
xbee_mutex_unlock
(
xbee
->
pktmutex
);
xbee_mutex_unlock
(
xbee
->
pktmutex
);
/*if (xbee->log) {
/*if (xbee->log) {
xbee_log("No packets ava
il
able...");
xbee_log("No packets ava
li
able...");
}*/
}*/
return
NULL
;
return
NULL
;
}
}
l
=
NULL
;
l
=
NULL
;
q
=
NULL
;
q
=
NULL
;
/* get the first ava
il
able packet for this connection */
/* get the first ava
li
able packet for this connection */
do
{
do
{
/* does the packet match the connection? */
/* does the packet match the connection? */
if
(
xbee_matchpktcon
(
xbee
,
p
,
con
))
{
if
(
xbee_matchpktcon
(
xbee
,
p
,
con
))
{
...
@@ -1490,18 +1490,18 @@ static int xbee_listen(xbee_hnd xbee) {
...
@@ -1490,18 +1490,18 @@ static int xbee_listen(xbee_hnd xbee) {
/* check it is a valid length... */
/* check it is a valid length... */
if
(
!
l
)
{
if
(
!
l
)
{
if
(
xbee
->
log
)
{
if
(
xbee
->
log
)
{
xbee_logI
(
"Rec
e
ived zero length packet!"
);
xbee_logI
(
"Recived zero length packet!"
);
}
}
continue
;
continue
;
}
}
if
(
l
>
100
)
{
if
(
l
>
100
)
{
if
(
xbee
->
log
)
{
if
(
xbee
->
log
)
{
xbee_logI
(
"Rec
e
ived oversized packet! Length: %d"
,
l
-
1
);
xbee_logI
(
"Recived oversized packet! Length: %d"
,
l
-
1
);
}
}
}
}
if
(
l
>
LISTEN_BUFLEN
)
{
if
(
l
>
LISTEN_BUFLEN
)
{
if
(
xbee
->
log
)
{
if
(
xbee
->
log
)
{
xbee_logI
(
"Rec
e
ived packet larger than buffer! Discarding..."
);
xbee_logI
(
"Recived packet larger than buffer! Discarding..."
);
}
}
continue
;
continue
;
}
}
...
@@ -1551,7 +1551,7 @@ static int xbee_listen(xbee_hnd xbee) {
...
@@ -1551,7 +1551,7 @@ static int xbee_listen(xbee_hnd xbee) {
/* add the checksum */
/* add the checksum */
chksum
+=
xbee_getbyte
(
xbee
);
chksum
+=
xbee_getbyte
(
xbee
);
/* check if the whole packet was rec
ei
ved, or something else occured... unlikely... */
/* check if the whole packet was rec
ie
ved, or something else occured... unlikely... */
if
(
l
>
1
)
{
if
(
l
>
1
)
{
if
(
xbee
->
log
)
{
if
(
xbee
->
log
)
{
xbee_logE
(
"Didn't get whole packet... :("
);
xbee_logE
(
"Didn't get whole packet... :("
);
...
@@ -1754,7 +1754,7 @@ static int xbee_listen(xbee_hnd xbee) {
...
@@ -1754,7 +1754,7 @@ static int xbee_listen(xbee_hnd xbee) {
xbee_mutex_unlock
(
xbee
->
conmutex
);
xbee_mutex_unlock
(
xbee
->
conmutex
);
/* ########################################## */
/* ########################################## */
/* if: 16 / 64bit data rec
ei
ve */
/* if: 16 / 64bit data rec
ie
ve */
}
else
if
((
t
==
XBEE_64BIT_DATARX
)
||
}
else
if
((
t
==
XBEE_64BIT_DATARX
)
||
(
t
==
XBEE_16BIT_DATARX
))
{
(
t
==
XBEE_16BIT_DATARX
))
{
int
offset
;
int
offset
;
...
@@ -1816,7 +1816,7 @@ static int xbee_listen(xbee_hnd xbee) {
...
@@ -1816,7 +1816,7 @@ static int xbee_listen(xbee_hnd xbee) {
for
(;
i
>
offset
+
1
;
i
--
)
p
->
data
[
i
-
(
offset
+
2
)]
=
d
[
i
];
for
(;
i
>
offset
+
1
;
i
--
)
p
->
data
[
i
-
(
offset
+
2
)]
=
d
[
i
];
/* ########################################## */
/* ########################################## */
/* if: 16 / 64bit I/O rec
ei
ve */
/* if: 16 / 64bit I/O rec
ie
ve */
}
else
if
((
t
==
XBEE_64BIT_IO
)
||
}
else
if
((
t
==
XBEE_64BIT_IO
)
||
(
t
==
XBEE_16BIT_IO
))
{
(
t
==
XBEE_16BIT_IO
))
{
int
offset
,
i2
;
int
offset
,
i2
;
...
@@ -1940,7 +1940,7 @@ static int xbee_listen(xbee_hnd xbee) {
...
@@ -1940,7 +1940,7 @@ static int xbee_listen(xbee_hnd xbee) {
p
->
datalen
=
0
;
p
->
datalen
=
0
;
/* ########################################## */
/* ########################################## */
/* if: Series 2 data rec
ei
ve */
/* if: Series 2 data rec
ie
ve */
}
else
if
(
t
==
XBEE2_DATARX
)
{
}
else
if
(
t
==
XBEE2_DATARX
)
{
int
offset
;
int
offset
;
offset
=
10
;
offset
=
10
;
...
@@ -2354,8 +2354,8 @@ static int _xbee_send_pkt(xbee_hnd xbee, t_data *pkt, xbee_con *con) {
...
@@ -2354,8 +2354,8 @@ static int _xbee_send_pkt(xbee_hnd xbee, t_data *pkt, xbee_con *con) {
xbee_log
(
"Waiting for ACK/NAK response..."
);
xbee_log
(
"Waiting for ACK/NAK response..."
);
xbee_sem_wait1sec
(
con
->
waitforACKsem
);
xbee_sem_wait1sec
(
con
->
waitforACKsem
);
switch
(
con
->
ACKstatus
)
{
switch
(
con
->
ACKstatus
)
{
case
0
:
xbee_log
(
"ACK rec
ei
ved!"
);
break
;
case
0
:
xbee_log
(
"ACK rec
ie
ved!"
);
break
;
case
1
:
xbee_log
(
"NAK rec
ei
ved..."
);
break
;
case
1
:
xbee_log
(
"NAK rec
ie
ved..."
);
break
;
case
2
:
xbee_log
(
"CCA failure..."
);
break
;
case
2
:
xbee_log
(
"CCA failure..."
);
break
;
case
3
:
xbee_log
(
"Purged..."
);
break
;
case
3
:
xbee_log
(
"Purged..."
);
break
;
case
255
:
default
:
xbee_log
(
"Timeout..."
);
case
255
:
default
:
xbee_log
(
"Timeout..."
);
...
...
libs/thirdParty/libxbee/doc/man/man3/libxbee.3.html
View file @
3c48c8c1
...
@@ -38,7 +38,7 @@ or contact me (Attie) directly:
...
@@ -38,7 +38,7 @@ or contact me (Attie) directly:
<A
NAME=
"lbAD"
>
</A>
<A
NAME=
"lbAD"
>
</A>
<H2>
MAN PAGES
</H2>
<H2>
MAN PAGES
</H2>
Documentation is ava
il
able via the following man pages, or by example in the 'sample' folder in the SVN repository
Documentation is ava
li
able via the following man pages, or by example in the 'sample' folder in the SVN repository
<P>
<P>
<B><A
HREF=
"../man3/xbee_pkt.3.html"
>
xbee_pkt
</A></B>
(3) - libxbee's packet structure
<B><A
HREF=
"../man3/xbee_pkt.3.html"
>
xbee_pkt
</A></B>
(3) - libxbee's packet structure
...
...
libs/thirdParty/libxbee/doc/man/man3/xbee_getpacket.3.html
View file @
3c48c8c1
...
@@ -26,7 +26,7 @@ xbee_getpacket
...
@@ -26,7 +26,7 @@ xbee_getpacket
The
The
<B>
xbee_getpacket
</B>
()
<B>
xbee_getpacket
</B>
()
function will return the next ava
il
able packet for the provided connection.
function will return the next ava
li
able packet for the provided connection.
It takes 1 argument.
It takes 1 argument.
<P>
<P>
The argument
The argument
...
@@ -49,7 +49,7 @@ You must keep hold of the packet until you are finished with it, and then you mu
...
@@ -49,7 +49,7 @@ You must keep hold of the packet until you are finished with it, and then you mu
it to prevent memory leaks.
it to prevent memory leaks.
<P>
<P>
If a packet was not ava
il
able for the provided connection, a
If a packet was not ava
li
able for the provided connection, a
<B>
NULL
</B>
<B>
NULL
</B>
is returned.
is returned.
...
@@ -69,7 +69,7 @@ For information on using callback functions with connections instead, please see
...
@@ -69,7 +69,7 @@ For information on using callback functions with connections instead, please see
<A
NAME=
"lbAF"
>
</A>
<A
NAME=
"lbAF"
>
</A>
<H2>
EXAMPLE
</H2>
<H2>
EXAMPLE
</H2>
To rec
ei
ve a packet from a previously made connection:
To rec
ie
ve a packet from a previously made connection:
<PRE>
<PRE>
#include
<
<A
HREF=
"file:/usr/include/xbee.h"
>
xbee.h
</A>
>
#include
<
<A
HREF=
"file:/usr/include/xbee.h"
>
xbee.h
</A>
>
...
...
libs/thirdParty/libxbee/doc/man/man3/xbee_newcon.3.html
View file @
3c48c8c1
...
@@ -37,7 +37,7 @@ It takes at least 2 arguments, and possibly up to 4 depending on the
...
@@ -37,7 +37,7 @@ It takes at least 2 arguments, and possibly up to 4 depending on the
<B>
NOTE:
</B>
<B>
NOTE:
</B>
Packets will only be collected when they match an active connection.
Packets will only be collected when they match an active connection.
You must setup a connection in order to rec
ei
ve packets.
You must setup a connection in order to rec
ie
ve packets.
<P>
<P>
The argument
The argument
<I>
frameID
</I>
<I>
frameID
</I>
...
@@ -48,7 +48,7 @@ identifies where the data is coming from or going to.
...
@@ -48,7 +48,7 @@ identifies where the data is coming from or going to.
The
The
<I>
type
</I>
<I>
type
</I>
specifies the type of connection you would like. The following types are ava
il
able:
specifies the type of connection you would like. The following types are ava
li
able:
<DL
COMPACT
>
<DL
COMPACT
>
<DT><B>
xbee_localAT
</B>
<DT><B>
xbee_localAT
</B>
...
@@ -57,11 +57,11 @@ communicates AT commands with the local XBee
...
@@ -57,11 +57,11 @@ communicates AT commands with the local XBee
<DT><B>
xbee_txStatus
</B>
<DT><B>
xbee_txStatus
</B>
<DD>
<DD>
rec
ei
ves transmit status information from the local XBee
rec
ie
ves transmit status information from the local XBee
<DT><B>
xbee_modemStatus
</B>
<DT><B>
xbee_modemStatus
</B>
<DD>
<DD>
rec
ei
ves modem status information from the local XBee
rec
ie
ves modem status information from the local XBee
<DT><B>
xbee_16bitRemoteAT
</B>
<DT><B>
xbee_16bitRemoteAT
</B>
<DD>
<DD>
...
@@ -73,19 +73,19 @@ communicates AT commands with a remote node (using 64-bit addressing)
...
@@ -73,19 +73,19 @@ communicates AT commands with a remote node (using 64-bit addressing)
<DT><B>
xbee_16bitData
</B>
<DT><B>
xbee_16bitData
</B>
<DD>
<DD>
sends/rec
ei
ves data through a remote node (using 16-bit addressing)
sends/rec
ie
ves data through a remote node (using 16-bit addressing)
<DT><B>
xbee_64bitData
</B>
<DT><B>
xbee_64bitData
</B>
<DD>
<DD>
sends/rec
ei
ves data through a remote node (using 64-bit addressing)
sends/rec
ie
ves data through a remote node (using 64-bit addressing)
<DT><B>
xbee_16bitIO
</B>
<DT><B>
xbee_16bitIO
</B>
<DD>
<DD>
sends/rec
ei
ves I/O data through a remote node (using 16-bit addressing)
sends/rec
ie
ves I/O data through a remote node (using 16-bit addressing)
<DT><B>
xbee_64bitIO
</B>
<DT><B>
xbee_64bitIO
</B>
<DD>
<DD>
sends/rec
ei
ves I/O data through a remote node (using 64-bit addressing)
sends/rec
ie
ves I/O data through a remote node (using 64-bit addressing)
</DL>
</DL>
<P>
<P>
...
...
libs/thirdParty/libxbee/doc/man/man3/xbee_pkt.3.html
View file @
3c48c8c1
...
@@ -51,18 +51,18 @@ and others need explaining. I will touch on the most important here:
...
@@ -51,18 +51,18 @@ and others need explaining. I will touch on the most important here:
<DT><B>
atCmd
</B>
<DT><B>
atCmd
</B>
<DD>
<DD>
This is the 2 character identifier for the AT command response you just rec
ei
ved.
This is the 2 character identifier for the AT command response you just rec
ie
ved.
Of course if you didnt setup an AT connection, you should never see, or try to see data here.
Of course if you didnt setup an AT connection, you should never see, or try to see data here.
<DT><B>
Addr64
</B>
and
<B>
Addr16
</B>
<DT><B>
Addr64
</B>
and
<B>
Addr16
</B>
<DD>
<DD>
These contain the address of the XBee that you rec
ei
ved the packet from. You should really know this
These contain the address of the XBee that you rec
ie
ved the packet from. You should really know this
because you setup the connection. However remote AT packets will contain both 16 and 64 bit
because you setup the connection. However remote AT packets will contain both 16 and 64 bit
addresses.
addresses.
<DT><B>
data
</B>
<DT><B>
data
</B>
<DD>
<DD>
This is the data you just rec
ei
ved. Either the AT reponse, or the data from the remote XBee node.
This is the data you just rec
ie
ved. Either the AT reponse, or the data from the remote XBee node.
<DT><B>
datalen
</B>
<DT><B>
datalen
</B>
<DD>
<DD>
...
...
libs/thirdParty/libxbee/doc/man/man3/xbee_senddata.3.html
View file @
3c48c8c1
...
@@ -80,7 +80,7 @@ If
...
@@ -80,7 +80,7 @@ If
has
has
<I>
waitforACK
</I>
<I>
waitforACK
</I>
enabled, then these functions return 1 when an ACK was not rec
ei
ved within 1 second.
enabled, then these functions return 1 when an ACK was not rec
ie
ved within 1 second.
<A
NAME=
"lbAF"
>
</A>
<A
NAME=
"lbAF"
>
</A>
<H2>
EXAMPLE
</H2>
<H2>
EXAMPLE
</H2>
...
...
libs/thirdParty/libxbee/doc/man/man3/xbee_setup.3.html
View file @
3c48c8c1
...
@@ -46,7 +46,7 @@ is the path to the serial port that the XBee is connected to (e.g. /dev/ttyUSB0)
...
@@ -46,7 +46,7 @@ is the path to the serial port that the XBee is connected to (e.g. /dev/ttyUSB0)
The
The
<I>
baudrate
</I>
<I>
baudrate
</I>
is the baud rate that the local XBee is configured to run at. The following are ava
il
able:
is the baud rate that the local XBee is configured to run at. The following are ava
li
able:
<PRE>
<PRE>
<B>
1200
</B>
<B>
1200
</B>
...
...
libs/thirdParty/libxbee/notes/v1-v2.txt
View file @
3c48c8c1
...
@@ -21,7 +21,7 @@ XBee 2.5
...
@@ -21,7 +21,7 @@ XBee 2.5
0x10* ZigBee Transmit Request
0x10* ZigBee Transmit Request
0x11 Explicit Addressing ZigBee Command Frame
0x11 Explicit Addressing ZigBee Command Frame
0x8B* ZigBee Transmit Status
0x8B* ZigBee Transmit Status
0x90* ZigBee Rec
ei
ve Packet
0x90* ZigBee Rec
ie
ve Packet
0x91 ZigBee Explicit Rx
0x91 ZigBee Explicit Rx
0x92 ZigBee IO Data Sample Rx
0x92 ZigBee IO Data Sample Rx
0x94 Xbee Sensor Read
0x94 Xbee Sensor Read
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment