Diff: main.cpp

Revision:

12:81209b6a2318

Parent:

11:275b5ff86ab0

--- a/main.cpp	Wed Dec 04 10:19:04 2019 +0000
+++ b/main.cpp	Fri Dec 13 14:17:55 2019 +0000
@@ -85,7 +85,7 @@
 #define PORT       7778               //Automation port
 
 #define MBX_OPEN        "MBX_OPEN srvpat"  //"MBX_OPEN srv_pat"
-#define MBX_CLOSE       "MBX_DISCONNECT" 
+#define MBX_CLOSE       "MBX_DISCONNECT"
 #define MBX_COUNT       "MBX_COUNT STM32Insrv_" PROBER_NAME
 #define MBX_GET         "MBX_GET 5,STM32Insrv_" PROBER_NAME
 #define MBX_PUT_BEGIN   "MBX_PUT STM32Outsrv, CMD/A=\"WAPP\" MID/A=\"gnb3t" PROBER_NAME "\" MTY/A=\"E\" WAPPID/A=\""
@@ -111,11 +111,12 @@
 //IsTagPresent(): function to read the Tag ID
 //  Return false if no Tag present
 //  Return true if a Tag ID was read (Tag ID is saved int the bufTagID buffer)
-bool IsTagPresent(){
+bool IsTagPresent()
+{
     /*
     if (Antenna.PICC_IsNewCardPresent() && WappExchangeSwitch == 1){
         PC.printf("TAG detected ... ");
-        
+
         //Select one of the cards
         int count = 0;
         while (!Antenna.PICC_ReadCardSerial() && WappExchangeSwitch == 1 && count < TIMEOUT_WAITTAG){
@@ -126,13 +127,13 @@
             PC.printf("Timeout occured -> no Tag present\r\n");
             return false;
         }
-        if (WappExchangeSwitch == 0) return false;    
-        
+        if (WappExchangeSwitch == 0) return false;
+
         //Light during 1s Tag LED to indicate that a tag was read
         TagReadLED = LED_ON;
         wait_ms(500);
-        TagReadLED = LED_OFF;   
-        
+        TagReadLED = LED_OFF;
+
         //Save Tag ID into buffer
         PC.printf("ID = ");
         int pos = 0;
@@ -147,15 +148,15 @@
             bufTagID[pos] = hexbuf[1];
             pos++;
         }
-        PC.printf("\r\n");     
+        PC.printf("\r\n");
         return true;
     }
     else return false;
     */
-    
+
     //Look for new cards during 5s
     int timeout = 0;
-    while ( ! Antenna.PICC_IsNewCardPresent() && WappExchangeSwitch == 1 && timeout < TIMEOUT_WAITTAG) {
+    while ( ! Antenna.PICC_IsNewCardPresent() == 1 && timeout < TIMEOUT_WAITTAG) {
         wait_ms(100);
         timeout++;
     }
@@ -163,14 +164,14 @@
         PC.printf("Timeout occured -> no Tag present\r\n");
         return false;
     }
-    if (WappExchangeSwitch == 0) return false; 
-    PC.printf("TAG detected ... ");   
+    //if (WappExchangeSwitch == 0) return false;
+    PC.printf("TAG detected ... ");
 
     //pc.printf("Yes, tag is present... Try to read Tag ID\r\n");
-    
+
     //Select one of the cards
     timeout = 0;
-    while ( ! Antenna.PICC_ReadCardSerial() && WappExchangeSwitch == 1 && timeout < TIMEOUT_WAITTAG) {
+    while ( ! Antenna.PICC_ReadCardSerial() == 1 && timeout < TIMEOUT_WAITTAG) {
         wait_ms(100);
         timeout++;
     }
@@ -178,13 +179,13 @@
         PC.printf("Timeout occured during ReadCardSerial\r\n");
         return false;
     }
-    if (WappExchangeSwitch == 0) return false;    
-    
+    //if (WappExchangeSwitch == 0) return false;
+
     //Light during 1s Tag LED to indicate that a tag was read
     TagReadLED = LED_ON;
     wait_ms(500);
-    TagReadLED = LED_OFF;   
-    
+    TagReadLED = LED_OFF;
+
     //Save Tag ID into buffer
     PC.printf("ID = ");
     int pos = 0;
@@ -200,7 +201,7 @@
         pos++;
     }
     PC.printf("\r\n");
-        
+
     return true;
 }
 
