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-12 19:30:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/langolierz/r_e_c_u_r into dev

Browse Source
This commit is contained in:
Tristan Rowley
2020-03-01 15:48:37 +00:00
parent 638a78ab68 cf0e2e0ea6
commit d7f1aa2813
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actions.py
View File

@@ -858,9 +858,9 @@ class Actions(object):
def toggle_access_point_delay(self, setting_value, osc_setting_state ):
if setting_value == 'enabled':
subprocess.call(['sudo', 'bash', '/home/pi/raspiApWlanScripts-master/switchToAP.sh'])
subprocess.call(['sudo', 'bash', '/home/pi/raspiApWlanScripts/switchToAP.sh'])
else:
subprocess.call(['sudo', 'bash', '/home/pi/raspiApWlanScripts-master/switchToWlan.sh'])
subprocess.call(['sudo', 'bash', '/home/pi/raspiApWlanScripts/switchToWlan.sh'])
self.tk.after(6000, self.enable_osc, osc_setting_state)
def toggle_remote_server(self, setting_value):
@@ -870,7 +870,7 @@ class Actions(object):
def toggle_remote_server_delay(self, setting_value, osc_setting_state):
if setting_value == 'enabled':
self.remote_process = subprocess.Popen(['node', '/home/pi/connecting-websockets-to-osc-for-rpi/webserver.js'])
self.remote_process = subprocess.Popen(['node', '/home/pi/r_e_m_o_t_e/webserver.js'])
else:
self.stop_remote_process()
self.data.settings['user_input']['OSC_INPUT']['value'] = osc_setting_state

10
user_input/midi_input.py
View File

@@ -35,11 +35,13 @@ class MidiInput(object):
def open_this_port_and_start_listening(self, port_phrase):
midi_ports = mido.get_input_names()
midi_device_on_port = [s for s in midi_ports if port_phrase in s]
if midi_device_on_port:
midi_devices = [s for s in midi_ports if not ('Midi Through' in s)]
if port_phrase == 'serial':
midi_devices = [s for s in midi_devices if port_phrase in s]
if midi_devices:
if self.data.midi_status == 'disconnected':
subport_index = self.port_index % len(midi_device_on_port)
self.midi_device = mido.open_input(midi_device_on_port[subport_index])
subport_index = self.port_index % len(midi_devices)
self.midi_device = mido.open_input(midi_devices[subport_index])
self.data.midi_status = 'connected'
self.message_handler.set_message('INFO', 'connected to midi device {}'.format(self.midi_device.name))
self.poll_midi_input()