diff options
| author | Bdale Garbee <bdale@gag.com> | 2017-08-12 00:59:03 -0400 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2017-08-12 00:59:03 -0400 |
| commit | 59c6167b9f1e9de30455af1632e9a0b65d64ad63 (patch) | |
| tree | d27e4b3df53300081aa6ac0a30820c58a1c968ef /src/product | |
| parent | 41eedf88751910ea9c0a299444fbac769edb8427 (diff) | |
| parent | fccfa54bb3b746cecfcdc1fd497cf736bbfe3ef3 (diff) | |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'src/product')
| -rw-r--r-- | src/product/ao_micropeak.c | 5 | ||||
| -rw-r--r-- | src/product/ao_micropeak.h | 3 | ||||
| -rw-r--r-- | src/product/ao_telemini.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/product/ao_micropeak.c b/src/product/ao_micropeak.c index f9960eb8..8aac79cd 100644 --- a/src/product/ao_micropeak.c +++ b/src/product/ao_micropeak.c @@ -22,7 +22,6 @@ #include <ao_log_micro.h> #include <ao_async.h> -static struct ao_ms5607_sample sample; static struct ao_ms5607_value value; alt_t ground_alt, max_alt; @@ -31,8 +30,8 @@ alt_t ao_max_height; void ao_pa_get(void) { - ao_ms5607_sample(&sample); - ao_ms5607_convert(&sample, &value); + ao_ms5607_sample(&ao_ms5607_current); + ao_ms5607_convert(&ao_ms5607_current, &value); pa = value.pres; } diff --git a/src/product/ao_micropeak.h b/src/product/ao_micropeak.h index 6dc7a465..240eed59 100644 --- a/src/product/ao_micropeak.h +++ b/src/product/ao_micropeak.h @@ -19,7 +19,9 @@ #ifndef _AO_MICROPEAK_H_ #define _AO_MICROPEAK_H_ +#ifndef SAMPLE_SLEEP #define SAMPLE_SLEEP AO_MS_TO_TICKS(96) +#endif /* 64 sample, or about six seconds worth */ #define GROUND_AVG_SHIFT 6 @@ -36,6 +38,7 @@ #define AO_LOG_ID_MICROPEAK 0 #define AO_LOG_ID_MICROKITE 1 +#define AO_LOG_ID_MICROPEAK2 2 #ifndef AO_LOG_ID #define AO_LOG_ID AO_LOG_ID_MICROPEAK diff --git a/src/product/ao_telemini.c b/src/product/ao_telemini.c index b192763d..14414a48 100644 --- a/src/product/ao_telemini.c +++ b/src/product/ao_telemini.c @@ -19,8 +19,6 @@ #include "ao.h" #include "ao_pins.h" -__xdata uint8_t ao_force_freq; - void main(void) { |