# HG changeset patch # User Michiel Broek # Date 1713786021 -7200 # Node ID 0f1ef5e6418e5af81d683b6cb65fb6f087db976e # Parent 3518c07737d8c5bc81b7690b5d6c1ee31f98235f Version 0.9.19a3. Fixed segfault in onewire temperature measurement. Fixed json error in onewire device. diff -r 3518c07737d8 -r 0f1ef5e6418e configure.ac --- a/configure.ac Mon Apr 22 11:33:04 2024 +0200 +++ b/configure.ac Mon Apr 22 13:40:21 2024 +0200 @@ -8,7 +8,7 @@ dnl General settings dnl After changeing the version number, run autoconf! PACKAGE="mbsePi-apps" -VERSION="0.9.19a2" +VERSION="0.9.19a3" COPYRIGHT="Copyright (C) 2014-2024 Michiel Broek, All Rights Reserved" CYEARS="2014-2024" AC_SUBST(PACKAGE) diff -r 3518c07737d8 -r 0f1ef5e6418e thermferm/one-wire.c --- a/thermferm/one-wire.c Mon Apr 22 11:33:04 2024 +0200 +++ b/thermferm/one-wire.c Mon Apr 22 13:40:21 2024 +0200 @@ -62,7 +62,7 @@ payload = xstrcat(payload, (char *)"\",\"value\":"); snprintf(vbuf, 63, "%d", dev_w1->value); payload = xstrcat(payload, vbuf); - payload = xstrcat(payload, (char *)"\",\"timestamp\":"); + payload = xstrcat(payload, (char *)",\"timestamp\":"); snprintf(vbuf, 63, "%ld", (long)dev_w1->timestamp); payload = xstrcat(payload, vbuf); payload = xstrcat(payload, (char *)"}"); @@ -403,9 +403,9 @@ if ((fgets(buffer, 25, fp))) { sscanf(buffer, "%d", &value); if (cur_w1->value != value) { - dev_w1->timestamp = time(NULL); + cur_w1->timestamp = time(NULL); changed = true; -// syslog(LOG_NOTICE, "One-wire device %s temperature read %d => %d", cur_w1->address, cur_w1->value, value); + syslog(LOG_NOTICE, "One-wire device %s temperature read %d => %d", cur_w1->address, cur_w1->value, value); } cur_w1->value = value; /* devices.c will pick this up */ } else {