More fiddling with coke code

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

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 3ab46c5..17f73a2 100644 (file)
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -21,6 +21,8 @@
  int   Coke_InitHandler();
  int   Coke_CanDispense(int User, int Item);
  int   Coke_DoDispense(int User, int Item);
+void   WaitForColon();
+ int   ReadLine(int len, char *output);
 
 // === GLOBALS ===
 tHandler       gCoke_Handler = {
@@ -37,10 +39,12 @@ regex_t     gCoke_StatusRegex;
 int Coke_InitHandler()
 {
        printf("connecting to coke machine...\n");
-       giCoke_SerialFD = open(gsCoke_SerialPort, O_RDWR);
+       
+       giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600);
        if( giCoke_SerialFD == -1 ) {
                fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort);
        }
+       
        CompileRegex(&gCoke_StatusRegex, "^slot\\s+(\\d)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
        return 0;
 }
@@ -54,16 +58,26 @@ int Coke_CanDispense(int User, int Item)
        // Sanity please
        if( Item < 0 || Item > 6 )      return -1;      // -EYOURBAD
        
+       write(giCoke_SerialFD, "\r\n", 2);
+       write(giCoke_SerialFD, "\r\n", 2);
+       write(giCoke_SerialFD, "\r\n", 2);
+       
+       WaitForColon();
+       
        // Ask the coke machine
-       sprintf(tmp, "s%i\n", Item);
-       write(giCoke_SerialFD, tmp, 2);
+       sprintf(tmp, "s%i\r\n", Item);
+       write(giCoke_SerialFD, tmp, 4);
+       
+       WaitForColon();
 
-       // Read the response
-       tmp[0] = '\0';
-       ret = read(giCoke_SerialFD, tmp, sizeof(tmp)-1);
-       //printf("ret = %i\n", ret);
+       ret = ReadLine(sizeof(tmp)-1, tmp);
+       printf("ret = %i, tmp = '%s'\n", ret, tmp);
+       
        if( ret <= 0 ) {
                fprintf(stderr, "Coke machine is not being chatty (read = %i)\n", ret);
+               if( ret == -1 ) {
+                       perror("Coke Machine");
+               }
                return -1;
        }
        ret = RunRegex(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, "Bad Response");
@@ -77,9 +91,9 @@ int Coke_CanDispense(int User, int Item)
        printf("Machine responded slot status '%s'\n", status);
 
        if( strcmp(status, "full") == 0 )
-               return 1;
+               return 0;
 
-       return 0;
+       return 1;
 }
 
 /**
@@ -93,13 +107,16 @@ int Coke_DoDispense(int User, int Item)
        // Sanity please
        if( Item < 0 || Item > 6 )      return -1;
 
+       WaitForColon();
+
        // Dispense
-       sprintf(tmp, "d%i\n", Item);
-       write(giCoke_SerialFD, tmp, 2);
+       sprintf(tmp, "d%i\r\n", Item);
+       write(giCoke_SerialFD, tmp, 4);
+       
+       WaitForColon();
 
        // Get status
-       read(giCoke_SerialFD, tmp, sizeof(tmp)-1);
-       regexec(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, 0);
+       ReadLine(sizeof(tmp)-1, tmp);
        
        tmp[ matches[3].rm_eo ] = '\0';
        status = &tmp[ matches[3].rm_so ];
@@ -109,4 +126,62 @@ int Coke_DoDispense(int User, int Item)
        return 0;
 }
 
+char ReadChar()
+{
+       fd_set  readfs;
+       char    ch = 0;
+        int    ret;
+       
+       FD_ZERO(&readfs);
+       FD_SET(giCoke_SerialFD, &readfs);
+       
+       ret = select(giCoke_SerialFD+1, &readfs, NULL, NULL, NULL);
+       if( ret != 1 ) {
+               printf("readchar return %i\n", ret);
+               return 0;
+       }
+       
+       ret = read(giCoke_SerialFD, &ch, 1);
+       if( ret != 1 ) {
+               printf("ret = %i\n", ret);
+               return 0;
+       }
+       
+       return ch;
+}
+
+void WaitForColon()
+{
+       fd_set  readfs;
+       char    ch = 0;
+       
+       FD_SET(giCoke_SerialFD, &readfs);
+       
+       while( (ch = ReadChar()) != ':' && ch != 0);
+}
+
+int ReadLine(int len, char *output)
+{
+       char    ch;
+        int    i = 0;
+       
+       for(;;)
+       {
+               ch = ReadChar();
+               
+               
+               if( i < len )
+                       output[i++] = ch;
+               
+               if( ch == '\0' ) {
+                       return -1;
+               }
+               if( ch == '\n' || ch == '\r' ) {
+                       if( i < len )
+                               output[--i] = '\0';
+                       return i;
+               }
+       }
+}
+