Merge pull request #8 from bitcraze/evoggy/router-split-fixes

Fix length and last packet issue in router

Author: evoggy

main/cpx.c

@@ -4,7 +4,6 @@ void cpxInitRoute(const CPXTarget_t source, const CPXTarget_t destination, const
     route->source = source;
     route->destination = destination;
     route->function = function;
-    route->lastPacket = true;
 }
 
 void cpxRouteToPacked(const CPXRouting_t* route, CPXRoutingPacked_t* packed) {

main/esp_transport.c

@@ -66,4 +66,5 @@ void espTransportSend(const CPXRoutablePacket_t* packet) {
 void espTransportReceive(CPXRoutablePacket_t* packet) {
   esp_routable_packet_t* buf = packet;
   xQueueReceive(espTxQueue, buf, portMAX_DELAY);
+  packet->route.lastPacket = true;
 }

main/router.c

@@ -101,19 +101,19 @@ static void route(Receiver_t receive, CPXRoutablePacket_t* rxp, RouteContext_t*
     switch (destination) {
       case CPX_T_GAP8:
         ESP_LOGD("ROUTER", "%s [0x%02X] -> GAP8 [0x%02X] (%u)", routerName, source, destination, cpxDataLength);
-        splitAndSend(rxp, context, spi_transport_send, SPI_TRANSPORT_MTU);
+        splitAndSend(rxp, context, spi_transport_send, SPI_TRANSPORT_MTU - CPX_ROUTING_PACKED_SIZE);
         break;
       case CPX_T_STM32:
         ESP_LOGD("ROUTER", "%s [0x%02X] -> STM32 [0x%02X] (%u)", routerName, source, destination, cpxDataLength);
-        splitAndSend(rxp, context, uart_transport_send, UART_TRANSPORT_MTU);
+        splitAndSend(rxp, context, uart_transport_send, UART_TRANSPORT_MTU - CPX_ROUTING_PACKED_SIZE);
         break;
       case CPX_T_ESP32:
         ESP_LOGD("ROUTER", "%s [0x%02X] -> ESP32 [0x%02X] (%u)", routerName, source, destination, cpxDataLength);
-        splitAndSend(rxp, context, espTransportSend, ESP_TRANSPORT_MTU);
+        splitAndSend(rxp, context, espTransportSend, ESP_TRANSPORT_MTU - CPX_ROUTING_PACKED_SIZE);
         break;
       case CPX_T_HOST:
         ESP_LOGD("ROUTER", "%s [0x%02X] -> HOST [0x%02X] (%u)", routerName, source, destination, cpxDataLength);
-        splitAndSend(rxp, context, wifi_transport_send, WIFI_TRANSPORT_MTU);
+        splitAndSend(rxp, context, wifi_transport_send, WIFI_TRANSPORT_MTU - CPX_ROUTING_PACKED_SIZE);
         break;
       default:
         ESP_LOGW("ROUTER", "Cannot route from %s [0x%02X] to [0x%02X]", routerName, source, destination);