High resolution barometer and altimeter using i2c mode
Dependents: upverter_fitbit_clone ReadingMag_HMC5883L_work
ms5611.cpp@2:05804ed70748, 2013-05-09 (annotated)
- Committer:
- loopsva
- Date:
- Thu May 09 16:34:52 2013 +0000
- Revision:
- 2:05804ed70748
- Parent:
- 0:f97f410d4a21
- Child:
- 3:c2d1b0d432ad
Updated calculations. Now accurate to 0.1mbar if temperature > 20C at sea level (ref KOAK). Error is 10+ mbar and variable if temperature < 20C. Temp is accurate however < 20C. Untested below -15C
Who changed what in which revision?
User | Revision | Line number | New contents of line |
---|---|---|---|
loopsva | 0:f97f410d4a21 | 1 | //! |
loopsva | 0:f97f410d4a21 | 2 | //! @file an520_I2C.c,v |
loopsva | 0:f97f410d4a21 | 3 | //! |
loopsva | 0:f97f410d4a21 | 4 | //! Copyright (c) 2009 MEAS Switzerland |
loopsva | 0:f97f410d4a21 | 5 | //! |
loopsva | 0:f97f410d4a21 | 6 | //! |
loopsva | 0:f97f410d4a21 | 7 | //! |
loopsva | 0:f97f410d4a21 | 8 | //! @brief This C code is for starter reference only. It is written for the |
loopsva | 0:f97f410d4a21 | 9 | //! MEAS Switzerland MS56xx pressure sensor modules and Atmel Atmega644p |
loopsva | 0:f97f410d4a21 | 10 | //! microcontroller. |
loopsva | 0:f97f410d4a21 | 11 | //! |
loopsva | 0:f97f410d4a21 | 12 | //! @version 1.0 $Id: an520_I2C.c,v 1.0 |
loopsva | 0:f97f410d4a21 | 13 | //! |
loopsva | 0:f97f410d4a21 | 14 | //! @todo |
loopsva | 0:f97f410d4a21 | 15 | |
loopsva | 0:f97f410d4a21 | 16 | #include "mbed.h" |
loopsva | 0:f97f410d4a21 | 17 | #include "ms5611.h" |
loopsva | 0:f97f410d4a21 | 18 | |
loopsva | 2:05804ed70748 | 19 | double P; // compensated pressure value |
loopsva | 2:05804ed70748 | 20 | double T; // compensated temperature value |
loopsva | 2:05804ed70748 | 21 | |
loopsva | 2:05804ed70748 | 22 | uint32_t C[8]; //coefficient storage |
loopsva | 2:05804ed70748 | 23 | |
loopsva | 0:f97f410d4a21 | 24 | //--------------------------------------------------------------------------------------------------------------------------------------// |
loopsva | 0:f97f410d4a21 | 25 | // Constructor and destructor |
loopsva | 0:f97f410d4a21 | 26 | |
loopsva | 0:f97f410d4a21 | 27 | ms5611::ms5611(PinName sda, PinName scl) : _i2c(sda, scl) { |
loopsva | 0:f97f410d4a21 | 28 | } |
loopsva | 0:f97f410d4a21 | 29 | |
loopsva | 0:f97f410d4a21 | 30 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 31 | //! @brief send I2C start condition and the address byte |
loopsva | 0:f97f410d4a21 | 32 | //! |
loopsva | 0:f97f410d4a21 | 33 | //! @return 0 |
loopsva | 0:f97f410d4a21 | 34 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 35 | |
loopsva | 0:f97f410d4a21 | 36 | int ms5611::m_i2c_start(bool readMode) { |
loopsva | 0:f97f410d4a21 | 37 | int twst; |
loopsva | 0:f97f410d4a21 | 38 | _i2c.start(); |
loopsva | 0:f97f410d4a21 | 39 | if(readMode == true) { |
loopsva | 0:f97f410d4a21 | 40 | twst = m_i2c_write(MS5611_ADDR_R); |
loopsva | 0:f97f410d4a21 | 41 | } else { |
loopsva | 0:f97f410d4a21 | 42 | twst = m_i2c_write(MS5611_ADDR_W); |
loopsva | 0:f97f410d4a21 | 43 | } |
loopsva | 0:f97f410d4a21 | 44 | return(twst); |
loopsva | 0:f97f410d4a21 | 45 | } |
loopsva | 0:f97f410d4a21 | 46 | |
loopsva | 0:f97f410d4a21 | 47 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 48 | //! @brief send I2C stop condition |
loopsva | 0:f97f410d4a21 | 49 | //! |
loopsva | 0:f97f410d4a21 | 50 | //! @return none |
loopsva | 0:f97f410d4a21 | 51 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 52 | |
loopsva | 0:f97f410d4a21 | 53 | void ms5611::m_i2c_stop(void) { |
loopsva | 0:f97f410d4a21 | 54 | _i2c.stop(); |
loopsva | 0:f97f410d4a21 | 55 | } |
loopsva | 0:f97f410d4a21 | 56 | |
loopsva | 0:f97f410d4a21 | 57 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 58 | //! @brief send I2C stop condition |
loopsva | 0:f97f410d4a21 | 59 | //! |
loopsva | 0:f97f410d4a21 | 60 | //! @return remote ack status |
loopsva | 0:f97f410d4a21 | 61 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 62 | |
loopsva | 0:f97f410d4a21 | 63 | unsigned char ms5611::m_i2c_write(unsigned char data) { |
loopsva | 0:f97f410d4a21 | 64 | int twst = _i2c.write(data); |
loopsva | 0:f97f410d4a21 | 65 | return(twst); |
loopsva | 0:f97f410d4a21 | 66 | } |
loopsva | 0:f97f410d4a21 | 67 | |
loopsva | 0:f97f410d4a21 | 68 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 69 | //! @brief read I2C byte with acknowledgment |
loopsva | 0:f97f410d4a21 | 70 | //! |
loopsva | 0:f97f410d4a21 | 71 | //! @return read byte |
loopsva | 0:f97f410d4a21 | 72 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 73 | |
loopsva | 0:f97f410d4a21 | 74 | unsigned char ms5611::m_i2c_readAck(void) { |
loopsva | 0:f97f410d4a21 | 75 | int twst = _i2c.read(1); |
loopsva | 0:f97f410d4a21 | 76 | return(twst); |
loopsva | 0:f97f410d4a21 | 77 | } |
loopsva | 0:f97f410d4a21 | 78 | |
loopsva | 0:f97f410d4a21 | 79 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 80 | //! @brief read I2C byte without acknowledgment |
loopsva | 0:f97f410d4a21 | 81 | //! |
loopsva | 0:f97f410d4a21 | 82 | //! @return read byte |
loopsva | 0:f97f410d4a21 | 83 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 84 | |
loopsva | 0:f97f410d4a21 | 85 | unsigned char ms5611::m_i2c_readNak(void) { |
loopsva | 0:f97f410d4a21 | 86 | int twst = _i2c.read(0); |
loopsva | 0:f97f410d4a21 | 87 | return(twst); |
loopsva | 0:f97f410d4a21 | 88 | } |
loopsva | 0:f97f410d4a21 | 89 | |
loopsva | 0:f97f410d4a21 | 90 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 91 | //! @brief send command using I2C hardware interface |
loopsva | 0:f97f410d4a21 | 92 | //! |
loopsva | 0:f97f410d4a21 | 93 | //! @return none |
loopsva | 0:f97f410d4a21 | 94 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 95 | |
loopsva | 0:f97f410d4a21 | 96 | void ms5611::m_i2c_send(char cmd) { |
loopsva | 0:f97f410d4a21 | 97 | unsigned char ret; |
loopsva | 2:05804ed70748 | 98 | ret = m_i2c_start(false); |
loopsva | 2:05804ed70748 | 99 | if(!(ret)) { |
loopsva | 0:f97f410d4a21 | 100 | m_i2c_stop(); |
loopsva | 2:05804ed70748 | 101 | } else { |
loopsva | 0:f97f410d4a21 | 102 | ret = m_i2c_write(cmd); |
loopsva | 0:f97f410d4a21 | 103 | m_i2c_stop(); |
loopsva | 0:f97f410d4a21 | 104 | } |
loopsva | 0:f97f410d4a21 | 105 | } |
loopsva | 0:f97f410d4a21 | 106 | |
loopsva | 0:f97f410d4a21 | 107 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 108 | //! @brief send reset sequence |
loopsva | 0:f97f410d4a21 | 109 | //! |
loopsva | 0:f97f410d4a21 | 110 | //! @return none |
loopsva | 0:f97f410d4a21 | 111 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 112 | |
loopsva | 0:f97f410d4a21 | 113 | void ms5611::cmd_reset() { |
loopsva | 2:05804ed70748 | 114 | m_i2c_send(MS5611_CMD_RESET); |
loopsva | 2:05804ed70748 | 115 | wait_ms(4); |
loopsva | 0:f97f410d4a21 | 116 | loadCoefs(); |
loopsva | 0:f97f410d4a21 | 117 | } |
loopsva | 0:f97f410d4a21 | 118 | |
loopsva | 0:f97f410d4a21 | 119 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 120 | //! @brief preform adc conversion |
loopsva | 0:f97f410d4a21 | 121 | //! |
loopsva | 0:f97f410d4a21 | 122 | //! @return 24bit result |
loopsva | 0:f97f410d4a21 | 123 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 124 | |
loopsva | 0:f97f410d4a21 | 125 | unsigned long ms5611::cmd_adc(char cmd) { |
loopsva | 0:f97f410d4a21 | 126 | char cobuf[3]; |
loopsva | 0:f97f410d4a21 | 127 | cobuf[0] = 0; |
loopsva | 0:f97f410d4a21 | 128 | cobuf[1] = 0; |
loopsva | 0:f97f410d4a21 | 129 | cobuf[2] = 0; |
loopsva | 0:f97f410d4a21 | 130 | unsigned int ret; |
loopsva | 0:f97f410d4a21 | 131 | unsigned long temp = 0; |
loopsva | 2:05804ed70748 | 132 | m_i2c_send(MS5611_CMD_ADC_CONV + cmd); |
loopsva | 2:05804ed70748 | 133 | switch (cmd & 0x0f) { |
loopsva | 0:f97f410d4a21 | 134 | case MS5611_CMD_ADC_256 : wait_us(900); break; |
loopsva | 0:f97f410d4a21 | 135 | case MS5611_CMD_ADC_512 : wait_ms(3); break; |
loopsva | 0:f97f410d4a21 | 136 | case MS5611_CMD_ADC_1024: wait_ms(4); break; |
loopsva | 0:f97f410d4a21 | 137 | case MS5611_CMD_ADC_2048: wait_ms(6); break; |
loopsva | 0:f97f410d4a21 | 138 | case MS5611_CMD_ADC_4096: wait_ms(10); break; |
loopsva | 0:f97f410d4a21 | 139 | } |
loopsva | 0:f97f410d4a21 | 140 | m_i2c_send(MS5611_CMD_ADC_READ); |
loopsva | 0:f97f410d4a21 | 141 | |
loopsva | 0:f97f410d4a21 | 142 | ret = _i2c.read(MS5611_ADDR_R, cobuf, 3, false); |
loopsva | 0:f97f410d4a21 | 143 | if(ret) printf("\n*** ms5611 ADC Read Error "); |
loopsva | 0:f97f410d4a21 | 144 | temp = (cobuf[0] << 16) + (cobuf[1] << 8) + cobuf[2]; |
loopsva | 0:f97f410d4a21 | 145 | return temp; |
loopsva | 0:f97f410d4a21 | 146 | } |
loopsva | 0:f97f410d4a21 | 147 | |
loopsva | 0:f97f410d4a21 | 148 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 149 | //! @brief Read calibration coefficients |
loopsva | 0:f97f410d4a21 | 150 | //! |
loopsva | 0:f97f410d4a21 | 151 | //! @return coefficient |
loopsva | 0:f97f410d4a21 | 152 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 153 | |
loopsva | 0:f97f410d4a21 | 154 | unsigned int ms5611::cmd_prom(char coef_num) { |
loopsva | 0:f97f410d4a21 | 155 | char cobuf[2]; |
loopsva | 0:f97f410d4a21 | 156 | unsigned int ret; |
loopsva | 0:f97f410d4a21 | 157 | unsigned int rC = 0; |
loopsva | 0:f97f410d4a21 | 158 | cobuf[0] = 0; |
loopsva | 0:f97f410d4a21 | 159 | cobuf[1] = 0; |
loopsva | 0:f97f410d4a21 | 160 | m_i2c_send(MS5611_CMD_PROM_RD + coef_num * 2); // send PROM READ command |
loopsva | 0:f97f410d4a21 | 161 | ret = _i2c.read(MS5611_ADDR_R, cobuf, 2, false); |
loopsva | 0:f97f410d4a21 | 162 | if(ret) printf("\n*** ms5611 PROM Read Error "); |
loopsva | 0:f97f410d4a21 | 163 | rC = cobuf[0] * 256 + cobuf[1]; |
loopsva | 0:f97f410d4a21 | 164 | return rC; |
loopsva | 0:f97f410d4a21 | 165 | } |
loopsva | 0:f97f410d4a21 | 166 | |
loopsva | 0:f97f410d4a21 | 167 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 168 | //! @brief calculate the CRC code |
loopsva | 0:f97f410d4a21 | 169 | //! |
loopsva | 0:f97f410d4a21 | 170 | //! @return crc code |
loopsva | 0:f97f410d4a21 | 171 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 172 | |
loopsva | 0:f97f410d4a21 | 173 | unsigned char ms5611::crc4(unsigned int n_prom[]) { |
loopsva | 2:05804ed70748 | 174 | unsigned int n_rem; |
loopsva | 2:05804ed70748 | 175 | unsigned int crc_read; |
loopsva | 0:f97f410d4a21 | 176 | unsigned char n_bit; |
loopsva | 0:f97f410d4a21 | 177 | n_rem = 0x00; |
loopsva | 2:05804ed70748 | 178 | crc_read = n_prom[7]; |
loopsva | 2:05804ed70748 | 179 | n_prom[7]=(0xFF00 & (n_prom[7])); |
loopsva | 2:05804ed70748 | 180 | for (int cnt = 0; cnt < 16; cnt++) { |
loopsva | 0:f97f410d4a21 | 181 | if (cnt%2 == 1) { |
loopsva | 0:f97f410d4a21 | 182 | n_rem ^= (unsigned short) ((n_prom[cnt>>1]) & 0x00FF); |
loopsva | 0:f97f410d4a21 | 183 | } else { |
loopsva | 0:f97f410d4a21 | 184 | n_rem ^= (unsigned short) (n_prom[cnt>>1]>>8); |
loopsva | 0:f97f410d4a21 | 185 | } |
loopsva | 0:f97f410d4a21 | 186 | for (n_bit = 8; n_bit > 0; n_bit--) { |
loopsva | 0:f97f410d4a21 | 187 | if (n_rem & (0x8000)) { |
loopsva | 0:f97f410d4a21 | 188 | n_rem = (n_rem << 1) ^ 0x3000; |
loopsva | 0:f97f410d4a21 | 189 | } else { |
loopsva | 0:f97f410d4a21 | 190 | n_rem = (n_rem << 1); |
loopsva | 0:f97f410d4a21 | 191 | } |
loopsva | 0:f97f410d4a21 | 192 | } |
loopsva | 0:f97f410d4a21 | 193 | } |
loopsva | 2:05804ed70748 | 194 | n_rem= (0x000F & (n_rem >> 12)); |
loopsva | 2:05804ed70748 | 195 | n_prom[7]=crc_read; |
loopsva | 0:f97f410d4a21 | 196 | return (n_rem ^ 0x0); |
loopsva | 2:05804ed70748 | 197 | } |
loopsva | 2:05804ed70748 | 198 | |
loopsva | 0:f97f410d4a21 | 199 | /* |
loopsva | 0:f97f410d4a21 | 200 | The CRC code is calculated and written in factory with the LSB byte in the prom n_prom[7] set to 0x00 (see |
loopsva | 0:f97f410d4a21 | 201 | Coefficient table below). It is thus important to clear those bytes from the calculation buffer before proceeding |
loopsva | 0:f97f410d4a21 | 202 | with the CRC calculation itself: |
loopsva | 0:f97f410d4a21 | 203 | n_prom[7]=(0xFF00 & (n_prom[7])); //CRC byte is replaced by 0 |
loopsva | 0:f97f410d4a21 | 204 | As a simple test of the CRC code, the following coefficient table could be used: |
loopsva | 0:f97f410d4a21 | 205 | unsigned int nprom[] = {0x3132,0x3334,0x3536,0x3738,0x3940,0x4142,0x4344,0x4500}; |
loopsva | 0:f97f410d4a21 | 206 | the resulting calculated CRC should be 0xB. |
loopsva | 0:f97f410d4a21 | 207 | |
loopsva | 0:f97f410d4a21 | 208 | DB 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 0 |
loopsva | 0:f97f410d4a21 | 209 | Addr |
loopsva | 0:f97f410d4a21 | 210 | 0 16 bit reserved for manufacturer |
loopsva | 0:f97f410d4a21 | 211 | 1 Coefficient 1 (16 bit unsigned) |
loopsva | 0:f97f410d4a21 | 212 | 2 Coefficient 2 (16 bit unsigned) |
loopsva | 0:f97f410d4a21 | 213 | 3 Coefficient 3 (16 bit unsigned) |
loopsva | 0:f97f410d4a21 | 214 | 4 Coefficient 4 (16 bit unsigned) |
loopsva | 0:f97f410d4a21 | 215 | 5 Coefficient 5 (16 bit unsigned) |
loopsva | 0:f97f410d4a21 | 216 | 6 Coefficient 6 (16 bit unsigned) |
loopsva | 0:f97f410d4a21 | 217 | 7 0 0 0 0 CRC(0x0) |
loopsva | 0:f97f410d4a21 | 218 | */ |
loopsva | 0:f97f410d4a21 | 219 | /* |
loopsva | 0:f97f410d4a21 | 220 | //Returns 0x0b as per AP520_004 |
loopsva | 2:05804ed70748 | 221 | C[0] = 0x3132; |
loopsva | 2:05804ed70748 | 222 | C[1] = 0x3334; |
loopsva | 2:05804ed70748 | 223 | C[2] = 0x3536; |
loopsva | 2:05804ed70748 | 224 | C[3] = 0x3738; |
loopsva | 2:05804ed70748 | 225 | C[4] = 0x3940; |
loopsva | 2:05804ed70748 | 226 | C[5] = 0x4142; |
loopsva | 2:05804ed70748 | 227 | C[6] = 0x4344; |
loopsva | 2:05804ed70748 | 228 | C[7] = 0x4546; |
loopsva | 0:f97f410d4a21 | 229 | n_crc = ms.crc4(C); // calculate the CRC |
loopsva | 0:f97f410d4a21 | 230 | pc.printf("testing CRC: 0x%x\n", n_crc); |
loopsva | 0:f97f410d4a21 | 231 | */ |
loopsva | 2:05804ed70748 | 232 | |
loopsva | 0:f97f410d4a21 | 233 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 234 | //! @brief load all calibration coefficients |
loopsva | 0:f97f410d4a21 | 235 | //! |
loopsva | 0:f97f410d4a21 | 236 | //! @return none |
loopsva | 0:f97f410d4a21 | 237 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 238 | |
loopsva | 0:f97f410d4a21 | 239 | void ms5611::loadCoefs() { |
loopsva | 0:f97f410d4a21 | 240 | for (int i = 0; i < 8; i++){ |
loopsva | 0:f97f410d4a21 | 241 | wait_ms(50); |
loopsva | 2:05804ed70748 | 242 | C[i] = cmd_prom(i); |
loopsva | 0:f97f410d4a21 | 243 | } |
loopsva | 2:05804ed70748 | 244 | unsigned char n_crc = crc4(C); |
loopsva | 0:f97f410d4a21 | 245 | } |
loopsva | 0:f97f410d4a21 | 246 | |
loopsva | 0:f97f410d4a21 | 247 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 248 | //! @brief calculate temperature and pressure |
loopsva | 0:f97f410d4a21 | 249 | //! |
loopsva | 0:f97f410d4a21 | 250 | //! @return none |
loopsva | 0:f97f410d4a21 | 251 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 252 | |
loopsva | 0:f97f410d4a21 | 253 | void ms5611::calcPT() { |
loopsva | 2:05804ed70748 | 254 | int32_t D2 = cmd_adc(MS5611_CMD_ADC_D2 + MS5611_CMD_ADC_4096); // read D2 |
loopsva | 2:05804ed70748 | 255 | int32_t D1 = cmd_adc(MS5611_CMD_ADC_D1 + MS5611_CMD_ADC_4096); // read D1 |
loopsva | 2:05804ed70748 | 256 | int32_t dT = D2 - ((uint32_t)C[5] << 8); |
loopsva | 2:05804ed70748 | 257 | int64_t OFF = ((uint32_t)C[2] << 16) + ((dT * (C[4]) >> 7)); //was OFF = (C[2] << 17) + dT * C[4] / (1 << 6); |
loopsva | 2:05804ed70748 | 258 | int64_t SENS = ((uint32_t)C[1] << 15) + ((dT * (C[3]) >> 8)); //was SENS = (C[1] << 16) + dT * C[3] / (1 << 7); |
loopsva | 2:05804ed70748 | 259 | T = (2000 + (((uint64_t)dT * C[6]) / (float)(1 << 23))) / 100; |
loopsva | 2:05804ed70748 | 260 | int32_t TEMP = 2000 + (int64_t)dT * (int64_t)C[6] / (int64_t)(1 << 23); |
loopsva | 0:f97f410d4a21 | 261 | |
loopsva | 2:05804ed70748 | 262 | if(TEMP < 2000) { // if temperature lower than 20 Celsius |
loopsva | 2:05804ed70748 | 263 | float T1 = (TEMP - 2000) * (TEMP - 2000); |
loopsva | 2:05804ed70748 | 264 | int64_t OFF1 = (5 * T1) / 2; |
loopsva | 2:05804ed70748 | 265 | int64_t SENS1 = (5 * T1) / 4; |
loopsva | 2:05804ed70748 | 266 | |
loopsva | 2:05804ed70748 | 267 | if(TEMP < -1500) { // if temperature lower than -15 Celsius |
loopsva | 2:05804ed70748 | 268 | T1 = (TEMP + 1500) * (TEMP + 1500); |
loopsva | 2:05804ed70748 | 269 | OFF1 += 7 * T1; |
loopsva | 2:05804ed70748 | 270 | SENS1 += 11 * T1 / 2; |
loopsva | 2:05804ed70748 | 271 | } |
loopsva | 2:05804ed70748 | 272 | OFF -= OFF1; |
loopsva | 2:05804ed70748 | 273 | SENS -= SENS1; |
loopsva | 2:05804ed70748 | 274 | T = (float)TEMP / 100; |
loopsva | 2:05804ed70748 | 275 | } |
loopsva | 2:05804ed70748 | 276 | // int64_t P1 = ((((int64_t)D1 * SENS) >> 21) - OFF) >> 15; |
loopsva | 2:05804ed70748 | 277 | P = ((((int64_t)D1 * SENS ) >> 21) - OFF) / (double) (1 << 15) / 100.0; |
loopsva | 0:f97f410d4a21 | 278 | } |
loopsva | 0:f97f410d4a21 | 279 | |
loopsva | 0:f97f410d4a21 | 280 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 281 | //! @brief calculate temperature |
loopsva | 0:f97f410d4a21 | 282 | //! |
loopsva | 0:f97f410d4a21 | 283 | //! @return double temperature degC |
loopsva | 0:f97f410d4a21 | 284 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 285 | |
loopsva | 0:f97f410d4a21 | 286 | double ms5611::calcTemp() { |
loopsva | 0:f97f410d4a21 | 287 | calcPT(); |
loopsva | 0:f97f410d4a21 | 288 | return(T); |
loopsva | 0:f97f410d4a21 | 289 | } |
loopsva | 0:f97f410d4a21 | 290 | |
loopsva | 0:f97f410d4a21 | 291 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 292 | //! @brief calculate prssure |
loopsva | 0:f97f410d4a21 | 293 | //! |
loopsva | 0:f97f410d4a21 | 294 | //! @return double barometric pressure millibar |
loopsva | 0:f97f410d4a21 | 295 | //******************************************************** |
loopsva | 0:f97f410d4a21 | 296 | |
loopsva | 0:f97f410d4a21 | 297 | double ms5611::calcPressure() { |
loopsva | 0:f97f410d4a21 | 298 | calcPT(); |
loopsva | 0:f97f410d4a21 | 299 | return(P); |
loopsva | 2:05804ed70748 | 300 | } |