Changeset - 645e46f4898d
[Not reviewed]
tip default
0 2 0
Ethan Zonca (ethanzonca) - 9 years ago 2017-02-08 16:32:25
e@ethanzonca.com
Update scale for bme280 to tenths of percent, disable lps25h
2 files changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
Include/config.h
Show inline comments
 
//
 
// Depth Select Configuration
 
//
 
 
#ifndef CONFIG_H
 
#define CONFIG_H
 
 
 
// --------------------------------------------------------------------------
 
// Transmitter config (si446x.c)
 
// --------------------------------------------------------------------------
 
 
// Transmit power (0-0x7F, 0mW - 40mw?)
 
#define SI446x_POWER 0x40 // 0x40 for jake launch
 
 
#define TUNE_FREQUENCY 433500000UL
 
 
 
// Internal macros
 
#define hal_init HAL_Init
 
 
 
// Uncomment if using legacy LPS25h pressure sensor
 
#define LPS25H
 
//#define LPS25H
 
 
 
#define FRIENDLY_MODE
 
#define FRIENDLY_TIMEOUT  1800 // 1800 // seconds before reducing tx rate
 
#define FRIENDLY_TX_RATE 60000 // milliseconds tx rate after timeout elapsed
 
 
// --------------------------------------------------------------------------
 
// ADC config (adc.c)
 
// --------------------------------------------------------------------------
 
 
// Temperature sensor offset (die temperature from ambient, esimate, in Celcius)
 
#define ADC_TEMPERATURE_OFFSET -10
 
 
 
// --------------------------------------------------------------------------
 
// AX.25 config (ax25.c)
 
// --------------------------------------------------------------------------
 
 
// TX delay in milliseconds
 
#define TX_DELAY      70
 
 
// Maximum packet delay
 
#define MAX_PACKET_LEN 512  // bytes
 
Source/bme280.c
Show inline comments
 
@@ -92,49 +92,49 @@ bool bme280_init(void)
 
	dig_P6 = ((int16_t)((bme280_read_byte(BME280_DIG_P6_MSB_REG) << 8) + bme280_read_byte(BME280_DIG_P6_LSB_REG)));
 
	dig_P7 = ((int16_t)((bme280_read_byte(BME280_DIG_P7_MSB_REG) << 8) + bme280_read_byte(BME280_DIG_P7_LSB_REG)));
 
	dig_P8 = ((int16_t)((bme280_read_byte(BME280_DIG_P8_MSB_REG) << 8) + bme280_read_byte(BME280_DIG_P8_LSB_REG)));
 
	dig_P9 = ((int16_t)((bme280_read_byte(BME280_DIG_P9_MSB_REG) << 8) + bme280_read_byte(BME280_DIG_P9_LSB_REG)));
 
 
	dig_H1 = ((uint8_t)(bme280_read_byte(BME280_DIG_H1_REG)));
 
	dig_H2 = ((int16_t)((bme280_read_byte(BME280_DIG_H2_MSB_REG) << 8) + bme280_read_byte(BME280_DIG_H2_LSB_REG)));
 
	dig_H3 = ((uint8_t)(bme280_read_byte(BME280_DIG_H3_REG)));
 
	dig_H4 = ((int16_t)((bme280_read_byte(BME280_DIG_H4_MSB_REG) << 4) + (bme280_read_byte(BME280_DIG_H4_LSB_REG) & 0x0F)));
 
	dig_H5 = ((int16_t)((bme280_read_byte(BME280_DIG_H5_MSB_REG) << 4) + ((bme280_read_byte(BME280_DIG_H4_LSB_REG) >> 4) & 0x0F)));
 
	dig_H6 = ((uint8_t)bme280_read_byte(BME280_DIG_H6_REG));
 
 
	return true;
 
}
 
 
 
// Acquire new readings from sensor and update values in RAM
 
void bme280_update(void)
 
{
 
	uint8_t result[8];
 
	bme280_read(BME280_PRESSURE_MSB_REG, result, 8);
 
 
	pressure = bme280_convert_pressure(result[0] << 12 | result[1] << 4 | (result[2] & 0xf0) << 0) / 256 / 10; // convert to mBar/hPa
 
	temperature = bme280_convert_temperature(result[3] << 12 | result[4] << 4 | (result[5] & 0xf0) << 0); // 0.01C
 
	humidity = bme280_convert_humidity(result[6] << 8 | result[7] << 0) / 1024; // 0.01% RH
 
	humidity = bme280_convert_humidity(result[6] << 8 | result[7] << 0) / (1024/10); // 0.1% RH
 
}
 
 
 
// returns pressure in mb with 0.1mb resolution
 
int32_t bme280_get_pressure(void)
 
{
 
	return pressure;
 
}
 
 
// returns temperature in DegC with 0.01 DegC resolution
 
int32_t bme280_get_temperature(void)
 
{
 
 
	return temperature;
 
}
 
 
// returns humidity in %RH with 0.01% resolution
 
int32_t bme280_get_humidity(void)
 
{
 
 
	return humidity;
 
}
 
 
0 comments (0 inline, 0 general)