Diff: Codes/EventDetector.cpp

Revision:

1:fe2d4530da1b

Parent:

0:66d8bd1f9d4c

Child:

2:628a25bb5d62

--- a/Codes/EventDetector.cpp	Thu Sep 04 19:40:18 2014 +0000
+++ b/Codes/EventDetector.cpp	Fri Sep 12 13:08:14 2014 +0000
@@ -229,19 +229,25 @@
     outlet_number = Settings::get_Outlet(aux);
     
     //Temporario - Sem leitor de RFID    
-    char rfid[9] = "1234560";
-    rfid[7] = (char)outlet_number + '0';
+    //char rfid[9] = "1234560";
+    //rfid[7] = (char)outlet_number + '0';
     
     // Com leitor de RFID
-    /*
+    char rfid[9];
+    rfid[0] = '\0';
     //send hitag request
     //capture hitag response
     //printf("OUTLET=%d\n",outlet_index+1);
     
-    if(m_OutletTriggered)
-        Capture::ReadRFID(outlet_index+1,m_RFID);
-    */
-    
+    if(m_OutletTriggered){
+        //Capture::ReadRFID(outlet_number+1,rfid);
+        if (! Capture::ReadRFID(outlet_number+1,rfid) ){ // não leu tag RFID
+            printf("Entrou\n");
+            strcpy(rfid, "1234560");
+            rfid[7] = (char)outlet_number + '0';
+        }
+        //printf("#%s#\n", rfid);
+    }        
            
     if(Settings::get_Purpose(m_Channel) == 'p') // phase channel 
     {