Diff: weather.h

Revision:

19:69b77f9e0446

Parent:

18:9286e5010c14

--- a/weather.h	Tue May 31 15:40:14 2011 +0000
+++ b/weather.h	Fri Jun 03 15:38:22 2011 +0000
@@ -19,14 +19,15 @@
 #define CF_TWITTER_NUM 5
 
 #define INPUT_NUM 2
-#define OUTPUT_NUM 4
-#define TIMER_NUM 4
-#define COUNTER_NUM 4
+#define OUTPUT_NUM 10
+#define TIMER_NUM 10
+#define COUNTER_NUM 10
 
 #define LED_FREQ 4 // x 0.1s
 
 enum eMNEMONIC {
     MNE_NULL,
+    MNE_DEF,
     MNE_LD, MNE_LDI, MNE_LDP, MNE_LDF,
     MNE_ALD, MNE_ALDI, MNE_ALDP, MNE_ALDF,
     MNE_OR, MNE_ORI, MNE_ORP, MNE_ORF,
@@ -64,9 +65,10 @@
 struct Sensor {
     float pres, temp, humi, light, anemo, vane, rain, uv, moist, temp2;
     time_t sec;
-    int input[INPUT_NUM], output[OUTPUT_NUM], timer_flg[TIMER_NUM];
-    unsigned long timer_cnt[TIMER_NUM];
-    unsigned long count[COUNTER_NUM];
+    int input[INPUT_NUM], output[OUTPUT_NUM];
+    int timer_flg[TIMER_NUM];
+    unsigned int timer_set[TIMER_NUM], timer_cnt[TIMER_NUM];
+    unsigned int count_set[COUNTER_NUM], count_cnt[COUNTER_NUM], count_rev[COUNTER_NUM];
 };
 
 struct Config {