Merge branch 'master' into patch1

src/esp32/architecture.h

@@ -70,6 +70,8 @@
     #define HW_VENDOR HardwareModel_NANO_G1
 #elif defined(M5STACK)
     #define HW_VENDOR HardwareModel_M5STACK
+#elif defined(STATION_G1)
+    #define HW_VENDOR HardwareModel_STATION_G1
 #endif
 
 //
@@ -77,12 +79,16 @@
 //
 
 #define GPS_SERIAL_NUM 1
+#ifndef GPS_RX_PIN
 #define GPS_RX_PIN 34
+#endif
+#ifndef GPS_TX_PIN
 #ifdef USE_JTAG
 #define GPS_TX_PIN -1
 #else
 #define GPS_TX_PIN 12
 #endif
+#endif
 
 // -----------------------------------------------------------------------------
 // LoRa SPI

src/mesh/FloodingRouter.cpp

@@ -29,8 +29,12 @@ bool FloodingRouter::shouldFilterReceived(MeshPacket *p)
 
 void FloodingRouter::sniffReceived(const MeshPacket *p, const Routing *c)
 {
-
-    if ((p->to == NODENUM_BROADCAST) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
+    PacketId ackId = ((c && c->error_reason == Routing_Error_NONE) || !c) ? p->decoded.request_id : 0;
+    if (ackId && p->to != getNodeNum()) {
+        // do not flood direct message that is ACKed 
+        DEBUG_MSG("Receiving an ACK not for me, but don't need to rebroadcast this direct message anymore.\n");
+        Router::cancelSending(p->to, p->decoded.request_id);   // cancel rebroadcast for this DM
+    } else if ((p->to != getNodeNum()) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
         if (p->id != 0) {
             if (config.device.role != Config_DeviceConfig_Role_ClientMute) {
                 MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it

src/mesh/ReliableRouter.cpp

@@ -16,7 +16,7 @@ ErrorCode ReliableRouter::send(MeshPacket *p)
         // If someone asks for acks on broadcast, we need the hop limit to be at least one, so that first node that receives our
         // message will rebroadcast.  But asking for hop_limit 0 in that context means the client app has no preference on hop
         // counts and we want this message to get through the whole mesh, so use the default.
-        if (p->to == NODENUM_BROADCAST && p->hop_limit == 0) {
+        if (p->hop_limit == 0) {
             if (config.lora.hop_limit && config.lora.hop_limit <= HOP_MAX) {
                 p->hop_limit = (config.lora.hop_limit >= HOP_MAX) ? HOP_MAX : config.lora.hop_limit;
             } else {
@@ -34,7 +34,7 @@ ErrorCode ReliableRouter::send(MeshPacket *p)
 bool ReliableRouter::shouldFilterReceived(MeshPacket *p)
 {
     // Note: do not use getFrom() here, because we want to ignore messages sent from phone
-    if (p->to == NODENUM_BROADCAST && p->from == getNodeNum()) {
+    if (p->from == getNodeNum()) {
         printPacket("Rx someone rebroadcasting for us", p);
 
         // We are seeing someone rebroadcast one of our broadcast attempts.
@@ -231,4 +231,4 @@ void ReliableRouter::setNextTx(PendingPacket *pending)
     DEBUG_MSG("Setting next retransmission in %u msecs: ", d);
     printPacket("", pending->packet);
     setReceivedMessage(); // Run ASAP, so we can figure out our correct sleep time
-}
+}

src/mesh/generated/mesh.pb.h

@@ -71,6 +71,8 @@ typedef enum _HardwareModel {
     HardwareModel_DR_DEV = 43, 
     /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */
     HardwareModel_M5STACK = 44, 
+    /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
+    HardwareModel_STATION_G1 = 45, 
     /* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. */
     HardwareModel_PRIVATE_HW = 255 
 } HardwareModel;

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -72,7 +72,7 @@ bool DeviceTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies)
 
     lastMeasurementPacket = packetPool.allocCopy(*p);
     DEBUG_MSG("Device Telemetry: Sending packet to mesh\n");
-    service.sendToMesh(p);
+    service.sendToMesh(p, RX_SRC_LOCAL, true);
     nodeDB.updateTelemetry(nodeDB.getNodeNum(), t, RX_SRC_LOCAL);
     return true;
 }

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -229,6 +229,6 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies
 
     lastMeasurementPacket = packetPool.allocCopy(*p);
     DEBUG_MSG("Environment Telemetry: Sending packet to mesh");
-    service.sendToMesh(p);
+    service.sendToMesh(p, RX_SRC_LOCAL, true);
     return true;
 }