X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=157f16de00ea3f61cc80384dfef1bd84bebcd7a4;hb=28d6d654a937490d5bc1c31a018a4dc7a99ac6fe;hp=15cb8d3ab1c279db1ec12e9c634f83ba7774bad3;hpb=bf1bc7b08525b09a783c0c9794542dbda7b52fd2;p=tpg%2Fopendispense2.git diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c index 15cb8d3..157f16d 100644 --- a/src/server/handler_coke.c +++ b/src/server/handler_coke.c @@ -13,33 +13,24 @@ #include "common.h" #include #include -#include -#include -#include -#include #include #include +#include +#include -#define READ_TIMEOUT 2 // 2 seconds for ReadChar -#define TRACE_COKE 0 +#define MIN_DISPENSE_PERIOD 5 -#if TRACE_COKE -# define TRACE(v...) do{printf("%s: ",__func__);printf(v);}while(0) -#else -# define TRACE(...) -#endif +// === CONSTANTS === +const int ciCoke_MinPeriod = 5; +const int ciCoke_DropBitBase = 0; +const int ciCoke_StatusBitBase = 0; // === 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, ...); - int WaitForColon(); - int ReadLine(int len, char *output); // === GLOBALS === tHandler gCoke_Handler = { @@ -48,145 +39,64 @@ tHandler gCoke_Handler = { Coke_CanDispense, Coke_DoDispense }; -char *gsCoke_SerialPort = "/dev/ttyS0"; - int giCoke_SerialFD; -regex_t gCoke_StatusRegex; - int gaCoke_CachedStatus[7]; -pthread_mutex_t gCoke_Mutex = PTHREAD_MUTEX_INITIALIZER; +const char *gsCoke_ModbusAddress = "130.95.13.73"; +modbus_t *gCoke_Modbus; time_t gtCoke_LastDispenseTime; + int gbCoke_DummyMode = 1; // == CODE === int Coke_InitHandler() { - 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"); - 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(); - } - else - fprintf(stderr, "Coke machine timed out.\n"); - } - - AddPeriodicFunction(Coke_int_UpdateSlotStatuses); - - 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 ]; - - 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; + // Configuable dummy/blank mode (all dispenses succeed) + // TODO: Find a better way of handling missing/invalid options + if( Config_GetValueCount("coke_dummy_mode") > 0 ) + { + gbCoke_DummyMode = Config_GetValue_Bool("coke_dummy_mode", 0); + if(gbCoke_DummyMode == -1) gbCoke_DummyMode = 0; } -} -/** - * \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( giCoke_SerialFD == -1 ) return ; - - 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 ++ ) + // Open modbus + if( !gbCoke_DummyMode ) { - // 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 :( + printf("Connecting to coke machine on '%s'\n", gsCoke_ModbusAddress); + + modbus_new_tcp(gsCoke_ModbusAddress, 502); + if( !gCoke_Modbus ) + { + perror("coke - modbus_new_tcp"); + } + + if( gCoke_Modbus && modbus_connect(gCoke_Modbus) ) + { + perror("coke - modbus_connect"); + modbus_free(gCoke_Modbus); + gCoke_Modbus = NULL; } - 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"); } - TRACE("Updated\n"); - -ret: - pthread_mutex_unlock(&gCoke_Mutex); + return 0; } int Coke_CanDispense(int UNUSED(User), int Item) { + uint8_t status; // Sanity please - if( Item < 0 || Item > 6 ) return -1; // -EYOURBAD + if( Item < 0 || Item > 6 ) return -1; + + // Check for 'dummy' mode + if( gbCoke_DummyMode ) + return 0; // Can't dispense if the machine is not connected - if( giCoke_SerialFD == -1 ) + if( !gCoke_Modbus ) return -2; - - return gaCoke_CachedStatus[Item]; + + if( modbus_read_bits(gCoke_Modbus, ciCoke_StatusBitBase + Item, 1, &status) ) + { + // TODO: Check for a connection issue + } + + return status == 0; } /** @@ -194,192 +104,32 @@ int Coke_CanDispense(int UNUSED(User), int Item) */ int Coke_DoDispense(int UNUSED(User), int Item) { - char tmp[32]; - int ret, len; - // Sanity please if( Item < 0 || Item > 6 ) return -1; + // Check for 'dummy' mode + if( gbCoke_DummyMode ) + return 0; + // Can't dispense if the machine is not connected - if( giCoke_SerialFD == -1 ) + if( !gCoke_Modbus ) return -2; // Make sure there are not two dispenses within n seconds - if( time(NULL) - gtCoke_LastDispenseTime < 10 ) + if( time(NULL) - gtCoke_LastDispenseTime < ciCoke_MinPeriod ) { - printf("Wait %li seconds?\n", 10 - (time(NULL) - gtCoke_LastDispenseTime)); - sleep( 10 - (time(NULL) - gtCoke_LastDispenseTime) ); + int delay = ciCoke_MinPeriod - (time(NULL) - gtCoke_LastDispenseTime); + printf("Wait %i seconds?\n", delay); + sleep( delay ); printf("wait done\n"); } - // LOCK - pthread_mutex_lock(&gCoke_Mutex); - - TRACE("flushing input\n"); - - - // Wait for prompt - ret = 0; - while( WaitForColon() && ret < 3 ) - { - // Flush the input buffer - char tmpbuf[512]; - read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf)); - TRACE("sending 'd7'\n"); - Writef("d7\r\n"); - ret ++; - } - if( ret == 3 ) - { - TRACE("timed out\n"); - pthread_mutex_unlock(&gCoke_Mutex); - return -1; - } - - 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 ) { - 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 - - TRACE("done\n"); - - // 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) - 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); + if( modbus_write_bit(gCoke_Modbus, ciCoke_DropBitBase + Item, 1) ) { - char buf[512]; - read(giCoke_SerialFD, buf, 512); // Flush + // TODO: Handle connection issues } - - gtCoke_LastDispenseTime = time(NULL); - - // Release and return - pthread_mutex_unlock(&gCoke_Mutex); - //return ret; - // HACK!!! return 0; } -char ReadChar() -{ - fd_set readfs; - char ch = 0; - int ret; - struct timeval timeout; - - timeout.tv_sec = READ_TIMEOUT; - timeout.tv_usec = 0; - - FD_ZERO(&readfs); - FD_SET(giCoke_SerialFD, &readfs); - - ret = select(giCoke_SerialFD+1, &readfs, NULL, NULL, &timeout); - if( ret == 0 ) return 0; // Timeout - if( ret != 1 ) { - printf("ReadChar: select return %i\n", ret); - return 0; - } - - ret = read(giCoke_SerialFD, &ch, 1); - if( ret != 1 ) { - printf("ReadChar: ret != 1 (%i)\n", ret); - return 0; - } - - 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; - char ch = 0; - - FD_SET(giCoke_SerialFD, &readfs); - - while( (ch = ReadChar()) != ':' && ch != 0); - - if( ch == 0 ) return -1; // Timeout - - return 0; -} - -int ReadLine(int len, char *output) -{ - char ch; - int i = 0; - - for(;;) - { - ch = ReadChar(); - - if( i < len ) - output[i++] = ch; - - if( ch == '\0' ) { - break; - } - if( ch == '\n' || ch == '\r' ) { - if( i < len ) - output[--i] = '\0'; - break; - } - } - - if( !ch ) return -1; - return i; -} - -