src/graphics/Screen.cpp

@@ -2662,14 +2662,13 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
 
 int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
 {
-    if (showingNormalScreen) {
+    // If auto carousel is disabled -> return 0 and skip new messages handling
-        // Outgoing message
+    if (config.display.auto_screen_carousel_secs == 0)
-        if (packet->from == 0)
+        return 0;
-            setFrames(FOCUS_PRESERVE); // Return to same frame (quietly hiding the rx text message frame)
 
-        // Incoming message
+    // Handle focus change based on message type
-        else
+    if (showingNormalScreen) {
-            setFrames(FOCUS_TEXTMESSAGE); // Focus on the new message
+        setFrames(packet->from == 0 ? FOCUS_PRESERVE : FOCUS_TEXTMESSAGE);
     }
 
     return 0;
@@ -2756,4 +2755,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

src/modules/PositionModule.cpp

@@ -160,8 +160,7 @@ bool PositionModule::hasGPS()
 #endif
 }
 
-// Allocate a packet with our position data if we have one
+meshtastic_MeshPacket *PositionModule::allocReply()
-meshtastic_MeshPacket *PositionModule::allocPositionPacket()
 {
     if (precision == 0) {
         LOG_DEBUG("Skip location send because precision is set to 0!");
@@ -263,8 +262,7 @@ meshtastic_MeshPacket *PositionModule::allocPositionPacket()
         p.has_ground_speed = true;
     }
 
-    LOG_INFO("Position packet: time=%i lat=%i lon=%i", p.time, p.latitude_i, p.longitude_i);
+    LOG_INFO("Position reply: time=%i lat=%i lon=%i", p.time, p.latitude_i, p.longitude_i);
-    lastSentToMesh = millis();
 
     // TAK Tracker devices should send their position in a TAK packet over the ATAK port
     if (config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER)
@@ -273,16 +271,6 @@ meshtastic_MeshPacket *PositionModule::allocPositionPacket()
     return allocDataProtobuf(p);
 }
 
-meshtastic_MeshPacket *PositionModule::allocReply()
-{
-    if (lastSentToMesh && Throttle::isWithinTimespanMs(lastSentToMesh, 3 * 60 * 1000)) {
-        LOG_DEBUG("Skip Position reply since we sent it <3min ago");
-        ignoreRequest = true; // Mark it as ignored for MeshModule
-        return nullptr;
-    }
-    return allocPositionPacket();
-}
-
 meshtastic_MeshPacket *PositionModule::allocAtakPli()
 {
     LOG_INFO("Send TAK PLI packet");
@@ -345,9 +333,9 @@ void PositionModule::sendOurPosition(NodeNum dest, bool wantReplies, uint8_t cha
         precision = 0;
     }
 
-    meshtastic_MeshPacket *p = allocPositionPacket();
+    meshtastic_MeshPacket *p = allocReply();
     if (p == nullptr) {
-        LOG_DEBUG("allocPositionPacket returned a nullptr");
+        LOG_DEBUG("allocReply returned a nullptr");
         return;
     }
 

src/modules/PositionModule.h

@@ -55,7 +55,6 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
     virtual int32_t runOnce() override;
 
   private:
-    meshtastic_MeshPacket *allocPositionPacket();
     struct SmartPosition getDistanceTraveledSinceLastSend(meshtastic_PositionLite currentPosition);
     meshtastic_MeshPacket *allocAtakPli();
     void trySetRtc(meshtastic_Position p, bool isLocal, bool forceUpdate = false);
@@ -63,7 +62,6 @@ class PositionModule : public ProtobufModule<meshtastic_Position>, private concu
     void sendLostAndFoundText();
     bool hasQualityTimesource();
     bool hasGPS();
-    uint32_t lastSentToMesh = 0; // Last time we sent our position to the mesh
 
     const uint32_t minimumTimeThreshold =
         Default::getConfiguredOrDefaultMs(config.position.broadcast_smart_minimum_interval_secs, 30);