Diff: main/def.h

Revision:

1:ea7307724f1c

Parent:

0:6c79a352010b

Child:

3:8ef3afcf4ade

--- a/main/def.h	Sat Feb 27 06:35:13 2016 +0000
+++ b/main/def.h	Sun Feb 28 06:38:03 2016 +0000
@@ -2,35 +2,22 @@
 #define _DEF_H_
 
 //4つの内どれか一つを定義する．
-//#define SD_CARD
-//#define ULTRA_SONIC//HC-SR04
-#define ULTRA_SONIC_2//HC-SR04_on_DebugBoard
-//#define COLOR_SENSOR//S9706→required for changing to S9032
+#define ULTRA_SONIC//HC-SR04
+//#define ULTRA_SONIC_2//HC-SR04_on_DebugBoard
 //#define IR_SENSOR//MCP3208
 
-#ifdef SD_CARD
-    #define BUFSIZE 40
-    #define FDATA_NUM 10
-#endif /*SD_CARD*/
-
 #if defined(ULTRA_SONIC) || defined(ULTRA_SONIC_2)
 
 #endif /*(ULTRA_SONIC) || (ULTRA_SONIC_2)*/
 
-#ifdef COLOR_SENSOR
-    #define SENSOR_NUM 3
-    #define COLOR_NUM 3
-    #define SENSOR_X_COLOR 9
-#endif /*COLOR_SENSOR*/
-
 #ifdef IR_SENSOR
     
     #define IC_NUM 3
     #define IR_NUM 8
     
-    #define IR_KEY 0xA
-    #define SHORT_SPOT 0
-    #define LONG_SPOT 1
+    #define IR_KEY 0x2
+    #define IR_SHORT 0
+    #define IR_LONG 1
     
     #define IR_NOTE_NONE    0x0
     #define IR_NOTE_FAR     0x1
@@ -41,6 +28,16 @@
     #define DIS_CLOSE 1000
     #define DIS_MORE_CLOSE 1500
     
+    #define DIS_0 0x0//low_value
+    #define DIS_1 0x1
+    #define DIS_2 0x2
+    #define DIS_3 0x3
+    #define DIS_4 0x4
+    #define DIS_5 0x5
+    #define DIS_6 0x6
+    #define DIS_7 0x7//high_value
+    
+    
     #define START_BIT   0x04
     #define MODE_SINGLE 0x02    // Single-ended mode
     #define MODE_DIFF   0x00    // Differential mode