summaryrefslogtreecommitdiff
path: root/apps/plugins/clock.c
diff options
context:
space:
mode:
authorZakk Roberts <midk@rockbox.org>2006-03-06 07:29:59 +0000
committerZakk Roberts <midk@rockbox.org>2006-03-06 07:29:59 +0000
commite4bb786ae21cd5828d251b9805a27f09981ed55d (patch)
treeab6d7294d48dff40865def1cc62f20d32a2c56d3 /apps/plugins/clock.c
parentb1b1026e1da9da7d3d472bd85cd78dbd62c5ae61 (diff)
downloadrockbox-e4bb786ae21cd5828d251b9805a27f09981ed55d.zip
rockbox-e4bb786ae21cd5828d251b9805a27f09981ed55d.tar.gz
rockbox-e4bb786ae21cd5828d251b9805a27f09981ed55d.tar.bz2
rockbox-e4bb786ae21cd5828d251b9805a27f09981ed55d.tar.xz
Actually. Let's build for the 3G.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8930 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/clock.c')
-rw-r--r--apps/plugins/clock.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c
index 8fc37d3..0bb5193 100644
--- a/apps/plugins/clock.c
+++ b/apps/plugins/clock.c
@@ -86,8 +86,6 @@ Original release, featuring analog / digital modes and a few options.
#include "plugin.h"
#include "time.h"
-#if !(CONFIG_KEYPAD == IPOD_3G_PAD) /* let's not compile for 3g for now */
-
PLUGIN_HEADER
#define CLOCK_VERSION "v3.0"
@@ -128,7 +126,7 @@ PLUGIN_HEADER
#define MENU_BUTTON_TEXT "PLAY"
#define COUNTER_BUTTON_TEXT "ON"
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
#define COUNTER_TOGGLE_BUTTON (BUTTON_PLAY|BUTTON_REL)
#define COUNTER_RESET_BUTTON (BUTTON_PLAY|BUTTON_REPEAT)
@@ -2701,7 +2699,7 @@ void counter_settings(void)
target_hour++;
else
target_hour = 0;
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
if(target_hour > 0)
target_hour--;
else
@@ -2713,7 +2711,7 @@ void counter_settings(void)
target_minute++;
else
target_minute = 0;
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
if(target_minute > 0)
target_minute--;
else
@@ -2725,7 +2723,7 @@ void counter_settings(void)
target_second++;
else
target_second = 0;
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
if(target_second > 0)
target_second--;
else
@@ -2749,7 +2747,7 @@ void counter_settings(void)
target_hour--;
else
target_hour = 9;
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
if(target_hour < 9)
target_hour++;
else
@@ -2761,7 +2759,7 @@ void counter_settings(void)
target_minute--;
else
target_minute = 59;
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
if(target_minute < 59)
target_minute++;
else
@@ -2773,7 +2771,7 @@ void counter_settings(void)
target_second--;
else
target_second = 59;
-#elif CONFIG_KEYPAD == IPOD_4G_PAD
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
if(target_second < 59)
target_second++;
else
@@ -3096,5 +3094,3 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
}
}
}
-
-#endif