Merge branch 'mobileapp' into biginstall

Conflicts:
	behaviors/RestrictLocation.py
	behaviors/Square.py
	config/6thFloor.xml
	inputs/TCPInput.py
	layouts/60StripLayout.xml
	operationscore/Behavior.py
	operationscore/PixelMapper.py
	pixelcore/Pixel.py
	pixelcore/Screen.py
	renderers/60StripSeq.xml

2 files changed, 15 insertions, 10 deletions

diff --git a/inputs/TCPInput.py b/inputs/TCPInput.py
index 5bf06bf..2bc69ef 100644
--- a/inputs/TCPInput.py
+++ b/inputs/TCPInput.py
@@ -3,6 +3,8 @@ import pdb
 from operationscore.Input import *
 import socket, json, time
 import logging as main_log
+import string
+
 class TCPInput(Input):
     def inputInit(self):
         self.HOST = ''                 # Symbolic name meaning all available interfaces
@@ -22,7 +24,9 @@ class TCPInput(Input):
         
         if not data or 'end' in data: # data end, close socket
             main_log.debug('End in data')
+            print 'end of stream'
             self.IS_RESPONDING = 0
+            self.conn.close()
             self.sock.close()
         
         if self.IS_RESPONDING == 1: # if 'responding', respond to the received data		       	
@@ -30,20 +34,21 @@ class TCPInput(Input):
                 for datagroup in data.split('\n'):
                     if datagroup != None and datagroup != '':
                         dataDict = json.loads(datagroup)
-                        # socketDict = {'data':dataDict, 'address':self.address}
-                        socketDict = {Strings.LOCATION: (dataDict['x'], dataDict['y'])} # like PygameInput
-                        print 'input'
-                        self.respond(socketDict)
+                        #print dataDict
+                        self.respond(dataDict)
+                        #socketDict = {'data':dataDict, 'address':self.address}
+                        #socketDict = {Strings.LOCATION: (dataDict['x'], dataDict['y'])} # like PygameInput
+                        #print 'input'
+                        #self.respond(socketDict)
             except Exception as exp:
                 print str(exp) 
         else:
             # if not 'responding', don't respond to data and restart socket
             # * an incomplete hack for now. will be changed if same-type-multi-Input is implemented.
-            time.sleep(1)
+
+            self.IS_RESPONDING = 1
             self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
             self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             self.sock.bind((self.HOST, self.PORT))
             self.sock.listen(1)
             (self.conn, self.address) = self.sock.accept()
-            self.IS_RESPONDING = 1
-             
diff --git a/inputs/UDPInput.py b/inputs/UDPInput.py
index 7d5609e..e95bd33 100644
--- a/inputs/UDPInput.py
+++ b/inputs/UDPInput.py
@@ -7,7 +7,7 @@ class UDPInput(Input):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self.sock.bind((HOST, PORT))
     def sensingLoop(self):
-            (data,address) = self.sock.recvfrom(1024)
-            dataDict = {'data':data, 'address':address}
-            self.respond(dataDict)
+        (data,address) = self.sock.recvfrom(1024)
+        dataDict = {'data':data, 'address':address}
+        self.respond(dataDict)