Update lay1+2_remastered.c

interrupts/crc/lay1+2_remastered.c

@@ -86,65 +86,74 @@ int main(void){
     byte* receivedFrame = malloc(MAXFRAMESIZE*sizeof(byte));
     uint16_t sizeToReceive = MAXFRAMESIZE;
     byte action; // 0 - broadcast successful, to layer 4; 1 - receive, to layer 4; 2 - relay
-
-    puts("Getting ready to send.");
-            byte sizeToSend = 4;
-            byte* payload = malloc((sizeToSend)*sizeof(byte));
-            payload[0] = 211; //dest
-            payload[1] = SELF; //src
-            payload[2] = 0xB3;
-            payload[3] = 0x10;
-
-            ATOMIC_BLOCK(ATOMIC_FORCEON){
-                fillSend(payload, sizeToSend);
-                puts("Sendbuffer filled.");
-            }
+    
+    /*
+     * puts("Getting ready to send.");
+     * byte sizeToSend = 4;
+     * byte* payload = malloc((sizeToSend)*sizeof(byte));
+     * payload[0] = 211; //dest
+     * payload[1] = SELF; //src
+     * payload[2] = 0xB3;
+     * payload[3] = 0x10;
+     * 
+     * ATOMIC_BLOCK(ATOMIC_FORCEON){
+     *     fillSend(payload, sizeToSend);
+     *     puts("Sendbuffer filled.");
+     * }
+     */
     
     while(1){
-        //if(!readyToSend){}
-        ATOMIC_BLOCK(ATOMIC_FORCEON){
-            // Data Package: 0 Preamble, 1 - 4 CRC,  5 Length,  6 Destination, 7 Source, 8 - n Data
-            if(readyToReceive){
-                if(bufferIndex != 0) receivedFrame[receiveIndex] = frame[bufferIndex-1];
-                else receivedFrame[receiveIndex] = frame[MAXFRAMESIZE-1];
-                //printf("receivedFrame[%d] = %d, bufferIndex: %d \n", receiveIndex, receivedFrame[receiveIndex], bufferIndex);
-                
-                if(receiveIndex==0){
-                        if(receivedFrame[receiveIndex] == 0x7E) receiveIndex++;
-                }
-                else if(receiveIndex==5){
-                        sizeToReceive = (uint16_t)receivedFrame[receiveIndex];
-                        //receivedFrame = (byte*) realloc (receivedFrame, (sizeToReceive+6)*sizeof(byte));
-                        receiveIndex++;
+        switch(state){
+            case 1: //USART interrupt/ receiving data
+                ATOMIC_BLOCK(ATOMIC_FORCEON){
+                    // Data Package: 0 Preamble, 1 - 4 CRC,  5 Length,  6 Destination, 7 Source, 8 - n Data
+                    if(readyToReceive){
+                        if(bufferIndex != 0) receivedFrame[receiveIndex] = frame[bufferIndex-1];
+                        else receivedFrame[receiveIndex] = frame[MAXFRAMESIZE-1];
+                        //printf("receivedFrame[%d] = %d, bufferIndex: %d \n", receiveIndex, receivedFrame[receiveIndex], bufferIndex);
+                        
+                        if(receiveIndex==0){
+                                if(receivedFrame[receiveIndex] == 0x7E) receiveIndex++;
+                        }
+                        else if(receiveIndex==5){
+                                sizeToReceive = (uint16_t)receivedFrame[receiveIndex];
+                                //receivedFrame = (byte*) realloc (receivedFrame, (sizeToReceive+6)*sizeof(byte));
+                                receiveIndex++;
+                        }
+                        else if(receiveIndex==sizeToReceive+5){
+                                    if(!crc_check(receivedFrame)){
+                                        puts("CRC-Check failed");
+                                        for(uint i=0; i < sizeToReceive+6; i++)
+                                            printf("%d ", receivedFrame[i] );
+                                    }
+                                    else{
+                                        puts("CRC-Check successful.\nReceived: ");
+                                        for(uint i=0; i < sizeToReceive+6; i++)
+                                            printf("%d ", receivedFrame[i] );
+                                        printf("\n");
+                                        //Hier evtl. noch Speicherung und/oder Ausgabe einbauen.
+                                    }
+                                    l3_exec(action, receivedFrame);
+                                    receiveIndex = 0;
+                        }
+                        else if(receiveIndex==7){ //check destination
+                            action = l3_action(receivedFrame[6], receivedFrame[7]);
+                            receiveIndex++;
+                        }
+                        else{
+                            receiveIndex++;
+                        }
+                        readyToReceive = 0;
+                    }
                 }
-                else if(receiveIndex==sizeToReceive+5){
-                            if(!crc_check(receivedFrame)){
-                                puts("CRC-Check failed");
-                                for(uint i=0; i < sizeToReceive+6; i++)
-                                    printf("%d ", receivedFrame[i] );
-                            }
-                            else{
-                                puts("CRC-Check successful.\nReceived: ");
-                                for(uint i=0; i < sizeToReceive+6; i++)
-                                    printf("%d ", receivedFrame[i] );
-                                printf("\n");
-                                //Hier evtl. noch Speicherung und/oder Ausgabe einbauen.
-                            }
-                            l3_exec(action, receivedFrame);
-                            receiveIndex = 0;
-                }
-                else if(receiveIndex==7){ //check destination
-                    action = l3_action(receivedFrame[6], receivedFrame[7]);
-                    receiveIndex++;
-                }
-                else{
-                    receiveIndex++;
-                }
-                
-                readyToReceive = 0;
-                
-                
-            }
+                if(action != 2) break; // wenn relayed werden soll, wird einfach in state 2 übergegangen
+                else state =2;
+            case 2:
+                //relay
+                break;
+            default:
+                memset(send, 0, sizeof(send));
+                break;
         }
     }  
     return 0;