Skip to content

Fix for windows path formatting (backslash) #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ppannuto merged 2 commits into from
Mar 8, 2017
Merged

Fix for windows path formatting (backslash) #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0fcfe8
Fix windows path formatting if a windows path is applied
Mar 8, 2017
05438f6
Fix windows path formatting if a windows path is applied (2/2)
Mar 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions saleae/saleae.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ def get_connected_devices(self):
[<saleae.ConnectedDevice #1 LOGIC_4_DEVICE Logic 4 (...) **ACTIVE**>, <saleae.ConnectedDevice #2 LOGIC_8_DEVICE Logic 8 (...)>, <saleae.ConnectedDevice #3 LOGIC_PRO_8_DEVICE Logic Pro 8 (...)>, <saleae.ConnectedDevice #4 LOGIC_PRO_16_DEVICE Logic Pro 16 (...)>]
'''
devices = self._cmd('GET_CONNECTED_DEVICES')
# command response is sometimes not the expected one : a non-empty string starting with a digit (index)
# command response is sometimes not the expected one : a non-empty string starting with a digit (index)
while ('' == devices or not devices[0].isdigit()):
time.sleep(0.1)
devices = self._cmd('GET_CONNECTED_DEVICES')
Expand Down Expand Up @@ -598,6 +598,8 @@ def capture_stop(self):
def capture_to_file(self, file_path_on_target_machine):
if os.path.splitext(file_path_on_target_machine)[1] == '':
file_path_on_target_machine += '.logicdata'
# Fix windows path if needed
file_path_on_target_machine = repr(file_path_on_target_machine).replace("\\", r"\\")[1:-1]
self._cmd('CAPTURE_TO_FILE, ' + file_path_on_target_machine)

def get_inputs(self):
Expand All @@ -612,9 +614,13 @@ def is_processing_complete(self):
def save_to_file(self, file_path_on_target_machine):
while not self.is_processing_complete():
time.sleep(1)
# Fix windows path if needed
file_path_on_target_machine = repr(file_path_on_target_machine).replace("\\", r"\\")[1:-1]
self._cmd('SAVE_TO_FILE, ' + file_path_on_target_machine)

def load_from_file(self, file_path_on_target_machine):
# Fix windows path if needed
file_path_on_target_machine = repr(file_path_on_target_machine).replace("\\", r"\\")[1:-1]
self._cmd('LOAD_FROM_FILE, ' + file_path_on_target_machine)

def close_all_tabs(self):
Expand Down Expand Up @@ -654,7 +660,8 @@ def export_data(self,
# for something that will definitely fail
if file_path_on_target_machine[0] in ('~', '.'):
raise NotImplementedError('File path must be absolute')

# Fix windows path if needed
file_path_on_target_machine = repr(file_path_on_target_machine).replace("\\", r"\\")[1:-1]
self._build('EXPORT_DATA')
self._build(file_path_on_target_machine)
if (digital_channels is None) and (analog_channels is None):
Expand Down Expand Up @@ -825,7 +832,8 @@ def export_data2(self, file_path_on_target_machine, digital_channels=None, analo
# NOTE: Note to Saleae, Logic should resolve relative paths, I do not see reasons not to do this ...
if file_path_on_target_machine[0] in ('~', '.'):
raise ValueError('File path must be absolute')

# Fix windows path if needed
file_path_on_target_machine = repr(file_path_on_target_machine).replace("\\", r"\\")[1:-1]
self._build('EXPORT_DATA2')
self._build(file_path_on_target_machine)

Expand Down