diff --git a/include/param_prj.h b/include/param_prj.h index ef41d62..e1ad8a7 100644 --- a/include/param_prj.h +++ b/include/param_prj.h @@ -58,7 +58,7 @@ PARAM_ENTRY(CAT_MOTOR, fwmargin, "dig", 0, 10000, 2000, 141 ) \ PARAM_ENTRY(CAT_MOTOR, syncofs, "dig", 0, 65535, 0, 70 ) \ PARAM_ENTRY(CAT_MOTOR, syncadv, "dig/Hz", 0, 65535, 10, 133 ) \ - PARAM_ENTRY(CAT_MOTOR, ldminuslq, "mH", 0, 1000, 0, 139 ) \ + PARAM_ENTRY(CAT_MOTOR, lqminusld, "mH", 0, 1000, 0, 139 ) \ PARAM_ENTRY(CAT_MOTOR, fluxlinkage, "mWeber", 0, 1000, 90, 140 ) #define INVERTER_PARAMETERS_COMMON \ diff --git a/libopeninv b/libopeninv index 1a746b7..1b0e5e8 160000 --- a/libopeninv +++ b/libopeninv @@ -1 +1 @@ -Subproject commit 1a746b7405336571098e0e5ff0c4e5dfbe4337a4 +Subproject commit 1b0e5e8d246a3e7b72346fb6ba5cd0468077c85a diff --git a/src/stm32_sine.cpp b/src/stm32_sine.cpp index eaca5d2..18021ba 100644 --- a/src/stm32_sine.cpp +++ b/src/stm32_sine.cpp @@ -289,7 +289,7 @@ void Param::Change(Param::PARAM_NUM paramNum) Param::GetInt(Param::fwkp), Param::GetInt(Param::fwki), Param::GetInt(Param::fwmargin)); Encoder::SwapSinCos((Param::GetInt(Param::pinswap) & SWAP_RESOLVER) > 0); - FOC::SetMotorParameters(Param::GetFloat(Param::ldminuslq) / 1000.0f, Param::GetFloat(Param::fluxlinkage) / 1000.0f); + FOC::SetMotorParameters(Param::GetFloat(Param::lqminusld) / 1000.0f, Param::GetFloat(Param::fluxlinkage) / 1000.0f); #endif // CONTROL Encoder::SetMode((enum Encoder::mode)Param::GetInt(Param::encmode));