Merge branch 'next' into agpl_next

srs-codebot · Your Name · commit 30df8052ce2d · 2021-04-30T12:37:29.000+02:00
diff --git a/README.md b/README.md
@@ -21,4 +21,4 @@ For license details, see LICENSE file.
 Support
 =======
 
-Mailing list: http://www.softwareradiosystems.com/mailman/listinfo/srsran-users
+Mailing list: http://www.softwareradiosystems.com/mailman/listinfo/srslte-users
diff --git a/srsue/src/metrics_stdout.cc b/srsue/src/metrics_stdout.cc
@@ -246,11 +246,7 @@ std::string metrics_stdout::float_to_eng_string(float f, int digits)
   }
 
   const double scaled = f * pow(1000.0, -degree);
-  if (degree != 0) {
-    return float_to_string(scaled, digits) + factor;
-  } else {
-    return float_to_string(scaled, digits) + factor;
-  }
+  return float_to_string(scaled, digits) + factor;
 }
 
 } // namespace srsue

Original file line number	Diff line number	Diff line change
`@@ -246,11 +246,7 @@ std::string metrics_stdout::float_to_eng_string(float f, int digits)`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`const double scaled = f * pow(1000.0, -degree);`
`249`		`- if (degree != 0) {`
`250`		`- return float_to_string(scaled, digits) + factor;`
`251`		`- } else {`
`252`		`- return float_to_string(scaled, digits) + factor;`
`253`		`- }`
	`249`	`+ return float_to_string(scaled, digits) + factor;`
`254`	`250`	`}`
`255`	`251`
`256`	`252`	`} // namespace srsue`