Merge branch 'dev' into Mikhail/feature_Gpio2Read

src/src/PacketAnalyzer1Mosi/PacketAnalyzer1Mosi.v

@@ -40,8 +40,9 @@ module PacketAnalyzer1Mosi (
 	output reg FlagDirectAtt_o,
 	output reg FlagDirectShReg_o,
 	output reg FlagDirectMax_o,
-	output reg FlagDirectGpio_o,
+	output reg FlagDirectGpio1_o,
 	output reg FlagDirectTemp_o,
+	output reg FlagDirectGpio2_o,
 
 	output reg Busy_o
 );
@@ -66,8 +67,9 @@ localparam DEV_ID_DAC 		= 5'd3;
 localparam DEV_ID_ATT 		= 5'd4;
 localparam DEV_ID_SH_REG 	= 5'd5;
 localparam DEV_ID_MAX 		= 5'd6;
-localparam DEV_ID_GPIO 		= 5'd7;
+localparam DEV_ID_GPIO_1 	= 5'd7;
 localparam DEV_ID_TEMP 		= 5'd8;
+localparam DEV_ID_GPIO_2 	= 5'd9;
 
 //==========================================
 // Assignments
@@ -110,8 +112,9 @@ always @(posedge Clk_i) begin
 		FlagDirectAtt_o 	<= 1'b0;
 		FlagDirectShReg_o 	<= 1'b0;
 		FlagDirectMax_o 	<= 1'b0;
-		FlagDirectGpio_o 	<= 1'b0;
+		FlagDirectGpio1_o 	<= 1'b0;
 		FlagDirectTemp_o 	<= 1'b0;
+		FlagDirectGpio2_o 	<= 1'b0;
 	end
 	else if (cntData != 0) begin
 		case (devId)
@@ -136,12 +139,15 @@ always @(posedge Clk_i) begin
 			DEV_ID_MAX : begin
 				FlagDirectMax_o <= 1'b1;
 			end
-			DEV_ID_GPIO : begin
-				FlagDirectGpio_o <= 1'b1;
+			DEV_ID_GPIO_1 : begin
+				FlagDirectGpio1_o <= 1'b1;
 			end
 			DEV_ID_TEMP : begin
 				FlagDirectTemp_o <= 1'b1;
 			end
+			DEV_ID_GPIO_2 : begin
+				FlagDirectGpio2_o <= 1'b1;
+			end
 			default : begin
 				FlagDirectLmx_o 	<= 1'b0;
 				FlagDirectDds_o 	<= 1'b0;
@@ -150,8 +156,9 @@ always @(posedge Clk_i) begin
 				FlagDirectAtt_o 	<= 1'b0;
 				FlagDirectShReg_o 	<= 1'b0;
 				FlagDirectMax_o 	<= 1'b0;
-				FlagDirectGpio_o 	<= 1'b0;
+				FlagDirectGpio1_o 	<= 1'b0;
 				FlagDirectTemp_o 	<= 1'b0;
+				FlagDirectGpio2_o 	<= 1'b0;
 			end
 		endcase
 	end
@@ -163,8 +170,9 @@ always @(posedge Clk_i) begin
 		FlagDirectAtt_o 	<= 1'b0;
 		FlagDirectShReg_o 	<= 1'b0;
 		FlagDirectMax_o 	<= 1'b0;
-		FlagDirectGpio_o 	<= 1'b0;
+		FlagDirectGpio1_o 	<= 1'b0;
 		FlagDirectTemp_o 	<= 1'b0;
+		FlagDirectGpio2_o 	<= 1'b0;
 	end
 end
 

src/src/PacketAnalyzer1Mosi/PacketAnalyzer1MosiTb.v

@@ -10,8 +10,9 @@ localparam [4:0] DAC_ID 		= 5'd3;
 localparam [4:0] ATT_ID 		= 5'd4;
 localparam [4:0] SH_REG_ID 		= 5'd5;
 localparam [4:0] MAX_ID 		= 5'd6;
-localparam [4:0] GPIO_ID 		= 5'd7;
+localparam [4:0] GPIO1_ID 		= 5'd7;
 localparam [4:0] TEMP_ID 		= 5'd8;
+localparam [4:0] GPIO2_ID 		= 5'd9;
 
 //===============USER DEFINE===================
 localparam [16:0] CNT_DATA_WORDS = 7;
@@ -161,8 +162,9 @@ PacketAnalyzer1Mosi DUT (
 	.FlagDirectAtt_o		(),
 	.FlagDirectShReg_o		(),
 	.FlagDirectMax_o		(),
-	.FlagDirectGpio_o		(),
+	.FlagDirectGpio1_o		(),
 	.FlagDirectTemp_o		(),
+	.FlagDirectGpio2_o		(),
 
 	.Busy_o					()
 );

src/src/PacketAnalyzer1Mosi/PacketAnalyzer1MosiWave.do

@@ -2,7 +2,7 @@ onerror {resume}
 quietly WaveActivateNextPane {} 0
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/Clk_i
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/Rst_i
-add wave -noupdate -radix binary /PacketAnalyzer1MosiTb/DUT/DataFromSpi_i
+add wave -noupdate /PacketAnalyzer1MosiTb/DUT/DataFromSpi_i
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/ValDataFromSpi_i
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/BusyMosi4_i
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectLmx_o
@@ -12,16 +12,17 @@ add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectDac_o
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectAtt_o
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectShReg_o
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectMax_o
-add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectGpio_o
+add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectGpio1_o
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectTemp_o
+add wave -noupdate /PacketAnalyzer1MosiTb/DUT/FlagDirectGpio2_o
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/Busy_o
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/devId
 add wave -noupdate /PacketAnalyzer1MosiTb/DUT/cntData
 TreeUpdate [SetDefaultTree]
-WaveRestoreCursors {{Cursor 1} {175 ns} 0}
-quietly wave cursor active 1
+WaveRestoreCursors {{Cursor 1} {0 ns} 0}
+quietly wave cursor active 0
 configure wave -namecolwidth 150
-configure wave -valuecolwidth 183
+configure wave -valuecolwidth 100
 configure wave -justifyvalue left
 configure wave -signalnamewidth 1
 configure wave -snapdistance 10
@@ -34,4 +35,4 @@ configure wave -griddelta 40
 configure wave -timeline 0
 configure wave -timelineunits ns
 update
-WaveRestoreZoom {0 ns} {3439 ns}
+WaveRestoreZoom {0 ns} {4951 ns}