summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 8fc37d3e75..0bb5193fc2 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.
86#include "plugin.h" 86#include "plugin.h"
87#include "time.h" 87#include "time.h"
88 88
89#if !(CONFIG_KEYPAD == IPOD_3G_PAD) /* let's not compile for 3g for now */
90
91PLUGIN_HEADER 89PLUGIN_HEADER
92 90
93#define CLOCK_VERSION "v3.0" 91#define CLOCK_VERSION "v3.0"
@@ -128,7 +126,7 @@ PLUGIN_HEADER
128#define MENU_BUTTON_TEXT "PLAY" 126#define MENU_BUTTON_TEXT "PLAY"
129#define COUNTER_BUTTON_TEXT "ON" 127#define COUNTER_BUTTON_TEXT "ON"
130 128
131#elif (CONFIG_KEYPAD == IPOD_4G_PAD) 129#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
132 130
133#define COUNTER_TOGGLE_BUTTON (BUTTON_PLAY|BUTTON_REL) 131#define COUNTER_TOGGLE_BUTTON (BUTTON_PLAY|BUTTON_REL)
134#define COUNTER_RESET_BUTTON (BUTTON_PLAY|BUTTON_REPEAT) 132#define COUNTER_RESET_BUTTON (BUTTON_PLAY|BUTTON_REPEAT)
@@ -2701,7 +2699,7 @@ void counter_settings(void)
2701 target_hour++; 2699 target_hour++;
2702 else 2700 else
2703 target_hour = 0; 2701 target_hour = 0;
2704#elif CONFIG_KEYPAD == IPOD_4G_PAD 2702#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
2705 if(target_hour > 0) 2703 if(target_hour > 0)
2706 target_hour--; 2704 target_hour--;
2707 else 2705 else
@@ -2713,7 +2711,7 @@ void counter_settings(void)
2713 target_minute++; 2711 target_minute++;
2714 else 2712 else
2715 target_minute = 0; 2713 target_minute = 0;
2716#elif CONFIG_KEYPAD == IPOD_4G_PAD 2714#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
2717 if(target_minute > 0) 2715 if(target_minute > 0)
2718 target_minute--; 2716 target_minute--;
2719 else 2717 else
@@ -2725,7 +2723,7 @@ void counter_settings(void)
2725 target_second++; 2723 target_second++;
2726 else 2724 else
2727 target_second = 0; 2725 target_second = 0;
2728#elif CONFIG_KEYPAD == IPOD_4G_PAD 2726#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
2729 if(target_second > 0) 2727 if(target_second > 0)
2730 target_second--; 2728 target_second--;
2731 else 2729 else
@@ -2749,7 +2747,7 @@ void counter_settings(void)
2749 target_hour--; 2747 target_hour--;
2750 else 2748 else
2751 target_hour = 9; 2749 target_hour = 9;
2752#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) 2750#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
2753 if(target_hour < 9) 2751 if(target_hour < 9)
2754 target_hour++; 2752 target_hour++;
2755 else 2753 else
@@ -2761,7 +2759,7 @@ void counter_settings(void)
2761 target_minute--; 2759 target_minute--;
2762 else 2760 else
2763 target_minute = 59; 2761 target_minute = 59;
2764#elif CONFIG_KEYPAD == IPOD_4G_PAD 2762#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
2765 if(target_minute < 59) 2763 if(target_minute < 59)
2766 target_minute++; 2764 target_minute++;
2767 else 2765 else
@@ -2773,7 +2771,7 @@ void counter_settings(void)
2773 target_second--; 2771 target_second--;
2774 else 2772 else
2775 target_second = 59; 2773 target_second = 59;
2776#elif CONFIG_KEYPAD == IPOD_4G_PAD 2774#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD)
2777 if(target_second < 59) 2775 if(target_second < 59)
2778 target_second++; 2776 target_second++;
2779 else 2777 else
@@ -3096,5 +3094,3 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
3096 } 3094 }
3097 } 3095 }
3098} 3096}
3099
3100#endif