diff --git a/v2/backend/arduino/VideoDisplayTeensy31/VideoDisplayTeensy31.ino b/v2/backend/arduino/VideoDisplayTeensy31/VideoDisplayTeensy31.ino index 2c1449c..89dec5b 100644 --- a/v2/backend/arduino/VideoDisplayTeensy31/VideoDisplayTeensy31.ino +++ b/v2/backend/arduino/VideoDisplayTeensy31/VideoDisplayTeensy31.ino @@ -100,10 +100,10 @@ void loop() { unsigned int startAt = micros(); unsigned int usecUntilFrameSync = 0; count = Serial.readBytes((char *)drawingMemory, sizeof(int) * ledsPerStrip*6); - Serial.write((char *)drawingMemory, sizeof(int) * ledsPerStrip*6); + //Serial.write((char *)drawingMemory, sizeof(int) * ledsPerStrip*6); if (count >= sizeof(int) * ledsPerStrip*6) { unsigned int endAt = micros(); - unsigned int usToWaitBeforeSyncOutput = 100; + unsigned int usToWaitBeforeSyncOutput = 1000; if (endAt - startAt < usecUntilFrameSync) { usToWaitBeforeSyncOutput = usecUntilFrameSync - (endAt - startAt); } diff --git a/v2/backend/forwarding/forward.py b/v2/backend/forwarding/forward.py index 8f30be4..73caa2f 100644 --- a/v2/backend/forwarding/forward.py +++ b/v2/backend/forwarding/forward.py @@ -23,7 +23,7 @@ def send(r, s): # print('Data sent ({} bytes)'.format(size)) -def serialConfigure(port_name, baudrate=38400): +def serialConfigure(port_name, baudrate=9600): ''' We use a very low baudrate by default because the USB port on the teensy enforce this value: http://www.pjrc.com/teensy/td_serial.html @@ -50,10 +50,25 @@ def serialConfigure(port_name, baudrate=38400): ser.timeout = 1 return ser + +def serialDataConfigure(port_name, baudrate=115200): + ser = Serial() + ser.port = port_name + ser.baudrate = baudrate + try: + ser.open() + except SerialException as e: + sys.stderr.write("Could not open serial port %s: %s\n" % (ser.portstr, e)) + return + + ser.timeout = 1 + return ser + if __name__ == "__main__": r = redis.Redis() r.hset('config', 'imgsize', height * width * 24) s = serialConfigure('/dev/ttyACM0') + #s_data = serialDataConfigure('/dev/ttyUSB0') while True: while r.llen('new') > 0: send(r, s) diff --git a/v2/backend/processing/PixelControl_TCP/PixelControl_TCP.pyde b/v2/backend/processing/PixelControl_TCP/PixelControl_TCP.pyde index a7f59d0..179167b 100644 --- a/v2/backend/processing/PixelControl_TCP/PixelControl_TCP.pyde +++ b/v2/backend/processing/PixelControl_TCP/PixelControl_TCP.pyde @@ -11,7 +11,7 @@ dimension = 0 # TODO: test with real serial # https://www.pjrc.com/teensy/td_uart.html -long_line = False +long_line = True ledTCP = None data = None