trunk + comment

This commit is contained in:
issey sandei 2025-01-18 20:25:45 +00:00
parent eacf3cd0db
commit fb01e72d04

View File

@ -2661,6 +2661,7 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
}
int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
// If auto carousel is disabled, the focus doesn't chage on the incoming message
{
if (config.display.auto_screen_carousel_secs != 0) {
if (showingNormalScreen) {
@ -2677,7 +2678,6 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
return 0;
}
// Triggered by MeshModules
int Screen::handleUIFrameEvent(const UIFrameEvent *event)
{
@ -2759,4 +2759,4 @@ int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
} // namespace graphics
#else
graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
#endif // HAS_SCREEN
#endif // HAS_SCREEN