summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Hohensohn <hohensoh@rockbox.org>2004-09-10 15:41:40 +0000
committerJörg Hohensohn <hohensoh@rockbox.org>2004-09-10 15:41:40 +0000
commit7a9910ccb9d67aed276778cf1bdb48ebcc3fed38 (patch)
treeea1762d55005908e5d3c9833f63da3635369c956
parent76994fb50e81d9fe319d287f863ce8dc39b6a145 (diff)
downloadrockbox-7a9910ccb9d67aed276778cf1bdb48ebcc3fed38.zip
rockbox-7a9910ccb9d67aed276778cf1bdb48ebcc3fed38.tar.gz
rockbox-7a9910ccb9d67aed276778cf1bdb48ebcc3fed38.tar.bz2
rockbox-7a9910ccb9d67aed276778cf1bdb48ebcc3fed38.tar.xz
different ADC channels for Ondio
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5062 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/adc.h17
-rw-r--r--firmware/export/config-ondiofm.h4
-rw-r--r--firmware/export/config-ondiosp.h3
3 files changed, 24 insertions, 0 deletions
diff --git a/firmware/export/adc.h b/firmware/export/adc.h
index 1c94eec..cbc40e2 100644
--- a/firmware/export/adc.h
+++ b/firmware/export/adc.h
@@ -21,6 +21,21 @@
#define NUM_ADC_CHANNELS 8
+#ifdef HAVE_ONDIO_ADC
+
+#define ADC_MMC_SWITCH 0 /* Battery voltage always reads 0x3FF due to
+ silly scaling */
+#define ADC_USB_POWER 1 /* USB, reads 0x000 when USB is inserted */
+#define ADC_BUTTON_OPTION 2 /* the option button, low value if pressed */
+#define ADC_BUTTON_ONOFF 3 /* the on/off button, high value if pressed */
+#define ADC_BUTTON_ROW1 4 /* Used for scanning the keys, different
+ voltages for different keys */
+#define ADC_UNREG_POWER 7 /* Battery voltage */
+/* FixMe: this doesn't exist, just to make the compiler happy */
+#define ADC_EXT_POWER 5 /* The external power voltage, V=X*0.0148 */
+
+#else
+/* normal JBR channel assignment */
#define ADC_BATTERY 0 /* Battery voltage always reads 0x3FF due to
silly scaling */
#ifdef HAVE_FMADC
@@ -39,6 +54,8 @@
#define ADC_UNREG_POWER 6 /* Battery voltage with a better scaling */
#define ADC_EXT_POWER 7 /* The external power voltage, V=X*0.0148 */
+#endif
+
#define EXT_SCALE_FACTOR 14800
unsigned short adc_read(int channel);
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index 44742a6..62e7c86 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -54,3 +54,7 @@
/* Define this for different I2C pinout */
#define HAVE_ONDIO_I2C
+
+/* Define this for different ADC channel assignment */
+#define HAVE_ONDIO_ADC
+
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 8907d46..f8d04bf 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -54,3 +54,6 @@
/* Define this for different I2C pinout */
#define HAVE_ONDIO_I2C
+
+/* Define this for different ADC channel assignment */
+#define HAVE_ONDIO_ADC