Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 30 insertions, 2 deletions

diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index ec2def5a7..4601e971b 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -16,6 +16,7 @@
 #define  HIZ_TIMEOUT 1000
 //#define DEMO_TEMPERATURE
 //#define TEST_LONGER_PID_THREAD
+//#define HUNDRED_MICROSECONDS_DANCER_READ
 
 #define MAX_STRING_LEN              255 //Embedded  version + filter.c
 
@@ -48,8 +49,9 @@ enum
 #define Cartridge_MidTank_OFF 0
 #define Atm_MidTank_ON        1
 #define Atm_MidTank_OFF       0
-#define Mixer_Head            0
-#define Mixer_Waste           1
+//waste valve reversed
+#define Mixer_Head            1
+#define Mixer_Waste           0
 
 
 #define NEW  0
@@ -241,6 +243,32 @@ typedef enum
     CART3 = 3,
 }CARTREGE;
 */
+
+typedef struct
+{
+    bool DRAWER_BIG;   //bit 0
+    bool DRAWER_SMALL0;//bit 1
+    bool DRAWER_SMALL1;//bit 2
+    bool DRAWER_SMALL2;//bit 3
+    bool DRAWER_SMALL3;//bit 4
+    bool SYSTEM_FAN0;  //bit 5
+    bool SYSTEM_FAN1;  //bit 6
+    bool SYSTEM_FAN2;  //bit 7
+}FANS_STATUS;
+
+enum
+{
+    DRAWER_B,
+    DRAWER_S0,
+    DRAWER_S1,
+    DRAWER_S2,
+    DRAWER_S3,
+    SYSTEM_0,
+    SYSTEM_1,
+    SYSTEM_2,
+    MAX_FANS,
+}FANS_ID;
+
 //---------------------
 #define MaxFlashWords 128 //1K
 #define MaxFlashBytes MaxFlashWords*4 //4K Byte