WebSVN – dashGPS – Diff – /branches/dashGPS-bmp/Core/Src/main.c

 #include "usb_device.h"
 /* Private includes ----------------------------------------------------------*/
 /* USER CODE BEGIN Includes */
 #include "libSerial/serial.h"
-#include "libBMP280/bmp280.h"
+#include "libBME280/bme280.h"
 #include "display.h"
 /* USER CODE END Includes */
 /* Private typedef -----------------------------------------------------------*/
 /* USER CODE BEGIN PTD */
 TIM_HandleTypeDef htim4;
 UART_HandleTypeDef huart1;
 /* USER CODE BEGIN PV */
+/* Structure that contains identifier details used in example */
-typedef struct
+struct identifier
+{
+    /* Variable to hold device address */
-  uint8_t dev_addr;
+    uint8_t dev_addr;
+    /* Variable that contains file descriptor */
-} interface_t;
+    int8_t fd;
+};
 static int8_t
-user_i2c_write (uint8_t i2c_addr, uint8_t reg_addr, uint8_t *reg_data, uint32_t len)
+user_i2c_write ( uint8_t reg_addr, uint8_t *reg_data, uint32_t len, struct identifier * intf)
+{
+  uint8_t i2c_addr = intf->dev_addr;
     HAL_StatusTypeDef st = HAL_I2C_Mem_Write(&hi2c2, i2c_addr<<1, reg_addr, 1, reg_data, len, 10000);
-  return st != HAL_OK ?  BMP280_E_COMM_FAIL: BMP280_OK;
+  return st != HAL_OK ?  BME280_E_COMM_FAIL: BME280_OK;
+}
 static int8_t
-user_i2c_read (uint8_t i2c_addr, uint8_t reg_addr, uint8_t *reg_data, uint32_t len)
+user_i2c_read ( uint8_t reg_addr, uint8_t *reg_data, uint32_t len, struct identifier * intf)
+{
+  uint8_t i2c_addr = intf->dev_addr;
   HAL_StatusTypeDef st = HAL_I2C_Mem_Read(&hi2c2, i2c_addr<<1, reg_addr, 1, reg_data, len, 10000);
-  return st != HAL_OK ?  BMP280_E_COMM_FAIL: BMP280_OK;
+  return st != HAL_OK ?  BME280_E_COMM_FAIL: BME280_OK;
+}
 static void
-user_delay_ms (uint32_t ms, void *handle)
+user_delay_us(uint32_t us, void *handle)
+{
-  HAL_Delay (ms);
+  HAL_Delay ((us+999)/1000);
+}
+struct bme280_dev dev;
-struct bmp280_dev bmp =
+struct identifier id;
-  {
-  .intf = BMP280_I2C_INTF, .read = user_i2c_read, .write = user_i2c_write,
-      .delay_ms = user_delay_ms,
-      /* Update interface pointer with the structure that contains both device address and file descriptor */
+/* Variable to store minimum wait time between consecutive measurement in force mode */
-     .dev_id =  BMP280_I2C_ADDR_PRIM };
+uint32_t req_delay;
 int8_t rslt;
-struct bmp280_config conf;
 /* USER CODE END PV */
 /* Private function prototypes -----------------------------------------------*/
 static void MX_TIM3_Init(void);
 static void MX_I2C2_Init(void);
 static void MX_RTC_Init(void);
 /* USER CODE BEGIN PFP */
+/*!
+ * @brief This API reads the sensor temperature, pressure and humidity data in forced mode.
+ */
+int8_t
+stream_sensor_data_forced_mode (struct bme280_dev *dev)
+{
+  /* Variable to define the result */
+  int8_t rslt = BME280_OK;
+  /* Variable to define the selecting sensors */
+  uint8_t settings_sel = 0;
+  /* Structure to get the pressure, temperature and humidity values */
+  struct bme280_data comp_data;
+  /* Recommended mode of operation: Indoor navigation */
+  dev->settings.osr_h = BME280_OVERSAMPLING_1X;
+  dev->settings.osr_p = BME280_OVERSAMPLING_16X;
+  dev->settings.osr_t = BME280_OVERSAMPLING_2X;
+  dev->settings.filter = BME280_FILTER_COEFF_16;
+  settings_sel = BME280_OSR_PRESS_SEL | BME280_OSR_TEMP_SEL | BME280_OSR_HUM_SEL
+      | BME280_FILTER_SEL;
+  /* Set the sensor settings */
+  rslt = bme280_set_sensor_settings (settings_sel, dev);
+  if (rslt != BME280_OK)
+    {
+//        fprintf(stderr, "Failed to set sensor settings (code %+d).", rslt);
+      return rslt;
+    }
+  /*Calculate the minimum delay required between consecutive measurement based upon the sensor enabled
+   *  and the oversampling configuration. */
+  req_delay = bme280_cal_meas_delay (&dev->settings);
+  /* Set the sensor to forced mode */
+  rslt = bme280_set_sensor_mode (BME280_FORCED_MODE, dev);
+  if (rslt != BME280_OK)
+    {
+      return rslt;
+    }
+  return rslt;
+}
 /* USER CODE END PFP */
 /* Private user code ---------------------------------------------------------*/
 /* USER CODE BEGIN 0 */
   */
 int main(void)
