nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/lib/ebus/datatype.cpp
This commit is contained in:
John
2022-01-30 21:37:13 +01:00
parent fded31b0cc 6836e6d71d
commit fb8ed4bd35
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/docker/build.sh
+1 -1
View File
@@ -42,7 +42,7 @@ for image in $images; do
output=$(echo "$outputFmt"|sed -e "s#%IMAGE%#$image#g") output=$(echo "$outputFmt"|sed -e "s#%IMAGE%#$image#g")
docker buildx build \ docker buildx build \
--target $target \ --target $target \
--progress pain \ --progress plain \
--platform $archs \ --platform $archs \
-f Dockerfile${namesuffix} \ -f Dockerfile${namesuffix} \
--build-arg "BASE_IMAGE=debian:$image" \ --build-arg "BASE_IMAGE=debian:$image" \
src/lib/ebus/datatype.cpp
+2 -1
View File
@@ -34,6 +34,7 @@
namespace ebusd { namespace ebusd {
using std::dec; using std::dec;
using std::defaultfloat;
using std::hex; using std::hex;
using std::fixed; using std::fixed;
using std::setfill; 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, result_t NumberDataType::readFromRawValue(size_t length, unsigned int value,
OutputFormat outputFormat, ostream* output) const { OutputFormat outputFormat, ostream* output) const {
int signedValue; int signedValue;
*output << setw(0) << dec; // initialize output *output << defaultfloat << setw(0) << dec; // initialize output
if (!hasFlag(REQ) && value == m_replacement) { if (!hasFlag(REQ) && value == m_replacement) {
if (outputFormat & OF_JSON) { if (outputFormat & OF_JSON) {