Removed experimental current limiter

jsphuebner · Aug 24, 2019 · b18eeac · b18eeac
1 parent 213fa2f
commit b18eeac
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 27 deletions.
diff --git a/include/project/param_prj.h b/include/project/param_prj.h
@@ -66,7 +66,7 @@
 #define POTMODE_DUALCHANNEL 1
 #define POTMODE_CAN         2
 
-#define VER 4.51.R
+#define VER 4.52.R
 #define VERSTR STRINGIFY(4=VER)
 
 enum _modes

diff --git a/include/project/throttle.h b/include/project/throttle.h
@@ -36,7 +36,6 @@ class Throttle
       static void BmsLimitCommand(int& finalSpnt, bool dinbms);
       static void UdcLimitCommand(int& finalSpnt, s32fp udc);
       static void IdcLimitCommand(int& finalSpnt, s32fp idc);
-      static void IacLimitCommand(int& finalSpnt, s32fp iac);
       static int potmin[2];
       static int potmax[2];
       static int brknom;
@@ -58,7 +57,6 @@ class Throttle
       static s32fp udcmax;
       static s32fp idcmin;
       static s32fp idcmax;
-      static s32fp iacmax;
 
    private:
       static int speedFiltered;

diff --git a/src/project/stm32_sine.cpp b/src/project/stm32_sine.cpp
@@ -558,9 +558,6 @@ static void ProcessThrottle()
    throtSpnt = GetUserThrottleCommand();
    GetCruiseCreepCommand(finalSpnt, throtSpnt);
 
-   Throttle::iacmax = (Param::Get(Param::iacmax) * finalSpnt) / 100;
-   Throttle::IacLimitCommand(finalSpnt, Param::Get(Param::ilmax));
-
    if (hwRev != HW_TESLA)
       Throttle::BmsLimitCommand(finalSpnt, Param::GetBool(Param::din_bms));
 

diff --git a/src/project/throttle.cpp b/src/project/throttle.cpp
@@ -44,7 +44,6 @@ s32fp Throttle::udcmin;
 s32fp Throttle::udcmax;
 s32fp Throttle::idcmin;
 s32fp Throttle::idcmax;
-s32fp Throttle::iacmax;
 
 bool Throttle::CheckAndLimitRange(int* potval, int potIdx)
 {
@@ -214,23 +213,3 @@ void Throttle::IdcLimitCommand(int& finalSpnt, s32fp idc)
       finalSpnt = MAX(res, finalSpnt);
    }
 }
-
-void Throttle::IacLimitCommand(int& finalSpnt, s32fp iac)
-{
-   if (finalSpnt >= 0)
-   {
-      s32fp iacerr = iacmax - iac;
-      int res = FP_TOINT(iacerr * 10);
-
-      res = MAX(0, res);
-      finalSpnt = MIN(res, finalSpnt);
-   }
-   else
-   {
-      s32fp iacerr = iacmax - iac;
-      int res = FP_TOINT(iacerr * 10);
-
-      res = MIN(0, res);
-      finalSpnt = MAX(res, finalSpnt);
-   }
-}