X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=5a6a86f5028592c7d3dc7d41528af8ee3eee1abe;hb=1c2e62ab45f3dc08a8a2b823ebc896381af5b3b0;hp=decdf4d327090abeb10d157d46ff2ed4c6032e8b;hpb=10fc79a2f4f72165cb1ce1ba78c84faa8d56f5db;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index decdf4d..5a6a86f 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,24 @@ 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");
+		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;
@@ -83,14 +103,23 @@ int Coke_CanDispense(int UNUSED(User), int Item)
 		#if TRACE_COKE
 		printf("Coke_CanDispense: sending 'd7'\n");
 		#endif
-		write(giCoke_SerialFD, "d7\r\n", 4);
+		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,15 +128,16 @@ 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);
+	#endif
 	// Read back-echoed lines
 	while( tmp[0] == ':' || tmp[1] != 'l' )
 	{
@@ -140,11 +170,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 )
@@ -182,15 +210,14 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 		#if TRACE_COKE
 		printf("Coke_DoDispense: sending 'd7'\n");
 		#endif
-		write(Item, "d7\r\n", 4);
+		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 and echo-backs
 	do {
@@ -249,6 +276,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;