From: John Hodge <tpg@mutabah.net>
Date: Sun, 20 Feb 2011 08:23:19 +0000 (+0800)
Subject: Misc
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=0e4ecce1c37a438068edc0839081090fa1be1b09;p=tpg%2Fopendispense2.git

Misc
---

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 9ec2576..17de89c 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -130,9 +130,15 @@ void Coke_int_UpdateSlotStatuses(void)
 	pthread_mutex_lock(&gCoke_Mutex);
 	
 	WaitForColon();
+	#if TRACE_COKE
+	printf("Coke_int_UpdateSlotStatuses: send d7\n");
+	#endif
 	Writef("d7\r\n");	// Update slot statuses
 	if( WaitForColon() )	goto ret;
-	Writef("s\n");
+	#if TRACE_COKE
+	printf("Coke_int_UpdateSlotStatuses: send s\n");
+	#endif
+	Writef("s\r\n");
 	ReadLine(sizeof tmp, tmp);	// Read back what we just said
 	
 	for( i = 0; i <= 6; i ++ )
@@ -144,6 +150,9 @@ void Coke_int_UpdateSlotStatuses(void)
 			#endif
 			goto ret;	// I give up :(
 		}
+		#if TRACE_COKE
+		printf("Coke_int_UpdateSlotStatuses: tmp = '%s'\n", tmp);
+		#endif
 		Coke_int_GetSlotStatus(tmp, i);
 	}
 
@@ -198,6 +207,14 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 		Writef("d7\r\n");
 		ret ++;
 	}
+	if( ret == 3 )
+	{
+		#if TRACE_COKE
+		printf("Coke_DoDispense: timed out\n", Item);
+		#endif
+		pthread_mutex_unlock(&gCoke_Mutex);
+		return -1;
+	}
 
 	#if TRACE_COKE
 	printf("Coke_DoDispense: sending 'd%i'\n", Item);