-
Notifications
You must be signed in to change notification settings - Fork 352
Refactor self-test #1615
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
Merged
Merged
Refactor self-test #1615
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
0717c8a
Refactor self-test
mutatrum 39d2987
Merge branch 'master' of https://github.com/bitaxeorg/ESP-Miner into …
mutatrum c2e8a45
Clean up logging on system init
mutatrum 70b948a
Change order of init, screen first
mutatrum 7b35248
Improve logging for self-test
mutatrum cb6fbf7
Merge branch 'master' of https://github.com/bitaxeorg/ESP-Miner into …
mutatrum ea4c6d4
Review comments
mutatrum 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| #include "filesystem.h" | ||
| #include "global_state.h" | ||
| #include "esp_log.h" | ||
| #include "esp_spiffs.h" | ||
| #include "esp_vfs.h" | ||
|
|
||
| static const char * TAG = "filesystem"; | ||
|
|
||
| esp_err_t filesystem_init(void * pvParameters) | ||
| { | ||
| GlobalState * GLOBAL_STATE = (GlobalState *) pvParameters; | ||
|
|
||
| esp_vfs_spiffs_conf_t conf = {.base_path = "", .partition_label = NULL, .max_files = 5, .format_if_mount_failed = false}; | ||
| esp_err_t ret = esp_vfs_spiffs_register(&conf); | ||
|
|
||
| if (ret != ESP_OK) { | ||
| if (ret == ESP_FAIL) { | ||
| ESP_LOGE(TAG, "Failed to mount or format filesystem"); | ||
| } else if (ret == ESP_ERR_NOT_FOUND) { | ||
| ESP_LOGE(TAG, "Failed to find SPIFFS partition"); | ||
| } else { | ||
| ESP_LOGE(TAG, "Failed to initialize SPIFFS (%s)", esp_err_to_name(ret)); | ||
| } | ||
| return ESP_FAIL; | ||
| } | ||
|
|
||
| GLOBAL_STATE->filesystem_is_available = true; | ||
|
|
||
| size_t total = 0, used = 0; | ||
| ret = esp_spiffs_info(NULL, &total, &used); | ||
| if (ret != ESP_OK) { | ||
| // This shouldn't happen | ||
| ESP_LOGE(TAG, "Failed to get SPIFFS partition information (%s)", esp_err_to_name(ret)); | ||
| } else { | ||
| ESP_LOGI(TAG, "Partition size: total: %d, used: %d", total, used); | ||
| } | ||
|
|
||
| return ESP_OK; | ||
| } | ||
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,16 @@ | ||
| #ifndef FILESYSTEM_H_ | ||
| #define FILESYSTEM_H_ | ||
|
|
||
| #include "esp_err.h" | ||
|
|
||
| /** | ||
| * @brief Initialize the SPIFFS filesystem | ||
| * | ||
| * This function mounts the SPIFFS partition and can be used | ||
| * independently of the REST server for self-test mode. | ||
| * | ||
| * @return ESP_OK on success, ESP_FAIL on failure | ||
| */ | ||
| esp_err_t filesystem_init(void * pvParameters); | ||
|
|
||
| #endif /* FILESYSTEM_H_ */ |
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
Oops, something went wrong.
Oops, something went wrong.
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.
afaik ESP-IDF does require a non empty path starting with "/" e.g. "/spiffs"
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.
This code is just moved out of
http_server.c, unchanged?