更新user_math

This commit is contained in:
Robofish 2025-10-02 21:41:52 +08:00
parent c3faf353e9
commit 17847459b4
2 changed files with 42 additions and 38 deletions

View File

@ -29,13 +29,13 @@ inline float AbsClip(float in, float limit) {
return (in < -limit) ? -limit : ((in > limit) ? limit : in); return (in < -limit) ? -limit : ((in > limit) ? limit : in);
} }
float fAbs(float in){ float fAbs(float in) { return (in > 0) ? in : -in; }
return (in > 0) ? in : -in;
}
inline void Clip(float *origin, float min, float max) { inline void Clip(float *origin, float min, float max) {
if (*origin > max) *origin = max; if (*origin > max)
if (*origin < min) *origin = min; *origin = max;
if (*origin < min)
*origin = min;
} }
inline float Sign(float in) { return (in > 0) ? 1.0f : 0.0f; } inline float Sign(float in) { return (in > 0) ? 1.0f : 0.0f; }
@ -48,13 +48,12 @@ inline float Sign(float in) { return (in > 0) ? 1.0f : 0.0f; }
inline void ResetMoveVector(MoveVector_t *mv) { memset(mv, 0, sizeof(*mv)); } inline void ResetMoveVector(MoveVector_t *mv) { memset(mv, 0, sizeof(*mv)); }
/** /**
* \brief * \brief
* 1.5PI其实等于相差-0.5PI *x,yrange应设定为y-x
* *-M_PI,M_PIrange=M_2PI;(0,M_2PI)range=M_2PI;a,a+brange=b;
* \param sp * \param sp
* \param fb * \param fb
* \param range * \param range
*
* \return * \return
*/ */
inline float CircleError(float sp, float fb, float range) { inline float CircleError(float sp, float fb, float range) {
@ -71,9 +70,8 @@ inline float CircleError(float sp, float fb, float range) {
} }
/** /**
* \brief * \brief x,yrange应设定为y-x
* 0-2PI内变化1.5PI + 1.5PI = 1PI * -M_PI,M_PIrange=M_2PI;(0,M_2PI)range=M_2PI;a,a+brange=b;
*
* \param origin * \param origin
* \param delta * \param delta
* \param range * \param range
@ -105,14 +103,20 @@ inline void CircleReverse(float *origin) { *origin = -(*origin) + M_2PI; }
* @return * @return
*/ */
inline float CalculateRpm(float bullet_speed, float fric_radius, bool is17mm) { inline float CalculateRpm(float bullet_speed, float fric_radius, bool is17mm) {
if (bullet_speed == 0.0f) return 0.f; if (bullet_speed == 0.0f)
return 0.f;
if (is17mm) { if (is17mm) {
if (bullet_speed == 15.0f) return 4670.f; if (bullet_speed == 15.0f)
if (bullet_speed == 18.0f) return 5200.f; return 4670.f;
if (bullet_speed == 30.0f) return 7350.f; if (bullet_speed == 18.0f)
return 5200.f;
if (bullet_speed == 30.0f)
return 7350.f;
} else { } else {
if (bullet_speed == 10.0f) return 4450.f; if (bullet_speed == 10.0f)
if (bullet_speed == 16.0f) return 5800.f; return 4450.f;
if (bullet_speed == 16.0f)
return 5800.f;
} }
/* 不为裁判系统设定值时,计算转速 */ /* 不为裁判系统设定值时,计算转速 */

View File

@ -82,11 +82,11 @@ float Sign(float in);
void ResetMoveVector(MoveVector_t *mv); void ResetMoveVector(MoveVector_t *mv);
/** /**
* \brief * \brief x,yrange应设定为y-x
* 1.5PI其实等于相差-0.5PI *-M_PI,M_PIrange=M_2PI;(0,M_2PI)range=M_2PI;a,a+brange=b;
* *
* \param sp * \param sp
* \param fb * \param fb
* \param range * \param range
* *
* \return * \return
@ -94,8 +94,8 @@ void ResetMoveVector(MoveVector_t *mv);
float CircleError(float sp, float fb, float range); float CircleError(float sp, float fb, float range);
/** /**
* \brief * \brief x,yrange应设定为y-x
* 0-2PI内变化1.5PI + 1.5PI = 1PI * -M_PI,M_PIrange=M_2PI;(0,M_2PI)range=M_2PI;a,a+brange=b;
* *
* \param origin * \param origin
* \param delta * \param delta