From c70ca8c0a0c5bea0e78bb945ba87f18f01374e90 Mon Sep 17 00:00:00 2001 From: bspaans Date: Mon, 2 Feb 2009 14:17:21 +0100 Subject: [PATCH] Remove Arduino references. The improviser with Arduino support has its own branch now. --- improviser/Arduino.py | 46 ------------------------------- improviser/Blocks/ArduinoBlock.py | 30 -------------------- 2 files changed, 76 deletions(-) delete mode 100644 improviser/Arduino.py delete mode 100644 improviser/Blocks/ArduinoBlock.py diff --git a/improviser/Arduino.py b/improviser/Arduino.py deleted file mode 100644 index e63fc22..0000000 --- a/improviser/Arduino.py +++ /dev/null @@ -1,46 +0,0 @@ -from threading import Thread -from os import sys -from time import sleep - -class Arduino: - - def __init__(self): - import serial - self.buf = BufferedRead() - self.arduino = ReadArduinoUSB(self.buf) - self.arduino.start() - - def get_last(self): - r = self.buf.get_last() - if r is not None and r != '': - return r - -class BufferedRead: - - values = [512, 512, 512, 512] - stop = False - - def add(self, line): - v = line.split(" ") - self.values = map(lambda x: int(x), v) - - def get_last(self): - return self.values - -class ReadArduinoUSB(Thread): - - - def __init__(self, buf): - self.usb = serial.Serial("/dev/ttyUSB0", 9600) - self.buf = buf - Thread.__init__(self) - - def run(self): - while not self.buf.stop: - try: - self.buf.add(self.usb.readline()) - except: - pass - self.usb.close() - - diff --git a/improviser/Blocks/ArduinoBlock.py b/improviser/Blocks/ArduinoBlock.py deleted file mode 100644 index 5fd78a1..0000000 --- a/improviser/Blocks/ArduinoBlock.py +++ /dev/null @@ -1,30 +0,0 @@ -from Block import Block -from time import sleep -import Arduino - -class ArduinoBlock(Block): - - def __init__(self): - self.arduino = Arduino.Arduino() - - def get_bpm(self, iterations, tick): - i = self.arduino.get_last()[0] - self.bpm = i / 4 + 50 - return self.bpm - - def get_wildness(self, iteration, tick): - i = self.arduino.get_last()[1] - self.wildness = i / 512.0 * (self.arduino.get_last()[3] / 512.0) - return self.wildness - - def get_resolution(self, iteration): - i = self.arduino.get_last()[2] - if i > 512: - self.resolution = 8 - else: - self.resolution = 4 - return self.resolution - - def stop(self): - self.arduino.buf.stop = True - sleep(0.1)