More consequences of the f_sw renaming

This commit is contained in:
Benjamin Vedder 2022-01-06 21:34:22 +01:00
parent af55c79a2a
commit a092ea99d2
22 changed files with 44 additions and 44 deletions

View File

@ -235,8 +235,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 400.0 // The maximum absolute current above which a fault is generated

View File

@ -228,8 +228,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 650.0 // The maximum absolute current above which a fault is generated

View File

@ -228,8 +228,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 450.0 // The maximum absolute current above which a fault is generated

View File

@ -279,8 +279,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 420.0 // The maximum absolute current above which a fault is generated

View File

@ -255,8 +255,8 @@
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 20000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 20000.0
#endif
#ifndef MCCONF_L_CURRENT_MAX

View File

@ -277,8 +277,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 20000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 20000.0
#endif
// Setting limits

View File

@ -240,8 +240,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 180.0 // The maximum absolute current above which a fault is generated

View File

@ -230,8 +230,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 35000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 35000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 80.0 // The maximum absolute current above which a fault is generated

View File

@ -228,8 +228,8 @@
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 40.0 // The maximum absolute current above which a fault is generated
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_FOC_SAMPLE_V0_V7
#define MCCONF_FOC_SAMPLE_V0_V7 false // Run control loop in both v0 and v7 (requires phase shunts)

View File

@ -254,8 +254,8 @@
#ifndef MCCONF_FOC_CURRENT_KI
#define MCCONF_FOC_CURRENT_KI 5800.0
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 20000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 20000.0
#endif
#ifndef MCCONF_FOC_MOTOR_L
#define MCCONF_FOC_MOTOR_L 0.0048

View File

@ -27,7 +27,7 @@
// HW properties
#define HW_HAS_3_SHUNTS
#define HW_HAS_PHASE_SHUNTS
//#define HW_HAS_PHASE_FILTERS
#define HW_HAS_PHASE_FILTERS
#define HW_HAS_SI8900
// Macros
@ -268,8 +268,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 700.0 // The maximum absolute current above which a fault is generated

View File

@ -264,8 +264,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT
#define MCCONF_L_MAX_ABS_CURRENT 120.0 // The maximum absolute current above which a fault is generated

View File

@ -267,8 +267,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_M_DRV8301_OC_MODE

View File

@ -279,8 +279,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef APPCONF_SHUTDOWN_MODE

View File

@ -239,8 +239,8 @@
#ifndef MCCONF_L_MAX_VOLTAGE
#define MCCONF_L_MAX_VOLTAGE 84.0 // Maximum input voltage
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 20000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 20000.0
#endif
#ifndef MCCONF_FOC_DT_US
#define MCCONF_FOC_DT_US 0.2 // Microseconds for dead time compensation

View File

@ -275,8 +275,8 @@
#ifndef MCCONF_FOC_CURRENT_KI
#define MCCONF_FOC_CURRENT_KI 6.0
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_FOC_MOTOR_L
#define MCCONF_FOC_MOTOR_L 6.0e-6

View File

@ -236,8 +236,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
// Setting limits

View File

@ -236,8 +236,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_FOC_SAMPLE_V0_V7
#define MCCONF_FOC_SAMPLE_V0_V7 false // Run control loop in both v0 and v7 (requires phase shunts)

View File

@ -245,8 +245,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_L_MAX_ABS_CURRENT

View File

@ -250,8 +250,8 @@
#ifndef MCCONF_DEFAULT_MOTOR_TYPE
#define MCCONF_DEFAULT_MOTOR_TYPE MOTOR_TYPE_FOC
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 30000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 30000.0
#endif
#ifndef MCCONF_FOC_OPENLOOP_RPM
#define MCCONF_FOC_OPENLOOP_RPM 1500.0 // Openloop RPM (sensorless low speed or when finding index pulse)

View File

@ -217,8 +217,8 @@
#ifndef MCCONF_FOC_SAMPLE_V0_V7
#define MCCONF_FOC_SAMPLE_V0_V7 false // Run control loop in both v0 and v7 (requires phase shunts)
#endif
#ifndef MCCONF_FOC_F_SW
#define MCCONF_FOC_F_SW 20000.0
#ifndef MCCONF_FOC_F_ZV
#define MCCONF_FOC_F_ZV 20000.0
#endif
#ifndef MCCONF_L_IN_CURRENT_MAX
#define MCCONF_L_IN_CURRENT_MAX 40.0 // Input current limit in Amperes (Upper)

View File

@ -151,7 +151,7 @@
#define MCCONF_FOC_CURRENT_KI 32.6
// Switching Frequency
#define MCCONF_FOC_F_SW 50000
#define MCCONF_FOC_F_ZV 50000
// Dead Time Compensation
#define MCCONF_FOC_DT_US 0.12