forked from micropython/micropython
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
esp32s2: esp_error: Consistent error checking of esp-idf calls #3677
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| /* | ||
| * This file is part of the MicroPython project, http://micropython.org/ | ||
| * | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2020 Jeff Epler for Adafruit Industries | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| #include "esp_error.h" | ||
| #include "py/runtime.h" | ||
|
|
||
| void raise_esp_error(esp_err_t err) { | ||
| const compressed_string_t *msg = NULL; | ||
| switch(err) { | ||
| case ESP_FAIL: | ||
| msg = translate("Generic Failure"); | ||
| break; | ||
| case ESP_ERR_NO_MEM: | ||
| msg = translate("Out of memory"); | ||
| break; | ||
| case ESP_ERR_INVALID_ARG: | ||
| msg = translate("Invalid argument"); | ||
| break; | ||
| case ESP_ERR_INVALID_STATE: | ||
| msg = translate("Invalid state"); | ||
| break; | ||
| case ESP_ERR_INVALID_SIZE: | ||
| msg = translate("Invalid size"); | ||
| break; | ||
| case ESP_ERR_NOT_FOUND: | ||
| msg = translate("Requested resource not found"); | ||
| break; | ||
| case ESP_ERR_NOT_SUPPORTED: | ||
| msg = translate("Operation or feature not supported"); | ||
| break; | ||
| case ESP_ERR_TIMEOUT: | ||
| msg = translate("Operation timed out"); | ||
| break; | ||
| case ESP_ERR_INVALID_RESPONSE: | ||
| msg = translate("Received response was invalid"); | ||
| break; | ||
| case ESP_ERR_INVALID_CRC: | ||
| msg = translate("CRC or checksum was invalid"); | ||
| break; | ||
| case ESP_ERR_INVALID_VERSION: | ||
| msg = translate("Version was invalid"); | ||
| break; | ||
| case ESP_ERR_INVALID_MAC: | ||
| msg = translate("MAC address was invalid"); | ||
| break; | ||
| } | ||
| if (msg) { | ||
| mp_raise_msg(&mp_type_OSError, msg); | ||
| } | ||
|
|
||
| const char *group = "ESP-IDF"; | ||
|
|
||
| // tests must be in descending order | ||
| MP_STATIC_ASSERT( ESP_ERR_FLASH_BASE > ESP_ERR_MESH_BASE ); | ||
| MP_STATIC_ASSERT( ESP_ERR_MESH_BASE > ESP_ERR_WIFI_BASE ); | ||
| if(err >= ESP_ERR_FLASH_BASE) { | ||
| group = "Flash"; | ||
| } else if (err >= ESP_ERR_MESH_BASE) { | ||
| group = "Mesh"; | ||
| } else if (err >= ESP_ERR_WIFI_BASE) { | ||
| group = "WiFi"; | ||
| } | ||
| mp_raise_msg_varg(&mp_type_OSError, translate("%s error 0x%x"), group, err); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * This file is part of the MicroPython project, http://micropython.org/ | ||
| * | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2020 Jeff Epler for Adafruit Industries | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| #pragma once | ||
|
|
||
| #include "esp_err.h" | ||
| #include "py/mpconfig.h" | ||
|
|
||
| void raise_esp_error(esp_err_t err) NORETURN; | ||
| #define ESP_CALL_RAISE(x) do { int res = (x); if(res != ESP_OK) raise_esp_error(res); } while(0) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have a special subclass of MemoryError for this already: https://github.com/adafruit/circuitpython/blob/main/ports/esp32s2/bindings/espidf/__init__.c#L68