X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=21d61f68ca2bb5b663763cbaceb7ec941e14b229;hb=da639e3f13ee62627f4e7b29eccfcac70aad681d;hp=ee7b869f0abc4dd2a2526d2d30159d140898f948;hpb=54085f9d3fa0c1b1eeb3a82a0c4a6e3400d9961c;p=tpg%2Fopendispense2.git diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c index ee7b869..21d61f6 100644 --- a/src/server/handler_coke.c +++ b/src/server/handler_coke.c @@ -13,13 +13,17 @@ #include "common.h" #include #include +#include +#include #include -#include -#include -#include +#include -#define READ_TIMEOUT 2 // 2 seconds for ReadChar -#define TRACE_COKE 1 +#define MIN_DISPENSE_PERIOD 5 + +// === CONSTANTS === +const int ciCoke_MinPeriod = 5; +const int ciCoke_DropBitBase = 0; +const int ciCoke_StatusBitBase = 0; // === IMPORTS === @@ -27,8 +31,6 @@ int Coke_InitHandler(); int Coke_CanDispense(int User, int Item); int Coke_DoDispense(int User, int Item); - int WaitForColon(); - int ReadLine(int len, char *output); // === GLOBALS === tHandler gCoke_Handler = { @@ -37,138 +39,58 @@ tHandler gCoke_Handler = { Coke_CanDispense, Coke_DoDispense }; -char *gsCoke_SerialPort = "/dev/ttyS0"; - int giCoke_SerialFD; -regex_t gCoke_StatusRegex; +const char *gsCoke_ModbusAddress = "130.95.13.73"; +modbus_t *gCoke_Modbus; +time_t gtCoke_LastDispenseTime; + int gbCoke_DummyMode = 1; // == CODE === int Coke_InitHandler() { - printf("connecting to coke machine...\n"); - - giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600); - 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. - write(giCoke_SerialFD, "n0 Slot0\n", 9); - WaitForColon(); - write(giCoke_SerialFD, "n1 Slot0\n", 9); - WaitForColon(); - write(giCoke_SerialFD, "n2 Slot0\n", 9); - WaitForColon(); - write(giCoke_SerialFD, "n3 Slot0\n", 9); - WaitForColon(); - write(giCoke_SerialFD, "n4 Slot0\n", 9); - WaitForColon(); - write(giCoke_SerialFD, "n5 Slot0\n", 9); - WaitForColon(); - write(giCoke_SerialFD, "n6 Coke\n", 8); - } - - CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED); - return 0; -} - -int Coke_CanDispense(int UNUSED(User), int Item) -{ - char tmp[40], *status; - regmatch_t matches[4]; - int ret; + printf("Connecting to coke machine on '%s'\n", gsCoke_ModbusAddress); - // 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 - - - // Wait for a prompt - ret = 0; - while( WaitForColon() && ret < 3 ) + // Configuable dummy/blank mode (all dispenses succeed) + // TODO: Find a better way of handling missing/invalid options + if( Config_GetValueCount("coke_dummy_mode") > 0 ) { - // Flush the input buffer - char tmpbuf[512]; - read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf)); - #if TRACE_COKE - printf("Coke_CanDispense: sending 'd7'\n"); - #endif - write(giCoke_SerialFD, "d7\r\n", 4); - ret ++; + gbCoke_DummyMode = Config_GetValue_Bool("coke_dummy_mode", 0); + if(gbCoke_DummyMode == -1) gbCoke_DummyMode = 0; } - 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'\n", Item); - #endif - - // Ask the coke machine - sprintf(tmp, "s%i\r\n", Item); - write(giCoke_SerialFD, tmp, 4); - - #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 ); - printf("ret = %i, tmp = '%s'\n", ret, tmp); - // Read back-echoed lines - while( tmp[0] == ':' || tmp[1] != 'l' ) + // Open modbus + modbus_new_tcp(gsCoke_ModbusAddress, 502); + if( !gCoke_Modbus ) { - ret = ReadLine(sizeof(tmp)-1, tmp); - printf("ret = %i, tmp = '%s'\n", ret, tmp); + perror("coke - modbus_new_tcp"); } - - // Catch an error - if( ret <= 0 ) { - fprintf(stderr, "Coke machine is not being chatty (read = %i)\n", ret); - if( ret == -1 ) { - perror("Coke Machine"); + else + { + if( modbus_connect(gCoke_Modbus) ) + { + perror("coke - modbus_connect"); } - return -1; } - - #if TRACE_COKE - 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; - } + return 0; +} - // Get slot status - tmp[ matches[3].rm_eo ] = '\0'; - status = &tmp[ matches[3].rm_so ]; +int Coke_CanDispense(int UNUSED(User), int Item) +{ + uint8_t status; + // Sanity please + if( Item < 0 || Item > 6 ) return -1; - printf("Machine responded slot status '%s'\n", status); + // Check for 'dummy' mode + if( gbCoke_DummyMode ) + return 0; - #if TRACE_COKE - printf("Coke_CanDispense: done"); - #endif + // Can't dispense if the machine is not connected + if( !gCoke_Modbus ) + return -2; - if( strcmp(status, "full") == 0 ) - return 0; + modbus_read_bits(gCoke_Modbus, ciCoke_StatusBitBase + Item, 1, &status); - return 1; + return status == 0; } /** @@ -176,137 +98,29 @@ int Coke_CanDispense(int UNUSED(User), int Item) */ int Coke_DoDispense(int UNUSED(User), int Item) { - char tmp[32]; - int ret; - // 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; - - #if TRACE_COKE - printf("Coke_DoDispense: flushing input\n"); - #endif - - // Wait for 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_DoDispense: sending 'd7'\n"); - #endif - write(Item, "d7\r\n", 4); - } - - #if TRACE_COKE - 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 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 - } while( ret == 0 || tmp[0] == ':' || tmp[0] == 'd' ); - - WaitForColon(); // Eat up rest of response - - #if TRACE_COKE - printf("Coke_DoDispense: done\n"); - #endif - - // 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; - } - - printf("Machine returned unknown value '%s'\n", tmp); - return -1; -} - -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 return %i\n", ret); - return 0; - } - - ret = read(giCoke_SerialFD, &ch, 1); - if( ret != 1 ) { - printf("ret = %i\n", ret); - return 0; + // Make sure there are not two dispenses within n seconds + if( time(NULL) - gtCoke_LastDispenseTime < ciCoke_MinPeriod ) + { + int delay = ciCoke_MinPeriod - (time(NULL) - gtCoke_LastDispenseTime); + printf("Wait %i seconds?\n", delay); + sleep( delay ); + printf("wait done\n"); } - return ch; -} - -int WaitForColon() -{ - fd_set readfs; - char ch = 0; - - FD_SET(giCoke_SerialFD, &readfs); - - while( (ch = ReadChar()) != ':' && ch != 0); - - if( ch == 0 ) return -1; // Timeout + // Dispense (with locking) + modbus_write_bit(gCoke_Modbus, ciCoke_DropBitBase + Item, 1); 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; - } - } - - //printf("ReadLine: output=%s\n", output); - - if( !ch ) return -1; - return i; -} - -