Diff: conf.h

Revision:

15:07bfa25ba6ae

Parent:

14:ee6cc1632166

Child:

16:df39da7bef98

--- a/conf.h	Tue Mar 29 18:15:27 2011 +0000
+++ b/conf.h	Wed Mar 30 20:09:04 2011 +0000
@@ -7,8 +7,10 @@
 #define CONFIG_FILE "weather.cfg"
 
 
+#define CF_MAXLEN_VALUE 128
 #define CF_ACTION_EXPS 10
 #define CF_ACTION_NUM 10
+#define CF_TWITTER_NUM 5
 
 enum eEXPRESSION {
     EXP_NULL,
@@ -37,7 +39,8 @@
 };
 
 struct tAction {
-    int action;
+    char action;
+    char sub;
     int count;
     struct tExpression exps[CF_ACTION_EXPS];
 };
@@ -53,11 +56,11 @@
     int filetype, actionscount;
     struct tAction actions[CF_ACTION_NUM];
     char pachube_apikey[70], pachube_feedid[8];
-    char twitter_user[30], twitter_pwd[30], twitter_mesg[160];
+    char twitter_user[30], twitter_pwd[30], twitter_mesg[CF_TWITTER_NUM][CF_MAXLEN_VALUE];
     char stations_id[8], stations_pin[34];
     char snmp_commname[30];
-    char lcd_mesg[100];
-    char leddisp_mesg[100];
+    char lcd_mesg[CF_MAXLEN_VALUE];
+    char leddisp_mesg[CF_MAXLEN_VALUE];
     enum eINPUTTYPE inputtype;
 };