Skip to content

Python3 compatibility #10

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

Open
heiderich wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python3 compatibility #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5eb1b26
do not open file in binary mode
heiderich Jul 14, 2019
8362c8b
use parenthesis for "print"
heiderich Jul 14, 2019
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
22 changes: 11 additions & 11 deletions cms50dplus/cms50dplus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ def getDictData(self):
class RecordedDataPoint(object):
def __init__(self, time, data):
if data[0] & 0xfe != 0xf0 or data[1] & 0x80 == 0 or data[2] & 0x80 != 0:
print data
print(data)
raise ValueError("Invalid data packet.")

self.time = time
Expand Down Expand Up @@ -266,7 +266,7 @@ def getRecordedData(self, time):
m = int(s / 60)
s -= m * 60

print "Number of measurements: {0} ({1}h{2}m{3}s)".format(length / 3, h, m, s)
print("Number of measurements: {0} ({1}h{2}m{3}s)".format(length / 3, h, m, s))

# Content...
packet = [0]*3
Expand All @@ -285,11 +285,11 @@ def getRecordedData(self, time):
self.disconnect()

def dumpLiveData(port, filename):
print "Saving live data..."
print "Press CTRL-C or disconnect the device to terminate data collection."
print("Saving live data...")
print("Press CTRL-C or disconnect the device to terminate data collection.")
oximeter = CMS50Dplus(port)
measurements = 0
with open(filename, 'wb') as csvfile:
with open(filename, 'w') as csvfile:
writer = csv.writer(csvfile, quoting=csv.QUOTE_NONNUMERIC)
writer.writerow(LiveDataPoint.getCsvColumns())
for liveData in oximeter.getLiveData():
Expand All @@ -307,11 +307,11 @@ def getLiveData(port, framerate=None):


def dumpRecordedData(starttime, port, filename):
print "Saving recorded data..."
print "Please wait as the latest session is downloaded..."
print("Saving recorded data...")
print("Please wait as the latest session is downloaded...")
oximeter = CMS50Dplus(port)
measurements = 0
with open(filename, 'wb') as csvfile:
with open(filename, 'w') as csvfile:
writer = csv.writer(csvfile, quoting=csv.QUOTE_NONNUMERIC)
writer.writerow(RecordedDataPoint.getCsvColumns())
for recordedData in oximeter.getRecordedData(starttime):
Expand Down Expand Up @@ -341,7 +341,7 @@ def valid_datetime(s):
elif args.mode == 'RECORDED' and args.starttime is not None:
dumpRecordedData(args.starttime, args.serialport, args.output)
else:
print "Missing start time for RECORDED mode."
print("Missing start time for RECORDED mode.")

print ""
print "Done."
print("")
print("Done.")