misc

client/keyboard.py

@@ -17,6 +17,7 @@ class Keyboard(threading.Thread):
         self.handleInput()
     def handleInput(self):
         device="/dev/input/by-id/usb-Microsoft_Comfort_Curve_Keyboard_3000-event-kbd"
+        device="/dev/input/by-id/usb-_USB_Keyboard-event-kbd"
         try:
             dev = InputDevice(device)
         except Exception as e:
@@ -25,6 +26,7 @@ class Keyboard(threading.Thread):
             return
         #dev = InputDevice("/dev/input/by-path/platform-i8042-serio-0-event-kbd")
         VALID_KEYS = [ "KEY_PAGEUP", "KEY_PAGEDOWN", "KEY_F5" ]
+        print("Reading keyboard")
         while True:
             r, w, e = select([dev], [], [])
             for ev in dev.read():

client/websocket.py

@@ -16,11 +16,8 @@ class Websocket(threading.Thread):
                             "toggle":toggle,
                             "video":handle_video
                         }
-        print(type(self.callbacks))
         self.valid_data_types=["add_preg", "diapo", "startrec","startrectrat","stoprec","toggle","video"]
 
-        #asyncio.get_event_loop().run_until_complete(start_server)
-        #asyncio.get_event_loop().run_forever()
         self.loop = asyncio.get_event_loop()
 
     def run(self):

node/node.lua

@@ -1,8 +1,9 @@
-gl.setup(800,600)
+--gl.setup(800,600)
+gl.setup(1024,768)
 
 local json = require "json"
 local font = resource.load_font("silkscreen.ttf")
-local cur_image = resource.load_image("/home/david/git/especificos-node/node/1.png")
+local cur_image = resource.load_image("/home/pi/especificos-node/node/1.png")
 local state = "diapo"
 local cur_preg = ""
 local time = "0:0"
@@ -34,9 +35,10 @@ end
 node.event("data", decode_command)  -- listen to UDP
 function node.render()
 	if state == "diapo" then
-		cur_image:draw(0,0,WIDTH,HEIGHT)
-		font:write(730,580,time,20,1,1,1,1)
-		font:write(10,580,img_prog,20,1,1,1,1)
+		--cur_image:draw(0,0,WIDTH,HEIGHT)
+        util.draw_correct(image, 0, 0, WIDTH, HEIGHT)
+		font:write(WIDTH-70,HEIGHT-20,time,20,1,1,1,1)
+		font:write(10,HEIGHT-20,img_prog,20,1,1,1,1)
 	elseif state == "pregunta" then
 		preguntas:draw(0,0,WIDTH,HEIGHT)
 		font:write(120,320,cur_preg,20,1,1,1,1)