Diff: main.cpp

Revision:

1:24db8b26b816

Parent:

0:8814d243dfec

Child:

2:50210204232a

Child:

4:caf61234018c

--- a/main.cpp	Fri Apr 14 08:42:25 2017 +0000
+++ b/main.cpp	Wed Jul 05 12:16:13 2017 +0000
@@ -4,19 +4,20 @@
 
 
 //***************************** Change this for each new prober installation ********************************
-#define PROBER_NAME "tl12"
-#define IP          "10.129.97.100"
+#define PROBER_NAME "tl15"
+#define IP          "10.129.97.104"
 /*Please update the list below:
     TEL12 : 10.129.97.100
     TEL20 : 10.129.97.101
     TEL23 : 10.129.97.102
     TEL36 : 10.129.97.103
+    TEL15 : 10.129.97.104
 ************************************************************************************************************/
 
 
 //******************************************* RFID Antenna **************************************************
 //Cheap 13.56 Mhz RFID-RC522 module (This code is based on Martin Olejar's MFRC522 library. Minimal changes)
-//On Nucleo-F429ZI, SPI1 and SPI2 could not be used in the same time of EthernetInterface -> SPI4 used
+//On Nucleo-F429ZI, SPI1 and SPI2 could not be used in the same time with EthernetInterface -> SPI4 used
 //RFID IRQ=pin5    ->   Not used. Leave open
 //RFID MISO=pin4   ->   Nucleo SPI_MISO   ->  White   -> PE_5
 //RFID MOSI=pin3   ->   Nucleo SPI_MOSI   ->  Green   -> PE_6
@@ -44,8 +45,8 @@
 #define MF_RESET D8                   // Nucleo Pin for MFRC522 reset
 #define LED_ON 0
 #define LED_OFF 1
-#define RELAY_CLOSED 1
-#define RELAY_OPEN 0
+#define RELAY_CLOSED 0
+#define RELAY_OPEN 1
 
 #define INTERLOCK_DELAY 5000          // Delay (in milliseconds) between alarm received and relay off to simulate open interlock
 #define APCD_READ_DELAY 500           // Delay (in milliseconds) before read the APCD data
@@ -299,8 +300,8 @@
     TagReadLED = LED_OFF; //Turn off the LED who indicate if a TAG was read
     PC.printf("DONE\r\n");
 
-    PC.printf("\tClose relay for prober Interlock\r\n");
-    Interlock = RELAY_CLOSED; //Close relay for prober interlock
+    //PC.printf("\tClose relay for prober Interlock\r\n");
+    //Interlock = RELAY_CLOSED; //Close relay for prober interlock
     
     //Ethernet Init
     PC.printf("\tInit Ethernet...");