diff --git a/actions.py b/actions.py index f353a75..3de818d 100644 --- a/actions.py +++ b/actions.py @@ -857,9 +857,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): @@ -869,7 +869,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 diff --git a/user_input/midi_input.py b/user_input/midi_input.py index 9217c76..5834578 100644 --- a/user_input/midi_input.py +++ b/user_input/midi_input.py @@ -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()