Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Update stm32_vcu.cpp" #156

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Revert "Update stm32_vcu.cpp" #156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/stm32_vcu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,8 +584,6 @@ static void Ms10Task(void)
}
if(opmode==MOD_RUN) Param::SetInt(Param::canctr, (Param::GetInt(Param::canctr) + 1) & 0xF);//Update the OI can counter in RUN mode only

ControlCabHeater(opmode);

//////////////////////////////////////////////////
// MODE CONTROL SECTION //
//////////////////////////////////////////////////
Expand Down Expand Up @@ -673,6 +671,7 @@ static void Ms10Task(void)
ErrorMessage::Post(ERR_PRECHARGE);
opmode = MOD_PCHFAIL;
}
Param::SetInt(Param::opmode, opmode);
break;

case MOD_PCHFAIL:
Expand All @@ -688,15 +687,14 @@ static void Ms10Task(void)
if(rlyDly==0)
{
DigIo::dcsw_out.Set();
Param::SetInt(Param::opmode, opmode);//Only set opmode to charge once Main Contactor is shut.
}
ErrorMessage::UnpostAll();
if(!chargeMode)
{
opmode = MOD_OFF;
rlyDly=250;//Recharge sequence timer for delayed shutdown
Param::SetInt(Param::opmode, opmode); //set opmode to OFF when leaving charge state
}
Param::SetInt(Param::opmode, opmode);
break;

case MOD_RUN:
Expand All @@ -705,21 +703,23 @@ static void Ms10Task(void)
{
DigIo::dcsw_out.Set();
DigIo::inv_out.Set();//inverter power on
Param::SetInt(Param::opmode, MOD_RUN); //Only set opmode to Run once main contactor is shut
}
Param::SetInt(Param::opmode, MOD_RUN);
ErrorMessage::UnpostAll();
if(!selectedVehicle->Ready())
{
opmode = MOD_OFF;
rlyDly=250;//Recharge sequence timer for delayed shutdown
Param::SetInt(Param::opmode, opmode); //set opmode to OFF when leaving charge state
}
Param::SetInt(Param::opmode, opmode);
break;
}

ControlCabHeater(opmode);
if (Param::GetInt(Param::ShuntType) == 2) SBOX::ControlContactors(opmode,canInterface[Param::GetInt(Param::ShuntCan)]);//BMW contactor box
if (Param::GetInt(Param::ShuntType) == 3) VWBOX::ControlContactors(opmode,canInterface[Param::GetInt(Param::ShuntCan)]);//VW contactor box


}

static void Ms1Task(void)
Expand Down