Mercurial > mbsePi-apps / file comparison
comparison: thermferm/one-wire.c
thermferm/one-wire.c
- changeset 694
- 0f1ef5e6418e
- parent 693
- 3518c07737d8
- child 711
- 844588d0df65
equal
deleted
inserted
replaced
| 693:3518c07737d8 | 694:0f1ef5e6418e |
|---|---|
| 60 payload = xstrcat(payload, (char *)"\",\"present\":\""); | 60 payload = xstrcat(payload, (char *)"\",\"present\":\""); |
| 61 payload = xstrcat(payload, (char *)DEVPRESENT[dev_w1->present]); | 61 payload = xstrcat(payload, (char *)DEVPRESENT[dev_w1->present]); |
| 62 payload = xstrcat(payload, (char *)"\",\"value\":"); | 62 payload = xstrcat(payload, (char *)"\",\"value\":"); |
| 63 snprintf(vbuf, 63, "%d", dev_w1->value); | 63 snprintf(vbuf, 63, "%d", dev_w1->value); |
| 64 payload = xstrcat(payload, vbuf); | 64 payload = xstrcat(payload, vbuf); |
| 65 payload = xstrcat(payload, (char *)"\",\"timestamp\":"); | 65 payload = xstrcat(payload, (char *)",\"timestamp\":"); |
| 66 snprintf(vbuf, 63, "%ld", (long)dev_w1->timestamp); | 66 snprintf(vbuf, 63, "%ld", (long)dev_w1->timestamp); |
| 67 payload = xstrcat(payload, vbuf); | 67 payload = xstrcat(payload, vbuf); |
| 68 payload = xstrcat(payload, (char *)"}"); | 68 payload = xstrcat(payload, (char *)"}"); |
| 69 | 69 |
| 70 return payload; | 70 return payload; |
| 401 // syslog(LOG_NOTICE, "One-wire device %s temperature is open, delay %d", cur_w1->address, conv_time); | 401 // syslog(LOG_NOTICE, "One-wire device %s temperature is open, delay %d", cur_w1->address, conv_time); |
| 402 mDelay(conv_time); | 402 mDelay(conv_time); |
| 403 if ((fgets(buffer, 25, fp))) { | 403 if ((fgets(buffer, 25, fp))) { |
| 404 sscanf(buffer, "%d", &value); | 404 sscanf(buffer, "%d", &value); |
| 405 if (cur_w1->value != value) { | 405 if (cur_w1->value != value) { |
| 406 dev_w1->timestamp = time(NULL); | 406 cur_w1->timestamp = time(NULL); |
| 407 changed = true; | 407 changed = true; |
| 408 // syslog(LOG_NOTICE, "One-wire device %s temperature read %d => %d", cur_w1->address, cur_w1->value, value); | 408 syslog(LOG_NOTICE, "One-wire device %s temperature read %d => %d", cur_w1->address, cur_w1->value, value); |
| 409 } | 409 } |
| 410 cur_w1->value = value; /* devices.c will pick this up */ | 410 cur_w1->value = value; /* devices.c will pick this up */ |
| 411 } else { | 411 } else { |
| 412 syslog(LOG_NOTICE, "One-wire device %s temperature read error", cur_w1->address); | 412 syslog(LOG_NOTICE, "One-wire device %s temperature read error", cur_w1->address); |
| 413 } | 413 } |
