altos: When slave mode first starts, accept any packet

[fw/altos] / src / drivers / ao_packet.c

diff --git a/src/drivers/ao_packet.c b/src/drivers/ao_packet.c
index 19fe0558b91892d6de9bc316bafd0818ce6892dc..2bada949e9c04769d60c0ed8748ca3266f46ec11 100644 (file)
--- a/src/drivers/ao_packet.c
+++ b/src/drivers/ao_packet.c
@@ -27,7 +27,12 @@ static __pdata uint8_t rx_seq;
 
 __xdata struct ao_task ao_packet_task;
 __xdata uint8_t ao_packet_enable;
+__xdata uint8_t ao_packet_restart;
+
+#if PACKET_HAS_MASTER
 __xdata uint8_t ao_packet_master_sleeping;
+__xdata uint8_t ao_packet_last_rssi;
+#endif
 
 void
 ao_packet_send(void)
@@ -61,15 +66,28 @@ ao_packet_recv(void)
 #ifdef AO_LED_GREEN
        ao_led_off(AO_LED_GREEN);
 #endif
+#if AO_PROFILE
+               {
+                       extern uint32_t ao_rx_start_tick, ao_rx_packet_tick, ao_rx_done_tick, ao_rx_last_done_tick;
+                       extern uint32_t ao_fec_decode_start, ao_fec_decode_end;
+
+                       printf ("between packet: %d\n", ao_rx_start_tick - ao_rx_last_done_tick);
+                       printf ("receive start delay: %d\n", ao_rx_packet_tick - ao_rx_start_tick);
+                       printf ("decode time: %d\n", ao_fec_decode_end - ao_fec_decode_start);
+                       printf ("rx cleanup: %d\n\n", ao_rx_done_tick - ao_fec_decode_end);
+                       flush();
+               }
+#endif
 
        /* Check to see if we got a valid packet */
        if (!dma_done)
                return 0;
-#ifdef PKT_APPEND_STATUS_1_CRC_OK
-       if (!(ao_rx_packet.status & PKT_APPEND_STATUS_1_CRC_OK))
+       if (!(ao_rx_packet.status & AO_RADIO_STATUS_CRC_OK))
                return 0;
-#endif
 
+#if PACKET_HAS_MASTER
+       ao_packet_last_rssi = ao_rx_packet.rssi;
+#endif
        /* Accept packets with matching call signs, or any packet if
         * our callsign hasn't been configured
         */
@@ -89,7 +107,8 @@ ao_packet_recv(void)
                /* Check for incoming data at the next sequence and
                 * for an empty data buffer
                 */
-               if (ao_rx_packet.packet.seq == (uint8_t) (rx_seq + (uint8_t) 1) &&
+               if ((ao_rx_packet.packet.seq == (uint8_t) (rx_seq + (uint8_t) 1) ||
+                    ao_packet_restart) &&
                    ao_packet_rx_used == ao_packet_rx_len) {
 
                        /* Copy data to the receive data buffer and set up the
@@ -109,6 +128,7 @@ ao_packet_recv(void)
                        ao_wakeup(&ao_stdin_ready);
                }
        }
+       ao_packet_restart = 0;
 
        /* If the other side has seen the latest data we queued,
         * wake up any task waiting to send data and let them go again
@@ -120,10 +140,6 @@ ao_packet_recv(void)
        return 1;
 }
 
-#ifndef PACKET_HAS_MASTER
-#define PACKET_HAS_MASTER 1
-#endif
-
 #if PACKET_HAS_MASTER
 void
 ao_packet_flush(void)