Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-10-26 10:26:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update dptconvert.cpp

Browse Source
This commit is contained in:
Maggyver 2019-07-13 14:18:04 +02:00 committed by GitHub
parent 1b03f91711
commit b18ef10694
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/knx/dptconvert.cpp
View File

@ -1785,9 +1785,9 @@ void signed32ToPayload(uint8_t* payload, int payload_length, int index, int32_t
payload[index + 2] = (payload[index + 2] & (~mask >> 8)) | ((value >> 8) & (mask >> 8)); payload[index + 2] = (payload[index + 2] & (~mask >> 8)) | ((value >> 8) & (mask >> 8));
payload[index + 3] = (payload[index + 3] & ~mask) | (value & mask); payload[index + 3] = (payload[index + 3] & ~mask) | (value & mask);
} }
/*
void float16ToPayload(uint8_t* payload, int payload_length, int index, double value, uint16_t mask) void float16ToPayload(uint8_t* payload, int payload_length, int index, double value, uint16_t mask)
{ {
/*
bool wasNegative = false; bool wasNegative = false;
if (value < 0) if (value < 0)
{ {
@ -1804,17 +1804,44 @@ void float16ToPayload(uint8_t* payload, int payload_length, int index, double va
signed16ToPayload(payload, payload_length, index, mantissa, mask); signed16ToPayload(payload, payload_length, index, mantissa, mask);
unsigned8ToPayload(payload, payload_length, index, exponent << 3, 0x78 & (mask >> 8)); unsigned8ToPayload(payload, payload_length, index, exponent << 3, 0x78 & (mask >> 8));
*/ }
value *= 100.0; */
int int_exponent = 0; void float16ToPayload(uint8_t* payload, int payload_length, int index, double value, uint16_t mask)
for (; value < -2048.0; value /= 2) int_exponent++; {
for (; value > 2047.0; value /= 2) int_exponent++; uint8_t dpt_Value[2];
short mantissa = round(value) & 0x7FF; long longValuex100 = (long)(100.0 * value);
unsigned short exponent = int_exponent << 3 | m >> 8; bool negativeSign = (longValuex100 & 0x80000000) ? true : false;
if (value < 0.0) exponent |= 0x80; uint8_t exponent = 0;
uint8_t round = 0;
signed16ToPayload(payload, payload_length, index, mantissa, mask);
unsigned8ToPayload(payload, payload_length, index, exponent, mask); if (negativeSign)
{
while (longValuex100 < (long)(-2048))
{
exponent++;
round = (uint8_t)(longValuex100) & 1;
longValuex100 >>= 1;
longValuex100 |= 0x80000000;
}
}
else
{
while (longValuex100 > (long)(2047))
{
exponent++;
round = (uint8_t)(longValuex100) & 1;
longValuex100 >>= 1;
}
}
if (round) longValuex100++;
dpt_Value[1] = (uint8_t)longValuex100;
dpt_Value[0] = (uint8_t)(longValuex100 >> 8) & 0x7;
dpt_Value[0] += exponent << 3;
if (negativeSign) dpt_Value[0] += 0x80;
ENSURE_PAYLOAD(index + 2);
payload[index] = (payload[index] & (~mask >> 8)) | (dpt_Value[1] & (mask >> 8));
payload[index + 1] = (payload[index + 1] & ~mask) | (dpt_Value[0] & mask);
} }
void float32ToPayload(uint8_t* payload, int payload_length, int index, double value, uint32_t mask) void float32ToPayload(uint8_t* payload, int payload_length, int index, double value, uint32_t mask)
{ {