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

1 files changed, 38 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index 755e5a962..91b3df6bf 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -29,8 +29,12 @@
 #define BTSR_NO_FEEDER_TFU
 #define BTSR_NO_PULLER_TFU
 #endif
-//#define USE_POWERSTEP01 -NA
 
+#define USE_RFID_STUB //stub only. to use it undef USE_RFID_LOGIC
+//#define RFID_READ_ONLY //
+#define USE_RFID_LOGIC //See more settings in RFID_Settings.h
+//#define USE_POWERSTEP01 -NA
+//#define LIGHT_COLORS
 //#define EMC_FORCE_MOT_CLOCK_INTERNAL
 
 //#define VAC_TEST
@@ -46,7 +50,7 @@ extern bool Special_Dispensers;
 
 #define USE_OLD_HEAD_EEPROM
 
-//#define USE_RFID
+
 //#define USE_VOC_BUZZER_ALARM
 
 #define I2C_2_Data_Transfer_Rate_400kbps
@@ -58,6 +62,7 @@ extern bool Special_Dispensers;
 
 #define NFC_HARDWARE_RESET 0x01
 
+#define REPEATED_INIT_FAILURE_LIMIT 10
 //#define RUN_AS_MAIN_JIG//(TEST_POWERSTEP01) send GATECFG parameters to work without sending parameters via machine studio + ADC + ADCINT
 
 #define ON  1
@@ -74,11 +79,12 @@ enum
     VERIFIED = 255
 };
 
-typedef enum Status_Enum
+typedef enum Status_Enum // don't change used for RFID
 {
-    S_NA,
-    S_SUCCEEDED,
-    S_FAILED
+    S_NA = 0,
+    S_SUCCEEDED = 1,
+    S_FAILED = -2,
+    S_NOTINUSE = -1
 }STATUS_ENUM;
 
 
@@ -304,6 +310,23 @@ typedef enum
 #define BIT30 0x40000000 //0x01 << 30
 #define BIT31 0x80000000 //0x01 << 31
 
+//LocalTimeInAScii
+typedef union
+{
+    struct
+    {
+        uint8_t DayH; //0
+        uint8_t DayL; //1
+        uint8_t SlashD; //2
+        uint8_t MonthH; //3
+        uint8_t MonthL; //4
+        uint8_t SlashM; //5
+        uint8_t YearH; //6
+        uint8_t YearL; //7
+    }Byte;
+    uint8_t Buf[8];
+    uint64_t Uint64;
+}TimeAScii;
 
 #define MAX_PWM_Command 100
 
@@ -319,6 +342,8 @@ typedef enum
     THREAD_LOAD ,
 }PANEL_BUTTON_OR_CRAT_ID;
 
+#define CART(readerID) ((PANEL_BUTTON_OR_CRAT_ID)(readerID+1))//readerID 0-2 , CRAT_ID 1-3
+
 typedef enum
 {
     MODE_OFF = 0,
@@ -635,9 +660,15 @@ Supports diagnostic <id> (--diag_suppress, - pds)
 #define HEAD6_PT100 TEMP_SENSE_AN_ENCLOSURETEMP3
 #define MIXER_PT100 TEMP_SENSE_ANALOG_MIXCHIP_TEMP
 
+#ifdef LIGHT_COLORS
+#define LUBRICANT_DISPENSER 9
+#define CLEANER_DISPENSER 9
+#define MAX_DYE_DISPENSERS MAX_SYSTEM_DISPENSERS
+#else
 #define LUBRICANT_DISPENSER 7
 #define CLEANER_DISPENSER 6
-//#define AUTO_HOME_DISPENSERS
+#define MAX_DYE_DISPENSERS 6
+#endif
 #define MAX_CARTRIDGES 3
 
 typedef enum