X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=door_daemon.pl;h=ce1436405cb6188d5e7f355b9cbdfa2b567b4e3d;hb=44da1f523dcdaf2fef158076f138ac8be5cb89fe;hp=8b83167492eaedf94605cb72c205897e1ade4d47;hpb=66918cbc98ad1b8cf81bcff12d75a82201d04cfd;p=svn42.git

diff --git a/door_daemon.pl b/door_daemon.pl
index 8b83167..ce14364 100755
--- a/door_daemon.pl
+++ b/door_daemon.pl
@@ -6,8 +6,8 @@ use Date::Format;
 use Fcntl; 
 use strict;
 
-my $url_door_open = "https://www.realraum.at/";
-my $url_door_closed = "https://www.realraum.at/";
+my $url_door_open = 'https://www.realraum.at/cgi/status.cgi?pass=jako16&set=%3Chtml%3E%3Cbody%20bgcolor=%22lime%22%3E%3Ch3%3E%3Ccenter%3ETuer%20ist%20Offen%3C/center%3E%3C/h3%3E%3C/body%3E%3C/html%3E';
+my $url_door_closed = 'https://www.realraum.at/cgi/status.cgi?pass=jako16&set=%3Chtml%3E%3Cbody%20bgcolor=%22red%22%3E%3Ch3%3E%3Ccenter%3ETuer%20ist%20Geschlossen%3C/center%3E%3C/h3%3E%3C/body%3E%3C/html%3E';
 
 my $door_ttyusb_dev = "/dev/ttyUSB0";
 my $fifofile = "/tmp/door_cmd.fifo";
@@ -24,7 +24,9 @@ open($logfile,'>>/var/log/tuer.log');
 $logfile->autoflush(1);
 sub door_log
 {
-  print $logfile Date::Format::time2str("%Y-%m-%d %T: ",time()).shift()."\n";
+  my $msg=shift;
+  chomp($msg);
+  print $logfile Date::Format::time2str("%Y-%m-%d %T: ",time()).$msg."\n";
 }
 door_log("Door Daemon started");
 
@@ -32,6 +34,7 @@ door_log("Door Daemon started");
 $main::door_open=1;
 $main::door_closed=0;
 $main::tuer_status=$main::door_closed;
+$main::tuer_future_status=$main::tuer_status;
 #system('wget --no-check-certificate -q -O /dev/null '.$url_door_closed.' &>/dev/null &');
 
 
