Test changes

src/src/Top/RFTop.v

@@ -136,8 +136,8 @@ wire [15:0] tempI2CData;
 //sums
 
 wire [6:0] sumForLmx = numOfConfigCmds+packetNum1;
-wire [6:0] sumForDDS = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 ;
-wire [6:0] sumForPot = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 ;
+wire [6:0] sumForDDS = numOfConfigCmds + packetNum1 + packetNum2 ;
+wire [6:0] sumForPot = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3;
 wire [6:0] sumForDAC = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4;
 wire [6:0] sumForATT = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5;
 wire [6:0] sumForShiftReg = numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6;
@@ -153,6 +153,7 @@ reg fsDelay;
 reg tempI2CDataReady;
 reg [15:0] misoRegI2C;
 reg [15:0] tempI2CDataReg;
+reg [Width-1:0] dataToRxFifoReg;
 
 //================================================================================
 
@@ -220,7 +221,13 @@ assign deviceID = (!modeSel)?configReg1[22:18] : 5'b0;
 assign wordNum = (!modeSel)?configReg1[17:1] : 17'b0;
 
 // assign dataToRxFifo = (RorQSPIFlag) ? dataToRxFifoQ : dataToRxFifoR;
-assign dataToRxFifo = (((currState == IDLE) ? (RorQSPIFlag) ? dataToRxFifoQ : dataToRxFifoR : (modeSel) ? dataToRxFifoQ : dataToRxFifoR));
+
+// assign dataToRxFifo = (((currState == IDLE) ? (RorQSPIFlag) ? dataToRxFifoQ : dataToRxFifoR : (modeSel) ? dataToRxFifoQ : dataToRxFifoR));
+assign dataToRxFifo = dataToRxFifoReg;
+
+
+
+ 
 // assign valToRxFifo = (RorQSPIFlag) ? valToRxFifoQ : valToRxFifoR;
 assign valToRxFifo = (((currState == IDLE) ? (RorQSPIFlag) ? valToRxFifoQ : valToRxFifoR : (modeSel) ? valToRxFifoQ : valToRxFifoR));
 assign rstSpi = (!IDLE) ? ((modeSel) ? 1'b0 : 1'b1) : 1'b0;
@@ -264,6 +271,30 @@ assign GPIO_o = GPIOReg[21:0];
 //  CODING
 
 
+
+always @(*) begin 
+    if (currState == IDLE) begin 
+        if (RorQSPIFlag) begin 
+            dataToRxFifoReg = dataToRxFifoQ;
+        end
+        else begin 
+            dataToRxFifoReg = dataToRxFifoR;
+        end
+    end
+    else begin 
+        if (modeSel) begin 
+            dataToRxFifoReg = dataToRxFifoQ;
+        end
+        else begin 
+            dataToRxFifoReg = dataToRxFifoR;
+        end
+    end
+end
+
+
+
+
+
 always @(posedge clk100) begin 
     ssReg <= Ss_i;
     ssRR <= ssReg;
@@ -471,12 +502,12 @@ always @(posedge clk100) begin
         end
         else begin 
             if (modeSel) begin 
-                if (trCnt == packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8 + numOfConfigCmds && trCnt != 0 ) begin 
+                if ((trCnt == sumForGPIO) && (trCnt != 0)) begin 
                     configReg1 <= 24'h0;
                 end
             end
             if (!modeSel) begin 
-                if (trCnt1Spi == wordNum && wordNum != 0) begin 
+                if ((trCnt1Spi == wordNum) && (wordNum != 0)) begin 
                     configReg1 <= 24'h0;
                 end
             end
@@ -890,34 +921,34 @@ always @(*) begin
         end
         LMX2594: begin
             if (modeSel) begin 
-                if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 != 0)) begin 
+                if ((trCnt == (sumForLmx)) && (packetNum2 != 0)) begin 
                     nextState = DDS;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum1 == 0)  && (packetNum2 == 0) && (packetNum3 != 0)) begin 
+                else if ((trCnt == (sumForLmx)) && (packetNum1 == 0)  && (packetNum2 == 0) && (packetNum3 != 0)) begin 
                     nextState = POT;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
+                else if ((trCnt == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
+                else if ((trCnt == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
                     nextState = ATTENUATOR;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0)) begin 
+                else if ((trCnt == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0)) begin 
                     nextState = SHIFTREG; 
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 != 0)) begin 
+                else if ((trCnt == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG; 
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
+                else if ((trCnt == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870; 
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCnt == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO; 
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCnt == (sumForLmx)) && (packetNum2 == 0) && (packetNum3 == 0) && (packetNum4 == 0)  && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE; 
                 end
-                else if (trCnt != (numOfConfigCmds + packetNum1)) begin 
+                else if (trCnt != (sumForLmx)) begin 
                     nextState = LMX2594;
                 end
             end
@@ -932,28 +963,28 @@ always @(*) begin
         end
         DDS: begin
             if (modeSel) begin 
-                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 != 0)) begin 
+                if ((trCnt == (sumForDDS)) && (packetNum3 != 0)) begin 
                     nextState = POT;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
+                else if ((trCnt == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0) ) begin 
+                else if ((trCnt == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 != 0) ) begin 
                     nextState = ATTENUATOR;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
+                else if ((trCnt == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0 ) && (packetNum7 != 0)) begin 
+                else if ((trCnt == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0 ) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0 ) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCnt == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0 ) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCnt == (sumForDDS)) && (packetNum3 == 0) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2)) begin 
+                else if (trCnt != (sumForDDS)) begin 
                     nextState = DDS;
                 end
             end
