X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=src%2Fserver%2Fhandler_coke.c;h=79d0a4697b2bdb4218a43cf119bb7d2a6e84c26e;hb=aab09714f5780d2d7eeb7f1f94a624e0535bdb22;hp=8c82a0709aaae82e603db39b910bc9088beb7c24;hpb=c0baa7cdec5263d46f5d4eca02a6e517c5193872;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 8c82a07..79d0a46 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -21,7 +21,7 @@
 #include <pthread.h>
 
 #define READ_TIMEOUT	2	// 2 seconds for ReadChar
-#define TRACE_COKE	0
+#define TRACE_COKE	1
 
 #if TRACE_COKE
 # define TRACE(v...) do{printf("%s: ",__func__);printf(v);}while(0)
@@ -60,7 +60,7 @@ int Coke_InitHandler()
 {
 	CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
 	
-	printf("connecting to coke machine...\n");
+	printf("Connecting to coke machine on '%s'\n", gsCoke_SerialPort);
 	
 	giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600);
 	if( giCoke_SerialFD == -1 ) {
@@ -90,6 +90,8 @@ int Coke_InitHandler()
 			
 			Coke_int_UpdateSlotStatuses();
 		}
+		else
+			fprintf(stderr, "Coke machine timed out.\n");
 	}
 	
 	AddPeriodicFunction(Coke_int_UpdateSlotStatuses);
@@ -154,7 +156,8 @@ void Coke_int_UpdateSlotStatuses(void)
 	
 	for( i = 0; i <= 6; i ++ )
 	{
-		len = ReadLine(sizeof tmp, tmp);
+		// Read until non-blank line
+		while( (len = ReadLine(sizeof tmp, tmp)) == 0 )	;
 		if( len == -1 ) {
 			TRACE("Read failed on slot %i\n", i);
 			goto ret;	// I give up :(
@@ -204,7 +207,9 @@ int Coke_DoDispense(int UNUSED(User), int Item)
 	// Make sure there are not two dispenses within n seconds
 	if( time(NULL) - gtCoke_LastDispenseTime < 10 )
 	{
-		sleep( 10 - time(NULL) - gtCoke_LastDispenseTime );
+		printf("Wait %li seconds?\n", 10 - (time(NULL) - gtCoke_LastDispenseTime));
+		sleep( 10 - (time(NULL) - gtCoke_LastDispenseTime) );
+		printf("wait done\n");
 	}
 	
 	// LOCK