projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Remove unused ao_adc_get from ao_adc_stm.c
[fw/altos]
/
ao-tools
/
ao-edit-telem
/
ao-edit-telem.c
diff --git
a/ao-tools/ao-edit-telem/ao-edit-telem.c
b/ao-tools/ao-edit-telem/ao-edit-telem.c
index 3f6830e7518377520732b93ff379973e012e06df..92cde3dc73ee88be3532550bff301a6bd5e241ee 100644
(file)
--- a/
ao-tools/ao-edit-telem/ao-edit-telem.c
+++ b/
ao-tools/ao-edit-telem/ao-edit-telem.c
@@
-3,7
+3,8
@@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-72,7
+73,7
@@
int pending = 1;
static void
dump_saved(void);
static void
dump_saved(void);
-void
+
static
void
doit(union ao_telemetry_all *telem)
{
double lat, lon;
doit(union ao_telemetry_all *telem)
{
double lat, lon;
@@
-141,10
+142,9
@@
int
main (int argc, char **argv)
{
char line[80];
main (int argc, char **argv)
{
char line[80];
- int c, i, ret;
- char *s;
+ int c, i, ret = 0;
FILE *file;
FILE *file;
- int serial;
+
while ((c = getopt_long(argc, argv, "l:L:", options, NULL)) != -1) {
switch (c) {
case 'L':
while ((c = getopt_long(argc, argv, "l:L:", options, NULL)) != -1) {
switch (c) {
case 'L':
@@
-165,11
+165,6
@@
main (int argc, char **argv)
ret++;
continue;
}
ret++;
continue;
}
- s = strstr(argv[i], "-serial-");
- if (s)
- serial = atoi(s + 8);
- else
- serial = 0;
while (fgets(line, sizeof (line), file)) {
union ao_telemetry_all telem;
while (fgets(line, sizeof (line), file)) {
union ao_telemetry_all telem;