Changeset 5190c4
- Timestamp:
- 01/12/12 14:40:43 (4 months ago)
- Branches:
- ('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')
- Children:
- 46d70ad4515a3d73d7e2f1680a0ee348b65ee2fd
- Parents:
- 01855cac968f05755723356ac8582602264fbffb
- git-author:
- Micke Prag <micke.prag@telldus.se>2012-01-12 11:20:15+01:00
- git-committer:
- Micke Prag <micke.prag@telldus.se>2012-01-12 14:40:43+01:00
- File:
-
- 1 edited
-
telldus-core/tdtool/main.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
telldus-core/tdtool/main.cpp
r554601 r5190c4 139 139 140 140 if (dataTypes & TELLSTICK_TEMPERATURE) { 141 tdSensorValue(protocol, model, sensorId, TELLSTICK_TEMPERATURE, tempvalue, DATA_LENGTH, (int *)×tamp);142 strcat(tempvalue, "°");143 strftime(timeBuf, sizeof(timeBuf), "%Y-%m-%d %H:%M:%S", localtime(×tamp));141 tdSensorValue(protocol, model, sensorId, TELLSTICK_TEMPERATURE, tempvalue, DATA_LENGTH, (int *)×tamp); 142 strcat(tempvalue, "°"); 143 strftime(timeBuf, sizeof(timeBuf), "%Y-%m-%d %H:%M:%S", localtime(×tamp)); 144 144 } 145 145 146 146 if (dataTypes & TELLSTICK_HUMIDITY) { 147 tdSensorValue(protocol, model, sensorId, TELLSTICK_HUMIDITY, humidityvalue, DATA_LENGTH, (int *)×tamp);148 strcat(humidityvalue, "%");149 strftime(timeBuf, sizeof(timeBuf), "%Y-%m-%d %H:%M:%S", localtime(×tamp));147 tdSensorValue(protocol, model, sensorId, TELLSTICK_HUMIDITY, humidityvalue, DATA_LENGTH, (int *)×tamp); 148 strcat(humidityvalue, "%"); 149 strftime(timeBuf, sizeof(timeBuf), "%Y-%m-%d %H:%M:%S", localtime(×tamp)); 150 150 } 151 151 printf("%-20s\t%-20s\t%-5i\t%-5s\t%-8s\t%-20s\n", protocol, model, sensorId, tempvalue, humidityvalue, timeBuf);
Note: See TracChangeset
for help on using the changeset viewer.
