X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Fopendispense2.git;a=blobdiff_plain;f=src%2Fserver%2Fhandler_coke.c;h=12e24315b98c442ea0d441dc9f355ebc7d1d6c33;hp=abd35068cee045fd4a2493895a9581f864e169b7;hb=24654ef0078320798912a273508e37f9ce921ba7;hpb=c11136c3e42375573736b4ac2b6aadc7897114b4

diff --git a/src/server/handler_coke.c b/src/server/handler_coke.c
index abd3506..12e2431 100644
--- a/src/server/handler_coke.c
+++ b/src/server/handler_coke.c
@@ -6,6 +6,9 @@
  *
  * This file is licenced under the 3-clause BSD Licence. See the file
  * COPYING for full details.
+ *
+ * NOTES:
+ * - Remember, the coke machine echoes your text back to you!
  */
 #include "common.h"
 #include <stdio.h>
@@ -14,13 +17,27 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <regex.h>
+#include <stdarg.h>
+#include <pthread.h>
+
+#define READ_TIMEOUT	2	// 2 seconds for ReadChar
+#define TRACE_COKE	1
+
+#if TRACE_COKE
+# define TRACE(v...) do{printf("%s: ",__func__);printf(v);}while(0)
+#else
+# define TRACE(...)
+#endif
 
 // === IMPORTS ===
 
 // === PROTOTYPES ===
  int	Coke_InitHandler();
+ int	Coke_int_GetSlotStatus(char *Buffer, int Slot);
+void	Coke_int_UpdateSlotStatuses(void);
  int	Coke_CanDispense(int User, int Item);
  int	Coke_DoDispense(int User, int Item);
+ int	Writef(const char *Format, ...);
  int	WaitForColon();
  int	ReadLine(int len, char *output);
 
