Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7f6da2a03a7f
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f093a679179
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Sep 7, 2020

  1. Copy the full SHA
    0f093a6 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 scopehal/Unit.cpp
2 changes: 1 addition & 1 deletion scopehal/Unit.cpp
Original file line number Diff line number Diff line change
@@ -217,7 +217,7 @@ double Unit::ParseString(string str)
scale = 1000000000.0;
else if(c == 'M')
scale = 1000000.0;
else if(c == 'K')
else if(c == 'K' || c == 'k')
scale = 1000.0;
else if(c == 'm')
scale = 0.001;