Mirrors/knx
1
0
Fork 0
mirror of https://github.com/thelsing/knx.git synced 2025-08-17 13:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update dptconvert.cpp

Browse Source 
Not verified.
This commit is contained in:
Maggyver 2019-07-13 09:32:02 +02:00 committed by GitHub
parent 8017c8b9c3
commit 7fd938f1c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/knx/dptconvert.cpp
View File

@ -1713,9 +1713,11 @@ double float16FromPayload(const uint8_t* payload, int index)
{ {
uint16_t mantissa = unsigned16FromPayload(payload, index) & 0x87FF; uint16_t mantissa = unsigned16FromPayload(payload, index) & 0x87FF;
if (mantissa & 0x8000) if (mantissa & 0x8000)
return ((~mantissa & 0x07FF) + 1.0) * -0.01 * (1 << ((payload[index] >> 3) & 0x0F)); //return ((~mantissa & 0x07FF) + 1.0) * -0.01 * (1 << ((payload[index] >> 3) & 0x0F));
return ((~mantissa & 0x07FF) + 1.0) * -0.01 * pow(2.0, ((payload[index] >> 3) & 0x0F)));
return mantissa * 0.01 * (1 << ((payload[index] >> 3) & 0x0F)); //return mantissa * 0.01 * (1 << ((payload[index] >> 3) & 0x0F));
return mantissa * 0.01 * pow(2.0, ((payload[index] >> 3) & 0x0F)));
} }
float float32FromPayload(const uint8_t* payload, int index) float float32FromPayload(const uint8_t* payload, int index)
{ {
@ -1783,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)
{ {
@ -1802,6 +1804,17 @@ 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));
*/
float v = value * 100.0f;
int exponent = 0;
for (; v < -2048.0f; v /= 2) exponent++;
for (; v > 2047.0f; v /= 2) exponent++;
long m = round(v) & 0x7FF;
short msb = (short) (exponent << 3 | m >> 8);
if (value < 0.0f) msb |= 0x80;
signed16ToPayload(payload, payload_length, index, m, mask);
unsigned8ToPayload(payload, payload_length, index, msb, 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)
{ {