wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87 from vrtsystems/ieee754-conversion

Browse Source 
IEEE754 conversion
This commit is contained in:
Robert
2015-12-30 10:17:24 +09:00
parent 716d712314 ef6c4be655
commit bce4c6959b
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mbus/mbus-protocol.c
View File

@ -10,9 +10,9 @@
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <math.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <arpa/inet.h>
#include "mbus-protocol.h" #include "mbus-protocol.h"
@ -649,6 +649,7 @@ mbus_data_int_encode(unsigned char *int_data, size_t int_data_size, int value)
float float
mbus_data_float_decode(unsigned char *float_data) mbus_data_float_decode(unsigned char *float_data)
{ {
#ifdef _HAS_NON_IEEE754_FLOAT
float val = 0.0f; float val = 0.0f;
long temp = 0, fraction; long temp = 0, fraction;
int sign,exponent; int sign,exponent;
@ -682,8 +683,20 @@ mbus_data_float_decode(unsigned char *float_data)
return val; return val;
} }
#else
if (float_data)
{
union {
uint32_t u32;
float f;
} data;
memcpy(&(data.u32), float_data, sizeof(uint32_t));
data.u32 = ntohl(data.u32);
return data.f;
}
#endif
return -1.0; return -1.0f;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------