Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
W
White Rabbit Calibration
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
White Rabbit Calibration
Commits
e6f9fe57
Commit
e6f9fe57
authored
Aug 02, 2018
by
Peter Jansweijer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Windows doesn't like micro second time formated filenames.
parent
ce983675
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
10 deletions
+16
-10
Keysight_DSO_S_254A.py
sw/lib/Keysight_DSO_S_254A.py
+16
-10
No files found.
sw/lib/Keysight_DSO_S_254A.py
View file @
e6f9fe57
...
...
@@ -126,12 +126,6 @@ def get_waveforms(scope, channels=[1,2,3,4], num_avg=1, output_dir="data"):
os
.
mkdir
(
output_dir
)
print
(
"Output directory does not exist => created: "
+
output_dir
)
#timestamp = time.localtime()
timestamp
=
datetime
.
datetime
.
now
()
#micro seconds timing
#filename=output_dir+time.strftime(format("%y%m%d_%H_%M_%S"),timestamp)+"_scope_keysight_dso_s_254A_bin"
filename
=
output_dir
+
timestamp
.
strftime
(
"
%
y
%
m
%
dT
%
H:
%
M:
%
S.
%
f"
)
+
"_scope_keysight_dso_s_254A_bin"
print
(
"save waveform into file:"
,
filename
)
file_header
=
"#WaveformData:Keysight DSO-S 254A
\n
"
file_header
+=
"#version:0.2
\n
"
file_header
+=
"#type:RAW
\n
"
...
...
@@ -142,10 +136,22 @@ def get_waveforms(scope, channels=[1,2,3,4], num_avg=1, output_dir="data"):
file_header
+=
str
(
chan
)
+
","
file_header
+=
"
\n
"
#file_header += "#date:"+time.strftime(format("%d %b %Y"),timestamp)+"\n"
file_header
+=
"#date:"
+
timestamp
.
strftime
(
"
%
d
%
b
%
Y"
)
+
"
\n
"
#file_header += "#time:"+time.strftime(format("%H:%M:%S"),timestamp)+"\n"
file_header
+=
"#time:"
+
timestamp
.
strftime
(
"
%
H:
%
M:
%
S"
)
+
"
\n
"
# Windows filenames cannot handle the datetime "micro second timing" format.
micro_second_timing
=
False
if
micro_second_timing
:
timestamp
=
datetime
.
datetime
.
now
()
#micro seconds timing
filename
=
output_dir
+
timestamp
.
strftime
(
"
%
y
%
m
%
dT
%
H:
%
M:
%
S.
%
f"
)
+
"_scope_keysight_dso_s_254A_bin"
file_header
+=
"#date:"
+
timestamp
.
strftime
(
"
%
d
%
b
%
Y"
)
+
"
\n
"
file_header
+=
"#time:"
+
timestamp
.
strftime
(
"
%
H:
%
M:
%
S"
)
+
"
\n
"
else
:
timestamp
=
time
.
localtime
()
filename
=
output_dir
+
time
.
strftime
(
format
(
"
%
y
%
m
%
d_
%
H_
%
M_
%
S"
),
timestamp
)
+
"_scope_keysight_dso_s_254A_bin"
file_header
+=
"#date:"
+
time
.
strftime
(
format
(
"
%
d
%
b
%
Y"
),
timestamp
)
+
"
\n
"
file_header
+=
"#time:"
+
time
.
strftime
(
format
(
"
%
H:
%
M:
%
S"
),
timestamp
)
+
"
\n
"
print
(
"save waveform into file:"
,
filename
)
file_header
+=
"#byteorder:LSBFIRST
\n
"
channel_preamble
=
[]
channel_data
=
[]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment