X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=fffa7b663d60f18bb09987a18a1aca4d56916671;hb=989710c614c291be681e272d96a0b65eb164232c;hp=188beb44ffb2b85ab9408e30715b71387cad89df;hpb=f66299331a4e635b3d25d3526e3900e67cd1895b;p=tpg%2Fopendispense2.git diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c index 188beb4..fffa7b6 100644 --- a/src/server/handler_coke.c +++ b/src/server/handler_coke.c @@ -18,14 +18,23 @@ #include #include #include +#include #define READ_TIMEOUT 2 // 2 seconds for ReadChar -#define TRACE_COKE 1 +#define TRACE_COKE 0 + +#if TRACE_COKE +# define TRACE(v...) do{printf("%s: ",__func__);printf(v);}while(0) +#else +# define TRACE(...) +#endif // === IMPORTS === // === 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, ...); @@ -42,145 +51,149 @@ 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; +time_t gtCoke_LastDispenseTime; // == CODE === int Coke_InitHandler() { - printf("connecting to coke machine...\n"); + CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED); + + printf("Connecting to coke machine on '%s'\n", gsCoke_SerialPort); giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600); if( giCoke_SerialFD == -1 ) { fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort); } else { + int i; + for( i = 0; i < 7; i ++ ) + gaCoke_CachedStatus[i] = -1; // Reset the slot names. // - Dunno why this is needed, but the machine plays silly // sometimes. - Writef("n0 Slot0\n"); + Writef("\r\n\r\n"); + WaitForColon(); + Writef("n0 Slot0\r\n"); if( !WaitForColon() ) { - Writef("n1 Slot1\n"); + Writef("n1 Slot1\r\n"); WaitForColon(); - Writef("n2 Slot2\n"); + Writef("n2 Slot2\r\n"); WaitForColon(); - Writef("n3 Slot3\n"); + Writef("n3 Slot3\r\n"); WaitForColon(); - Writef("n4 Slot4\n"); + Writef("n4 Slot4\r\n"); WaitForColon(); - Writef("n5 Slot5\n"); + Writef("n5 Slot5\r\n"); WaitForColon(); - Writef("n6 Coke\n"); + Writef("n6 Coke\r\n"); + WaitForColon(); + + Coke_int_UpdateSlotStatuses(); } + else + fprintf(stderr, "Coke machine timed out.\n"); } - CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED); + AddPeriodicFunction(Coke_int_UpdateSlotStatuses); + return 0; } -int Coke_CanDispense(int UNUSED(User), int Item) +int Coke_int_GetSlotStatus(char *Buffer, int Slot) { - char tmp[40], *status; regmatch_t matches[4]; int ret; - - // Sanity please - if( Item < 0 || Item > 6 ) return -1; // -EYOURBAD - - // Can't dispense if the machine is not connected - if( giCoke_SerialFD == -1 ) - return -2; - - #if TRACE_COKE - printf("Coke_CanDispense: Flushing\n"); - #endif + char *status; - - // Wait for a prompt - ret = 0; - while( WaitForColon() && ret < 3 ) - { - // Flush the input buffer - char tmpbuf[512]; - read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf)); - #if TRACE_COKE - printf("Coke_CanDispense: sending 'd7'\n"); - #endif - Writef("d7\r\n"); - ret ++; - } - // Check for a timeout error - if( !(ret < 3) ) { - fprintf(stderr, "Coke machine timed out\n"); - return -2; // -EMYBAD + // 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 ]; - // 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(); + TRACE("Machine responded slot %i status '%s'\n", Slot, status); + + if( strcmp(status, "full") == 0 ) { + gaCoke_CachedStatus[Slot] = 0; // 0: Avaliiable + return 0; } + else { + gaCoke_CachedStatus[Slot] = 1; // 1: Empty + return 1; + } +} - // TODO: Handle "not ok" response to D7 +/** + * \brief Update the status of all coke slots + * \note Uses goto to reduce the chance of the lock being kept + */ +void Coke_int_UpdateSlotStatuses(void) +{ + int i, len; + char tmp[40]; - #if TRACE_COKE - printf("Coke_CanDispense: sending 's%i'\n", Item); - #endif + if( giCoke_SerialFD == -1 ) return ; - // Ask the coke machine - Writef("s%i\r\n", Item); - - #if TRACE_COKE - 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); - #endif - // Read back-echoed lines - while( tmp[0] == ':' || tmp[1] != 'l' ) + pthread_mutex_lock(&gCoke_Mutex); + + while( ReadLine(sizeof tmp, tmp) >= 0 ) ; + TRACE("send d7\n"); + Writef("d7\r\n"); // Update slot statuses + if( WaitForColon() ) goto ret; + TRACE("send s\n"); + Writef("s\r\n"); + do { + i = ReadLine(sizeof tmp, tmp); // Read back what we just said + if( i == -1 ) { + TRACE("Eat read failed"); + goto ret; + } + } while(tmp[0] != ':' && tmp[1] != 's'); + + for( i = 0; i <= 6; i ++ ) { - 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 ) { - perror("Coke Machine"); + // Read until non-blank line + while( (len = ReadLine(sizeof tmp, tmp)) == 0 ) ; + if( len == -1 ) { + TRACE("Read failed on slot %i\n", i); + goto ret; // I give up :( } - return -1; + TRACE("tmp = '%s'\n", tmp); + Coke_int_GetSlotStatus(tmp, i); + } + // Eat blank line + len = ReadLine(sizeof tmp, tmp); + if( len == -1 ) { + TRACE("Read failed on blank line\n"); } - - #if TRACE_COKE - printf("Coke_CanDispense: wait for the prompt again\n"); - #endif - // Eat rest of response - WaitForColon(); + TRACE("Updated\n"); - // Parse status response - ret = RunRegex(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, "Bad Response"); - if( ret ) { - return -1; - } +ret: + pthread_mutex_unlock(&gCoke_Mutex); +} - // Get slot status - tmp[ matches[3].rm_eo ] = '\0'; - status = &tmp[ matches[3].rm_so ]; +int Coke_CanDispense(int UNUSED(User), int Item) +{ + // Sanity please + if( Item < 0 || Item > 6 ) return -1; // -EYOURBAD - #if TRACE_COKE - printf("Coke_CanDispense: Machine responded slot status '%s'\n", status); - #endif + // Can't dispense if the machine is not connected + if( giCoke_SerialFD == -1 ) + return -2; - if( strcmp(status, "full") == 0 ) - return 0; + // HACK! + // 2011-10-21: The sensors in slot 1 and 3 a bad, just ignore the sensor result + if( Item == 1 || Item == 3 ) return 0; - return 1; + return gaCoke_CachedStatus[Item]; } /** @@ -189,7 +202,7 @@ int Coke_CanDispense(int UNUSED(User), int Item) int Coke_DoDispense(int UNUSED(User), int Item) { char tmp[32]; - int ret; + int ret, len; // Sanity please if( Item < 0 || Item > 6 ) return -1; @@ -197,11 +210,21 @@ int Coke_DoDispense(int UNUSED(User), int Item) // Can't dispense if the machine is not connected if( giCoke_SerialFD == -1 ) return -2; + + // Make sure there are not two dispenses within n seconds + if( time(NULL) - gtCoke_LastDispenseTime < 10 ) + { + printf("Wait %li seconds?\n", 10 - (time(NULL) - gtCoke_LastDispenseTime)); + sleep( 10 - (time(NULL) - gtCoke_LastDispenseTime) ); + printf("wait done\n"); + } - #if TRACE_COKE - printf("Coke_DoDispense: flushing input\n"); - #endif + // LOCK + pthread_mutex_lock(&gCoke_Mutex); + TRACE("flushing input\n"); + + // Wait for prompt ret = 0; while( WaitForColon() && ret < 3 ) @@ -209,44 +232,68 @@ int Coke_DoDispense(int UNUSED(User), int Item) // Flush the input buffer char tmpbuf[512]; read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf)); - #if TRACE_COKE - printf("Coke_DoDispense: sending 'd7'\n"); - #endif + TRACE("sending 'd7'\n"); Writef("d7\r\n"); + ret ++; + } + if( ret == 3 ) + { + TRACE("timed out\n"); + pthread_mutex_unlock(&gCoke_Mutex); + return -1; } - #if TRACE_COKE - printf("Coke_DoDispense: sending 'd%i'\n", Item); - #endif + TRACE("sending 'd%i'\n", Item); // Dispense Writef("d%i\r\n", Item); // Read empty lines and echo-backs do { ret = ReadLine(sizeof(tmp)-1, tmp); - if( ret == -1 ) return -1; - #if TRACE_COKE - printf("Coke_DoDispense: read %i '%s'\n", ret, tmp); - #endif + if( ret == -1 ) { + pthread_mutex_unlock(&gCoke_Mutex); + return -1; + } + TRACE("read %i '%s'\n", ret, tmp); } while( ret == 0 || tmp[0] == ':' || tmp[0] == 'd' ); WaitForColon(); // Eat up rest of response - #if TRACE_COKE - printf("Coke_DoDispense: done\n"); - #endif + TRACE("done\n"); - // TODO: Regex + // TODO: Regex instead? 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; + ret = 0; + } + else { + printf("Coke_DoDispense: Machine returned unknown value '%s'\n", tmp); + ret = -1; + } + + TRACE("Updating slot status\n"); + + // Update status + WaitForColon(); + Writef("s%i\r\n", Item); + len = ReadLine(sizeof tmp, tmp); + if(len == -1) gaCoke_CachedStatus[Item] = -1; + Coke_int_GetSlotStatus(tmp, Item); + { + char buf[512]; + read(giCoke_SerialFD, buf, 512); // Flush } - printf("Machine returned unknown value '%s'\n", tmp); - - return -1; + gtCoke_LastDispenseTime = time(NULL); + + // Release and return + pthread_mutex_unlock(&gCoke_Mutex); + + //return ret; + // HACK!!! + return 0; } char ReadChar() @@ -263,15 +310,18 @@ char ReadChar() FD_SET(giCoke_SerialFD, &readfs); ret = select(giCoke_SerialFD+1, &readfs, NULL, NULL, &timeout); - if( ret == 0 ) return 0; // Timeout + if( ret == 0 ) { + fprintf(stderr, "ReadChar: Timeout of %is expired\n", READ_TIMEOUT); + return 0; // Timeout + } if( ret != 1 ) { - printf("readchar return %i\n", ret); + printf("ReadChar: select return %i\n", ret); return 0; } ret = read(giCoke_SerialFD, &ch, 1); if( ret != 1 ) { - printf("ret = %i\n", ret); + printf("ReadChar: ret != 1 (%i)\n", ret); return 0; } @@ -338,8 +388,6 @@ int ReadLine(int len, char *output) } } - //printf("ReadLine: output=%s\n", output); - if( !ch ) return -1; return i; }