Fixes bugs around packet length.

bakerstu · Jul 4, 2021 · b97b1dd · b97b1dd
1 parent d875dda
commit b97b1dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/dcc/Receiver.hxx b/src/dcc/Receiver.hxx
@@ -169,6 +169,7 @@ public:
                         clear_packet();
                         pkt_->dlc = 0;
                         pkt_->payload[0] = 0;
+                        pkt_->packet_header.skip_ec = 1;
                     }
                     else
                     {
@@ -209,6 +210,10 @@ public:
                     else
                     {
                         // end of packet 1 bit.
+                        if (havePacket_)
+                        {
+                            pkt_->dlc++;
+                        }
                         parseState_ = DCC_MAYBE_CUTOUT;
                         return;
                     }
@@ -233,7 +238,7 @@ public:
                             pkt_->dlc++;
                             if (pkt_->dlc >= DCC_PACKET_MAX_PAYLOAD)
                             {
-                                pkt_ = nullptr;
+                                havePacket_ = false;
                             }
                             else
                             {

diff --git a/src/freertos_drivers/common/DccDecoder.hxx b/src/freertos_drivers/common/DccDecoder.hxx
@@ -303,13 +303,6 @@ __attribute__((optimize("-O3"))) void DccDecoder<Module>::interrupt_handler()
         {
             prepCutout_ = true;
             Module::dcc_before_cutout_hook();
-            if (decoder_.pkt())
-            {
-                decoder_.pkt()->header_raw_data = 0;
-                decoder_.pkt()->packet_header.skip_ec = 1;
-                nextPacketFilled_ = true;
-            }
-            Module::trigger_os_interrupt();
         }
         // If we are at the second half of the last 1 bit and the
         // value of the input pin is 1, then we cannot recognize when
@@ -324,6 +317,11 @@ __attribute__((optimize("-O3"))) void DccDecoder<Module>::interrupt_handler()
             Module::set_cap_timer_delay_usec(RAILCOM_CUTOUT_PRE);
             inCutout_ = true;
             cutoutState_ = 0;
+            if (decoder_.pkt())
+            {
+                nextPacketFilled_ = true;
+            }
+            Module::trigger_os_interrupt();
         }
         else if (decoder_.state() == dcc::DccDecoder::DCC_CUTOUT)
         {