управление реле и чтение фолта перенесено на CPU2

This commit is contained in:
seklyuts 2024-05-21 10:05:43 +03:00
parent 3a383cfde6
commit 6d997d7233
5 changed files with 15 additions and 28 deletions

View File

@ -27,10 +27,7 @@ void main(void)
for(;;) for(;;)
{ {
// asm (" NOP");
// frmmstr_run();
// AdcRun();
// BissClkgenRun();
} }
} }

View File

@ -73,37 +73,27 @@ void GpioInit(void)
{ {
EALLOW; EALLOW;
GpioCtrlRegs.GPCMUX2.bit.GPIO95 = 0; // <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> GpioCtrlRegs.GPCMUX2.bit.GPIO95 = 0; // Rele
GpioCtrlRegs.GPCGMUX2.bit.GPIO95 = 0; GpioCtrlRegs.GPCGMUX2.bit.GPIO95 = 0;
GpioCtrlRegs.GPCDIR.bit.GPIO95 = 1; GpioCtrlRegs.GPCDIR.bit.GPIO95 = 1;
GpioDataRegs.GPCDAT.bit.GPIO95 = 1; GpioDataRegs.GPCDAT.bit.GPIO95 = 1;
GpioCtrlRegs.GPCCSEL4.bit.GPIO95 = 2;
GpioCtrlRegs.GPCMUX1.bit.GPIO64 = 0;//FaultPWM GpioCtrlRegs.GPCMUX1.bit.GPIO64 = 0;//FaultPWM
GpioCtrlRegs.GPCGMUX1.bit.GPIO64 = 0; GpioCtrlRegs.GPCGMUX1.bit.GPIO64 = 0;
GpioCtrlRegs.GPCDIR.bit.GPIO64 = 0; GpioCtrlRegs.GPCDIR.bit.GPIO64 = 0;
GpioDataRegs.GPCDAT.bit.GPIO64 = 0; GpioDataRegs.GPCDAT.bit.GPIO64 = 0;
GpioCtrlRegs.GPCCSEL1.bit.GPIO64 = 2;
GpioCtrlRegs.GPBMUX2.bit.GPIO57 = 0; // GpioCtrlRegs.GPBMUX2.bit.GPIO57 = 0;
GpioCtrlRegs.GPBGMUX2.bit.GPIO57 = 0; // GpioCtrlRegs.GPBGMUX2.bit.GPIO57 = 0;
GpioCtrlRegs.GPBDIR.bit.GPIO57 = 1; // GpioCtrlRegs.GPBDIR.bit.GPIO57 = 1;
GpioDataRegs.GPBDAT.bit.GPIO57 = 1;//BISS-C_PWR_EN // GpioDataRegs.GPBDAT.bit.GPIO57 = 1;//BISS-C_PWR_EN
// GpioCtrlRegs.GPCMUX2.bit.GPIO83 = 0;
// GpioCtrlRegs.GPCGMUX2.bit.GPIO83 = 0;
// GpioCtrlRegs.GPCDIR.bit.GPIO83 = 1;
// //
// GpioDataRegs.GPCDAT.bit.GPIO83 = 0; // GpioCtrlRegs.GPDMUX1.bit.GPIO103 = 0;
// // GpioCtrlRegs.GPDGMUX1.bit.GPIO103 = 0;
// GpioCtrlRegs.GPAMUX2.bit.GPIO21 = 0; // GpioCtrlRegs.GPDDIR.bit.GPIO103 = 1;
// GpioCtrlRegs.GPAGMUX2.bit.GPIO21 = 0; // GpioDataRegs.GPDDAT.bit.GPIO103 = 0; //BISS-C_PWR_12V/5V
// GpioCtrlRegs.GPADIR.bit.GPIO21 = 1;
//
// GpioDataRegs.GPADAT.bit.GPIO21 = 1;
GpioCtrlRegs.GPDMUX1.bit.GPIO103 = 0;
GpioCtrlRegs.GPDGMUX1.bit.GPIO103 = 0;
GpioCtrlRegs.GPDDIR.bit.GPIO103 = 1;
GpioDataRegs.GPDDAT.bit.GPIO103 = 0; //BISS-C_PWR_12V/5V
EDIS; EDIS;
} }

View File

@ -38,6 +38,6 @@ static uint16_t diod = 0;
FMSTR_Recorder(); FMSTR_Recorder();
FMSTREnableClr(); FMSTREnableClr();
Gpio95out(Rele);
} }
} }

View File

@ -59,7 +59,7 @@ void pwm_set_volt_3F(float phaseA, float phaseB, float phaseC, float Udc)
PWM_motor.UB = PERIOD_2 + B_proc; PWM_motor.UB = PERIOD_2 + B_proc;
PWM_motor.UC = PERIOD_2 - C_proc; PWM_motor.UC = PERIOD_2 - C_proc;
FaultABC = 0;//(FaultPWM); FaultABC = FaultPWM;
if(FaultABC) FaultABCFix = FaultABC; if(FaultABC) FaultABCFix = FaultABC;
if((FaultABC)||(FaultABCFix)) if((FaultABC)||(FaultABCFix))

View File

@ -18,7 +18,6 @@ volatile uint16_t testMode = 0;
void frmmstr_run(void) void frmmstr_run(void)
{ {
static uint16_t diod = 0; static uint16_t diod = 0;
FMSTREnableSet();
if(SciaRegs.SCIRXST.bit.RXERROR) if(SciaRegs.SCIRXST.bit.RXERROR)
{ {
@ -52,5 +51,6 @@ static uint16_t diod = 0;
FMSTR_Poll(); FMSTR_Poll();
FMSTR_Recorder(); FMSTR_Recorder();
FMSTREnableClr(); FMSTREnableClr();
Gpio95out(Rele);
} }
} }