-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[all-devices-app] Add M5Stack LCD UI and interactive device selection menu #74074
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
Open
andy31415
wants to merge
2
commits into
project-chip:master
Choose a base branch
from
andy31415:all-devices-m5stack-ui
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
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,99 @@ | ||
| /* | ||
| * | ||
| * Copyright (c) 2026 Project CHIP Authors | ||
| * All rights reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| #include "Button.h" | ||
| #include "Display.h" | ||
| #include "ScreenManager.h" | ||
| #include <esp_log.h> | ||
| #include <platform/PlatformManager.h> | ||
|
|
||
| #define APP_BUTTON_PRESSED 0 | ||
| #define APP_BUTTON_RELEASED 1 | ||
|
|
||
| static const char TAG[] = "Button"; | ||
|
|
||
| void IRAM_ATTR button_isr_handler(void * arg) | ||
| { | ||
| auto * button = static_cast<Button *>(arg); | ||
| if (button != nullptr && button->mButtonTimer != nullptr) | ||
| { | ||
| xTimerStartFromISR(button->mButtonTimer, nullptr); | ||
| } | ||
| } | ||
|
|
||
| void Button::TimerCallback(TimerHandle_t xTimer) | ||
| { | ||
| auto * button = static_cast<Button *>(pvTimerGetTimerID(xTimer)); | ||
| if (button == nullptr) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| int state = gpio_get_level(button->mGPIONum); | ||
| if (state == APP_BUTTON_PRESSED) | ||
| { | ||
| WakeDisplay(); | ||
| int buttonId = 40 - button->mGPIONum; | ||
| LogErrorOnFailure(chip::DeviceLayer::PlatformMgr().ScheduleWork( | ||
| [](intptr_t arg) { ScreenManager::ButtonPressed(static_cast<int>(arg)); }, static_cast<intptr_t>(buttonId))); | ||
| } | ||
| } | ||
|
|
||
| esp_err_t Button::Init() | ||
| { | ||
| if (mGPIONum == GPIO_NUM_NC) | ||
| { | ||
| return ESP_FAIL; | ||
| } | ||
| return Init(mGPIONum); | ||
| } | ||
|
|
||
| esp_err_t Button::Init(gpio_num_t gpioNum) | ||
| { | ||
| mGPIONum = gpioNum; | ||
|
|
||
| gpio_config_t io_conf = {}; | ||
| io_conf.intr_type = GPIO_INTR_NEGEDGE; | ||
| io_conf.pin_bit_mask = (1ULL << gpioNum); | ||
| io_conf.mode = GPIO_MODE_INPUT; | ||
| io_conf.pull_up_en = GPIO_PULLUP_ENABLE; | ||
| io_conf.pull_down_en = GPIO_PULLDOWN_DISABLE; | ||
|
|
||
| esp_err_t err = gpio_config(&io_conf); | ||
| if (err != ESP_OK) | ||
| { | ||
| ESP_LOGE(TAG, "gpio_config failed for pin %d: %s", gpioNum, esp_err_to_name(err)); | ||
| return err; | ||
| } | ||
|
|
||
| mButtonTimer = xTimerCreate("BtnTmr", pdMS_TO_TICKS(50), pdFALSE, this, TimerCallback); | ||
| if (mButtonTimer == nullptr) | ||
| { | ||
| ESP_LOGE(TAG, "Failed to create debounce timer for button on pin %d", gpioNum); | ||
| return ESP_FAIL; | ||
| } | ||
|
|
||
| err = gpio_isr_handler_add(gpioNum, button_isr_handler, this); | ||
| if (err != ESP_OK) | ||
| { | ||
| ESP_LOGE(TAG, "gpio_isr_handler_add failed for pin %d: %s", gpioNum, esp_err_to_name(err)); | ||
| return err; | ||
| } | ||
|
|
||
| return ESP_OK; | ||
| } |
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.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Report the failure when persistence fails.
SetDeviceTypeAndRestartreturns without restarting if the NVS write fails (main.cpp Lines 568-573). This handler prints "Restarting..." before the call and then returnsCHIP_NO_ERROR, so the operator sees success although the device keeps the previous device type.Return a status from
SetDeviceTypeAndRestartand print the result, or print the message only after the write succeeds.🩹 Proposed change
This requires
SetDeviceTypeAndRestartinexamples/all-devices-app/esp32/main/main.cppto returnCHIP_ERROR, and the display caller inexamples/all-devices-app/esp32/main/display/DeviceSelectionScreen.cppto handle the returned value.🤖 Prompt for AI Agents