Skip to content

Commit

Permalink
Merge branch 'develop' into feature/dotenv-vars
Browse files Browse the repository at this point in the history
  • Loading branch information
hhvrc committed Oct 2, 2023
2 parents 544f285 + 170759e commit 594150a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 10 deletions.
28 changes: 20 additions & 8 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"platformio.platformio-ide"
],
"unwantedRecommendations": [
"ms-vscode.cpptools-extension-pack"
]
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"ardenivanov.svelte-intellisense",
"bradlc.vscode-tailwindcss",
"dbaeumer.vscode-eslint",
"editorconfig.editorconfig",
"esbenp.prettier-vscode",
"esbenp.prettier-vscode",
"fivethree.vscode-svelte-snippets",
"lkrms.inifmt",
"ms-python.black-formatter",
"ms-vscode.cpptools",
"ms-vscode.cpptools-extension-pack",
"platformio.platformio-ide",
"svelte.svelte-vscode",
"svelte.svelte-vscode",
"xaver.clang-format"
],
"unwantedRecommendations": ["ms-vscode.cpptools-extension-pack"]
}
4 changes: 2 additions & 2 deletions src/VisualStateManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,11 @@ void VisualStateManager::SetWiFiState(WiFiState state) {
#ifndef OPENSHOCK_LED_IMPLEMENTATION

void VisualStateManager::SetCriticalError() {
ESP_LOGW(TAG, "SetCriticalError: (But no LED implementation is selected)");
ESP_LOGW(TAG, "SetCriticalError: (But no LED implementation is selected / Selected implementation doesn't exist)");
}

void VisualStateManager::SetWiFiState(WiFiState state) {
ESP_LOGW(TAG, "SetWiFiState: %d (But no LED implementation is selected)", state);
ESP_LOGW(TAG, "SetWiFiState: %d (But no LED implementation is selected / Selected implementation doesn't exist)", state);
}

#endif // OPENSHOCK_LED_NONE

0 comments on commit 594150a

Please sign in to comment.