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

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 56810bd..decdf4d 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -72,22 +72,22 @@ 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 );
+		ret ++;
+	}
 
-	if( ret == 3 ) {
+	if( !(ret < 3) ) {
 		fprintf(stderr, "Coke machine timed out\n");
 		return -2;	// -EMYBAD
 	}
@@ -108,7 +108,9 @@ int Coke_CanDispense(int UNUSED(User), int Item)
 	// 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);
 	}
@@ -157,7 +159,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,20 +171,19 @@ 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 );
+	}
 
 	#if TRACE_COKE
 	printf("Coke_DoDispense: sending 'd%i'\n", Item);
@@ -191,17 +192,14 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 	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