X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=09bcc8e95d4482feb17346a6c77b962a1875541d;hb=ec400f11ebc2e81079e464145915fb2d25602fbc;hp=62ea17f0564f4e673ea90c5a14223a38729d0351;hpb=ffc52312097ac25aaca6d20a132242f5f0670c5b;p=tpg%2Fopendispense2.git diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c index 62ea17f..09bcc8e 100644 --- a/src/server/handler_coke.c +++ b/src/server/handler_coke.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include #define READ_TIMEOUT 2 // 2 seconds for ReadChar #define TRACE_COKE 1 @@ -25,8 +27,11 @@ // === PROTOTYPES === int Coke_InitHandler(); + int Coke_int_GetSlotStatus(char *Buffer, int Slot); +void Coke_int_UpdateSlotStatuses(void); int Coke_CanDispense(int User, int Item); int Coke_DoDispense(int User, int Item); + int Writef(const char *Format, ...); int WaitForColon(); int ReadLine(int len, char *output); @@ -40,6 +45,8 @@ tHandler gCoke_Handler = { char *gsCoke_SerialPort = "/dev/ttyS0"; int giCoke_SerialFD; regex_t gCoke_StatusRegex; + int gaCoke_CachedStatus[7]; +pthread_mutex_t gCoke_Mutex = PTHREAD_MUTEX_INITIALIZER; // == CODE === int Coke_InitHandler() @@ -50,13 +57,92 @@ int Coke_InitHandler() if( giCoke_SerialFD == -1 ) { fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort); } + else { + // Reset the slot names. + // - Dunno why this is needed, but the machine plays silly + // sometimes. + Writef("n0 Slot0\n"); + if( !WaitForColon() ) + { + Writef("n1 Slot1\n"); + WaitForColon(); + Writef("n2 Slot2\n"); + WaitForColon(); + Writef("n3 Slot3\n"); + WaitForColon(); + Writef("n4 Slot4\n"); + WaitForColon(); + Writef("n5 Slot5\n"); + WaitForColon(); + Writef("n6 Coke\n"); + + Coke_int_UpdateSlotStatuses(); + } + } + + AddPeriodicFunction(Coke_int_UpdateSlotStatuses); CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED); return 0; } +int Coke_int_GetSlotStatus(char *Buffer, int Slot) +{ + regmatch_t matches[4]; + int ret; + char *status; + + // Parse status response + ret = RunRegex(&gCoke_StatusRegex, Buffer, sizeof(matches)/sizeof(matches[0]), matches, "Bad Response"); + if( ret ) { + return -1; + } + + // Get slot status + Buffer[ matches[3].rm_eo ] = '\0'; + status = &Buffer[ matches[3].rm_so ]; + + #if TRACE_COKE + printf("Coke_CanDispense: Machine responded slot status '%s'\n", status); + #endif + + if( strcmp(status, "full") == 0 ) { + gaCoke_CachedStatus[Slot] = 0; // 0: Avaliiable + return 0; + } + else { + gaCoke_CachedStatus[Slot] = 1; // 1: Empty + return 1; + } +} + +void Coke_int_UpdateSlotStatuses(void) +{ + int i; + int len; + char tmp[40]; + + pthread_mutex_lock(&gCoke_Mutex); + + if( WaitForColon() ) return ; + Writef("d7\r\n"); // Update slot statuses + WaitForColon(); + Writef("s\n"); + ReadLine(sizeof tmp, tmp); // Read back what we just said + + for( i = 0; i <= 6; i ++ ) + { + len = ReadLine(sizeof tmp, tmp); + if( len == -1 ) return ; // I give up :( + Coke_int_GetSlotStatus(tmp, i); + } + pthread_mutex_unlock(&gCoke_Mutex); +} + int Coke_CanDispense(int UNUSED(User), int Item) { + // Disabled in favor of caching + #if 0 char tmp[40], *status; regmatch_t matches[4]; int ret; @@ -69,47 +155,60 @@ int Coke_CanDispense(int UNUSED(User), int Item) return -2; #if TRACE_COKE - printf("Coke_CanDispense: Flushing"); + printf("Coke_CanDispense: Flushing\n"); #endif - // Flush the input buffer - { - char tmpbuf[512]; - read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf)); - } // Wait for a prompt ret = 0; - do { + while( WaitForColon() && ret < 3 ) + { + // Flush the input buffer + char tmpbuf[512]; + read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf)); #if TRACE_COKE - printf("Coke_DoDispense: sending 'd7'"); + printf("Coke_CanDispense: sending 'd7'\n"); #endif - write(giCoke_SerialFD, "d7\r\n", 4); - } while( WaitForColon() && ret++ < 3 ); - - if( ret == 3 ) { + Writef("d7\r\n"); + ret ++; + } + // Check for a timeout error + if( !(ret < 3) ) { fprintf(stderr, "Coke machine timed out\n"); return -2; // -EMYBAD } + + // You need to do a 'd7' before reading the status + // - Otherwise it sometimes reports a full slot as empty + // [TPG] (2011-02-19) + if( ret == 0 ) + { + Writef("d7\r\n"); + WaitForColon(); + } // TODO: Handle "not ok" response to D7 #if TRACE_COKE - printf("Coke_CanDispense: sending 's%i'", Item); + printf("Coke_CanDispense: sending 's%i'\n", Item); #endif // Ask the coke machine - sprintf(tmp, "s%i\r\n", Item); - write(giCoke_SerialFD, tmp, 4); + Writef("s%i\r\n", Item); #if TRACE_COKE - printf("Coke_CanDispense: reading response"); + printf("Coke_CanDispense: reading response\n"); #endif // Read from the machine (ignoring empty lines) while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == 0 ); + #if TRACE_COKE printf("ret = %i, tmp = '%s'\n", ret, tmp); - if( tmp[0] == ':' ) { + #endif + // Read back-echoed lines + while( tmp[0] == ':' || tmp[1] != 'l' ) + { ret = ReadLine(sizeof(tmp)-1, tmp); + if( ret == -1 ) return -1; printf("ret = %i, tmp = '%s'\n", ret, tmp); } @@ -123,32 +222,23 @@ int Coke_CanDispense(int UNUSED(User), int Item) } #if TRACE_COKE - printf("Coke_CanDispense: wait for the prompt again"); + printf("Coke_CanDispense: wait for the prompt again\n"); #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); + return Coke_GetSlotStatus(tmp, Item); + #else + // Sanity please + if( Item < 0 || Item > 6 ) return -1; // -EYOURBAD - #if TRACE_COKE - printf("Coke_CanDispense: done"); + // Can't dispense if the machine is not connected + if( giCoke_SerialFD == -1 ) + return -2; + + return gaCoke_CachedStatus[Item]; #endif - - if( strcmp(status, "full") == 0 ) - return 0; - - return 1; } /** @@ -157,7 +247,7 @@ int Coke_CanDispense(int UNUSED(User), int Item) int Coke_DoDispense(int UNUSED(User), int Item) { char tmp[32]; - int i, ret; + int ret, len; // Sanity please if( Item < 0 || Item > 6 ) return -1; @@ -166,47 +256,48 @@ int Coke_DoDispense(int UNUSED(User), int Item) if( giCoke_SerialFD == -1 ) return -2; + // LOCK + pthread_mutex_lock(&gCoke_Mutex); + #if TRACE_COKE - printf("Coke_DoDispense: flushing input"); + printf("Coke_DoDispense: flushing input\n"); #endif - // Flush the input buffer + + // Wait for prompt + ret = 0; + while( WaitForColon() && ret < 3 ) { + // 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'"); + printf("Coke_DoDispense: sending 'd7'\n"); #endif - write(Item, "d7\r\n", 4); - } while( WaitForColon() && i++ < 3 ); + Writef("d7\r\n"); + } #if TRACE_COKE - printf("Coke_DoDispense: sending 'd%i'", Item); + printf("Coke_DoDispense: sending 'd%i'\n", Item); #endif // Dispense - sprintf(tmp, "d%i\r\n", Item); - write(giCoke_SerialFD, tmp, 4); - - // Read empty lines - while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == -1 ); - if( ret == -1 ) return -1; - // Read d%i - while( tmp[0] == ':' ) { + Writef("d%i\r\n", Item); + + // Read empty lines and echo-backs + do { ret = ReadLine(sizeof(tmp)-1, tmp); - if( ret == -1 ) return -1; - } - // Get status - ret = ReadLine(sizeof(tmp)-1, tmp); - if( ret == -1 ) return -1; + if( ret == -1 ) { + pthread_mutex_unlock(&gCoke_Mutex); + return -1; + } + #if TRACE_COKE + printf("Coke_DoDispense: read %i '%s'\n", ret, tmp); + #endif + } while( ret == 0 || tmp[0] == ':' || tmp[0] == 'd' ); WaitForColon(); // Eat up rest of response #if TRACE_COKE - printf("Coke_DoDispense: done"); + printf("Coke_DoDispense: done\n"); #endif // TODO: Regex @@ -214,12 +305,23 @@ int Coke_DoDispense(int UNUSED(User), int Item) // 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; + ret = 0; } - - printf("Machine returned unknown value '%s'\n", tmp); - - return -1; + else { + printf("Machine returned unknown value '%s'\n", tmp); + ret = -1; + } + + // Update status + Writef("s%i\r\n", Item); + len = ReadLine(sizeof tmp, tmp); + if(len == -1) gaCoke_CachedStatus[Item] = -1; + Coke_int_GetSlotStatus(tmp, Item); + + + pthread_mutex_unlock(&gCoke_Mutex); + + return ret; } char ReadChar() @@ -251,6 +353,30 @@ char ReadChar() return ch; } +int Writef(const char *Format, ...) +{ + va_list args; + int len; + + va_start(args, Format); + len = vsnprintf(NULL, 0, Format, args); + va_end(args); + + { + char buf[len+1]; + va_start(args, Format); + vsnprintf(buf, len+1, Format, args); + va_end(args); + + #if DEBUG + printf("Writef: %s", buf); + #endif + + return write(giCoke_SerialFD, buf, len); + } + +} + int WaitForColon() { fd_set readfs;