-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
[esp] Add status screen to all-clusters-app on M5Stack #14986
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
005b815
[m5] Add status screen to M5Stack.
turon 75bf4bd
[m5] Add status screen to esp for FabricId/Idx, NodeId, and IP addres…
turon 65bf72f
[m5] Correct some comments.
turon 0483f06
[m5] Use lib defined Inet::IPAddress::kMaxStringLength.
turon d63c1a5
[m5] Update comment on what screen displays.
turon 5681964
[m5] Reference issue #15049 deferral.
turon 1626d5c
Apply suggestions from code review
turon 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 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,189 @@ | ||
/* | ||
* | ||
* Copyright (c) 2022 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. | ||
*/ | ||
|
||
/** | ||
* @file StatusScreen.cpp | ||
* | ||
* Screen which displays device state and status: | ||
* - Fabric Index : none | # | ||
* - Fabric ID : none | # | ||
* - Node ID : none | # | ||
* - UDP Port : # | ||
* - IPv4 : none | addr | ||
* - IPv6 LL : none | addr | ||
* - IPv6 ULA : none | addr | ||
*/ | ||
|
||
#include "StatusScreen.h" | ||
|
||
#if CONFIG_HAVE_DISPLAY | ||
|
||
#include "esp_log.h" | ||
#include "esp_system.h" | ||
#include "esp_wifi.h" | ||
#include "freertos/FreeRTOS.h" | ||
#include "freertos/task.h" | ||
|
||
#include <lib/support/CodeUtils.h> | ||
#include <platform/CHIPDeviceLayer.h> | ||
|
||
#include <app/server/Server.h> | ||
#include <lib/core/DataModelTypes.h> | ||
|
||
#define MAX_LENGTH_SMALL_FONT 30 | ||
|
||
using namespace chip; | ||
|
||
class StatusListModel : public ListScreen::Model | ||
{ | ||
public: | ||
enum | ||
{ | ||
kStatusItemFabricIndex, | ||
kStatusItemFabricId, | ||
kStatusItemNodeId, | ||
kStatusItemPort, | ||
kStatusItemIp4, | ||
kStatusItemIp6LinkLocal, | ||
kStatusItemIp6Ula, | ||
}; | ||
|
||
StatusListModel() | ||
{ | ||
options.emplace_back("FabricIndex : none"); | ||
options.emplace_back("FabricID : none"); | ||
options.emplace_back("NodeID : none"); | ||
options.emplace_back("UDP port : " + std::to_string(CHIP_PORT)); | ||
options.emplace_back("IPv4 : none"); | ||
options.emplace_back("IPv6 LL : none"); | ||
options.emplace_back("IPv6 ULA : none"); | ||
} | ||
|
||
virtual std::string GetTitle() { return "Status"; } | ||
|
||
virtual int GetItemCount() { return options.size(); } | ||
virtual std::string GetItemText(int i) | ||
{ | ||
std::string itemString = options.at(i); | ||
switch (i) | ||
{ | ||
case kStatusItemFabricIndex: { | ||
for (const auto & fb : Server::GetInstance().GetFabricTable()) | ||
{ | ||
FabricIndex fabricIndex = fb.GetFabricIndex(); | ||
itemString = "FabricIdx : " + std::to_string(fabricIndex); | ||
break; // Only print first fabric for now | ||
} | ||
break; | ||
} | ||
|
||
case kStatusItemFabricId: { | ||
for (const auto & fb : Server::GetInstance().GetFabricTable()) | ||
{ | ||
FabricId fabricId = fb.GetFabricId(); | ||
itemString = "FabricID : " + std::to_string(fabricId); | ||
break; // Only print first fabric for now | ||
} | ||
break; | ||
} | ||
|
||
case kStatusItemNodeId: { | ||
for (const auto & fb : Server::GetInstance().GetFabricTable()) | ||
{ | ||
NodeId nodeId = fb.GetNodeId(); | ||
itemString = "NodeID : " + std::to_string(nodeId); | ||
break; // Only print first fabric for now | ||
} | ||
break; | ||
} | ||
|
||
case kStatusItemIp4: { | ||
chip::Inet::IPAddress addr; | ||
for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next()) | ||
{ | ||
if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv4()) | ||
{ | ||
char buf[Inet::IPAddress::kMaxStringLength]; | ||
addr.ToString(buf); | ||
itemString = std::string(buf); | ||
break; // Only print first IPv4 address for now | ||
} | ||
} | ||
break; | ||
} | ||
|
||
case kStatusItemIp6LinkLocal: { | ||
chip::Inet::IPAddress addr; | ||
for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next()) | ||
{ | ||
if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv6LinkLocal()) | ||
{ | ||
char buf[Inet::IPAddress::kMaxStringLength]; | ||
addr.ToString(buf); | ||
itemString = std::string(buf); | ||
if (itemString.length() < MAX_LENGTH_SMALL_FONT) | ||
{ | ||
TFT_setFont(SMALL_FONT, nullptr); | ||
} | ||
else | ||
{ | ||
TFT_setFont(DEF_SMALL_FONT, nullptr); | ||
} | ||
break; // Only print first IPv6 LL for now | ||
} | ||
} | ||
break; | ||
} | ||
|
||
case kStatusItemIp6Ula: { | ||
chip::Inet::IPAddress addr; | ||
for (chip::Inet::InterfaceAddressIterator it; it.HasCurrent(); it.Next()) | ||
{ | ||
if ((it.GetAddress(addr) == CHIP_NO_ERROR) && addr.IsIPv6ULA()) | ||
{ | ||
char buf[Inet::IPAddress::kMaxStringLength]; | ||
addr.ToString(buf); | ||
itemString = std::string(buf); | ||
if (itemString.length() < MAX_LENGTH_SMALL_FONT) | ||
{ | ||
TFT_setFont(SMALL_FONT, nullptr); | ||
} | ||
else | ||
{ | ||
TFT_setFont(DEF_SMALL_FONT, nullptr); | ||
} | ||
break; // Only print first IPv6 ULA for now | ||
} | ||
} | ||
break; | ||
} | ||
} | ||
ESP_LOGI("M5 UI", "Display status %d: %s", i, itemString.c_str()); | ||
|
||
return itemString; | ||
} | ||
|
||
virtual void ItemAction(int i) {} | ||
|
||
private: | ||
std::vector<std::string> options; | ||
}; | ||
|
||
StatusScreen::StatusScreen() : ListScreen(chip::Platform::New<StatusListModel>()) {} | ||
|
||
#endif // CONFIG_HAVE_DISPLAY |
45 changes: 45 additions & 0 deletions
45
examples/all-clusters-app/esp32/main/include/StatusScreen.h
This file contains 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,45 @@ | ||
/* | ||
* | ||
* Copyright (c) 2022 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. | ||
*/ | ||
|
||
/** | ||
* @file StatusScreen.h | ||
* | ||
* Screen which displays a QR code. | ||
* | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include "ListScreen.h" | ||
#include "ScreenManager.h" | ||
|
||
#if CONFIG_HAVE_DISPLAY | ||
|
||
#include <cstdint> | ||
#include <vector> | ||
|
||
class StatusScreen : public ListScreen | ||
{ | ||
|
||
public: | ||
StatusScreen(); | ||
|
||
virtual ~StatusScreen() {} | ||
}; | ||
|
||
#endif // CONFIG_HAVE_DISPLAY |
This file contains 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 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
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.
@turon For what it's worth, this has issues similar to #15065
We should probably really queue this stuff over to the Matter thread and then block until it runs or something....