From 15051a0aca1acd130f72eaf76089ae8ebcc55812 Mon Sep 17 00:00:00 2001 From: Christian Loch Date: Mon, 17 Feb 2020 09:04:52 +0100 Subject: [PATCH] Restructured library calls to make them work together --- main/main.c | 173 ++++++++++++++++++++++++++++------------------------ 1 file changed, 93 insertions(+), 80 deletions(-) diff --git a/main/main.c b/main/main.c index 4ec5245..848561e 100644 --- a/main/main.c +++ b/main/main.c @@ -1,13 +1,5 @@ -//#include "freertos/FreeRTOS.h" -//#include "esp_wifi.h" -//#include "esp_system.h" -//#include "esp_event.h" -//#include "esp_event_loop.h" -//#include "nvs_flash.h" -//#include "driver/gpio.h" #include "bme280.h" #include "bme280_defs.h" -//#include "ssd1366.h" #include "driver/i2c.h" #include #include "u8g2_esp32_hal.h" @@ -64,22 +56,6 @@ void i2c_detect() } int8_t i2c_read(uint8_t dev_id, uint8_t reg_addr, uint8_t *data, uint16_t len) { - //printf("Reading from bus: dev_id=%x, reg_addr=%x, data=%p, length=%u\n", dev_id, reg_addr, data, len); - /*i2c_cmd_handle_t cmd = i2c_cmd_link_create(); - i2c_master_start(cmd); - if (data_addr != -1) { - i2c_master_write_byte(cmd, chip_addr << 1 | WRITE_BIT, ACK_CHECK_EN); - i2c_master_write_byte(cmd, data_addr, ACK_CHECK_EN); - i2c_master_start(cmd); - } - i2c_master_write_byte(cmd, chip_addr << 1 | READ_BIT, ACK_CHECK_EN); - if (len > 1) { - i2c_master_read(cmd, data, len - 1, ACK_VAL); - } - i2c_master_read_byte(cmd, data + len - 1, NACK_VAL); - i2c_master_stop(cmd); - esp_err_t ret = i2c_master_cmd_begin(i2c_port, cmd, 1000 / portTICK_RATE_MS); - i2c_cmd_link_delete(cmd);*/ i2c_cmd_handle_t cmd = i2c_cmd_link_create(); i2c_master_start(cmd); i2c_master_write_byte(cmd, dev_id << 1 | I2C_MASTER_WRITE, 1); @@ -123,88 +99,125 @@ void i2c_shutdown() printf("Success!\n"); } -void app_main(void) -{ - i2c_setup(); - struct bme280_dev dev; - int8_t rslt = BME280_OK; - - dev.dev_id = 0x76; - dev.intf = BME280_I2C_INTF; - dev.read = i2c_read; - dev.write = i2c_write; - dev.delay_ms = i2c_delay; - - rslt = bme280_init(&dev); +void read_sensor(struct bme280_dev* dev, int32_t* temp, uint32_t* pressure, uint32_t* humidity) { uint8_t settings_sel; uint32_t req_delay; 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; + dev->settings.osr_h = BME280_OVERSAMPLING_1X; + dev->settings.osr_p = BME280_OVERSAMPLING_16X; + dev->settings.osr_t = BME280_OVERSAMPLING_16X; + dev->settings.filter = BME280_FILTER_COEFF_16; settings_sel = BME280_OSR_PRESS_SEL | BME280_OSR_TEMP_SEL | BME280_OSR_HUM_SEL | BME280_FILTER_SEL; - - rslt = bme280_set_sensor_settings(settings_sel, &dev); - + bme280_set_sensor_settings(settings_sel, dev); /*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)); + * and the oversampling configuration. */ + req_delay = 12*bme280_cal_meas_delay(&(dev->settings)); + printf("req_delay=%i\r\n", req_delay); - printf("Temperature, Pressure, Humidity\r\n"); /* Continuously stream sensor data */ - while (1) { - rslt = bme280_set_sensor_mode(BME280_FORCED_MODE, &dev); - /* Wait for the measurement to complete and print data @25Hz */ - dev.delay_ms(req_delay); - rslt = bme280_get_sensor_data(BME280_ALL, &comp_data, &dev); - printf("%i °c, %i hPa, %i %%\r\n", comp_data.temperature/100, comp_data.pressure/100, comp_data.humidity/1024); - vTaskDelay(50 / portTICK_PERIOD_MS); + bme280_set_sensor_mode(BME280_FORCED_MODE, dev); + /* Wait for the measurement to complete and print data @25Hz */ + dev->delay_ms(req_delay / portTICK_PERIOD_MS); + bme280_get_sensor_data(BME280_ALL, &comp_data, dev); + *temp = comp_data.temperature; + *pressure = comp_data.pressure; + *humidity = comp_data.humidity; +} + +void print_data(u8g2_t* u8g2, int32_t temp, uint32_t pressure, uint32_t humidity) { + int32_t temp1 = temp / 100; + int32_t temp2 = (abs(temp) % 100) / 10; + uint32_t press1 = pressure / 100; + uint32_t humid1 = humidity / 1024; + uint32_t humid2 = (humidity - humid1*1024) * 10 / 1024; + //temp1 = 12; + //temp2 = 3; + int32_t temp3 = -1*temp1; + int32_t temp4 = temp2; + //press1 = 9999; + //humid1 = 13; + //humid2 = 4; + char temp1str[31]; + char temp1str2[32]; + sprintf(temp1str, "%d,%d", temp1, temp2); + if (temp1 < 10) { + sprintf(temp1str2, " %s", temp1str); + } else { + sprintf(temp1str2, "%s", temp1str); } + char temp2str[31]; + char temp2str2[33]; + sprintf(temp2str, "%d,%d", temp3, temp4); + uint8_t spaces = 0; + if (temp3 > 0) + spaces++; + if (abs(temp3) < 10) + spaces++; + if (spaces == 2) + sprintf(temp2str2, " %s", temp2str); + else if (spaces == 1) + sprintf(temp2str2, " %s", temp2str); + else { + sprintf(temp2str2, "%s", temp2str); + } + char tempstr[70]; + sprintf(tempstr, "%s %s °C", temp1str2, temp2str2); + u8g2_ClearBuffer(u8g2); + + char pressstr[27]; + char humidstr[27]; + + sprintf(pressstr, "%d %d hPa", press1, press1); + sprintf(humidstr, "%d,%d %d,%d %%", humid1, humid2, humid1, humid2); + + u8g2_SetFont(u8g2, u8g2_font_profont17_mf); + int8_t fontheight = u8g2_GetAscent(u8g2); + int8_t fontmargin = abs(u8g2_GetDescent(u8g2))+2; + u8g2_DrawStr(u8g2, 0, fontheight, " IN OUT "); + u8g2_DrawStr(u8g2, 0, 2*fontheight + fontmargin, tempstr); + u8g2_DrawStr(u8g2, 0, 3*fontheight + 2*fontmargin, humidstr); + u8g2_DrawStr(u8g2, 0, 4*fontheight + 3*fontmargin, pressstr); + u8g2_SendBuffer(u8g2); +} - i2c_shutdown(); +void app_main(void) +{ + int32_t temp = 0; + uint32_t pressure = 0; + uint32_t humidity = 0; + + // INIT SENSOR + i2c_setup(); + struct bme280_dev dev; + dev.dev_id = 0x76; + dev.intf = BME280_I2C_INTF; + dev.read = i2c_read; + dev.write = i2c_write; + dev.delay_ms = i2c_delay; + bme280_init(&dev); + // INIT DISPLAY u8g2_esp32_hal_t u8g2_esp32_hal = U8G2_ESP32_HAL_DEFAULT; u8g2_esp32_hal.sda = 18; u8g2_esp32_hal.scl = 19; - u8g2_esp32_hal_init(u8g2_esp32_hal); + u8g2_esp32_hal_init(u8g2_esp32_hal); u8g2_t u8g2; u8g2_Setup_ssd1306_i2c_128x64_vcomh0_f(&u8g2, U8G2_R0, u8g2_esp32_i2c_byte_cb, u8g2_esp32_gpio_and_delay_cb); - - //u8x8_SetI2CAddress(&u8g2.u8x8,0x78); u8x8_SetI2CAddress(&u8g2.u8x8,0x3C << 1); u8g2_InitDisplay(&u8g2); // send init sequence to the display, display is in sleep mode after this, u8g2_SetPowerSave(&u8g2, 0); // wake up display - u8g2_SetContrast(&u8g2, 50); - - u8g2_uint_t r = 10; - u8g2_uint_t x = r+1; - u8g2_uint_t y = r+1; - int8_t dx = 2; - int8_t dy = 5; - while (1) { - u8g2_ClearBuffer(&u8g2); - u8g2_DrawDisc(&u8g2, x, y, r, U8G2_DRAW_ALL); - u8g2_DrawFrame(&u8g2, 0, 0, 128, 64); - u8g2_SendBuffer(&u8g2); - x = x + dx; - y = y + dy; - if (x <= 0+r+1 || x >= 127-r-1) { - dx = dx * -1; - } - if (y <= 0+r+1 || y >= 63-r-1) { - dy = dy * -1; - vTaskDelay(10 / portTICK_PERIOD_MS); - } + read_sensor(&dev, &temp, &pressure, &humidity); + printf("%i °c, %i hPa, %i %%\r\n", temp, pressure, humidity); + print_data(&u8g2, temp, pressure, humidity); + vTaskDelay(250 / portTICK_PERIOD_MS); } - }