Browse Source

change back correction on thirdParty libs

QGC4.4
nopeppermint 9 years ago
parent
commit
3c48c8c151
  1. 2
      libs/thirdParty/fetchUpstream
  2. 2
      libs/thirdParty/libxbee/README
  3. 26
      libs/thirdParty/libxbee/api.c
  4. 2
      libs/thirdParty/libxbee/doc/man/man3/libxbee.3.html
  5. 6
      libs/thirdParty/libxbee/doc/man/man3/xbee_getpacket.3.html
  6. 16
      libs/thirdParty/libxbee/doc/man/man3/xbee_newcon.3.html
  7. 6
      libs/thirdParty/libxbee/doc/man/man3/xbee_pkt.3.html
  8. 2
      libs/thirdParty/libxbee/doc/man/man3/xbee_senddata.3.html
  9. 2
      libs/thirdParty/libxbee/doc/man/man3/xbee_setup.3.html
  10. 2
      libs/thirdParty/libxbee/notes/v1-v2.txt

2
libs/thirdParty/fetchUpstream vendored

@ -50,7 +50,7 @@ function processLib @@ -50,7 +50,7 @@ function processLib
exit 0
;;
*)
echo unknown lib, possibilities are: $libList
echo unknown lib, possiblities are: $libList
exit 1
esac
REPLY=

2
libs/thirdParty/libxbee/README vendored

@ -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
Documentation is available via the man page system once you have installed the
Documentation is avaliable via the man page system once you have installed the
library, or as HTML in the 'doc' directory.
$ man libxbee

26
libs/thirdParty/libxbee/api.c vendored

