X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Fao-test-baro%2Fao-test-baro.c;h=d617a83aa876d4c95c7cbfcca513cd21bf6fd04d;hb=72bcff4c1af10571314e5cbbe29f073de818088e;hp=d2b81e4f98fd0d8178e1803ad737194f905cc8e9;hpb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;p=fw%2Faltos diff --git a/ao-tools/ao-test-baro/ao-test-baro.c b/ao-tools/ao-test-baro/ao-test-baro.c index d2b81e4f..d617a83a 100644 --- a/ao-tools/ao-test-baro/ao-test-baro.c +++ b/ao-tools/ao-test-baro/ao-test-baro.c @@ -47,7 +47,7 @@ static void usage(char *program) exit(1); } -void +static void done(struct cc_usb *cc, int code) { /* cc_usb_printf(cc, "a\n"); */ @@ -55,28 +55,6 @@ done(struct cc_usb *cc, int code) exit (code); } -static int -ends_with(char *whole, char *suffix) -{ - int whole_len = strlen(whole); - int suffix_len = strlen(suffix); - - if (suffix_len > whole_len) - return 0; - return strcmp(whole + whole_len - suffix_len, suffix) == 0; -} - -static int -starts_with(char *whole, char *prefix) -{ - int whole_len = strlen(whole); - int prefix_len = strlen(prefix); - - if (prefix_len > whole_len) - return 0; - return strncmp(whole, prefix, prefix_len) == 0; -} - static char ** tok(char *line) { char **strs = malloc (sizeof (char *)), *str; @@ -140,16 +118,15 @@ free_baro(struct baro *b) { } } -char ** +static char ** find_baro(struct baro *b, char *word0) { - int i; for (;b; b = b->next) if (b->strs[0] && !strcmp(b->strs[0], word0)) return b->strs; return NULL; } -int +static int do_baro(struct cc_usb *usb) { struct baro *b = baro(usb); char **temp = find_baro(b, "Temperature:"); @@ -164,7 +141,7 @@ do_baro(struct cc_usb *usb) { double temperature = strtod(temp[2], NULL) / 100.0; double altitude = strtod(alt[1], NULL); - if (altitude < -50 || 3000 < altitude) { + if (altitude < -100 || 3000 < altitude) { printf ("weird altitude %f\n", altitude); free_baro(b); return 0; @@ -185,15 +162,9 @@ int main (int argc, char **argv) { char *device = NULL; - char *filename; - Elf *e; - unsigned int s; - int i; int c; - int tries; struct cc_usb *cc = NULL; char *tty = NULL; - int success; int verbose = 0; int ret = 0;