@@ -34,96 +51,227 @@ tHandler	gCoke_Handler = {
 char	*gsCoke_SerialPort = "/dev/ttyS0";
  int	giCoke_SerialFD;
 regex_t	gCoke_StatusRegex;
+ int	gaCoke_CachedStatus[7];
+pthread_mutex_t	gCoke_Mutex = PTHREAD_MUTEX_INITIALIZER;
 
 // == CODE ===
 int Coke_InitHandler()
 {
+	CompileRegex(&gCoke_StatusRegex, "^slot\\s+([0-9]+)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
+	
 	printf("connecting to coke machine...\n");
 	
 	giCoke_SerialFD = InitSerial(gsCoke_SerialPort, 9600);
 	if( giCoke_SerialFD == -1 ) {
 		fprintf(stderr, "ERROR: Unable to open coke serial port ('%s')\n", gsCoke_SerialPort);
 	}
+	else {
+		int i;
+		for( i = 0; i < 7; i ++ )
+			gaCoke_CachedStatus[i] = -1;
+		// Reset the slot names.
+		// - Dunno why this is needed, but the machine plays silly
+		//   sometimes.
+		Writef("n0 Slot0\n");
+		if( !WaitForColon() )
+		{
+			Writef("n1 Slot1\n");
+			WaitForColon();
+			Writef("n2 Slot2\n");
+			WaitForColon();
+			Writef("n3 Slot3\n");
+			WaitForColon();
+			Writef("n4 Slot4\n");
+			WaitForColon();
+			Writef("n5 Slot5\n");
+			WaitForColon();
+			Writef("n6 Coke\n");
+			
+			Coke_int_UpdateSlotStatuses();
+		}
+	}
+	
+	AddPeriodicFunction(Coke_int_UpdateSlotStatuses);
 	
-	CompileRegex(&gCoke_StatusRegex, "^slot\\s+(\\d)\\s+([^:]+):([a-zA-Z]+)\\s*", REG_EXTENDED);
 	return 0;
 }
 
-int Coke_CanDispense(int User, int Item)
+int Coke_int_GetSlotStatus(char *Buffer, int Slot)
 {
-	char	tmp[32], *status;
 	regmatch_t	matches[4];
 	 int	ret;
-
-	// Sanity please
-	if( Item < 0 || Item > 6 )	return -1;	// -EYOURBAD
+	char	*status;	
 	
-	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
+	// Parse status response
+	ret = RunRegex(&gCoke_StatusRegex, Buffer, sizeof(matches)/sizeof(matches[0]), matches, "Bad Response");
+	if( ret ) {
+		return -1;
 	}
+
+	// Get slot status
+	Buffer[ matches[3].rm_eo ] = '\0';
+	status = &Buffer[ matches[3].rm_so ];
 	
-	// Ask the coke machine
-	sprintf(tmp, "s%i\r\n", Item);
-	write(giCoke_SerialFD, tmp, 4);
+	TRACE("Machine responded slot %i status '%s'\n", Slot, status);
+
+	if( strcmp(status, "full") == 0 ) {
+		gaCoke_CachedStatus[Slot] = 0;	// 0: Avaliiable
+		return 0;
+	}
+	else {
+		gaCoke_CachedStatus[Slot] = 1;	// 1: Empty
+		return 1;
+	}
+}
 
-	ret = ReadLine(sizeof(tmp)-1, tmp);
-	printf("ret = %i, tmp = '%s'\n", ret, tmp);
+/**
+ * \brief Update the status of all coke slots
+ * \note Uses goto to reduce the chance of the lock being kept
+ */
+void Coke_int_UpdateSlotStatuses(void)
+{
+	 int	i, len;
+	char	tmp[40];
 	
-	if( ret <= 0 ) {
-		fprintf(stderr, "Coke machine is not being chatty (read = %i)\n", ret);
-		if( ret == -1 ) {
-			perror("Coke Machine");
+	if( giCoke_SerialFD == -1 )	return ;
+	
+	pthread_mutex_lock(&gCoke_Mutex);
+	
+	while( ReadLine(sizeof tmp, tmp) >= 0 )	;
+	TRACE("send d7\n");
+	Writef("d7\r\n");	// Update slot statuses
+	if( WaitForColon() )	goto ret;
+	TRACE("send s\n");
+	Writef("s\r\n");
+	do {
+		i = ReadLine(sizeof tmp, tmp);	// Read back what we just said
+		if( i == -1 ) {
+			TRACE("Eat read failed");
+			goto ret;
 		}
-		return -1;
+	} while(tmp[0] != ':' && tmp[1] != 's');
+	
+	for( i = 0; i <= 6; i ++ )
+	{
+		len = ReadLine(sizeof tmp, tmp);
+		if( len == -1 ) {
+			TRACE("Read failed on slot %i\n", i);
+			goto ret;	// I give up :(
+		}
+		TRACE("tmp = '%s'\n", tmp);
+		Coke_int_GetSlotStatus(tmp, i);
 	}
-	ret = RunRegex(&gCoke_StatusRegex, tmp, sizeof(matches)/sizeof(matches[0]), matches, "Bad Response");
-	if( ret ) {
-		return -1;
+	// Eat blank line
+	len = ReadLine(sizeof tmp, tmp);
+	if( len == -1 ) {
+		TRACE("Read failed on blank line\n");
 	}
 
-	tmp[ matches[3].rm_eo ] = '\0';
-	status = &tmp[ matches[3].rm_so ];
-
-	printf("Machine responded slot status '%s'\n", status);
+	TRACE("Updated\n");
 
-	if( strcmp(status, "full") == 0 )
-		return 0;
+ret:
+	pthread_mutex_unlock(&gCoke_Mutex);
+}
 
-	return 1;
+int Coke_CanDispense(int UNUSED(User), int Item)
+{
+	// Sanity please
+	if( Item < 0 || Item > 6 )	return -1;	// -EYOURBAD
+	
+	// Can't dispense if the machine is not connected
+	if( giCoke_SerialFD == -1 )
+		return -2;
+	
+	return gaCoke_CachedStatus[Item];
 }
 
 /**
  * \brief Actually do a dispense from the coke machine
  */
-int Coke_DoDispense(int User, int Item)
+int Coke_DoDispense(int UNUSED(User), int Item)
 {
-	char	tmp[32], *status;
-	regmatch_t	matches[4];
+	char	tmp[32];
+	 int	ret, len;
 
 	// Sanity please
 	if( Item < 0 || Item > 6 )	return -1;
 
-	WaitForColon();
+	// Can't dispense if the machine is not connected
+	if( giCoke_SerialFD == -1 )
+		return -2;
+	
+	// LOCK
+	pthread_mutex_lock(&gCoke_Mutex);
+	
+	TRACE("flushing input\n");
+	
+
+	// Wait for prompt
+	ret = 0;
+	while( WaitForColon() && ret < 3 )
+	{
+		// Flush the input buffer
+		char	tmpbuf[512];
+		read(giCoke_SerialFD, tmpbuf, sizeof(tmpbuf));
+		TRACE("sending 'd7'\n");
+		Writef("d7\r\n");
+		ret ++;
+	}
+	if( ret == 3 )
+	{
+		TRACE("timed out\n");
+		pthread_mutex_unlock(&gCoke_Mutex);
+		return -1;
+	}
 
+	TRACE("sending 'd%i'\n", Item);
 	// Dispense
-	sprintf(tmp, "d%i\r\n", Item);
-	write(giCoke_SerialFD, tmp, 4);
+	Writef("d%i\r\n", Item);
 	
-	WaitForColon();
+	// Read empty lines and echo-backs
+	do {
+		ret = ReadLine(sizeof(tmp)-1, tmp);
+		if( ret == -1 ) {
+			pthread_mutex_unlock(&gCoke_Mutex);
+			return -1;
+		}
+		TRACE("read %i '%s'\n", ret, tmp);
+	} while( ret == 0 || tmp[0] == ':' || tmp[0] == 'd' );
 
-	// Get status
-	ReadLine(sizeof(tmp)-1, tmp);
+	WaitForColon();	// Eat up rest of response
 	
-	tmp[ matches[3].rm_eo ] = '\0';
-	status = &tmp[ matches[3].rm_so ];
-
-	printf("Machine responded slot status '%s'\n", status);
+	TRACE("done\n");
 
+	// TODO: Regex instead?
+	if( strcmp(tmp, "ok") == 0 ) {
+		// We think dispense worked
+		// - The machine returns 'ok' if an empty slot is dispensed, even if
+		//   it doesn't actually try to dispense (no sound)
+		ret = 0;
+	}
+	else {
+		printf("Coke_DoDispense: Machine returned unknown value '%s'\n", tmp);
+		ret = -1;
+	}
+	
+	TRACE("Updating slot status\n");
+	
+	// Update status
+	WaitForColon();
+	Writef("s%i\r\n", Item);
+	len = ReadLine(sizeof tmp, tmp);
+	if(len == -1)	gaCoke_CachedStatus[Item] = -1;
+	Coke_int_GetSlotStatus(tmp, Item);
+	{
+		char buf[512];
+		read(giCoke_SerialFD, buf, 512);	// Flush
+	}
+	
+	// Release and return
+	pthread_mutex_unlock(&gCoke_Mutex);
+	
+	//return ret;
+	// HACK!!!
 	return 0;
 }
 
@@ -134,7 +282,7 @@ char ReadChar()
 	 int	ret;
 	struct timeval	timeout;
 	
-	timeout.tv_sec = 5;	// 5 second timeout
+	timeout.tv_sec = READ_TIMEOUT;
 	timeout.tv_usec = 0;
 	
 	FD_ZERO(&readfs);
@@ -143,19 +291,43 @@ char ReadChar()
 	ret = select(giCoke_SerialFD+1, &readfs, NULL, NULL, &timeout);
 	if( ret == 0 )	return 0;	// Timeout
 	if( ret != 1 ) {
-		printf("readchar return %i\n", ret);
+		printf("ReadChar: select return %i\n", ret);
 		return 0;
 	}
 	
 	ret = read(giCoke_SerialFD, &ch, 1);
 	if( ret != 1 ) {
-		printf("ret = %i\n", ret);
+		printf("ReadChar: ret != 1 (%i)\n", ret);
 		return 0;
 	}
 	
 	return ch;
 }
 
+int Writef(const char *Format, ...)
+{
+	va_list	args;
+	 int	len;
+	
+	va_start(args, Format);
+	len = vsnprintf(NULL, 0, Format, args);
+	va_end(args);
+	
+	{
+		char	buf[len+1];
+		va_start(args, Format);
+		vsnprintf(buf, len+1, Format, args);
+		va_end(args);
+		
+		#if DEBUG
+		printf("Writef: %s", buf);
+		#endif
+		
+		return write(giCoke_SerialFD, buf, len);
+	}
+	
+}
+
 int WaitForColon()
 {
 	fd_set	readfs;
@@ -178,20 +350,22 @@ int ReadLine(int len, char *output)
 	for(;;)
 	{
 		ch = ReadChar();
-		
-		
+			
 		if( i < len )
 			output[i++] = ch;
 		
 		if( ch == '\0' ) {
-			return -1;
+			break;
 		}
 		if( ch == '\n' || ch == '\r' ) {
 			if( i < len )
 				output[--i] = '\0';
-			return i;
+			break;
 		}
 	}
+
+	if( !ch ) 	return -1;
+	return i;
 }