Permalink
Browse files

Merge pull request #1 from electrodynatronic/patch-1

Bug in line 41 which causes a plots to be displayed without applying pro...
  • Loading branch information...
2 parents 2650593 + e5a2acb commit fde392511991904682e52ff7638ef9d9cbe687d6 @hadmack committed Jan 30, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 realtime_chart.py
View
@@ -37,7 +37,7 @@ def getChannelData(channel):
# Now, we know from experimentation that the scope display range is actually
# 30-229. So shift by 130 - the voltage offset in counts, then scale to
# get the actual voltage.
- data = (data - 130.0 - voltoffset/voltscale*25) / 25 * voltscale
+ data = (data - 130.0 - voltoffset/voltscale*25) / 25 * voltscale + voltoffset
# Get the timescale
test.write(":TIM:SCAL?")

0 comments on commit fde3925

Please sign in to comment.