Merge pull request #4 from WeActStudio/main

1
This commit is contained in:
ZYQ-FEIYUE
2022-11-21 22:54:08 +08:00
committed by GitHub
3 changed files with 13 additions and 11 deletions

View File

@@ -735,7 +735,7 @@ void String::remove(unsigned int index, unsigned int count)
}
char *writeTo = buffer + index;
len = len - count;
strncpy(writeTo, buffer + index + count, len - index);
memmove(writeTo, buffer + index + count, len - index);
buffer[len] = 0;
}

View File

@@ -65,7 +65,7 @@ void I2Cx_Init(i2c_type *I2Cx, uint32_t baudRate)
void I2Cx_ClearADDRFlag(i2c_type* I2Cx)
{
__IO uint32_t tmpreg;
__attribute__((unused)) __IO uint32_t tmpreg;
tmpreg = I2Cx->sts1;

View File

@@ -77,17 +77,19 @@ void Timer_ClockCmd(tmr_type* TIMx, bool Enable)
static float Qsqrt(float number)
{
long i;
float x2, y;
union {
long i;
float y;
} cast;
float x2;
const float threehalfs = 1.5f;
x2 = number * 0.5f;
y = number;
i = *(long*)&y;
i = 0x5f3759df - (i >> 1);
y = *(float*)&i;
y = y * (threehalfs - (x2 * y * y));
y = y * (threehalfs - (x2 * y * y));
return 1.0f / y;
cast.y = number;
cast.i = 0x5f3759df - (cast.i >> 1);
cast.y = cast.y * (threehalfs - (x2 * cast.y * cast.y));
cast.y = cast.y * (threehalfs - (x2 * cast.y * cast.y));
return 1.0f / cast.y;
}
/**