X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=188beb44ffb2b85ab9408e30715b71387cad89df;hb=b45406d25eee76ccd4cb95541edd98f2e498c69a;hp=56810bd942c385e3d5707973ea1dec86d3fff8d6;hpb=b42302186308252d40184c2af8a5e1bc329db5e2;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 56810bd..188beb4 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -17,6 +17,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <regex.h>
+#include <stdarg.h>
 
 #define READ_TIMEOUT	2	// 2 seconds for ReadChar
 #define TRACE_COKE	1
@@ -27,6 +28,7 @@
  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);
 
@@ -50,6 +52,26 @@ 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");
+		}
+	}
 	
 	CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
 	return 0;
@@ -72,25 +94,34 @@ int Coke_CanDispense(int UNUSED(User), int Item)
 	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'\n");
+		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
 	
@@ -99,16 +130,19 @@ int Coke_CanDispense(int UNUSED(User), int 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\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);
 		printf("ret = %i, tmp = '%s'\n", ret, tmp);
 	}
@@ -138,11 +172,9 @@ int Coke_CanDispense(int UNUSED(User), int Item)
 	// Get slot status
 	tmp[ matches[3].rm_eo ] = '\0';
 	status = &tmp[ matches[3].rm_so ];
-
-	printf("Machine responded slot status '%s'\n", status);
 	
 	#if TRACE_COKE
-	printf("Coke_CanDispense: done");
+	printf("Coke_CanDispense: Machine responded slot status '%s'\n", status);
 	#endif
 
 	if( strcmp(status, "full") == 0 )
@@ -157,7 +189,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;
 
 	// Sanity please
 	if( Item < 0 || Item > 6 )	return -1;
@@ -169,39 +201,34 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 	#if TRACE_COKE
 	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'\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'\n", Item);
 	#endif
 	// Dispense
-	sprintf(tmp, "d%i\r\n", Item);
-	write(giCoke_SerialFD, tmp, 4);
+	Writef("d%i\r\n", Item);
 	
-	// Read empty lines
-	while( (ret = ReadLine(sizeof(tmp)-1, tmp)) == -1 );
-	if( ret == -1 )	return -1;
-	// Read d%i
-	while( tmp[0] == ':' ) {
+	// 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 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
 	
@@ -251,6 +278,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;