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

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 030740c..decdf4d 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -18,6 +18,9 @@
 #include <fcntl.h>
 #include <regex.h>
 
+#define READ_TIMEOUT	2	// 2 seconds for ReadChar
+#define TRACE_COKE	1
+
 // === IMPORTS ===
 
 // === PROTOTYPES ===
@@ -52,7 +55,7 @@ int Coke_InitHandler()
 	return 0;
 }
 
-int Coke_CanDispense(int User, int Item)
+int Coke_CanDispense(int UNUSED(User), int Item)
 {
 	char	tmp[40], *status;
 	regmatch_t	matches[4];
@@ -61,26 +64,53 @@ int Coke_CanDispense(int User, int Item)
 	// 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;
-	do {
+	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
 		write(giCoke_SerialFD, "d7\r\n", 4);
-	} while( WaitForColon() && ret++ < 3 );
+		ret ++;
+	}
 
-	if( ret == 3 ) {
+	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);
-	if( tmp[0] == ':' ) {
+	// Read back-echoed lines
+	while( tmp[0] == ':' || tmp[1] != 'l' )
+	{
 		ret = ReadLine(sizeof(tmp)-1, tmp);
 		printf("ret = %i, tmp = '%s'\n", ret, tmp);
 	}
@@ -93,6 +123,10 @@ int Coke_CanDispense(int User, int Item)
 		}
 		return -1;
 	}
+	
+	#if TRACE_COKE
+	printf("Coke_CanDispense: wait for the prompt again\n");
+	#endif
 
 	// Eat rest of response
 	WaitForColon();
@@ -108,6 +142,10 @@ int Coke_CanDispense(int User, int Item)
 	status = &tmp[ matches[3].rm_so ];
 
 	printf("Machine responded slot status '%s'\n", status);
+	
+	#if TRACE_COKE
+	printf("Coke_CanDispense: done");
+	#endif
 
 	if( strcmp(status, "full") == 0 )
 		return 0;
@@ -118,37 +156,56 @@ int Coke_CanDispense(int User, int Item)
 /**
  * \brief Actually do a dispense from the coke machine
  */
-int Coke_DoDispense(int 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;
 
+	// 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
-	i = 0;
-	do {
+	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);
-	} while( WaitForColon() && i++ < 3 );
+	}
 
+	#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
-	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
+	
+	#if TRACE_COKE
+	printf("Coke_DoDispense: done\n");
+	#endif
 
 	// TODO: Regex
 	if( strcmp(tmp, "ok") == 0 ) {
@@ -170,7 +227,7 @@ char ReadChar()
 	 int	ret;
 	struct timeval	timeout;
 	
-	timeout.tv_sec = 5;	// 5 second timeout
+	timeout.tv_sec = READ_TIMEOUT;
 	timeout.tv_usec = 0;
 	
 	FD_ZERO(&readfs);