X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=cd02fa737355516e12ccea76c3f8e7d50aa00056;hb=94a66383f886eaecb7ff641785117247784900c8;hp=53cbd0fd7d3be7afecefdd8cd97f84125fdd5953;hpb=dfa4eb21fc9e7cc2bfa912581d38aaee04f3b990;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index 53cbd0f..cd02fa7 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -21,6 +21,8 @@
  int	Coke_InitHandler();
  int	Coke_CanDispense(int User, int Item);
  int	Coke_DoDispense(int User, int Item);
+ int	WaitForColon();
+ int	ReadLine(int len, char *output);
 
 // === GLOBALS ===
 tHandler	gCoke_Handler = {
@@ -37,13 +39,12 @@ regex_t	gCoke_StatusRegex;
 int Coke_InitHandler()
 {
 	printf("connecting to coke machine...\n");
-	giCoke_SerialFD = open(gsCoke_SerialPort, O_RDWR | O_NOCTTY | O_NONBLOCK);
+	
+	giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600);
 	if( giCoke_SerialFD == -1 ) {
 		fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort);
 	}
 	
-	InitSerial(giCoke_SerialFD, 9600);
-	
 	CompileRegex(&gCoke_StatusRegex, "^slot\\s+(\\d)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
 	return 0;
 }
@@ -57,16 +58,32 @@ int Coke_CanDispense(int User, int Item)
 	// Sanity please
 	if( Item < 0 || Item > 6 )	return -1;	// -EYOURBAD
 	
+	write(giCoke_SerialFD, "d7\r\n", 4);
+	write(giCoke_SerialFD, "d7\r\n", 4);
+	write(giCoke_SerialFD, "d7\r\n", 4);
+	
+	if( WaitForColon() ) {
+		fprintf(stderr, "Coke machine timed out\n");
+		return -2;	// -EMYBAD
+	}
+	
 	// Ask the coke machine
-	sprintf(tmp, "s%i\n", Item);
-	write(giCoke_SerialFD, tmp, 2);
+	sprintf(tmp, "s%i\r\n", Item);
+	write(giCoke_SerialFD, tmp, 4);
+	
+	if( WaitForColon() ) {
+		fprintf(stderr, "Coke machine timed out (after initial)\n");
+		return -2;	// -EMYBAD
+	}
 
-	// Read the response
-	tmp[0] = '\0';
-	ret = read(giCoke_SerialFD, tmp, sizeof(tmp)-1);
-	//printf("ret = %i\n", ret);
+	ret = ReadLine(sizeof(tmp)-1, tmp);
+	printf("ret = %i, tmp = '%s'\n", ret, tmp);
+	
 	if( ret <= 0 ) {
 		fprintf(stderr, "Coke machine is not being chatty (read = %i)\n", ret);
+		if( ret == -1 ) {
+			perror("Coke Machine");
+		}
 		return -1;
 	}
 	ret = RunRegex(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, "Bad Response");
@@ -96,13 +113,16 @@ int Coke_DoDispense(int User, int Item)
 	// Sanity please
 	if( Item < 0 || Item > 6 )	return -1;
 
+	WaitForColon();
+
 	// Dispense
-	sprintf(tmp, "d%i\n", Item);
-	write(giCoke_SerialFD, tmp, 2);
+	sprintf(tmp, "d%i\r\n", Item);
+	write(giCoke_SerialFD, tmp, 4);
+	
+	WaitForColon();
 
 	// Get status
-	read(giCoke_SerialFD, tmp, sizeof(tmp)-1);
-	regexec(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, 0);
+	ReadLine(sizeof(tmp)-1, tmp);
 	
 	tmp[ matches[3].rm_eo ] = '\0';
 	status = &tmp[ matches[3].rm_so ];
@@ -112,4 +132,71 @@ int Coke_DoDispense(int User, int Item)
 	return 0;
 }
 
+char ReadChar()
+{
+	fd_set	readfs;
+	char	ch = 0;
+	 int	ret;
+	struct timeval	timeout;
+	
+	timeout.tv_sec = 5;	// 5 second timeout
+	timeout.tv_usec = 0;
+	
+	FD_ZERO(&readfs);
+	FD_SET(giCoke_SerialFD, &readfs);
+	
+	ret = select(giCoke_SerialFD+1, &readfs, NULL, NULL, &timeout);
+	if( ret == 0 )	return 0;	// Timeout
+	if( ret != 1 ) {
+		printf("readchar return %i\n", ret);
+		return 0;
+	}
+	
+	ret = read(giCoke_SerialFD, &ch, 1);
+	if( ret != 1 ) {
+		printf("ret = %i\n", ret);
+		return 0;
+	}
+	
+	return ch;
+}
+
+int WaitForColon()
+{
+	fd_set	readfs;
+	char	ch = 0;
+	
+	FD_SET(giCoke_SerialFD, &readfs);
+	
+	while( (ch = ReadChar()) != ':' && ch != 0);
+	
+	if( ch == 0 )	return -1;	// Timeout
+	
+	return 0;
+}
+
+int ReadLine(int len, char *output)
+{
+	char	ch;
+	 int	i = 0;
+	
+	for(;;)
+	{
+		ch = ReadChar();
+		
+		
+		if( i < len )
+			output[i++] = ch;
+		
+		if( ch == '\0' ) {
+			return -1;
+		}
+		if( ch == '\n' || ch == '\r' ) {
+			if( i < len )
+				output[--i] = '\0';
+			return i;
+		}
+	}
+}
+