diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/database/track.cpp | 2 | ||||
| -rw-r--r-- | src/drivers/adc.cpp | 2 | ||||
| -rw-r--r-- | src/drivers/bluetooth.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/database/track.cpp b/src/database/track.cpp index 141a9b7e..a2bd05d3 100644 --- a/src/database/track.cpp +++ b/src/database/track.cpp @@ -234,7 +234,7 @@ auto TrackTags::genres(const std::string_view s) -> void { std::string src = {s.data(), s.size()}; char* token = std::strtok(src.data(), kGenreDelimiters); - auto trim_and_add = [=](std::string_view s) { + auto trim_and_add = [this](std::string_view s) { std::string copy = {s.data(), s.size()}; // Trim the left diff --git a/src/drivers/adc.cpp b/src/drivers/adc.cpp index 56d2cbb4..3379a1ae 100644 --- a/src/drivers/adc.cpp +++ b/src/drivers/adc.cpp @@ -18,7 +18,7 @@ static const adc_bitwidth_t kAdcBitWidth = ADC_BITWIDTH_12; static const adc_unit_t kAdcUnit = ADC_UNIT_1; // Max battery voltage should be a little over 2V due to our divider, so we need // the max attenuation to properly handle the full range. -static const adc_atten_t kAdcAttenuation = ADC_ATTEN_DB_11; +static const adc_atten_t kAdcAttenuation = ADC_ATTEN_DB_12; // Corresponds to SENSOR_VP. static const adc_channel_t kAdcChannel = ADC_CHANNEL_0; diff --git a/src/drivers/bluetooth.cpp b/src/drivers/bluetooth.cpp index edd5f67e..5d1b35fa 100644 --- a/src/drivers/bluetooth.cpp +++ b/src/drivers/bluetooth.cpp @@ -438,7 +438,8 @@ void Disabled::react(const events::Enable&) { return; } - if ((err = esp_bluedroid_init() != ESP_OK)) { + esp_bluedroid_config_t cfg = BT_BLUEDROID_INIT_CONFIG_DEFAULT(); + if ((err = esp_bluedroid_init_with_cfg(&cfg) != ESP_OK)) { ESP_LOGE(kTag, "initialize bluedroid failed %s", esp_err_to_name(err)); return; } |