X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=21d61f68ca2bb5b663763cbaceb7ec941e14b229;hb=3b9de73f2264b8688d7814b0013076c8b81a1a5c;hp=188beb44ffb2b85ab9408e30715b71387cad89df;hpb=f66299331a4e635b3d25d3526e3900e67cd1895b;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 188beb4..21d61f6 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -13,14 +13,17 @@
 #include "common.h"
 #include <stdio.h>
 #include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <regex.h>
 #include <stdarg.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <modbus/modbus.h>
+
+#define MIN_DISPENSE_PERIOD	5
 
-#define READ_TIMEOUT	2	// 2 seconds for ReadChar
-#define TRACE_COKE	1
+// === CONSTANTS ===
+const int	ciCoke_MinPeriod = 5;
+const int	ciCoke_DropBitBase = 0;
+const int	ciCoke_StatusBitBase = 0;
 
 // === IMPORTS ===
 
@@ -28,9 +31,6 @@
  int	Coke_InitHandler();
  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 = {
@@ -39,148 +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);
+	printf("Connecting to coke machine on '%s'\n", gsCoke_ModbusAddress);
+
+	// 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;
 	}
-	else {
-		// Reset the slot names.
-		// - Dunno why this is needed, but the machine plays silly
-		//   sometimes.
-		Writef("n0 Slot0\n");
-		if( !WaitForColon() )
+
+	// Open modbus
+	modbus_new_tcp(gsCoke_ModbusAddress, 502);
+	if( !gCoke_Modbus )
+	{
+		perror("coke - modbus_new_tcp");
+	}
+	else
+	{
+		if( modbus_connect(gCoke_Modbus) )
 		{
-			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");
+			perror("coke - modbus_connect");
 		}
 	}
-	
-	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;
-
+	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;
-	
-	#if TRACE_COKE
-	printf("Coke_CanDispense: Flushing\n");
-	#endif
-	
-	
-	// 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
-	}
-	
-	// 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'\n", Item);
-	#endif
-	
-	// 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' )
-	{
-		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");
-		}
-		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;
-	}
 
-	// Get slot status
-	tmp[ matches[3].rm_eo ] = '\0';
-	status = &tmp[ matches[3].rm_so ];
-	
-	#if TRACE_COKE
-	printf("Coke_CanDispense: Machine responded slot status '%s'\n", status);
-	#endif
+	modbus_read_bits(gCoke_Modbus, ciCoke_StatusBitBase + Item, 1, &status);
 
-	if( strcmp(status, "full") == 0 )
-		return 0;
-
-	return 1;
+	return status == 0;
 }
 
 /**
@@ -188,160 +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;
 
-	// Can't dispense if the machine is not connected
-	if( giCoke_SerialFD == -1 )
-		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
-		Writef("d7\r\n");
-	}
-
-	#if TRACE_COKE
-	printf("Coke_DoDispense: sending 'd%i'\n", Item);
-	#endif
-	// 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
-	} 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)
+	// Check for 'dummy' mode
+	if( gbCoke_DummyMode )
 		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;
-	}
-	
-	return ch;
-}
+	// Can't dispense if the machine is not connected
+	if( !gCoke_Modbus )
+		return -2;
 
-int Writef(const char *Format, ...)
-{
-	va_list	args;
-	 int	len;
-	
-	va_start(args, Format);
-	len = vsnprintf(NULL, 0, Format, args);
-	va_end(args);
-	
+	// Make sure there are not two dispenses within n seconds
+	if( time(NULL) - gtCoke_LastDispenseTime < ciCoke_MinPeriod )
 	{
-		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	delay = ciCoke_MinPeriod - (time(NULL) - gtCoke_LastDispenseTime);
+		printf("Wait %i seconds?\n", delay);
+		sleep( delay );
+		printf("wait done\n");
 	}
 	
-}
-
-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;
-}
-
-