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

Update ESP-IDF to v5.1.2 #96

Merged
merged 6 commits into from
Nov 18, 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
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ env:
jobs:
build-firmware:
runs-on: ubuntu-latest
container: barabas5532/shrapnel:6
container: barabas5532/shrapnel:7
steps:
- uses: actions/checkout@v2
with:
Expand All @@ -47,7 +47,7 @@ jobs:

build-plugins:
runs-on: ubuntu-latest
container: barabas5532/shrapnel:6
container: barabas5532/shrapnel:7
strategy:
matrix:
plugin: ["shrapnel"]
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:

ctest:
runs-on: ubuntu-latest
container: barabas5532/shrapnel:6
container: barabas5532/shrapnel:7
strategy:
matrix:
build_type: ["Release", "Debug"]
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:

ctest-sanitize:
runs-on: ubuntu-latest
container: barabas5532/shrapnel:6
container: barabas5532/shrapnel:7
strategy:
matrix:
build_type: ["Release", "Debug"]
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ RUN rm -rf /var/lib/apt/lists/* && \
apt-get clean

RUN git clone --shallow-submodules --recurse-submodules --depth 1 \
--branch v5.0-shrapnel1 \
https://github.com/shrapneldsp/esp-idf.git \
--branch v5.1.2 \
https://github.com/espressif/esp-idf.git \
$IDF_PATH

RUN $IDF_PATH/install.sh esp32
Expand Down
10 changes: 3 additions & 7 deletions firmware/components/wifi/src/wifi_state_machine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -310,14 +310,10 @@ void WifiStateMachine::provisioning_start()
get_device_service_name(service_name, sizeof(service_name));

wifi_prov_security_t security = WIFI_PROV_SECURITY_1;
constexpr std::string_view proof_of_possession{"abcd1234"};
wifi_prov_security1_params_t params{
.data{reinterpret_cast<const uint8_t *>(proof_of_possession.data())},
.len{proof_of_possession.size()},
};
constexpr char proof_of_possession[]{"abcd1234"};
const char *service_key = nullptr;

ESP_ERROR_CHECK(wifi_prov_mgr_start_provisioning(security, &params, service_name, service_key));
ESP_ERROR_CHECK(wifi_prov_mgr_start_provisioning(
security, &proof_of_possession, service_name, service_key));
}

void WifiStateMachine::provisioning_stop()
Expand Down
8 changes: 4 additions & 4 deletions firmware/dependencies.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
dependencies:
espressif/mdns:
component_hash: 57d784cbe88b55b46ec815045153d195aca368a8019bb1eba9b0eb1d7e8f2de8
component_hash: 810ec139689ae93bf42520d05de4855fbb68f7140ef67797d91d8d61829589cb
source:
service_url: https://api.components.espressif.com/
type: service
version: 1.0.8
version: 1.2.2
idf:
component_hash: null
source:
type: idf
version: 5.0.0
manifest_hash: 8e1aebf3b5991c112c5647a6fb0b72b2f26ad8508e9ffa70aa26da5a8a23b100
version: 5.1.2
manifest_hash: f07478b4217cadfb47c3d14602d60c69fe72bea2bcf6d412a6d50a2eb6af3c56
target: esp32
version: 1.0.0
4 changes: 2 additions & 2 deletions firmware/main/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static void i2c_setup(void)

static void failed_alloc_callback(size_t size, uint32_t caps, const char *function_name)
{
ESP_LOGE(TAG, "allocation failed. size=%zu caps=%08xh, function=%s", size, caps, function_name);
ESP_LOGE(TAG, "allocation failed. size=%zu caps=%08" PRIx32 "h, function=%s", size, caps, function_name);
heap_caps_print_heap_info(caps);
abort();
}
Expand Down Expand Up @@ -402,7 +402,7 @@ extern "C" void app_main(void)
auto tick_count_iteration = xTaskGetTickCount() - tick_count_start;
if(tick_count_iteration > pdMS_TO_TICKS(5))
{
ESP_LOGW(TAG, "slow iteration: %d ms", pdTICKS_TO_MS(tick_count_iteration));
ESP_LOGW(TAG, "slow iteration: %d ms", (int)pdTICKS_TO_MS(tick_count_iteration));
}
}
}
Expand Down
7 changes: 7 additions & 0 deletions plugins/shrapnel/.idea/discord.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion thirdparty/esp-idf-components/esp-dsp
Submodule esp-dsp updated 272 files
Loading