Skip to content

Commit

Permalink
Merge pull request #206 from ptar543/BlueFors_ControlSoftwarev2.2
Browse files Browse the repository at this point in the history
BlueFors: update datetime parsing to be compatibe with v2.2 bluefors software
  • Loading branch information
astafan8 authored Mar 1, 2023
2 parents 0bc336e + 99a5b9b commit 42b8555
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions qcodes_contrib_drivers/drivers/BlueFors/BlueFors.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ def get_temperature(self, channel: int) -> float:
names = ['date', 'time', 'y'],
header = None)

# There is a space before the day
df.index = pd.to_datetime(df['date']+'-'+df['time'], format=' %d-%m-%y-%H:%M:%S')
# There is no space before the day with BlueFors Control Software v2.2
df.index = pd.to_datetime(df['date']+'-'+df['time'], format='%d-%m-%y-%H:%M:%S')

return df.iloc[-1]['y']
except (PermissionError, OSError) as err:
Expand Down

0 comments on commit 42b8555

Please sign in to comment.