X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fhandler_door.c;h=0273cbf4788d366d8b1453e04a6cb1e9ad749e2d;hb=f14393c85d4c66f34e6d92f8894e170163da1e37;hp=163ed3c761dae69859eab6c3017a6e333b2e17aa;hpb=54d6e1ce493e434c84830746ca7d72fab3a68343;p=tpg%2Fopendispense2.git

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index 163ed3c..0273cbf 100644
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -2,7 +2,7 @@
  * OpenDispense 2 
  * UCC (University [of WA] Computer Club) Electronic Accounting System
  *
- * handler_doror.c - Door Relay code
+ * handler_door.c - Door Relay code
  *
  * This file is licenced under the 3-clause BSD Licence. See the file
  * COPYING for full details.
@@ -18,18 +18,20 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
-#include <sys/wait.h>
 #include <pty.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <errno.h>
 
-#define DOOR_UNLOCKED_DELAY	5	// Time in seconds before the door re-locks
+#define DOOR_UNLOCKED_DELAY	10	// Time in seconds before the door re-locks
 
 // === IMPORTS ===
 
 // === PROTOTYPES ===
+void*	Door_Lock(void* Unused);
  int	Door_InitHandler();
  int	Door_CanDispense(int User, int Item);
  int	Door_DoDispense(int User, int Item);
- int	writes(int fd, const char *str);
 
 // === GLOBALS ===
 tHandler	gDoor_Handler = {
@@ -38,11 +40,55 @@ tHandler	gDoor_Handler = {
 	Door_CanDispense,
 	Door_DoDispense
 };
-char	*gsDoor_SerialPort = "/dev/ttyS3";
+char	*gsDoor_SerialPort;	// Set from config in main.c
+sem_t	gDoor_UnlockSemaphore;
+pthread_t	gDoor_LockThread;
+
+// === CODE ===
+void* Door_Lock(void* Unused __attribute__((unused)))
+{
+	while(1)
+	{
+		sem_wait(&gDoor_UnlockSemaphore);
+
+		int door_serial_handle = InitSerial(gsDoor_SerialPort, 9600);
+		if(door_serial_handle < 0)
+		{
+			fprintf(stderr, "Unable to open door serial '%s'\n", gsDoor_SerialPort);
+			perror("Opening door port");
+		}
+
+		// Disable local echo
+		{
+			struct termios	info;
+			tcgetattr(door_serial_handle, &info);
+			info.c_cflag &= ~CLOCAL;
+			tcsetattr(door_serial_handle, TCSANOW, &info);
+		}
+
+		if(write(door_serial_handle, "\xff\x01\x01", 3) != 3)	// Relay ON
+		{
+			fprintf(stderr, "Failed to write Relay ON (unlock) command, errstr: %s", strerror(errno));
+		}
+
+		sleep(DOOR_UNLOCKED_DELAY);
+
+		if(write(door_serial_handle, "\xff\x01\x00", 3) != 3)	// Relay OFF
+		{
+			fprintf(stderr, "Failed to write Relay OFF (lock) command, errstr: %s", strerror(errno));
+		}
+
+		close(door_serial_handle);
+	}
+}
 
-// == CODE ===
 int Door_InitHandler(void)
 {
+	// Initialize semaphore, triggers door lock release if semaphore is greater than 0
+	sem_init(&gDoor_UnlockSemaphore, 0, 0);	
+	
+	pthread_create(&gDoor_LockThread, NULL, &Door_Lock, NULL);
+
 	return 0;
 }
 
@@ -75,9 +121,7 @@ int Door_CanDispense(int User, int Item)
  * \brief Actually do a dispense from the coke machine
  */
 int Door_DoDispense(int User, int Item)
-{
-	 int	door_serial_handle;
-	
+{	
 	#if DEBUG
 	printf("Door_DoDispense: (User=%i,Item=%i)\n", User, Item);
 	#endif
@@ -94,52 +138,16 @@ int Door_DoDispense(int User, int Item)
 		return 1;
 	}
 	
-	door_serial_handle = InitSerial(gsDoor_SerialPort, 1200);
-	if(door_serial_handle < 0) {
-		fprintf(stderr, "Unable to open door serial '%s'\n", gsDoor_SerialPort);
-		perror("Opening door port");
-		return -1;
-	}
 
+	if(sem_post(&gDoor_UnlockSemaphore))
 	{
-		struct termios	info;
-		tcgetattr(door_serial_handle, &info);
-		info.c_iflag &= ~IGNCR;	// Ignore \r
-		tcsetattr(door_serial_handle, TCSANOW, &info);
-	}
-
-	if( writes(door_serial_handle, "\r\nATH1\r\n") ) {
-		fprintf(stderr, "Unable to open door (sending ATH1)\n");
-		perror("Sending ATH1");
-		return -1;
-	}
-	
-	// Wait before re-locking
-	sleep(DOOR_UNLOCKED_DELAY);
-
-	if( writes(door_serial_handle, "\r\nATH0\r\n") ) {
-		fprintf(stderr, "Oh, hell! Door not re-locking, big error (sending ATH0 failed)\n");
-		perror("Sending ATH0");
+		perror("Failed to post \"Unlock Door\" semaphore, sem_post returned");
 		return -1;
 	}
 
-	close(door_serial_handle);
-	
 	#if DEBUG
 	printf("Door_DoDispense: User %i opened door\n", User);
 	#endif
 
 	return 0;
 }
-
-int writes(int fd, const char *str)
-{
-	 int	len = strlen(str);
-	
-	if( len != write(fd, str, len) )
-	{
-		return 1;
-	}
-	return 0;
-}
-