@ -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 */
retBuf[bufi] = '\0';
xbee_log("sendATdelay: Received '%s'",retBuf);
xbee_log("sendATdelay: Recieved '%s'",retBuf);
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:
1 - if NAC was received
1 - if NAC was recieved
0 - if packet was successfully sent (or just sent if waitforACK is off)
-1 - if there was an error building the packet
-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) {
xbee_mutex_unlock(xbee->pktmutex);
/*if (xbee->log) {
xbee_log("No packets available...");
xbee_log("No packets avaliable...");
}*/
return NULL;
}
l = NULL;
q = NULL;
/* get the first available packet for this connection */
/* get the first avaliable packet for this connection */
do {
/* does the packet match the connection? */
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... */
if (!l) {
if (xbee->log) {
xbee_logI("Received zero length packet!");
xbee_logI("Recived zero length packet!");
}
continue;
}
if (l > 100) {
if (xbee->log) {
xbee_logI("Received oversized packet! Length: %d",l - 1);
xbee_logI("Recived oversized packet! Length: %d",l - 1);
}
}
if (l > LISTEN_BUFLEN) {
if (xbee->log) {
xbee_logI("Received packet larger than buffer! Discarding...");
xbee_logI("Recived packet larger than buffer! Discarding...");
}
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 */
chksum += xbee_getbyte(xbee);
/* check if the whole packet was received, or something else occured... unlikely... */
/* check if the whole packet was recieved, or something else occured... unlikely... */
if (l>1) {
if (xbee->log) {
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);
/* ########################################## */
/* if: 16 / 64bit data receive */
/* if: 16 / 64bit data recieve */
} else if ((t == XBEE_64BIT_DATARX) ||
(t == XBEE_16BIT_DATARX)) {
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];
/* ########################################## */
/* if: 16 / 64bit I/O receive */
/* if: 16 / 64bit I/O recieve */
} else if ((t == XBEE_64BIT_IO) ||
(t == XBEE_16BIT_IO)) {
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;
/* ########################################## */
/* if: Series 2 data receive */
/* if: Series 2 data recieve */
} else if (t == XBEE2_DATARX) {
int offset;
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_sem_wait1sec(con->waitforACKsem);
switch (con->ACKstatus) {
case 0: xbee_log("ACK received!"); break;
case 1: xbee_log("NAK received..."); break;
case 0: xbee_log("ACK recieved!"); break;
case 1: xbee_log("NAK recieved..."); break;
case 2: xbee_log("CCA failure..."); break;
case 3: xbee_log("Purged..."); break;
case 255: default: xbee_log("Timeout...");

2
libs/thirdParty/libxbee/doc/man/man3/libxbee.3.html vendored

@ -38,7 +38,7 @@ or contact me (Attie) directly: @@ -38,7 +38,7 @@ or contact me (Attie) directly:
<A NAME="lbAD">&nbsp;</A>
<H2>MAN PAGES</H2>
Documentation is available via the following man pages, or by example in the 'sample' folder in the SVN repository
Documentation is avaliable via the following man pages, or by example in the 'sample' folder in the SVN repository
<P>
<B><A HREF="../man3/xbee_pkt.3.html">xbee_pkt</A></B>(3) - libxbee's packet structure

6
libs/thirdParty/libxbee/doc/man/man3/xbee_getpacket.3.html vendored

@ -26,7 +26,7 @@ xbee_getpacket @@ -26,7 +26,7 @@ xbee_getpacket
The
<B>xbee_getpacket</B>()
function will return the next available packet for the provided connection.
function will return the next avaliable packet for the provided connection.
It takes 1 argument.
<P>
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.
<P>
If a packet was not available for the provided connection, a
If a packet was not avaliable for the provided connection, a
<B>NULL</B>
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">&nbsp;</A>
<H2>EXAMPLE</H2>
To receive a packet from a previously made connection:
To recieve a packet from a previously made connection:
<PRE>
#include &lt;<A HREF="file:/usr/include/xbee.h">xbee.h</A>&gt;

16
libs/thirdParty/libxbee/doc/man/man3/xbee_newcon.3.html vendored

@ -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>
Packets will only be collected when they match an active connection.
You must setup a connection in order to receive packets.
You must setup a connection in order to recieve packets.
<P>
The argument
<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
<I>type</I>
specifies the type of connection you would like. The following types are available:
specifies the type of connection you would like. The following types are avaliable:
<DL COMPACT>
<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>
<DD>
receives transmit status information from the local XBee
recieves transmit status information from the local XBee
<DT><B>xbee_modemStatus</B>
<DD>
receives modem status information from the local XBee
recieves modem status information from the local XBee
<DT><B>xbee_16bitRemoteAT</B>
<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>
<DD>
sends/receives data through a remote node (using 16-bit addressing)
sends/recieves data through a remote node (using 16-bit addressing)
<DT><B>xbee_64bitData</B>
<DD>
sends/receives data through a remote node (using 64-bit addressing)
sends/recieves data through a remote node (using 64-bit addressing)
<DT><B>xbee_16bitIO</B>
<DD>
sends/receives I/O data through a remote node (using 16-bit addressing)
sends/recieves I/O data through a remote node (using 16-bit addressing)
<DT><B>xbee_64bitIO</B>
<DD>
sends/receives I/O data through a remote node (using 64-bit addressing)
sends/recieves I/O data through a remote node (using 64-bit addressing)
</DL>
<P>

6
libs/thirdParty/libxbee/doc/man/man3/xbee_pkt.3.html vendored

@ -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>
<DD>
This is the 2 character identifier for the AT command response you just received.
This is the 2 character identifier for the AT command response you just recieved.
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>
<DD>
These contain the address of the XBee that you received the packet from. You should really know this
These contain the address of the XBee that you recieved the packet from. You should really know this
because you setup the connection. However remote AT packets will contain both 16 and 64 bit
addresses.
<DT><B>data</B>
<DD>
This is the data you just received. Either the AT reponse, or the data from the remote XBee node.
This is the data you just recieved. Either the AT reponse, or the data from the remote XBee node.
<DT><B>datalen</B>
<DD>

2
libs/thirdParty/libxbee/doc/man/man3/xbee_senddata.3.html vendored

@ -80,7 +80,7 @@ If @@ -80,7 +80,7 @@ If
has
<I>waitforACK</I>
enabled, then these functions return 1 when an ACK was not received within 1 second.
enabled, then these functions return 1 when an ACK was not recieved within 1 second.
<A NAME="lbAF">&nbsp;</A>
<H2>EXAMPLE</H2>

2
libs/thirdParty/libxbee/doc/man/man3/xbee_setup.3.html vendored

@ -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
<I>baudrate</I>
is the baud rate that the local XBee is configured to run at. The following are available:
is the baud rate that the local XBee is configured to run at. The following are avaliable:
<PRE>
<B>1200</B>

2
libs/thirdParty/libxbee/notes/v1-v2.txt vendored

@ -21,7 +21,7 @@ XBee 2.5 @@ -21,7 +21,7 @@ XBee 2.5
0x10* ZigBee Transmit Request
0x11 Explicit Addressing ZigBee Command Frame
0x8B* ZigBee Transmit Status
0x90* ZigBee Receive Packet
0x90* ZigBee Recieve Packet
0x91 ZigBee Explicit Rx
0x92 ZigBee IO Data Sample Rx
0x94 Xbee Sensor Read

Loading…
Cancel
Save