eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-10 02:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed a few small bugs and only read analog inputs if there is a change

Browse Source
This commit is contained in:
langolierz
2018-09-24 21:25:00 +00:00
parent f1e92a01db
commit 0652c55613
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
user_input/analog_input.py
View File

@@ -9,8 +9,8 @@ class AnalogInput(object):
self.actions = actions
self.data = data
self.analog_mappings = data.analog_mappings
self.midi_device = None
self.analog_delay = 50
self.last_readings = [0,0,0,0,0,0,0,0]
SPI_PORT = 1
SPI_DEVICE = 2
@@ -26,11 +26,12 @@ class AnalogInput(object):
def poll_analog_inputs(self):
if self.data.settings['other']['ANALOG_INPUT']['value'] == 'enabled':
for i in range(0,8):
for i in range(0,8):
if str(i) in self.analog_mappings:
print('{} is in the mapping'.format(i))
reading = self.analog_input.read_adc(i)
self.run_action_for_mapped_channel(i, reading)
this_reading = self.analog_input.read_adc(i)
if this_reading - self.last_readings[i] > 3:
self.run_action_for_mapped_channel(i, this_reading)
self.last_readings[i] = this_reading
self.root.after(self.analog_delay, self.poll_analog_inputs)
else:
self.check_if_listening_enabled()

4
user_input/midi_input.py
View File

@@ -36,8 +36,8 @@ class MidiInput(object):
for message in self.midi_device.iter_pending():
i = i + 1
message_dict = message.dict()
## only listening to midi channel 1 for now , will make it seletcable later
if not message_dict['channel'] == 0:
midi_channel = midi_setting = self.data.settings['midi']['CHANNEL']['value'] - 1
if not message_dict['channel'] == midi_channel:
pass
## turning off noisey clock messages for now - may want to use them at some point
elif message_dict['type'] == 'clock':