|
|
@@ -119,15 +119,15 @@ int main (void)
|
|
119
|
119
|
reportPacket.senderId = ownId;
|
|
120
|
120
|
//reportPacket.salt; /* TODO */
|
|
121
|
121
|
reportPacket.payload.values.packetIdentifier.elementCount = 3;
|
|
122
|
|
- reportPacket.payload.values.packetIdentifier.packetType = 0; /* TODO: report type ? */
|
|
|
122
|
+ reportPacket.payload.values.packetIdentifier.packetType = PACKET_TYPE_REPORT;
|
|
123
|
123
|
|
|
124
|
124
|
/* Fill in the payload */
|
|
125
|
125
|
reportPacket.payload.values.valueTypeTemperature = VALUE_TYPE_TEMPERATURE;
|
|
126
|
|
- reportPacket.payload.values.temperature = sensorData.temperature;
|
|
|
126
|
+ reportPacket.payload.values.temperature = sensorData.temperature/10;
|
|
127
|
127
|
reportPacket.payload.values.valueTypePressure = VALUE_TYPE_PRESSURE;
|
|
128
|
128
|
reportPacket.payload.values.pressure = sensorData.pressure;
|
|
129
|
129
|
reportPacket.payload.values.valueTypeHumidity = VALUE_TYPE_HUMIDITY;
|
|
130
|
|
- reportPacket.payload.values.humidity = sensorData.humidity;
|
|
|
130
|
+ reportPacket.payload.values.humidity = sensorData.humidity * 100/1024;
|
|
131
|
131
|
|
|
132
|
132
|
/* Calculate the CRC */
|
|
133
|
133
|
crc = Calculate_Crc(reportPacket.payload.buffer, PACKET_BUFFER_LENGTH);
|