Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/lib/ebus/datatype.cpp
This commit is contained in:
John
2022-01-30 21:37:13 +01:00
2 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -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" \
+2 -1
View File
@@ -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) {