diff options
| author | Bdale Garbee <bdale@gag.com> | 2014-06-15 17:47:41 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2014-06-15 17:47:41 -0600 |
| commit | c5cfc0d6e507d093987741b6ffaf69ebb24caa4b (patch) | |
| tree | a75b83343939e96592ac07178f2011d82ea6ded8 /src/core/ao_convert_volt.c | |
| parent | 1b3d07ede530fa40cb7257fb1725c969ba60e0f0 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge branch 'branch-1.4' into debian
Diffstat (limited to 'src/core/ao_convert_volt.c')
| -rw-r--r-- | src/core/ao_convert_volt.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/src/core/ao_convert_volt.c b/src/core/ao_convert_volt.c deleted file mode 100644 index 8556d423..00000000 --- a/src/core/ao_convert_volt.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright © 2014 Keith Packard <keithp@keithp.com> - * - * 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. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -#include "ao.h" - -#define scale(v,p,m) ((int32_t) (v) * (AO_ADC_REFERENCE_DV * ((p) + (m))) / (AO_ADC_MAX * (m))) - -int16_t -ao_battery_decivolt(int16_t adc) -{ - return scale(adc, AO_BATTERY_DIV_PLUS, AO_BATTERY_DIV_MINUS); -} - -int16_t -ao_ignite_decivolt(int16_t adc) -{ - return scale(adc, AO_IGNITE_DIV_PLUS, AO_IGNITE_DIV_MINUS); -} - |