Fixing serial handling

[tpg/opendispense2.git] / src / server / handler_coke.c

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index f8ed168..53cbd0f 100644 (file)
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -9,6 +9,7 @@
  */
 #include "common.h"
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -35,30 +36,53 @@ regex_t     gCoke_StatusRegex;
 // == CODE ===
 int Coke_InitHandler()
 {
-       giCoke_SerialFD = open(gsCoke_SerialPort, O_RDWR);
-       regexc(&gCoke_StatusRegex, "^$", REG_EXTENDED);
+       printf("connecting to coke machine...\n");
+       giCoke_SerialFD = open(gsCoke_SerialPort, O_RDWR | O_NOCTTY | O_NONBLOCK);
+       if( giCoke_SerialFD == -1 ) {
+               fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort);
+       }
+       
+       InitSerial(giCoke_SerialFD, 9600);
+       
+       CompileRegex(&gCoke_StatusRegex, "^slot\\s+(\\d)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
        return 0;
 }
 
 int Coke_CanDispense(int User, int Item)
 {
-       char    tmp[32];
+       char    tmp[32], *status;
        regmatch_t      matches[4];
+        int    ret;
 
        // Sanity please
-       if( Item < 0 || Item > 6 )      return -1;
+       if( Item < 0 || Item > 6 )      return -1;      // -EYOURBAD
        
        // Ask the coke machine
-       sprintf(tmp, "s%i", Item);
+       sprintf(tmp, "s%i\n", Item);
        write(giCoke_SerialFD, tmp, 2);
 
        // Read the response
-       read(giCoke_SerialFD, tmp, sizeof(tmp)-1);
-       regexec(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches);
-
-       printf("s%i response '%s'\n", Item, tmp);
-
-       return 0;
+       tmp[0] = '\0';
+       ret = read(giCoke_SerialFD, tmp, sizeof(tmp)-1);
+       //printf("ret = %i\n", ret);
+       if( ret <= 0 ) {
+               fprintf(stderr, "Coke machine is not being chatty (read = %i)\n", ret);
+               return -1;
+       }
+       ret = RunRegex(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, "Bad Response");
+       if( ret ) {
+               return -1;
+       }
+
+       tmp[ matches[3].rm_eo ] = '\0';
+       status = &tmp[ matches[3].rm_so ];
+
+       printf("Machine responded slot status '%s'\n", status);
+
+       if( strcmp(status, "full") == 0 )
+               return 0;
+
+       return 1;
 }
 
 /**
@@ -66,20 +90,24 @@ int Coke_CanDispense(int User, int Item)
  */
 int Coke_DoDispense(int User, int Item)
 {
-       char    tmp[32];
+       char    tmp[32], *status;
+       regmatch_t      matches[4];
 
        // Sanity please
        if( Item < 0 || Item > 6 )      return -1;
 
        // Dispense
-       sprintf(tmp, "d%i", Item);
+       sprintf(tmp, "d%i\n", Item);
        write(giCoke_SerialFD, tmp, 2);
 
        // Get status
        read(giCoke_SerialFD, tmp, sizeof(tmp)-1);
-       regexec(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches);
+       regexec(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, 0);
        
-       printf("d%i response '%s'\n", Item, tmp);
+       tmp[ matches[3].rm_eo ] = '\0';
+       status = &tmp[ matches[3].rm_so ];
+
+       printf("Machine responded slot status '%s'\n", status);
 
        return 0;
 }