Bug fixes for all CPLDs
This commit is contained in:
+13
-7
@@ -37,9 +37,9 @@ module CPLD_Con (
|
||||
reg [3:0] OC_x25;
|
||||
|
||||
//Condition Tester
|
||||
reg [15:0]en_t ;
|
||||
reg freq_t;
|
||||
reg dc_t;
|
||||
reg [3:0]en_t ;
|
||||
reg [3:0]freq_t;
|
||||
reg [3:0]dc_t;
|
||||
|
||||
//Relay Reg
|
||||
reg [7:0]relay_l1;
|
||||
@@ -62,6 +62,12 @@ module CPLD_Con (
|
||||
//Counter
|
||||
reg [15:0]delay_cnt;
|
||||
|
||||
//Shift Counter
|
||||
wire [4:0]OC_Shifter1 = i_DC_Con1[8:4]; // Channel Number div 8
|
||||
wire [4:0]OC_Shifter2 = i_DC_Con2[8:4]; // Channel Number div 8
|
||||
wire [4:0]OC_Shifter3 = i_DC_Con3[8:4]; // Channel Number div 8
|
||||
wire [4:0]OC_Shifter4 = i_DC_Con4[8:4]; // Channel Number div 8
|
||||
|
||||
wire [8:0] freq_relay1 = i_freq_relay1[9:1];
|
||||
wire [8:0] freq_relay2 = i_freq_relay2[9:1];
|
||||
wire [8:0] freq_relay3 = i_freq_relay3[9:1];
|
||||
@@ -243,7 +249,7 @@ module CPLD_Con (
|
||||
end
|
||||
else begin
|
||||
if (i_DC_Con1[23] == 1'b0) begin //Select PMU
|
||||
PMU_OC_1 <= (32'b0000_0000_0000_0000_0000_0000_0000_0001)<<(i_DC_Con1[9:1]/8);
|
||||
PMU_OC_1 <= (32'b0000_0000_0000_0000_0000_0000_0000_0001)<<OC_Shifter1;
|
||||
end
|
||||
else if (i_DC_Con1[23] == 1'b1) begin //Select DPS
|
||||
|
||||
@@ -259,7 +265,7 @@ module CPLD_Con (
|
||||
end
|
||||
else begin
|
||||
if (i_DC_Con2[23] == 1'b0) begin //Select PMU
|
||||
PMU_OC_2 <= (32'b0000_0000_0000_0000_0000_0000_0000_0001)<<(i_DC_Con2[9:1]/8);
|
||||
PMU_OC_2 <= (32'b0000_0000_0000_0000_0000_0000_0000_0001)<<OC_Shifter2;
|
||||
end
|
||||
else if (i_DC_Con2[23] == 1'b1) begin //Select DPS
|
||||
|
||||
@@ -275,7 +281,7 @@ module CPLD_Con (
|
||||
end
|
||||
else begin
|
||||
if (i_DC_Con3[23] == 1'b0) begin //Select PMU
|
||||
PMU_OC_3 <= (32'b0000_0000_0000_0000_0000_0000_0000_0001)<<(i_DC_Con3[9:1]/8);
|
||||
PMU_OC_3 <= (32'b0000_0000_0000_0000_0000_0000_0000_0001)<<OC_Shifter3;
|
||||
end
|
||||
else if (i_DC_Con3[23] == 1'b1) begin //Select DPS
|
||||
|
||||
@@ -291,7 +297,7 @@ module CPLD_Con (
|
||||
end
|
||||
else begin
|
||||
if (i_DC_Con4[23] == 1'b0) begin //Select PMU
|
||||
PMU_OC_4 <= (32'b0000_0000_0000_0000_0000_0000_0000_0001)<<(i_DC_Con4[9:1]/8);
|
||||
PMU_OC_4 <= (32'b0000_0000_0000_0000_0000_0000_0000_0001)<<OC_Shifter4;
|
||||
end
|
||||
else if (i_DC_Con4[23] == 1'b1) begin //Select DPS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user