added branch main_UNIT2
This commit is contained in:
parent
e08d94509f
commit
234f560f2c
8
FOExp.v
8
FOExp.v
@ -1,5 +1,5 @@
|
|||||||
// Unit name to specify here - UNIT1, UNIT2, UNIT3 or UNIT4
|
// Unit name to specify here - UNIT1, UNIT2, UNIT3 or UNIT4
|
||||||
`define UNIT4
|
`define UNIT2
|
||||||
|
|
||||||
module FOExp (SKiiP_EN, SKiiP_CTRL, SKiiP_ERR, PCON_IN, PCON_OUT, PCON_OUT_EN , SENS_IN, clock, DINPUT, DOUTPUT, INP_1V2OK, INP_2V5OK, INP_3V3OK);
|
module FOExp (SKiiP_EN, SKiiP_CTRL, SKiiP_ERR, PCON_IN, PCON_OUT, PCON_OUT_EN , SENS_IN, clock, DINPUT, DOUTPUT, INP_1V2OK, INP_2V5OK, INP_3V3OK);
|
||||||
|
|
||||||
@ -301,7 +301,7 @@ ERROR_FLAGS[3] = OUTPUT_VOLTAGE_ERR[0]|OUTPUT_VOLTAGE_ERR[1];
|
|||||||
ERROR_FLAGS[4] = SKIIP_CHOPP_ERR[0]|SKIIP_CHOPP_ERR[1];
|
ERROR_FLAGS[4] = SKIIP_CHOPP_ERR[0]|SKIIP_CHOPP_ERR[1];
|
||||||
|
|
||||||
`ifdef UNIT2
|
`ifdef UNIT2
|
||||||
ERROR_FLAGS[5] = 0; //TEMPLOCK U2!!!!
|
ERROR_FLAGS[5] = SKIIP_BRAKE_ERR[0]|SKIIP_BRAKE_ERR[1]; //NORMAL U2
|
||||||
`else
|
`else
|
||||||
ERROR_FLAGS[5] = SKIIP_BRAKE_ERR[0]|SKIIP_BRAKE_ERR[1]; //NORMAL U1,3,4!!!!
|
ERROR_FLAGS[5] = SKIIP_BRAKE_ERR[0]|SKIIP_BRAKE_ERR[1]; //NORMAL U1,3,4!!!!
|
||||||
`endif
|
`endif
|
||||||
@ -449,8 +449,8 @@ else if (CALC_SM_STATE==1)
|
|||||||
SKIIP_CHOPP_TEMP_ADC[11:0] = SKIIP_CHOPP_TEMP_IN;
|
SKIIP_CHOPP_TEMP_ADC[11:0] = SKIIP_CHOPP_TEMP_IN;
|
||||||
|
|
||||||
`ifdef UNIT2
|
`ifdef UNIT2
|
||||||
SKIIP_BRAKE_CURRENT_ADC[11:0] = 1707; //TEMPLOCK U2!!!!
|
SKIIP_BRAKE_CURRENT_ADC[11:0] = SKIIP_BRAKE_CURRENT_IN; //NORMAL U2
|
||||||
SKIIP_BRAKE_TEMP_ADC[11:0] = 1707; //TEMPLOCK U2!!!!
|
SKIIP_BRAKE_TEMP_ADC[11:0] = SKIIP_BRAKE_TEMP_IN; //NORMAL U2
|
||||||
`else
|
`else
|
||||||
SKIIP_BRAKE_CURRENT_ADC[11:0] = SKIIP_BRAKE_CURRENT_IN; //NORMAL U1,3,4!!!!
|
SKIIP_BRAKE_CURRENT_ADC[11:0] = SKIIP_BRAKE_CURRENT_IN; //NORMAL U1,3,4!!!!
|
||||||
SKIIP_BRAKE_TEMP_ADC[11:0] = SKIIP_BRAKE_TEMP_IN; //NORMAL U1,3,4!!!!
|
SKIIP_BRAKE_TEMP_ADC[11:0] = SKIIP_BRAKE_TEMP_IN; //NORMAL U1,3,4!!!!
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user