diff --git a/contrib/docker/build.sh b/contrib/docker/build.sh index 694ec1a5..583f3346 100755 --- a/contrib/docker/build.sh +++ b/contrib/docker/build.sh @@ -42,7 +42,7 @@ for image in $images; do output=$(echo "$outputFmt"|sed -e "s#%IMAGE%#$image#g") docker buildx build \ --target $target \ - --progress pain \ + --progress plain \ --platform $archs \ -f Dockerfile${namesuffix} \ --build-arg "BASE_IMAGE=debian:$image" \ diff --git a/src/lib/ebus/datatype.cpp b/src/lib/ebus/datatype.cpp index b585cd33..45c3a3fd 100755 --- a/src/lib/ebus/datatype.cpp +++ b/src/lib/ebus/datatype.cpp @@ -34,6 +34,7 @@ namespace ebusd { using std::dec; +using std::defaultfloat; using std::hex; using std::fixed; using std::setfill; @@ -746,7 +747,7 @@ result_t NumberDataType::readSymbols(size_t offset, size_t length, const SymbolS result_t NumberDataType::readFromRawValue(size_t length, unsigned int value, OutputFormat outputFormat, ostream* output) const { int signedValue; - *output << setw(0) << dec; // initialize output + *output << defaultfloat << setw(0) << dec; // initialize output if (!hasFlag(REQ) && value == m_replacement) { if (outputFormat & OF_JSON) {