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.

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

Is300h+gs450h changes #113

Merged
merged 2 commits into from
Sep 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions include/param_prj.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define VER 2.20.TN
#define VER 2.20.TM


/* Entries must be ordered as follows:
Expand Down Expand Up @@ -46,7 +46,7 @@
PARAM_ENTRY(CAT_SETUP, CanMapCan, CAN_DEV, 0, 1, 0, 97 ) \
PARAM_ENTRY(CAT_SETUP, DCDCCan, CAN_DEV, 0, 1, 1, 107 ) \
PARAM_ENTRY(CAT_SETUP, HeaterCan, CAN_DEV, 0, 1, 1, 138 ) \
PARAM_ENTRY(CAT_SETUP, MotActive, MotorsAct, 0, 2, 0, 129 ) \
PARAM_ENTRY(CAT_SETUP, MotActive, MotorsAct,0, 3, 0, 129 ) \
PARAM_ENTRY(CAT_THROTTLE, potmin, "dig", 0, 4095, 0, 7 ) \
PARAM_ENTRY(CAT_THROTTLE, potmax, "dig", 0, 4095, 4095, 8 ) \
PARAM_ENTRY(CAT_THROTTLE, pot2min, "dig", 0, 4095, 4095, 9 ) \
Expand Down Expand Up @@ -303,7 +303,7 @@
#define CAT_SHUNT "ISA Shunt Control"
#define CAT_IOPINS "General Purpose I/O"
#define CAT_PWM "PWM Control"
#define MotorsAct "0=Mg1and2, 1=Mg1, 2=Mg2"
#define MotorsAct "0=Mg1and2, 1=Mg1, 2=Mg2, 3=BlendingMG2and1"
#define PumpOutType "0=GS450hOil, 1=TachoOut"
#define LIMITREASON "0=None, 1=UDClimLow, 2=UDClimHigh, 3=UDClimHigh+UDClimHigh, 4=IDClimLow, 5=UDClimLow+IDClimLow, 6=UDClimHigh+IDClimLow,"\
"7=UDClimLow+UDClimHigh+IDClimLow, 8=IDClimHigh, 9=UDClimLow+IDClimHigh, 10=UDClimHigh+IDClimHigh, 11=UDClimHigh+UDClimHigh+IDClimHigh,"\
Expand Down
18 changes: 17 additions & 1 deletion src/GS450H.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,14 @@ void GS450HClass::SetTorque(float torquePercent)
else if(MotorActive == 2)//Only Mg2 active
{
mg1_torque = 0;
}
else if(MotorActive == 3)//MG1 only at high torque
{
mg1_torque = 0;
if(torquePercent > 50)//only have MG1 active above 50%
{
mg1_torque = utils::change(torquePercent,50,100,0,4375);
}
}
}
else if(DriveType == PRIUS)
Expand Down Expand Up @@ -186,6 +194,14 @@ void GS450HClass::SetTorque(float torquePercent)
{
mg1_torque = 0;
}
else if(MotorActive == 3)//MG1 only at high torque
{
mg1_torque = 0;
if(torquePercent > 50)//only have MG1 active above 50%
{
mg1_torque = utils::change(torquePercent,50,100,0,4375);
}
}
}
else
{
Expand Down Expand Up @@ -651,7 +667,7 @@ void GS450HClass::Task1Ms()
{

statusInv=0;
inv_status=0;
//inv_status=0; Stop reinit of inverter
//set speeds to 0 to prevent dynamic throttle/regen issues
mg1_speed=0;
mg2_speed=0;
Expand Down