Bayley Wang / Mbed 2 deprecated foc-ed_in_the_bot_compact

Dependencies:   FastPWM3 mbed

Revision:
190:01674f19f9ce
Parent:
189:760cd81a7633
Child:
192:3152a86cd108
--- a/BREMS/derived.h	Sat Feb 10 02:47:07 2018 +0000
+++ b/BREMS/derived.h	Sat Feb 10 02:55:48 2018 +0000
@@ -14,11 +14,11 @@
 #define LINEAR_MODULATION_MAX (2.f * LINEAR_DTC_MAX - 1.f)
 
 /*internally computed loop parameters*/
-#define KP_D (K_LOOP_D / BUS_VOLTAGE / LINEAR_MODULATION_MAX)
-#define KI_D (KI_BASE_D * K_LOOP_D / BUS_VOLTAGE * 5000.0f / F_SW / LINEAR_MODULATION_MAX)
+#define KP_D (_K_LOOP_D / _BUS_VOLTAGE / LINEAR_MODULATION_MAX)
+#define KI_D (_KI_BASE_D * _K_LOOP_D / _BUS_VOLTAGE * 5000.0f / _F_SW / LINEAR_MODULATION_MAX)
 
-#define KP_Q (K_LOOP_Q / BUS_VOLTAGE / LINEAR_MODULATION_MAX)
-#define KI_Q (KI_BASE_Q * K_LOOP_Q / BUS_VOLTAGE * 5000.0f / F_SW / LINEAR_MODULATION_MAX)
+#define KP_Q (_K_LOOP_Q / _BUS_VOLTAGE / LINEAR_MODULATION_MAX)
+#define KI_Q (_KI_BASE_Q * _K_LOOP_Q / _BUS_VOLTAGE * 5000.0f / _F_SW / LINEAR_MODULATION_MAX)
 
 #define SLOW_LOOP_COUNTER ((int) (_F_SW / _F_SLOW_LOOP))