X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=62ea17f0564f4e673ea90c5a14223a38729d0351;hb=ffc52312097ac25aaca6d20a132242f5f0670c5b;hp=abd35068cee045fd4a2493895a9581f864e169b7;hpb=c11136c3e42375573736b4ac2b6aadc7897114b4;p=tpg%2Fopendispense2.git diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c index abd3506..62ea17f 100644 --- a/src/server/handler_coke.c +++ b/src/server/handler_coke.c @@ -6,6 +6,9 @@ * * This file is licenced under the 3-clause BSD Licence. See the file * COPYING for full details. + * + * NOTES: + * - Remember, the coke machine echoes your text back to you! */ #include "common.h" #include @@ -15,6 +18,9 @@ #include #include +#define READ_TIMEOUT 2 // 2 seconds for ReadChar +#define TRACE_COKE 1 + // === IMPORTS === // === PROTOTYPES === @@ -45,35 +51,69 @@ int Coke_InitHandler() 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); + CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED); return 0; } -int Coke_CanDispense(int User, int Item) +int Coke_CanDispense(int UNUSED(User), int Item) { - char tmp[32], *status; + char tmp[40], *status; regmatch_t matches[4]; int ret; // Sanity please if( Item < 0 || Item > 6 ) return -1; // -EYOURBAD - write(giCoke_SerialFD, "d7\r\n", 4); - write(giCoke_SerialFD, "d7\r\n", 4); - write(giCoke_SerialFD, "d7\r\n", 4); + // Can't dispense if the machine is not connected + if( giCoke_SerialFD == -1 ) + return -2; + + #if TRACE_COKE + printf("Coke_CanDispense: Flushing"); + #endif + + // Flush the input buffer + { + char tmpbuf[512]; + read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf)); + } - if( WaitForColon() ) { + // Wait for a prompt + ret = 0; + do { + #if TRACE_COKE + printf("Coke_DoDispense: sending 'd7'"); + #endif + write(giCoke_SerialFD, "d7\r\n", 4); + } while( WaitForColon() && ret++ < 3 ); + + if( ret == 3 ) { fprintf(stderr, "Coke machine timed out\n"); return -2; // -EMYBAD } + + // TODO: Handle "not ok" response to D7 + + #if TRACE_COKE + printf("Coke_CanDispense: sending 's%i'", Item); + #endif // Ask the coke machine sprintf(tmp, "s%i\r\n", Item); write(giCoke_SerialFD, tmp, 4); - ret = ReadLine(sizeof(tmp)-1, tmp); + #if TRACE_COKE + printf("Coke_CanDispense: reading response"); + #endif + // Read from the machine (ignoring empty lines) + while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == 0 ); printf("ret = %i, tmp = '%s'\n", ret, tmp); - + if( tmp[0] == ':' ) { + ret = ReadLine(sizeof(tmp)-1, tmp); + printf("ret = %i, tmp = '%s'\n", ret, tmp); + } + + // Catch an error if( ret <= 0 ) { fprintf(stderr, "Coke machine is not being chatty (read = %i)\n", ret); if( ret == -1 ) { @@ -81,15 +121,29 @@ int Coke_CanDispense(int User, int Item) } return -1; } + + #if TRACE_COKE + printf("Coke_CanDispense: wait for the prompt again"); + #endif + + // Eat rest of response + WaitForColon(); + + // Parse status response ret = RunRegex(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, "Bad Response"); if( ret ) { return -1; } + // Get slot status tmp[ matches[3].rm_eo ] = '\0'; status = &tmp[ matches[3].rm_so ]; printf("Machine responded slot status '%s'\n", status); + + #if TRACE_COKE + printf("Coke_CanDispense: done"); + #endif if( strcmp(status, "full") == 0 ) return 0; @@ -100,31 +154,72 @@ int Coke_CanDispense(int User, int Item) /** * \brief Actually do a dispense from the coke machine */ -int Coke_DoDispense(int User, int Item) +int Coke_DoDispense(int UNUSED(User), int Item) { - char tmp[32], *status; - regmatch_t matches[4]; + char tmp[32]; + int i, ret; // Sanity please if( Item < 0 || Item > 6 ) return -1; - WaitForColon(); + // Can't dispense if the machine is not connected + if( giCoke_SerialFD == -1 ) + return -2; + + #if TRACE_COKE + printf("Coke_DoDispense: flushing input"); + #endif + // Flush the input buffer + { + char tmpbuf[512]; + read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf)); + } + + // Wait for prompt + i = 0; + do { + #if TRACE_COKE + printf("Coke_DoDispense: sending 'd7'"); + #endif + write(Item, "d7\r\n", 4); + } while( WaitForColon() && i++ < 3 ); + #if TRACE_COKE + printf("Coke_DoDispense: sending 'd%i'", Item); + #endif // Dispense sprintf(tmp, "d%i\r\n", Item); write(giCoke_SerialFD, tmp, 4); - WaitForColon(); - + // Read empty lines + while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == -1 ); + if( ret == -1 ) return -1; + // Read d%i + while( tmp[0] == ':' ) { + ret = ReadLine(sizeof(tmp)-1, tmp); + if( ret == -1 ) return -1; + } // Get status - ReadLine(sizeof(tmp)-1, tmp); + ret = ReadLine(sizeof(tmp)-1, tmp); + if( ret == -1 ) return -1; + + WaitForColon(); // Eat up rest of response - tmp[ matches[3].rm_eo ] = '\0'; - status = &tmp[ matches[3].rm_so ]; + #if TRACE_COKE + printf("Coke_DoDispense: done"); + #endif - printf("Machine responded slot status '%s'\n", status); + // TODO: Regex + if( strcmp(tmp, "ok") == 0 ) { + // We think dispense worked + // - The machine returns 'ok' if an empty slot is dispensed, even if + // it doesn't actually try to dispense (no sound) + return 0; + } - return 0; + printf("Machine returned unknown value '%s'\n", tmp); + + return -1; } char ReadChar() @@ -134,7 +229,7 @@ char ReadChar() int ret; struct timeval timeout; - timeout.tv_sec = 5; // 5 second timeout + timeout.tv_sec = READ_TIMEOUT; timeout.tv_usec = 0; FD_ZERO(&readfs); @@ -178,20 +273,24 @@ int ReadLine(int len, char *output) for(;;) { ch = ReadChar(); - - + if( i < len ) output[i++] = ch; if( ch == '\0' ) { - return -1; + break; } if( ch == '\n' || ch == '\r' ) { if( i < len ) output[--i] = '\0'; - return i; + break; } } + + //printf("ReadLine: output=%s\n", output); + + if( !ch ) return -1; + return i; }