2 files changed, 24 insertions, 6 deletions

diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h
index 20804c5007..1a835be3e8 100644
--- a/firmware/export/config-gmini120.h
+++ b/firmware/export/config-gmini120.h
@@ -12,17 +12,31 @@
 #define LCD_HEIGHT 64
 
 /* When button.h is updated with gmini details, then fix this: */
-#define CONFIG_KEYPAD /*GMINI_PAD */ IRIVER_H100_PAD
+#define CONFIG_KEYPAD GMINI100_PAD
+
+#define CONFIG_LCD GMINI100_LCD
 
 #ifndef SIMULATOR
 
-/* Define this if you have a CalmRISC16 */
-#define CONFIG_CPU CR16
+/* Define this if you have a TCC730 (CalmRISC16) */
+#define CONFIG_CPU TCC730
+
+/* Define this if you have a gmini 100 style LCD */
+#define CONFIG_LCD LCD_GMINI100
 
 /* Type of mobile power, FIXME: probably different, make new type */
-#define CONFIG_BATTERY
+#define CONFIG_BATTERY BATT_LIION2200
+#define BATTERY_SCALE_FACTOR 6465
+/* chosen values at random -- jyp */
 
 /* Define this if the platform can charge batteries */
 #define HAVE_CHARGING 1
 
+#define CPU_FREQ 30000000
+/* approximate value (and false in general since freq is variable) */
+
+/* Always enable debug till we stabilize */
+#define EMULATOR
+#define DEBUG
+
 #endif
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 45e8d890e3..75a1b3ff67 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -34,20 +34,24 @@
 /* CONFIG_CPU */
 #define SH7034  7034
 #define MCF5249 5249
-#define CR16    16   /* lacking a proper abbrivation */
+#define TCC730   730   /* lacking a proper abbrivation */
 
 /* CONFIG_KEYPAD */
 #define PLAYER_PAD      0
 #define RECORDER_PAD    1
 #define ONDIO_PAD       2
 #define IRIVER_H100_PAD 3
-#define GMINI_PAD       4
+#define GMINI100_PAD    4
 
 /* CONFIG_BATTERY */
 #define BATT_LIION2200      2200 /* FM/V2 recorder type */
 #define BATT_4AA_NIMH       1500
 #define BATT_3AAA_ALKALINE  1000
 
+/* CONFIG_LCD */
+#define LCD_GMINI100 0
+#define LCD_SSD1815  1 /* as used by Archos Recorders and Ondios */
+
 /* CONFIG_BACKLIGHT */
 #define BL_PA14_LO  0 /* Player, PA14 low active */
 #define BL_RTC      1 /* Recorder, RTC square wave output */