X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=virtualvend%2Fvvend.py;h=f4d04cb55c6a41c1a8e437d367d29a36d22f91c3;hp=4f64af006d352d60ada2542a385dc200ce4b278d;hb=bc2cb8253cb3538b2670987a5e9ac2ae1da392be;hpb=4b7b9abafe0b543e73b22113fe7ca7544a8f3a66

diff --git a/virtualvend/vvend.py b/virtualvend/vvend.py
index 4f64af0..f4d04cb 100644
--- a/virtualvend/vvend.py
+++ b/virtualvend/vvend.py
@@ -81,13 +81,22 @@ class appgui:
 
 
     return
-  
+
+    def __del__(self):
+    	try:
+	    self.sock.close()
+	    self.sock.shutdown()
+	except:
+	    pass
+
 #####CALLBACKS
   def keypad_clicked(self,widget):
-    print "button clicked"
-    print widget.get_label()
-    self.do_send(widget.get_label())
-    sys.stdout.write("\a")
+    key = widget.get_label()
+    if key == 'RESET':
+    	key = '11'
+    else:
+    	key = '0'+key
+    self.do_send('2'+key+' keypress\n')
 
   def handleNewConnection(self,source,condition):
     #source is a socket in GTK v 1 and a fd in version 2
@@ -119,6 +128,7 @@ class appgui:
      port = 5150
 
      self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+     self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
      self.sock.bind(('localhost', port))
      self.sock.listen(0)
      print "listening on ", port
@@ -235,16 +245,22 @@ Mark Tearle, June 2004
 
   def do_vend_all(self):
      for i in range(11,99):
-     	self.do_send("101 Vending ",i)
-     	self.do_send("153 Home sensors failing")
-     self.do_send("102 Vend all motors complete")
+     	self.do_send("101 Vending "+i+"\n")
+     	self.do_send("153 Home sensors failing\n")
+     self.do_send("102 Vend all motors complete\n")
   
   def do_vend(self,command):
-     self.do_send("153 Home sensors failing")
+     fail = None
+     if fail:
+     	self.do_send("153 Home sensors failing\n")
+     else:
+        self.insert("Vending ",command)
+     	self.do_send("100 Vend successful\n")
     
   def do_display(self,string):
      display = self.wTree.get_widget("label1")
      display.set_text("%10.10s" % (string))
+     self.do_send('300 Written\n')
 
   def do_beep(self,command):
      sys.stdout.write("\a")
@@ -252,6 +268,11 @@ Mark Tearle, June 2004
   def do_silence(self,command):
      pass
 
+  def do_switches(self):
+     self.do_send("600 3F 3F\n")
+
+  def do_pong(self):
+     self.do_send("000 PONG!\n")
 
   def handle_command(self, command):
      command = string.upper(command)
@@ -260,16 +281,20 @@ Mark Tearle, June 2004
 	self.do_help()
      elif string.find(command, "ABOUT",0) == 0:
 	self.do_about()
+     elif string.find(command, "PING",0) == 0:
+	self.do_pong()
      elif string.find(command, "VALL",0) == 0:
 	self.do_vend_all()
      elif string.find(command, "V",0) == 0:
 	self.do_vend(command)
      elif string.find(command, "B",0) == 0:
 	self.do_beep(command)
-     elif string.find(command, "S",0) == 0:
+     elif string.find(command, "C",0) == 0:
 	self.do_silence(command)
+     elif string.find(command, "S",0) == 0:
+	self.do_switches()
      elif string.find(command, "D",0) == 0:
-	self.do_display(command[1:-1])
+	self.do_display(command[1:])
      self.do_prompt()