@@ -40,6 +43,7 @@ my $ttyusb=undef;
 sub handler
 {
   #local($sig) = @_;
+  print $ttyusb "c" if (defined $ttyusb);
   door_log("Door Daemon stopped");
   close $logfile;
   close $fifo if (defined $fifo);
@@ -54,13 +58,15 @@ my $read_set = new IO::Select();
 
 sub open_fifo
 {
-	print "open fifo\n"; sysopen($fifo,$fifofile, O_RDONLY | O_NONBLOCK); print "x\n";
+	#print "open fifo\n"; 
+	sysopen($fifo,$fifofile, O_RDONLY | O_NONBLOCK); 
+	#print "x\n";
 	 $read_set->add($fifo); 
 }
 
 sub open_usb
 {
-	print "open usb\n";
+	#print "open usb\n";
 	sysopen($ttyusb, $door_ttyusb_dev, O_RDWR | O_NONBLOCK); 
 	$ttyusb->autoflush(1);
 	my $termios = POSIX::Termios->new;
@@ -69,7 +75,7 @@ sub open_usb
 	$termios->setospeed( &POSIX::B9600 );
 	#$termios->setcflag( $termios->getcflag & ~(&POSIX::PARENB | &POSIX::PARODD) & (~&POSIX::CSIZE | &POSIX::CS8));
 	$termios->setattr(fileno $ttyusb);
-	print "x\n";
+	#print "x\n";
 	$read_set->add($ttyusb); 
 }
 
@@ -92,17 +98,18 @@ print $ttyusb "s";
 	 
 while(1)
 {
-	print $main::tuer_status,"\n";
 	my ($rh_set) = IO::Select->select($read_set, undef, undef);
+	#print "tuer_status_start: ".$main::tuer_status,"\n";
+	sleep(1); #give other end time to finish writing... (bad fix)
 	foreach my $fh (@$rh_set)
 	{
 		if ($fh == $fifo)
 		{
-			my $fifo_msg = <$fh>;
+			my $fifo_msg = readline($fh);
 			unless ($fifo_msg)
 			{
 				close_fifo();
-				sleep(0.5);
+				#sleep(0.1);
 				open_fifo();
 				last;
 			}
@@ -113,36 +120,49 @@ while(1)
 		}
 		elsif ($fh == $ttyusb)
 		{
-			my $ttyusb_msg = <$fh>;
+			my $ttyusb_msg = readline($fh);
 			last unless ($ttyusb_msg);
-			print($ttyusb_msg);
+			#print($ttyusb_msg);
 			door_log($door_ttyusb_dev.": ".$ttyusb_msg);
+			if ($ttyusb_msg =~ /took too long!/)
+			{
+				door_log("Got '".$ttyusb_msg."'.  Sending Reset..");
+				print $ttyusb "r";
+				$main::tuer_status=$main::door_closed;
+				$main::tuer_future_status=$main::tuer_status;
+				last;
+			}			
+			$main::tuer_status = $main::tuer_future_status if $ttyusb_msg =~ /^Ok/;
 			my $tuer=$main::tuer_status;
 			$tuer=$main::door_open if $ttyusb_msg =~ /open/;
 			$tuer=$main::door_closed if $ttyusb_msg =~ /close|closing/;
-			if (not $tuer == $main::tuer_status)
+			door_log("$tuer");
+			if (not ($tuer == $main::tuer_status))
 			{
 				$main::tuer_status=$tuer;
 				if ($tuer == $main::door_open)
 				{
-					print "change to open\n";
-					system('wget --no-check-certificate -q -O /dev/null '.$url_door_open.' &>/dev/null &');
+					door_log("change to opened");
+					#print "change to open\n";
+					system('wget --no-check-certificate -q -O /dev/null "'.$url_door_open.'" &>/dev/null &');
 				}
 				else
 				{
-					print "change to closed\n";
-					system('wget --no-check-certificate -q -O /dev/null '.$url_door_closed.' &>/dev/null &');
+					#print "change to closed\n";
+					door_log("change to closed");
+					system('wget --no-check-certificate -q -O /dev/null "'.$url_door_closed.'" &>/dev/null &');
 				}
 			}
 		}
 	}
+	#print "tuer_status_end: ".$main::tuer_status,"\n------------\n";
 }
 
 sub handle_cmd
 {
 	my $cmd = shift;
 	my $who = shift;
-	print "c:'$cmd' w:'$who'\n";
+	#print "c:'$cmd' w:'$who'\n";
 	my $tuer=$main::tuer_status;
 	if    ($cmd eq "open")   { $tuer=$main::door_open; }
 	elsif ($cmd eq "close")  {$tuer=$main::door_closed; }
@@ -152,18 +172,18 @@ sub handle_cmd
 	
 	if (not $tuer == $main::tuer_status)
 	{
-		$main::tuer_status=$tuer;
+		$main::tuer_future_status=$tuer;
 		if ($tuer == $main::door_open)
 		{
 			door_log("Door opened by $who");
 			print $ttyusb "o";
-			system('wget --no-check-certificate -q -O /dev/null '.$url_door_open.' &>/dev/null &');
+			system('wget --no-check-certificate -q -O /dev/null "'.$url_door_open.'" &>/dev/null &');
 		}
 		else
 		{
 			door_log("Door closed by $who");
 			print $ttyusb "c";
-			system('wget --no-check-certificate -q -O /dev/null '.$url_door_closed.' &>/dev/null &');
+			system('wget --no-check-certificate -q -O /dev/null "'.$url_door_closed.'" &>/dev/null &');
 		}
 		
 	}