+{
   /* USER CODE BEGIN 1 */
   /* USER CODE END 1 */
   /* MCU Configuration--------------------------------------------------------*/
   /* Reset of all peripherals, Initializes the Flash interface and the Systick. */
   /* setup the USART control blocks */
   init_usart_ctl (&uc1, &huart1);
   EnableSerialRxInterrupt (&uc1);
+  /* BME 280 */
+  struct bme280_dev dev;
+  struct identifier id;
+  /* Variable to define the result */
+  int8_t rslt = BME280_OK;
+  /* Make sure to select BME280_I2C_ADDR_PRIM or BME280_I2C_ADDR_SEC as needed */
+  id.dev_addr = BME280_I2C_ADDR_PRIM >> 1;
+  dev.intf = BME280_I2C_INTF;
+  dev.read = user_i2c_read;
+  dev.write = user_i2c_write;
+  dev.delay_us = user_delay_us;
+  /* Update interface pointer with the structure that contains both device address and file descriptor */
+  dev.intf_ptr = &id;
+  /* Initialize the bme280 */
+    rslt = bme280_init(&dev);
+    if (rslt != BME280_OK)
+    {
+//        fprintf(stderr, "Failed to initialize the device (code %+d).\n", rslt);
+        exit(1);
+    }
+    rslt = stream_sensor_data_forced_mode(&dev);
+    if (rslt != BME280_OK)
+    {
+  //      fprintf(stderr, "Failed to stream sensor data (code %+d).\n", rslt);
+        exit(1);
+    }
-  /* Initialize the bmp280 */
-  rslt = bmp280_init(&bmp);
-//  print_rslt(" bmp280_init status", rslt);
-  /* Always read the current settings before writing, especially when
-   * all the configuration is not modified
-   */
-  rslt = bmp280_get_config(&conf, &bmp);
- // print_rslt(" bmp280_get_config status", rslt);
-  /* configuring the temperature oversampling, filter coefficient and output data rate */
-  /* Overwrite the desired settings */
-  conf.filter = BMP280_FILTER_COEFF_2;
-  /* Temperature oversampling set at 4x */
-  conf.os_temp = BMP280_OS_4X;
-  /* Pressure over sampling none (disabling pressure measurement) */
-  conf.os_pres = BMP280_OS_4X;
-  /* Setting the output data rate as 2HZ(500ms) */
-  conf.odr = BMP280_ODR_500_MS;
-  rslt = bmp280_set_config(&conf, &bmp);
-  //print_rslt(" bmp280_set_config status", rslt);
-  /* Always set the power mode after setting the configuration */
-  rslt = bmp280_set_power_mode(BMP280_NORMAL_MODE, &bmp);
-  //print_rslt(" bmp280_set_power_mode status", rslt);
   cc_init ();
   /* USER CODE END 2 */
   /* Infinite loop */
   /* USER CODE BEGIN WHILE */
   while (1)
+    {
-      cc_run (&bmp);
+      cc_run (&dev);
       HAL_Delay (50);
   /* USER CODE BEGIN TIM3_Init 1 */
   /* USER CODE END TIM3_Init 1 */
   htim3.Instance = TIM3;
-  htim3.Init.Prescaler = 640;
+  htim3.Init.Prescaler = 719;
   htim3.Init.CounterMode = TIM_COUNTERMODE_UP;
   htim3.Init.Period = 10000;
   htim3.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1;
   htim3.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE;
   if (HAL_TIM_OC_Init(&htim3) != HAL_OK)

Subversion Repositories dashGPS

(root)/branches/dashGPS-bmp/Core/Src/main.c – Rev 18 → 19