Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to IDF 5.1 #36

Merged
merged 8 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: esp-idf build
uses: espressif/esp-idf-ci-action@v1
with:
esp_idf_version: v5.0
esp_idf_version: v5.1
target: esp32s3
path: ''

Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"idf.adapterTargetName": "esp32s3",
"idf.openOcdConfigs": [
"board/esp32s3-bridge.cfg"
"board/esp32s3-builtin.cfg"
],
"idf.portWin": "COM4",
"idf.flashType": "UART",
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ message(STATUS "SDKCONFIG = ${SDKCONFIG}")
message(STATUS "SDKCONFIG_DEFAULTS = ${SDKCONFIG_DEFAULTS}")
message(STATUS "CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}")
message(STATUS "CMAKE_BINARY_DIR = ${CMAKE_BINARY_DIR}")
message(STATUS "COMPILE_OPTIONS = ${COMPILE_OPTIONS}")
message(STATUS "---------------------------------------")
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Air quality sensor on ESP32-S3 using ESP-IDF framework
* BH1750 - Light Sensor
* SPS30 Sensirion - Particle sensor
* SCD30 Sensirion - CO2 Sensor (Optional)
* SCD4x Sensirion - CO2 Sensor (Optional)

## Features
* LVGL based display UI
Expand Down
2 changes: 1 addition & 1 deletion components/lvgl
Submodule lvgl updated 142 files
4 changes: 2 additions & 2 deletions dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies:
component_hash: null
source:
type: idf
version: 5.0.0
manifest_hash: 8b65dc932f822da643ba61df832839c0bef7ac863618013b03dedfdbdbc7f024
version: 5.1.0
manifest_hash: 9275a596616c0a70cfe5b167d7bb0650aa90eb700c5b2ebe12470c3274692aa7
target: esp32s3
version: 1.0.0
2 changes: 1 addition & 1 deletion main/hardware/sensors/scd30_sensor_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class scd30_sensor_device final : public esp32::singleton<scd30_sensor_device>

uint8_t get_initial_delay();

private:
private:
i2c_dev_t scd30_sensor_{};
last_measurement_helper<std::tuple<float, float, float, float>, 60000> last_measurement_value_;

Expand Down
1 change: 1 addition & 0 deletions main/hardware/sensors/sensor.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "util/circular_buffer.h"
#include "util/psram_allocator.h"
#include "util/semaphore_lockable.h"
#include <array>
#include <atomic>
#include <cmath>
#include <mutex>
Expand Down
2 changes: 1 addition & 1 deletion main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ dependencies:
# # For transient dependencies `public` flag can be set.
# # `public` flag doesn't have an effect dependencies of the `main` component.
# # All dependencies of `main` are public by default.
# public: true
# public: true
1 change: 0 additions & 1 deletion main/lv_conf.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/**
* @file lv_conf.h
* Configuration file for v8.3.2
*/

/*
Expand Down
1 change: 0 additions & 1 deletion main/ui/ui2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ void ui::no_wifi_img_animation_cb(void *var, int32_t v)

void ui::load_boot_screen()
{

#if LV_USE_LOG
lv_log_register_print_cb(&lv_logger);
#endif
Expand Down
1 change: 1 addition & 0 deletions main/util/helper.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#pragma once

#include <algorithm>
#include <cmath>
#include <cstring>
#include <memory>
Expand Down
Loading