Next stage of COBS development, with TPIU channels in COBS frame header

orbcode · Sep 2, 2023 · 5b0abe4 · 5b0abe4
1 parent efe6cd3
commit 5b0abe4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/Src/cobsDecoder.c b/Src/cobsDecoder.c
@@ -95,8 +95,6 @@ void COBSPump( struct COBSDecoder *t, uint8_t *incoming, int len,
         switch ( t->s )
         {
             case COBS_UNSYNCED: // ----------------------------------------------------------------
-
-                /* This case was already dealt with above */
                 if ( COBS_SYNC_CHAR == *fp )
                 {
                     packetRxed( COBS_EV_NEWSYNC, NULL, NULL );
@@ -154,6 +152,14 @@ void COBSPump( struct COBSDecoder *t, uint8_t *incoming, int len,
                     }
                 }
 
+                /* Check for frame overflow ... if it's max then error */
+                if ( COBS_MAX_PACKET_LEN == t->f.len )
+                {
+                    t->stats.error++;
+                    packetRxed( COBS_EV_ERROR, &t->f, param );
+                    t->s = COBS_IDLE;
+                }
+
                 break;
 
             case COBS_ERROR:  // ------------------------------------------------------------------

diff --git a/Src/orbuculum.c b/Src/orbuculum.c
@@ -809,7 +809,7 @@ static void _COBSpacketRxed( enum COBSPumpEvent e, struct Frame *p, void *param
 
 {
 
-  
+
     struct RunTime *r = ( struct RunTime * )param;
 
     struct handlers *h;
@@ -819,13 +819,6 @@ static void _COBSpacketRxed( enum COBSPumpEvent e, struct Frame *p, void *param
     switch ( e )
     {
         case COBS_EV_RXEDFRAME:
-	  /////////////////////////////////////////////////////////////////////
-	  //// HACK FOR CASE THAT COBS IS JUST TRANSITING RAW TPIU FRAMES /////
-	  TPIUPump2( &r->t, p->d, p->len, _TPIUpacketRxed, r );
-	  _purgeBlock( r );
-	  break;
-	  /////////////////////////////////////////////////////////////////////
-
             if ( p->len > 1 )
             {
                 incomingChannel = p->d[0];
@@ -855,8 +848,6 @@ static void _COBSpacketRxed( enum COBSPumpEvent e, struct Frame *p, void *param
                             _purgeBlock( r );
                         }
                     }
-
-                    _purgeBlock( r );
                 }
             }
 
@@ -916,6 +907,7 @@ static void _processBlock( struct RunTime *r, ssize_t fillLevel, uint8_t *buffer
         {
             /* Strip the COBS framing from this input */
             COBSPump( &r->c, r->rawBlock[r->rp].buffer, r->rawBlock[r->rp].fillLevel, _COBSpacketRxed, r );
+            _purgeBlock( r );
         }
         else if ( r-> options->useTPIU )
         {