diff options
| author | Robert Garbee <robert@gag.com> | 2012-07-18 14:25:27 -0600 |
|---|---|---|
| committer | Robert Garbee <robert@gag.com> | 2012-07-18 14:25:27 -0600 |
| commit | e2b472bbb2418fc13be42dbc7c52beb88479c46d (patch) | |
| tree | 80c758082cad6517d86fb4aa31abc6a6049555eb /src/core/ao_telemetry.c | |
| parent | 75d6aa6f798606f1a6c5a46542065dda81e63b2a (diff) | |
| parent | b242f2756a8d9419a9bdba890b9e6b73560bdc19 (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src/core/ao_telemetry.c')
| -rw-r--r-- | src/core/ao_telemetry.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c index 583a6636..52ac9489 100644 --- a/src/core/ao_telemetry.c +++ b/src/core/ao_telemetry.c @@ -138,9 +138,9 @@ ao_send_mega_data(void) telemetry.mega_data.v_batt = packet->adc.v_batt; telemetry.mega_data.v_pyro = packet->adc.v_pbatt; - /* XXX figure out right shift value; 4 might suffice */ + /* ADC range is 0-4095, so shift by four to save the high 8 bits */ for (i = 0; i < AO_ADC_NUM_SENSE; i++) - telemetry.mega_data.sense[i] = packet->adc.sense[i] >> 8; + telemetry.mega_data.sense[i] = packet->adc.sense[i] >> 4; telemetry.mega_data.ground_pres = ao_ground_pres; telemetry.mega_data.ground_accel = ao_ground_accel; |