diff --git a/Firmware/.vscode/c_cpp_properties.json b/Firmware/.vscode/c_cpp_properties.json index 7f70edfe..c77d5165 100644 --- a/Firmware/.vscode/c_cpp_properties.json +++ b/Firmware/.vscode/c_cpp_properties.json @@ -28,7 +28,7 @@ "USE_HAL_DRIVER", "HW_VERSION_MAJOR=3", "HW_VERSION_MINOR=5", - "HW_VERSION_VOLTAGE=48", + "HW_VERSION_VOLTAGE=24", "__weak=\"__attribute__((weak))\"", "__packed=\"__attribute__((__packed__))\"", "__GNUC__" diff --git a/Firmware/MotorControl/odrive_main.h b/Firmware/MotorControl/odrive_main.h index 17c3ea1b..a9a36479 100644 --- a/Firmware/MotorControl/odrive_main.h +++ b/Firmware/MotorControl/odrive_main.h @@ -60,7 +60,11 @@ struct BoardConfig_t { bool enable_uart = true; bool enable_i2c_instead_of_can = false; bool enable_ascii_protocol_on_usb = true; +#if HW_VERSION_MAJOR == 3 && HW_VERSION_MINOR >= 5 && HW_VERSION_VOLTAGE >= 48 + float brake_resistance = 2.0f; // [ohm] +#else float brake_resistance = 0.47f; // [ohm] +#endif float dc_bus_undervoltage_trip_level = 8.0f; //