X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=c937756583c9bac0a7bbf1f9b65d03aface5d3f2;hb=3e7700e1b9b652bb3ed7daaff76cf891907a63b3;hp=3ab46c59d189f7c9279b33748cd8b39afa514097;hpb=d40b4a892a6b06e2ef0cb72e90ebf7b023577d03;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 3ab46c5..c937756 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -37,10 +37,12 @@ regex_t	gCoke_StatusRegex;
 int Coke_InitHandler()
 {
 	printf("connecting to coke machine...\n");
-	giCoke_SerialFD = open(gsCoke_SerialPort, O_RDWR);
+	
+	giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600);
 	if( giCoke_SerialFD == -1 ) {
 		fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort);
 	}
+	
 	CompileRegex(&gCoke_StatusRegex, "^slot\\s+(\\d)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
 	return 0;
 }
@@ -58,6 +60,9 @@ int Coke_CanDispense(int User, int Item)
 	sprintf(tmp, "s%i\n", Item);
 	write(giCoke_SerialFD, tmp, 2);
 
+	// Wait a little
+	sleep(250);
+
 	// Read the response
 	tmp[0] = '\0';
 	ret = read(giCoke_SerialFD, tmp, sizeof(tmp)-1);
@@ -77,9 +82,9 @@ int Coke_CanDispense(int User, int Item)
 	printf("Machine responded slot status '%s'\n", status);
 
 	if( strcmp(status, "full") == 0 )
-		return 1;
+		return 0;
 
-	return 0;
+	return 1;
 }
 
 /**
@@ -96,6 +101,9 @@ int Coke_DoDispense(int User, int Item)
 	// Dispense
 	sprintf(tmp, "d%i\n", Item);
 	write(giCoke_SerialFD, tmp, 2);
+	
+	// Wait a little
+	sleep(250);
 
 	// Get status
 	read(giCoke_SerialFD, tmp, sizeof(tmp)-1);