@@ -973,28 +1004,28 @@ always @(*) begin
         end
         POT: begin
             if (modeSel) begin 
-                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 != 0)) begin 
+                if ((trCnt == (sumForPot)) && (packetNum4 != 0)) begin 
                     nextState = DAC;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
+                else if ((trCnt == (sumForPot)) && (packetNum4 == 0) && (packetNum5 != 0)) begin 
                     nextState = ATTENUATOR;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0)) begin 
+                else if ((trCnt == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
+                else if ((trCnt == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
+                else if ((trCnt == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCnt == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCnt == (sumForPot)) && (packetNum4 == 0) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3)) begin 
+                else if (trCnt != (sumForPot)) begin 
                     nextState = POT;
                 end
             end
@@ -1009,25 +1040,25 @@ always @(*) begin
         end
         DAC: begin
             if (modeSel) begin 
-                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 != 0) ) begin 
+                if ((trCnt == (sumForDAC)) && (packetNum5 != 0) ) begin 
                     nextState = ATTENUATOR;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0)) begin 
+                else if ((trCnt == (sumForDAC)) && (packetNum5 == 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
+                else if ((trCnt == (sumForDAC)) && (packetNum5 == 0) && (packetNum6 != 0)) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
+                else if ((trCnt == (sumForDAC)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCnt == (sumForDAC)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCnt == (sumForDAC)) && (packetNum5 == 0) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4)) begin 
+                else if (trCnt != (sumForDAC)) begin 
                     nextState = DAC;
                 end
             end
@@ -1042,19 +1073,19 @@ always @(*) begin
         end
         ATTENUATOR: begin
             if (modeSel) begin 
-                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) && (packetNum6 != 0) ) begin 
+                if ((trCnt == (sumForATT)) && (packetNum6 != 0) ) begin 
                     nextState = SHIFTREG;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
+                else if ((trCnt == (sumForATT)) && (packetNum6 == 0) && (packetNum7 != 0)) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCnt == (sumForATT)) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCnt == (sumForATT)) && (packetNum6 == 0) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5)) begin 
+                else if (trCnt != (sumForATT)) begin 
                     nextState = ATTENUATOR;
                 end
             end
@@ -1069,16 +1100,16 @@ always @(*) begin
         end
         SHIFTREG : begin 
             if (modeSel) begin 
-                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6)) && (packetNum7 != 0) ) begin 
+                if ((trCnt == (sumForShiftReg)) && (packetNum7 != 0) ) begin 
                     nextState = MAX2870;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6)) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
+                else if ((trCnt == (sumForShiftReg)) && (packetNum7 == 0) && (packetNum8 != 0)) begin 
                     nextState = GPIO;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6)) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
+                else if ((trCnt == (sumForShiftReg)) && (packetNum7 == 0) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6)) begin 
+                else if (trCnt != (sumForShiftReg)) begin 
                     nextState = SHIFTREG;
                 end
             end
@@ -1093,13 +1124,13 @@ always @(*) begin
         end
         MAX2870 : begin 
             if (modeSel) begin 
-                if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7)) && (packetNum8 != 0))  begin 
+                if ((trCnt == (sumForMAX)) && (packetNum8 != 0))  begin 
                     nextState = GPIO;
                 end
-                else if ((trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7)) && (packetNum8 == 0)) begin 
+                else if ((trCnt == (sumForMAX)) && (packetNum8 == 0)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4+packetNum5+packetNum6+packetNum7)) begin 
+                else if (trCnt != (sumForMAX)) begin 
                     nextState = MAX2870;
                 end
             end
@@ -1114,10 +1145,10 @@ always @(*) begin
         end
         GPIO : begin 
             if (modeSel) begin 
-                if (trCnt == (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8)) begin 
+                if (trCnt == (sumForGPIO)) begin 
                     nextState = IDLE;
                 end
-                else if (trCnt != (numOfConfigCmds + packetNum1 + packetNum2 + packetNum3 + packetNum4 + packetNum5 + packetNum6 + packetNum7 + packetNum8)) begin 
+                else if (trCnt != (sumForGPIO)) begin 
                     nextState = GPIO;
                 end
             end