summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/adc.h10
-rw-r--r--firmware/export/config-h300.h2
2 files changed, 2 insertions, 10 deletions
diff --git a/firmware/export/adc.h b/firmware/export/adc.h
index 7a90afd9b5..a5ba583c38 100644
--- a/firmware/export/adc.h
+++ b/firmware/export/adc.h
@@ -21,7 +21,7 @@
21 21
22#include "config.h" 22#include "config.h"
23 23
24#ifdef IRIVER_H100_SERIES 24#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
25#define NUM_ADC_CHANNELS 4 25#define NUM_ADC_CHANNELS 4
26 26
27#define ADC_BUTTONS 0 27#define ADC_BUTTONS 0
@@ -30,14 +30,6 @@
30#define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ 30#define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */
31 31
32#else 32#else
33#ifdef IRIVER_H300
34/* TODO: we don't have enough info about the ADC for the H3x0 for now, so this
35 stuff is only added here for now to make things compile. */
36#define ADC_BUTTONS -2
37#define ADC_REMOTE -3
38unsigned char adc_scan(int channel);
39
40#endif
41 33
42#define NUM_ADC_CHANNELS 8 34#define NUM_ADC_CHANNELS 8
43 35
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 5343b657d9..a3d07a61bd 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -57,7 +57,7 @@
57/* Type of mobile power */ 57/* Type of mobile power */
58#define CONFIG_BATTERY BATT_LIPOL1300 58#define CONFIG_BATTERY BATT_LIPOL1300
59 59
60#define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ 60#define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */
61 61
62/* Define this if the platform can charge batteries */ 62/* Define this if the platform can charge batteries */
63#define HAVE_CHARGING 1 63#define HAVE_CHARGING 1