@@ -208,72 +209,71 @@
 //  return 1 in case of alarm
 //  return 2 if apcd.connect failed
 //  return 0 if there is no alarm
-int APCDGetWappAlarm(){
+int APCDGetWappAlarm()
+{
     int result = 2;
     int rtrn = 2;
     int attempt = 0;
-    
+
     //Open a TCP socket
     rtrn = apcd.open(&eth);
     PC.printf("\r\nAPCDGetWappAlarm:\r\n");
     PC.printf("\tOpen socket -> %d\r\n", rtrn);
     blue = 1;
-    
+
     //Try APCD connection
     rtrn = apcd.connect(SERVER, PORT);
-    while (rtrn < 0 && attempt < SOCKETCONNECTION_ATTEMPT){
+    while (rtrn < 0 && attempt < SOCKETCONNECTION_ATTEMPT) {
         wait_ms(500);
         rtrn = apcd.connect(SERVER, PORT);
         attempt++;
     }
     PC.printf("\tConnection -> %d\r\n", rtrn);
-    
-    if (rtrn == 0){ //Automation server connection successfully
+
+    if (rtrn == 0) { //Automation server connection successfully
         APCDsendData(MBX_OPEN); //Open the APCD bus
         APCDgetData();
-        
+
         //Get message's number in the mailbox
         PC.printf("\tAPCD   -> %s\r\n", MBX_COUNT);
-        APCDsendData(MBX_COUNT); 
-        
+        APCDsendData(MBX_COUNT);
+
         //Extract the data from the string received
         char buf[256];
         sprintf(buf,"%s", APCDgetData());
         unsigned short int answerLen = strlen(buf);
         PC.printf("\tAnswer -> %s\r\n", buf);
-        if (answerLen > 10){ //Answer will be MBX_COUNT,xx where xx is the number of message
+        if (answerLen > 10) { //Answer will be MBX_COUNT,xx where xx is the number of message
             int nbMsg = 0;
             char nb[10];
             int pos = 10;
-            while (buf[pos] != '\0' && pos < 20){
+            while (buf[pos] != '\0' && pos < 20) {
                 nb[pos-10] = buf[pos];
                 pos++;
             }
             nb[pos-10] = '\0';
             nbMsg = atoi(nb);
             PC.printf("\tMsg count -> %d\r\n", nbMsg);
-            //If there is a message or more, get all message (=> mailbox will be empty) 
-            if (nbMsg > 0){
+            //If there is a message or more, get all message (=> mailbox will be empty)
+            if (nbMsg > 0) {
                 result = 1;
-                while (nbMsg > 0){ //Get all VFEI message in the mailbox
+                while (nbMsg > 0) { //Get all VFEI message in the mailbox
                     PC.printf("\tAPCD -> %s\r\n", MBX_GET);
                     APCDsendData(MBX_GET);
                     APCDgetData();
                     nbMsg--;
                 }
-            }
-            else result = 0;
+            } else result = 0;
         }
-          
+
         //Close the APCD bus
-        APCDsendData(MBX_CLOSE); 
+        APCDsendData(MBX_CLOSE);
         PC.printf("\tAPCD -> %s\r\n", MBX_CLOSE);
         APCDgetData();
-    }    
-    else result = 2;
-    
+    } else result = 2;
+
     apcd.close();
-    blue = 0;    
+    blue = 0;
     return result;
 }
 
@@ -281,7 +281,8 @@
 //  return 1 if data sent correctly
 //  return 2 if apcd.connect failed
 //  return 0 if sent data lenght doesn't match with message lenght
-int APCDSendTagID(){
+int APCDSendTagID()
+{
     int attempt = 0;
     int result = 2;
     int rtrn = 2;
@@ -291,7 +292,7 @@
     char concatBuffer[256];
     sprintf(concatBuffer, "%s%s%s\0", MBX_PUT_BEGIN, bufTagID, MBX_PUT_END);
     PC.printf("\tVFEI message : %s\r\n", concatBuffer);
-    
+
     //Open a TCP socket
     rtrn = apcd.open(&eth);
     PC.printf("\tOpen socket -> %d\r\n", rtrn);
@@ -299,7 +300,7 @@
 
     //Try APCD connection
     rtrn = apcd.connect(SERVER, PORT);
-    while (rtrn < 0 && attempt < SOCKETCONNECTION_ATTEMPT){
+    while (rtrn < 0 && attempt < SOCKETCONNECTION_ATTEMPT) {
         wait_ms(500);
         rtrn = apcd.connect(SERVER, PORT);
         attempt++;
@@ -307,7 +308,7 @@
     PC.printf("\tConnection -> %d\r\n", rtrn);
 
     //Send VFEI message if possible
-    if (rtrn == 0){
+    if (rtrn == 0) {
         PC.printf("\tAPCD -> %s\r\n", MBX_OPEN);
         APCDsendData(MBX_OPEN); //Open the APCD bus
         APCDgetData();
@@ -317,9 +318,8 @@
         APCDsendData(MBX_CLOSE); //Close the APCD bus
         APCDgetData();
         result = 1;
-    }
-    else result = 2;
-    
+    } else result = 2;
+
     apcd.close();
     blue = 0;
     return result;
@@ -328,10 +328,11 @@
 //APCDsendData: function to send data to APCD bus
 //  Return 1 if data sent correctly, 0 in other case
 //  Author: F. Frezot from Arduino code
-int APCDsendData (char *tcpCmd){
+int APCDsendData (char *tcpCmd)
+{
     unsigned short int dataLength = strlen(tcpCmd);
     unsigned char len[2];
-   
+
     len[0] = ((dataLength>>8)&0xFF); //MSB
     len[1] = ((dataLength>>0)&0xFF); //LSB
 
@@ -340,140 +341,138 @@
     if (rtrnLenght == dataLength) return 1;
     else return 0;
 }
-  
+
 
 //APCDgetData: function to read data from APCD bus
 //  Return a char array with data read
 //  Author: F. Frezot from Arduino code
-char *APCDgetData (){
+char *APCDgetData ()
+{
     char MSB[1];
     char LSB[1];
     unsigned short int dataLength;
     char readBuf[256] = "\0";
-    
+
     wait_ms(APCD_READ_DELAY);
 
     apcd.recv(MSB, 1);
     apcd.recv(LSB, 1);
-    dataLength = ((MSB[0]<<8)&0xFF00)|(LSB[0]<<0)&0x00FF;    
+    dataLength = ((MSB[0]<<8)&0xFF00)|(LSB[0]<<0)&0x00FF;
     apcd.recv(readBuf, dataLength);
-    
+
     return (readBuf);
- }
+}
 
-int main() {
+int main()
+{
     // Init Serial and nucleo board LED (off)
-    PC.baud(9600);    
+    PC.baud(9600);
     PC.printf("Running ...\r\n");
     green = 0;
     red = 0;
     blue = 0;
-    
+
     // Init RC522 Chip
     PC.printf("\tInit RFID...");
     wait_ms(500);
     Antenna.PCD_Init();
     wait_ms(100);
-    Antenna.PCD_AntennaOff(); //Turn off the RFID antenna.   
+    Antenna.PCD_AntennaOff(); //Turn off the RFID antenna.
     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
-    
+
     //Ethernet Init
     PC.printf("\tInit Ethernet...");
     eth.set_network(IP, MASK, GATEWAY);
     int rtrn = eth.connect();
     int reset_eth = 0;
-    if (rtrn == 0){
+    if (rtrn == 0) {
         PC.printf("DONE\r\n");
         const char *ip = eth.get_ip_address();
         const char *mac = eth.get_mac_address();
         PC.printf("\tIP  address = %s\n\r", ip ? ip : "No IP");
         PC.printf("\tMAC address = %s\n\r", mac ? mac : "No MAC");
         PC.printf("Running DONE\r\n\r\n");
-    }
-    else{
+    } else {
         PC.printf("FAIL -> Check if Network cable is plug-in then reset the board\r\n");
         red = 0;
         green = 0;
         PC.printf("Running FAIL -> Program aborted\r\n\r\n");
-        while (reset_eth <= 900){
+        while (reset_eth <= 900) {
             blue = !blue;
             TagReadLED = !TagReadLED;
             wait_ms(200);
             reset_eth++;
         }
         NVIC_SystemReset(); // reset system if no ethernet connection succeeded after 180sec Added by B. Tournier
-            
+
     }
-   
+
     //Waiting Tag and WAPP alarm
     int count = 0;
     int reset_trigger = 0;
     while (true) {
         //Check if Tag read
-        if (WappExchangeSwitch == 1){
+        //if (true) {
             //Turn on the antenna
             Antenna.PCD_AntennaOn();
             wait_ms(100);
-            
+
             //Waiting Tag ID
-            if (IsTagPresent()){
+            if (IsTagPresent()) {
                 green = 0;
-                int rtrn = APCDSendTagID();                
-                if (rtrn == 1){
+                int rtrn = APCDSendTagID();
+                if (rtrn == 1) {
                     PC.printf("\tTag ID sent correctly (Code=%d)\r\n", rtrn);
                     red = 0;
                     //Blink Tag LED during 3s
-                    for (int i = 0; i < 10; i++){
+                    for (int i = 0; i < 10; i++) {
                         TagReadLED = !TagReadLED;
                         wait_ms(500);
                     }
                     //Tag LED continuous ON during 1s
                     TagReadLED = LED_ON;
                     wait_ms(2000);
-                    
+
                     //Turn off Tag LED
-                    TagReadLED = LED_OFF; 
-                }
-                else {
+                    TagReadLED = LED_OFF;
+                } else {
                     PC.printf("\tWARNING: Fail to send Tag ID (Code=%d)\r\n", rtrn);
                     red = 1;
                 }
             }
             Antenna.PCD_AntennaOff();
-        }
+        //}
 
         //Check alarm each 4s
-        if (count >= 8){ // Count value = each xx seconds * 2. Example: Count >= 4 for check alarm each 2s
+        if (count >= 8) { // Count value = each xx seconds * 2. Example: Count >= 4 for check alarm each 2s
             green = 0;
             count = -1;
             int rtrn = APCDGetWappAlarm();
-            if (rtrn == 1){
+            if (rtrn == 1) {
                 red = 0;
-                PC.printf("Wapp alarm received -> Open interlock relay during 1s\r\n");
-                wait_ms(INTERLOCK_DELAY);
-                Interlock = RELAY_OPEN; //Activate the relay on prober interlock
-                wait_ms(1000);
-                Interlock = RELAY_CLOSED;
-                PC.printf("                    -> Close interlock relay\r\n");
-            }
-            else if (rtrn == 2){
+                PC.printf("Wapp alarm received");
+                          //wait_ms(INTERLOCK_DELAY);
+                          //Interlock = RELAY_OPEN; //Activate the relay on prober interlock
+                          wait_ms(2000);
+                          //Interlock = RELAY_CLOSED;
+                          //PC.printf("                    -> Close interlock relay\r\n");
+            } else if (rtrn == 2) {
                 PC.printf("WARNING: Fail to check if alarm is present (Code=%d)\r\n", rtrn);
                 red = 1;
-            }
-            else if (rtrn == 0){
+            } else if (rtrn == 0) {
                 red = 0;
             }
-        }    
+        }
 
         green = !green;
         count++;
         reset_trigger++;
         wait_ms(500);
-        if (reset_trigger >= 14400){
+        if (reset_trigger >= 14400) {
             NVIC_SystemReset(); // reset system each 2 hours
         }
     }