alex/GY-63_MS5611
1
0
Fork 0
mirror of https://github.com/RobTillaart/Arduino.git synced 2024-10-03 18:09:02 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

+ 0.1.03

Browse Source 
+ changed math to float [test version]
This commit is contained in:
rob tillaart 2014-10-19 13:01:09 +02:00
parent e4db5d21e6
commit 2e5b971a8f
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/MS5611/MS5611.cpp
View File

@ -1,11 +1,13 @@
//
// FILE: MS5611.cpp
// AUTHOR: Rob Tillaart
// VERSION: 0.1.02
// Erni - testing/fixes
// VERSION: 0.1.03
// PURPOSE: MS5611 Temperature & Humidity library for Arduino
// URL:
//
// HISTORY:
// 0.1.03 changed math to float [test version]
// 0.1.02 fixed bug return value read()
// fixed bug #bits D2
// added MS5611_READ_OK
@ -56,18 +58,13 @@ int MS5611::read(uint8_t bits)
int32_t D2 = readADC();
if (_result) return _result;
// PAGE 7/20 DATASHEET
int32_t dT = D2 - C[5] * 256L;
// PAGE 7/20 of the datasheet
float dT = D2 - (C[5] * 256L);
_temperature = 2000 + (dT * C[6])/8388608L;
// float is faster and smaller footprint (700 bytes).
// no substantial loss in accuracy TODO verify
int64_t offset = C[2] * 65536L + (C[4] * dT ) / 128L;
int64_t sens = C[1] * 32768L + (C[3] * dT ) / 256L;
_pressure = ((D1 * sens)/2097152L - offset) / 32768L;
// TODO second order compensation
// PAGE 8/20 DATASHEET
float offset = (C[2] * 65536L) + (C[4] * dT ) / 128L;
float sens = C[1] * 32768L + (C[3] * dT ) / 256L;
_pressure = (((D1 * sens)/2097152L) - offset) / 32768L;
return 0;
}

7
libraries/MS5611/MS5611.h
View File

@ -1,7 +1,8 @@
//
// FILE: MS5611.h
// AUTHOR: Rob Tillaart
// VERSION: 0.1.02
// Erni - testing/fixes
// VERSION: 0.1.03
// PURPOSE: MS5611 Temperature & Pressure library for Arduino
// URL:
//
@ -19,7 +20,7 @@
#include <Arduino.h>
#endif
#define MS5611_LIB_VERSION "0.1.02"
#define MS5611_LIB_VERSION "0.1.03"
#define MS5611_READ_OK 0
@ -45,7 +46,7 @@ private:
int32_t _temperature;
int32_t _pressure;
int _result;
uint16_t C[8];
float C[8];
};
#endif
//