diff --git a/lib/main/CMSIS/Core/Include/cmsis_iccarm.h b/lib/main/CMSIS/Core/Include/cmsis_iccarm.h index edcaee3d4a..a3165b4aba 100644 --- a/lib/main/CMSIS/Core/Include/cmsis_iccarm.h +++ b/lib/main/CMSIS/Core/Include/cmsis_iccarm.h @@ -182,7 +182,7 @@ __IAR_FT uint16_t __iar_uint16_read(void const *ptr) #pragma language=extended __IAR_FT void __iar_uint16_write(void const *ptr, uint16_t val) { - *(__packed uint16_t*)(ptr) = val;; + *(__packed uint16_t*)(ptr) = val; } #pragma language=restore #define __UNALIGNED_UINT16_WRITE(PTR,VAL) __iar_uint16_write(PTR,VAL) @@ -204,7 +204,7 @@ __IAR_FT uint32_t __iar_uint32_read(void const *ptr) #pragma language=extended __IAR_FT void __iar_uint32_write(void const *ptr, uint32_t val) { - *(__packed uint32_t*)(ptr) = val;; + *(__packed uint32_t*)(ptr) = val; } #pragma language=restore #define __UNALIGNED_UINT32_WRITE(PTR,VAL) __iar_uint32_write(PTR,VAL) diff --git a/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c b/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c index 9625ae501e..2376ba03af 100644 --- a/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c +++ b/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c @@ -289,7 +289,7 @@ void arm_conv_fast_q15( x0 = *__SIMD32(px); /* read x[1], x[2] samples */ x1 = _SIMD32_OFFSET(px+1); - px+= 2U; + px+= 2U; /* Apply loop unrolling and compute 4 MACs simultaneously. */ @@ -335,7 +335,7 @@ void arm_conv_fast_q15( /* Read x[5], x[6] */ x1 = _SIMD32_OFFSET(px+3); - px += 4U; + px += 4U; /* acc2 += x[4] * y[srcBLen - 3] + x[5] * y[srcBLen - 4] */ acc2 = __SMLADX(x0, c0, acc2); @@ -369,7 +369,7 @@ void arm_conv_fast_q15( /* Read x[7] */ x3 = *__SIMD32(px); - px++; + px++; /* Perform the multiply-accumulates */ acc0 = __SMLAD(x0, c0, acc0); @@ -388,7 +388,7 @@ void arm_conv_fast_q15( /* Read x[9] */ x2 = _SIMD32_OFFSET(px+1); - px += 2U; + px += 2U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x0, c0, acc0); @@ -415,7 +415,7 @@ void arm_conv_fast_q15( acc3 = __SMLADX(x2, c0, acc3); /* Read y[srcBLen - 7] */ - c0 = *(py-1); + c0 = *(py-1); #ifdef ARM_MATH_BIG_ENDIAN c0 = c0 << 16U; @@ -426,7 +426,7 @@ void arm_conv_fast_q15( /* Read x[10] */ x3 = _SIMD32_OFFSET(px+2); - px += 3U; + px += 3U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x1, c0, acc0); @@ -802,7 +802,7 @@ void arm_conv_fast_q15( /* First part of the processing with loop unrolling. Compute 4 MACs at a time. ** a second loop below computes MACs for the remaining 1 to 3 samples. */ - py++; + py++; while (k > 0U) { @@ -887,22 +887,22 @@ void arm_conv_fast_q15( acc3 = 0; /* read x[0], x[1] samples */ - a = *px++; - b = *px++; + a = *px++; + b = *px++; #ifndef ARM_MATH_BIG_ENDIAN - x0 = __PKHBT(a, b, 16); - a = *px; - x1 = __PKHBT(b, a, 16); + x0 = __PKHBT(a, b, 16); + a = *px; + x1 = __PKHBT(b, a, 16); #else - x0 = __PKHBT(b, a, 16); - a = *px; - x1 = __PKHBT(a, b, 16); + x0 = __PKHBT(b, a, 16); + a = *px; + x1 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Apply loop unrolling and compute 4 MACs simultaneously. */ k = srcBLen >> 2U; @@ -913,19 +913,19 @@ void arm_conv_fast_q15( { /* Read the last two inputB samples using SIMD: * y[srcBLen - 1] and y[srcBLen - 2] */ - a = *py; - b = *(py+1); - py -= 2; + a = *py; + b = *(py+1); + py -= 2; #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16);; + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc0 += x[0] * y[srcBLen - 1] + x[1] * y[srcBLen - 2] */ acc0 = __SMLADX(x0, c0, acc0); @@ -933,22 +933,22 @@ void arm_conv_fast_q15( /* acc1 += x[1] * y[srcBLen - 1] + x[2] * y[srcBLen - 2] */ acc1 = __SMLADX(x1, c0, acc1); - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x2 = __PKHBT(a, b, 16); - a = *(px + 2); - x3 = __PKHBT(b, a, 16); + x2 = __PKHBT(a, b, 16); + a = *(px + 2); + x3 = __PKHBT(b, a, 16); #else - x2 = __PKHBT(b, a, 16); - a = *(px + 2); - x3 = __PKHBT(a, b, 16); + x2 = __PKHBT(b, a, 16); + a = *(px + 2); + x3 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc2 += x[2] * y[srcBLen - 1] + x[3] * y[srcBLen - 2] */ acc2 = __SMLADX(x2, c0, acc2); @@ -957,19 +957,19 @@ void arm_conv_fast_q15( acc3 = __SMLADX(x3, c0, acc3); /* Read y[srcBLen - 3] and y[srcBLen - 4] */ - a = *py; - b = *(py+1); - py -= 2; + a = *py; + b = *(py+1); + py -= 2; #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16);; + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc0 += x[2] * y[srcBLen - 3] + x[3] * y[srcBLen - 4] */ acc0 = __SMLADX(x2, c0, acc0); @@ -978,24 +978,24 @@ void arm_conv_fast_q15( acc1 = __SMLADX(x3, c0, acc1); /* Read x[4], x[5], x[6] */ - a = *(px + 2); - b = *(px + 3); + a = *(px + 2); + b = *(px + 3); #ifndef ARM_MATH_BIG_ENDIAN - x0 = __PKHBT(a, b, 16); - a = *(px + 4); - x1 = __PKHBT(b, a, 16); + x0 = __PKHBT(a, b, 16); + a = *(px + 4); + x1 = __PKHBT(b, a, 16); #else - x0 = __PKHBT(b, a, 16); - a = *(px + 4); - x1 = __PKHBT(a, b, 16); + x0 = __PKHBT(b, a, 16); + a = *(px + 4); + x1 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 4U; + px += 4U; /* acc2 += x[4] * y[srcBLen - 3] + x[5] * y[srcBLen - 4] */ acc2 = __SMLADX(x0, c0, acc2); @@ -1028,19 +1028,19 @@ void arm_conv_fast_q15( #endif /* #ifdef ARM_MATH_BIG_ENDIAN */ /* Read x[7] */ - a = *px; - b = *(px+1); - px++; + a = *px; + b = *(px+1); + px++; #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); + x3 = __PKHBT(a, b, 16); #else - x3 = __PKHBT(b, a, 16);; + x3 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Perform the multiply-accumulates */ @@ -1053,37 +1053,37 @@ void arm_conv_fast_q15( if (k == 2U) { /* Read y[srcBLen - 5], y[srcBLen - 6] */ - a = *py; - b = *(py+1); + a = *py; + b = *(py+1); #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16);; + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Read x[7], x[8], x[9] */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); - a = *(px + 2); - x2 = __PKHBT(b, a, 16); + x3 = __PKHBT(a, b, 16); + a = *(px + 2); + x2 = __PKHBT(b, a, 16); #else - x3 = __PKHBT(b, a, 16); - a = *(px + 2); - x2 = __PKHBT(a, b, 16); + x3 = __PKHBT(b, a, 16); + a = *(px + 2); + x2 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 2U; +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ + px += 2U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x0, c0, acc0); @@ -1095,36 +1095,36 @@ void arm_conv_fast_q15( if (k == 3U) { /* Read y[srcBLen - 5], y[srcBLen - 6] */ - a = *py; - b = *(py+1); + a = *py; + b = *(py+1); #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16);; + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Read x[7], x[8], x[9] */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); - a = *(px + 2); - x2 = __PKHBT(b, a, 16); + x3 = __PKHBT(a, b, 16); + a = *(px + 2); + x2 = __PKHBT(b, a, 16); #else - x3 = __PKHBT(b, a, 16); - a = *(px + 2); - x2 = __PKHBT(a, b, 16); + x3 = __PKHBT(b, a, 16); + a = *(px + 2); + x2 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Perform the multiply-accumulates */ acc0 = __SMLADX(x0, c0, acc0); @@ -1133,7 +1133,7 @@ void arm_conv_fast_q15( acc3 = __SMLADX(x2, c0, acc3); /* Read y[srcBLen - 7] */ - c0 = *(py-1); + c0 = *(py-1); #ifdef ARM_MATH_BIG_ENDIAN c0 = c0 << 16U; @@ -1143,20 +1143,20 @@ void arm_conv_fast_q15( #endif /* #ifdef ARM_MATH_BIG_ENDIAN */ /* Read x[10] */ - a = *(px+2); - b = *(px+3); + a = *(px+2); + b = *(px+3); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); + x3 = __PKHBT(a, b, 16); #else - x3 = __PKHBT(b, a, 16);; + x3 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 3U; + px += 3U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x1, c0, acc0); @@ -1166,10 +1166,10 @@ void arm_conv_fast_q15( } /* Store the results in the accumulators in the destination buffer. */ - *pOut++ = (q15_t)(acc0 >> 15); - *pOut++ = (q15_t)(acc1 >> 15); - *pOut++ = (q15_t)(acc2 >> 15); - *pOut++ = (q15_t)(acc3 >> 15); + *pOut++ = (q15_t)(acc0 >> 15); + *pOut++ = (q15_t)(acc1 >> 15); + *pOut++ = (q15_t)(acc2 >> 15); + *pOut++ = (q15_t)(acc3 >> 15); /* Increment the pointer pIn1 index, count by 4 */ count += 4U; @@ -1318,7 +1318,7 @@ void arm_conv_fast_q15( /* First part of the processing with loop unrolling. Compute 4 MACs at a time. ** a second loop below computes MACs for the remaining 1 to 3 samples. */ - py++; + py++; while (k > 0U) { @@ -1390,7 +1390,7 @@ void arm_conv_fast_q15( blockSize3--; } -#endif /* #ifndef UNALIGNED_SUPPORT_DISABLE */ +#endif /* #ifndef UNALIGNED_SUPPORT_DISABLE */ } /** diff --git a/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c b/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c index bd43a9840e..6a8bd6c09b 100644 --- a/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c +++ b/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c @@ -312,7 +312,7 @@ arm_status arm_conv_partial_fast_q15( x0 = *__SIMD32(px); /* read x[1], x[2] samples */ x1 = _SIMD32_OFFSET(px+1); - px+= 2U; + px+= 2U; /* Apply loop unrolling and compute 4 MACs simultaneously. */ @@ -358,7 +358,7 @@ arm_status arm_conv_partial_fast_q15( /* Read x[5], x[6] */ x1 = _SIMD32_OFFSET(px+3); - px += 4U; + px += 4U; /* acc2 += x[4] * y[srcBLen - 3] + x[5] * y[srcBLen - 4] */ acc2 = __SMLADX(x0, c0, acc2); @@ -391,7 +391,7 @@ arm_status arm_conv_partial_fast_q15( /* Read x[7] */ x3 = *__SIMD32(px); - px++; + px++; /* Perform the multiply-accumulates */ acc0 = __SMLAD(x0, c0, acc0); @@ -410,7 +410,7 @@ arm_status arm_conv_partial_fast_q15( /* Read x[9] */ x2 = _SIMD32_OFFSET(px+1); - px += 2U; + px += 2U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x0, c0, acc0); @@ -436,7 +436,7 @@ arm_status arm_conv_partial_fast_q15( acc2 = __SMLADX(x3, c0, acc2); acc3 = __SMLADX(x2, c0, acc3); - c0 = *(py-1); + c0 = *(py-1); #ifdef ARM_MATH_BIG_ENDIAN c0 = c0 << 16U; @@ -447,7 +447,7 @@ arm_status arm_conv_partial_fast_q15( /* Read x[10] */ x3 = _SIMD32_OFFSET(px+2); - px += 3U; + px += 3U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x1, c0, acc0); @@ -875,7 +875,7 @@ arm_status arm_conv_partial_fast_q15( /* First part of the processing with loop unrolling. Compute 4 MACs at a time. ** a second loop below computes MACs for the remaining 1 to 3 samples. */ - py++; + py++; while (k > 0U) { @@ -967,22 +967,22 @@ arm_status arm_conv_partial_fast_q15( acc3 = 0; /* read x[0], x[1] samples */ - a = *px++; - b = *px++; + a = *px++; + b = *px++; #ifndef ARM_MATH_BIG_ENDIAN - x0 = __PKHBT(a, b, 16); - a = *px; - x1 = __PKHBT(b, a, 16); + x0 = __PKHBT(a, b, 16); + a = *px; + x1 = __PKHBT(b, a, 16); #else - x0 = __PKHBT(b, a, 16); - a = *px; - x1 = __PKHBT(a, b, 16); + x0 = __PKHBT(b, a, 16); + a = *px; + x1 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Apply loop unrolling and compute 4 MACs simultaneously. */ k = srcBLen >> 2U; @@ -993,19 +993,19 @@ arm_status arm_conv_partial_fast_q15( { /* Read the last two inputB samples using SIMD: * y[srcBLen - 1] and y[srcBLen - 2] */ - a = *py; - b = *(py+1); - py -= 2; + a = *py; + b = *(py+1); + py -= 2; #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16);; + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc0 += x[0] * y[srcBLen - 1] + x[1] * y[srcBLen - 2] */ acc0 = __SMLADX(x0, c0, acc0); @@ -1013,22 +1013,22 @@ arm_status arm_conv_partial_fast_q15( /* acc1 += x[1] * y[srcBLen - 1] + x[2] * y[srcBLen - 2] */ acc1 = __SMLADX(x1, c0, acc1); - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x2 = __PKHBT(a, b, 16); - a = *(px + 2); - x3 = __PKHBT(b, a, 16); + x2 = __PKHBT(a, b, 16); + a = *(px + 2); + x3 = __PKHBT(b, a, 16); #else - x2 = __PKHBT(b, a, 16); - a = *(px + 2); - x3 = __PKHBT(a, b, 16); + x2 = __PKHBT(b, a, 16); + a = *(px + 2); + x3 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc2 += x[2] * y[srcBLen - 1] + x[3] * y[srcBLen - 2] */ acc2 = __SMLADX(x2, c0, acc2); @@ -1037,19 +1037,19 @@ arm_status arm_conv_partial_fast_q15( acc3 = __SMLADX(x3, c0, acc3); /* Read y[srcBLen - 3] and y[srcBLen - 4] */ - a = *py; - b = *(py+1); - py -= 2; + a = *py; + b = *(py+1); + py -= 2; #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16);; + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc0 += x[2] * y[srcBLen - 3] + x[3] * y[srcBLen - 4] */ acc0 = __SMLADX(x2, c0, acc0); @@ -1058,24 +1058,24 @@ arm_status arm_conv_partial_fast_q15( acc1 = __SMLADX(x3, c0, acc1); /* Read x[4], x[5], x[6] */ - a = *(px + 2); - b = *(px + 3); + a = *(px + 2); + b = *(px + 3); #ifndef ARM_MATH_BIG_ENDIAN - x0 = __PKHBT(a, b, 16); - a = *(px + 4); - x1 = __PKHBT(b, a, 16); + x0 = __PKHBT(a, b, 16); + a = *(px + 4); + x1 = __PKHBT(b, a, 16); #else - x0 = __PKHBT(b, a, 16); - a = *(px + 4); - x1 = __PKHBT(a, b, 16); + x0 = __PKHBT(b, a, 16); + a = *(px + 4); + x1 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 4U; + px += 4U; /* acc2 += x[4] * y[srcBLen - 3] + x[5] * y[srcBLen - 4] */ acc2 = __SMLADX(x0, c0, acc2); @@ -1108,19 +1108,19 @@ arm_status arm_conv_partial_fast_q15( #endif /* #ifdef ARM_MATH_BIG_ENDIAN */ /* Read x[7] */ - a = *px; - b = *(px+1); - px++; + a = *px; + b = *(px+1); + px++; #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); + x3 = __PKHBT(a, b, 16); #else - x3 = __PKHBT(b, a, 16);; + x3 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Perform the multiply-accumulates */ @@ -1133,37 +1133,37 @@ arm_status arm_conv_partial_fast_q15( if (k == 2U) { /* Read y[srcBLen - 5], y[srcBLen - 6] */ - a = *py; - b = *(py+1); + a = *py; + b = *(py+1); #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16);; + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Read x[7], x[8], x[9] */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); - a = *(px + 2); - x2 = __PKHBT(b, a, 16); + x3 = __PKHBT(a, b, 16); + a = *(px + 2); + x2 = __PKHBT(b, a, 16); #else - x3 = __PKHBT(b, a, 16); - a = *(px + 2); - x2 = __PKHBT(a, b, 16); + x3 = __PKHBT(b, a, 16); + a = *(px + 2); + x2 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 2U; +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ + px += 2U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x0, c0, acc0); @@ -1175,36 +1175,36 @@ arm_status arm_conv_partial_fast_q15( if (k == 3U) { /* Read y[srcBLen - 5], y[srcBLen - 6] */ - a = *py; - b = *(py+1); + a = *py; + b = *(py+1); #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16);; + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Read x[7], x[8], x[9] */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); - a = *(px + 2); - x2 = __PKHBT(b, a, 16); + x3 = __PKHBT(a, b, 16); + a = *(px + 2); + x2 = __PKHBT(b, a, 16); #else - x3 = __PKHBT(b, a, 16); - a = *(px + 2); - x2 = __PKHBT(a, b, 16); + x3 = __PKHBT(b, a, 16); + a = *(px + 2); + x2 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Perform the multiply-accumulates */ acc0 = __SMLADX(x0, c0, acc0); @@ -1213,7 +1213,7 @@ arm_status arm_conv_partial_fast_q15( acc3 = __SMLADX(x2, c0, acc3); /* Read y[srcBLen - 7] */ - c0 = *(py-1); + c0 = *(py-1); #ifdef ARM_MATH_BIG_ENDIAN c0 = c0 << 16U; @@ -1223,20 +1223,20 @@ arm_status arm_conv_partial_fast_q15( #endif /* #ifdef ARM_MATH_BIG_ENDIAN */ /* Read x[10] */ - a = *(px+2); - b = *(px+3); + a = *(px+2); + b = *(px+3); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); + x3 = __PKHBT(a, b, 16); #else - x3 = __PKHBT(b, a, 16);; + x3 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 3U; + px += 3U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x1, c0, acc0); @@ -1246,10 +1246,10 @@ arm_status arm_conv_partial_fast_q15( } /* Store the results in the accumulators in the destination buffer. */ - *pOut++ = (q15_t)(acc0 >> 15); - *pOut++ = (q15_t)(acc1 >> 15); - *pOut++ = (q15_t)(acc2 >> 15); - *pOut++ = (q15_t)(acc3 >> 15); + *pOut++ = (q15_t)(acc0 >> 15); + *pOut++ = (q15_t)(acc1 >> 15); + *pOut++ = (q15_t)(acc2 >> 15); + *pOut++ = (q15_t)(acc3 >> 15); /* Increment the pointer pIn1 index, count by 4 */ count += 4U; @@ -1399,7 +1399,7 @@ arm_status arm_conv_partial_fast_q15( /* First part of the processing with loop unrolling. Compute 4 MACs at a time. ** a second loop below computes MACs for the remaining 1 to 3 samples. */ - py++; + py++; while (k > 0U) { diff --git a/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c b/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c index 383949d4ce..f7fe98cd15 100644 --- a/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c +++ b/lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c @@ -272,7 +272,7 @@ void arm_correlate_fast_q15( x0 = *__SIMD32(px); /* read x[1], x[2] samples */ x1 = _SIMD32_OFFSET(px + 1); - px += 2U; + px += 2U; /* Apply loop unrolling and compute 4 MACs simultaneously. */ k = srcBLen >> 2U; @@ -317,7 +317,7 @@ void arm_correlate_fast_q15( /* Read x[5], x[6] */ x1 = _SIMD32_OFFSET(px + 3); - px += 4U; + px += 4U; /* acc2 += x[4] * y[2] + x[5] * y[3] */ acc2 = __SMLAD(x0, c0, acc2); @@ -350,7 +350,7 @@ void arm_correlate_fast_q15( /* Read x[7] */ x3 = *__SIMD32(px); - px++; + px++; /* Perform the multiply-accumulates */ acc0 = __SMLAD(x0, c0, acc0); @@ -369,7 +369,7 @@ void arm_correlate_fast_q15( /* Read x[9] */ x2 = _SIMD32_OFFSET(px + 1); - px += 2U; + px += 2U; /* Perform the multiply-accumulates */ acc0 = __SMLAD(x0, c0, acc0); @@ -407,7 +407,7 @@ void arm_correlate_fast_q15( /* Read x[10] */ x3 = _SIMD32_OFFSET(px + 2); - px += 3U; + px += 3U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x1, c0, acc0); @@ -816,24 +816,24 @@ void arm_correlate_fast_q15( acc3 = 0; /* read x[0], x[1], x[2] samples */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x0 = __PKHBT(a, b, 16); - a = *(px + 2); - x1 = __PKHBT(b, a, 16); + x0 = __PKHBT(a, b, 16); + a = *(px + 2); + x1 = __PKHBT(b, a, 16); #else - x0 = __PKHBT(b, a, 16); - a = *(px + 2); - x1 = __PKHBT(a, b, 16); + x0 = __PKHBT(b, a, 16); + a = *(px + 2); + x1 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 2U; + px += 2U; /* Apply loop unrolling and compute 4 MACs simultaneously. */ k = srcBLen >> 2U; @@ -844,18 +844,18 @@ void arm_correlate_fast_q15( { /* Read the first two inputB samples using SIMD: * y[0] and y[1] */ - a = *py; - b = *(py + 1); + a = *py; + b = *(py + 1); #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16); + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc0 += x[0] * y[0] + x[1] * y[1] */ acc0 = __SMLAD(x0, c0, acc0); @@ -864,22 +864,22 @@ void arm_correlate_fast_q15( acc1 = __SMLAD(x1, c0, acc1); /* Read x[2], x[3], x[4] */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x2 = __PKHBT(a, b, 16); - a = *(px + 2); - x3 = __PKHBT(b, a, 16); + x2 = __PKHBT(a, b, 16); + a = *(px + 2); + x3 = __PKHBT(b, a, 16); #else - x2 = __PKHBT(b, a, 16); - a = *(px + 2); - x3 = __PKHBT(a, b, 16); + x2 = __PKHBT(b, a, 16); + a = *(px + 2); + x3 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc2 += x[2] * y[0] + x[3] * y[1] */ acc2 = __SMLAD(x2, c0, acc2); @@ -888,20 +888,20 @@ void arm_correlate_fast_q15( acc3 = __SMLAD(x3, c0, acc3); /* Read y[2] and y[3] */ - a = *(py + 2); - b = *(py + 3); + a = *(py + 2); + b = *(py + 3); - py += 4U; + py += 4U; #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16); + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* acc0 += x[2] * y[2] + x[3] * y[3] */ acc0 = __SMLAD(x2, c0, acc0); @@ -910,24 +910,24 @@ void arm_correlate_fast_q15( acc1 = __SMLAD(x3, c0, acc1); /* Read x[4], x[5], x[6] */ - a = *(px + 2); - b = *(px + 3); + a = *(px + 2); + b = *(px + 3); #ifndef ARM_MATH_BIG_ENDIAN - x0 = __PKHBT(a, b, 16); - a = *(px + 4); - x1 = __PKHBT(b, a, 16); + x0 = __PKHBT(a, b, 16); + a = *(px + 4); + x1 = __PKHBT(b, a, 16); #else - x0 = __PKHBT(b, a, 16); - a = *(px + 4); - x1 = __PKHBT(a, b, 16); + x0 = __PKHBT(b, a, 16); + a = *(px + 4); + x1 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 4U; + px += 4U; /* acc2 += x[4] * y[2] + x[5] * y[3] */ acc2 = __SMLAD(x0, c0, acc2); @@ -959,22 +959,22 @@ void arm_correlate_fast_q15( #endif /* #ifdef ARM_MATH_BIG_ENDIAN */ /* Read x[7] */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); - px++;; + px++; #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); + x3 = __PKHBT(a, b, 16); #else - x3 = __PKHBT(b, a, 16); + x3 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px++; + px++; /* Perform the multiply-accumulates */ acc0 = __SMLAD(x0, c0, acc0); @@ -986,38 +986,38 @@ void arm_correlate_fast_q15( if (k == 2U) { /* Read y[4], y[5] */ - a = *py; - b = *(py + 1); + a = *py; + b = *(py + 1); #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16); + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Read x[7], x[8], x[9] */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); - a = *(px + 2); - x2 = __PKHBT(b, a, 16); + x3 = __PKHBT(a, b, 16); + a = *(px + 2); + x2 = __PKHBT(b, a, 16); #else - x3 = __PKHBT(b, a, 16); - a = *(px + 2); - x2 = __PKHBT(a, b, 16); + x3 = __PKHBT(b, a, 16); + a = *(px + 2); + x2 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 2U; + px += 2U; /* Perform the multiply-accumulates */ acc0 = __SMLAD(x0, c0, acc0); @@ -1029,38 +1029,38 @@ void arm_correlate_fast_q15( if (k == 3U) { /* Read y[4], y[5] */ - a = *py; - b = *(py + 1); + a = *py; + b = *(py + 1); #ifndef ARM_MATH_BIG_ENDIAN - c0 = __PKHBT(a, b, 16); + c0 = __PKHBT(a, b, 16); #else - c0 = __PKHBT(b, a, 16); + c0 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - py += 2U; + py += 2U; /* Read x[7], x[8], x[9] */ - a = *px; - b = *(px + 1); + a = *px; + b = *(px + 1); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); - a = *(px + 2); - x2 = __PKHBT(b, a, 16); + x3 = __PKHBT(a, b, 16); + a = *(px + 2); + x2 = __PKHBT(b, a, 16); #else - x3 = __PKHBT(b, a, 16); - a = *(px + 2); - x2 = __PKHBT(a, b, 16); + x3 = __PKHBT(b, a, 16); + a = *(px + 2); + x2 = __PKHBT(a, b, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ /* Perform the multiply-accumulates */ acc0 = __SMLAD(x0, c0, acc0); @@ -1079,19 +1079,19 @@ void arm_correlate_fast_q15( #endif /* #ifdef ARM_MATH_BIG_ENDIAN */ /* Read x[10] */ - b = *(px + 3); + b = *(px + 3); #ifndef ARM_MATH_BIG_ENDIAN - x3 = __PKHBT(a, b, 16); + x3 = __PKHBT(a, b, 16); #else - x3 = __PKHBT(b, a, 16); + x3 = __PKHBT(b, a, 16); -#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ +#endif /* #ifndef ARM_MATH_BIG_ENDIAN */ - px += 3U; + px += 3U; /* Perform the multiply-accumulates */ acc0 = __SMLADX(x1, c0, acc0); diff --git a/lib/main/STM32G4/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_cryp.c b/lib/main/STM32G4/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_cryp.c old mode 100755 new mode 100644 index eb2ac5b5b1..4cdae5bfdd --- a/lib/main/STM32G4/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_cryp.c +++ b/lib/main/STM32G4/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_cryp.c @@ -930,7 +930,7 @@ HAL_StatusTypeDef HAL_CRYP_UnRegisterCallback(CRYP_HandleTypeDef *hcryp, HAL_CRY else { /* Update the error code */ - hcryp->ErrorCode |= HAL_CRYP_ERROR_INVALID_CALLBACK;; + hcryp->ErrorCode |= HAL_CRYP_ERROR_INVALID_CALLBACK; /* Return error status */ status = HAL_ERROR; } diff --git a/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cryp.c b/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cryp.c index 0407c65a23..79aacb2081 100644 --- a/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cryp.c +++ b/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cryp.c @@ -456,7 +456,7 @@ HAL_StatusTypeDef HAL_CRYP_Init(CRYP_HandleTypeDef *hcryp) } #endif /* (USE_HAL_CRYP_REGISTER_CALLBACKS) */ - /* Set the key size(This bit field is ‘don’t care’ in the DES or TDES modes) data type and Algorithm */ + /* Set the key size(This bit field is �don�t care� in the DES or TDES modes) data type and Algorithm */ MODIFY_REG(hcryp->Instance->CR, CRYP_CR_DATATYPE | CRYP_CR_KEYSIZE | CRYP_CR_ALGOMODE, hcryp->Init.DataType | hcryp->Init.KeySize | hcryp->Init.Algorithm); #if !defined (CRYP_VER_2_2) @@ -567,7 +567,7 @@ HAL_StatusTypeDef HAL_CRYP_SetConfig(CRYP_HandleTypeDef *hcryp, CRYP_ConfigTypeD hcryp->Init.B0 = pConf->B0; hcryp->Init.DataWidthUnit = pConf->DataWidthUnit; - /* Set the key size(This bit field is ‘don’t care’ in the DES or TDES modes) data type, AlgoMode and operating mode*/ + /* Set the key size(This bit field is �don�t care� in the DES or TDES modes) data type, AlgoMode and operating mode*/ MODIFY_REG(hcryp->Instance->CR, CRYP_CR_DATATYPE | CRYP_CR_KEYSIZE | CRYP_CR_ALGOMODE, hcryp->Init.DataType | hcryp->Init.KeySize | hcryp->Init.Algorithm); @@ -853,7 +853,7 @@ HAL_StatusTypeDef HAL_CRYP_UnRegisterCallback(CRYP_HandleTypeDef *hcryp, HAL_CRY else { /* Update the error code */ - hcryp->ErrorCode |= HAL_CRYP_ERROR_INVALID_CALLBACK;; + hcryp->ErrorCode |= HAL_CRYP_ERROR_INVALID_CALLBACK; /* Return error status */ status = HAL_ERROR; } @@ -4240,8 +4240,8 @@ static void CRYP_GCMCCM_SetPayloadPhase_IT(CRYP_HandleTypeDef *hcryp) } else if ((hcryp->Size % 16U) != 0U) { - /* Set padding only in case of input fifo interrupt */ - if ((hcryp->Instance->IMSCR & CRYP_IMSCR_INIM)!= 0x0U) + /* Set padding only in case of input fifo interrupt */ + if ((hcryp->Instance->IMSCR & CRYP_IMSCR_INIM)!= 0x0U) { /* Compute the number of padding bytes in last block of payload */ npblb = ((((uint32_t)hcryp->Size / 16U) + 1U) * 16U) - (uint32_t)(hcryp->Size); @@ -4292,7 +4292,7 @@ static void CRYP_GCMCCM_SetPayloadPhase_IT(CRYP_HandleTypeDef *hcryp) /* Disable the input FIFO Interrupt */ __HAL_CRYP_DISABLE_IT(hcryp, CRYP_IT_INI); - } + } /*Read the output block from the output FIFO */ if ((hcryp->Instance->SR & CRYP_FLAG_OFNE) != 0x0U) diff --git a/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_eth_ex.c b/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_eth_ex.c index 8504f75b15..f9e6cca989 100644 --- a/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_eth_ex.c +++ b/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_eth_ex.c @@ -410,7 +410,7 @@ HAL_StatusTypeDef HAL_ETHEx_GetTxVLANConfig(ETH_HandleTypeDef *heth, uint32_t VL pVlanConfig->VLANTagControl = READ_BIT(heth->Instance->MACVIR, (ETH_MACVIR_VLP | ETH_MACVIR_VLC)); } - return HAL_OK;; + return HAL_OK; } /** diff --git a/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_flash_ex.c b/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_flash_ex.c index dc45d4a190..925a011a50 100644 --- a/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_flash_ex.c +++ b/lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_flash_ex.c @@ -1819,7 +1819,7 @@ static void FLASH_OB_SharedRAM_Config(uint32_t SharedRamConfig) */ static uint32_t FLASH_OB_SharedRAM_GetConfig(void) { - return (FLASH->OPTSR2_CUR & FLASH_OPTSR2_TCM_AXI_SHARED);; + return (FLASH->OPTSR2_CUR & FLASH_OPTSR2_TCM_AXI_SHARED); } #endif /* FLASH_OPTSR2_TCM_AXI_SHARED */ @@ -1846,7 +1846,7 @@ static void FLASH_OB_CPUFreq_BoostConfig(uint32_t FreqBoost) */ static uint32_t FLASH_OB_CPUFreq_GetBoost(void) { - return (FLASH->OPTSR2_CUR & FLASH_OPTSR2_CPUFREQ_BOOST);; + return (FLASH->OPTSR2_CUR & FLASH_OPTSR2_CPUFREQ_BOOST); } #endif /* FLASH_OPTSR2_CPUFREQ_BOOST */ diff --git a/lib/main/STM32_USB_OTG_Driver/src/usb_core.c b/lib/main/STM32_USB_OTG_Driver/src/usb_core.c index bdd8881380..c5eaea46d8 100644 --- a/lib/main/STM32_USB_OTG_Driver/src/usb_core.c +++ b/lib/main/STM32_USB_OTG_Driver/src/usb_core.c @@ -384,7 +384,7 @@ USB_OTG_STS USB_OTG_CoreInit(USB_OTG_CORE_HANDLE *pdev) else /* FS interface (embedded Phy) */ { - usbcfg.d32 = USB_OTG_READ_REG32(&pdev->regs.GREGS->GUSBCFG);; + usbcfg.d32 = USB_OTG_READ_REG32(&pdev->regs.GREGS->GUSBCFG); usbcfg.b.physel = 1; /* FS Interface */ USB_OTG_WRITE_REG32 (&pdev->regs.GREGS->GUSBCFG, usbcfg.d32); /* Reset after a PHY select and set Host mode */ diff --git a/src/main/drivers/accgyro/accgyro_spi_bmi160.c b/src/main/drivers/accgyro/accgyro_spi_bmi160.c index 99654624c6..56a53ef758 100644 --- a/src/main/drivers/accgyro/accgyro_spi_bmi160.c +++ b/src/main/drivers/accgyro/accgyro_spi_bmi160.c @@ -217,7 +217,7 @@ static int32_t BMI160_Config(const extDevice_t *dev) static int32_t BMI160_do_foc(const extDevice_t *dev) { // assume sensor is mounted on top - uint8_t val = 0x7D;; + uint8_t val = 0x7D; spiWriteReg(dev, BMI160_REG_FOC_CONF, val); // Start FOC diff --git a/src/main/drivers/vtx_rtc6705.c b/src/main/drivers/vtx_rtc6705.c index cd2d1aa00b..091d874884 100644 --- a/src/main/drivers/vtx_rtc6705.c +++ b/src/main/drivers/vtx_rtc6705.c @@ -128,7 +128,7 @@ bool rtc6705IOInit(const vtxIOConfig_t *vtxIOConfig) #endif } - return false;; + return false; } /** diff --git a/src/main/osd/osd_elements.c b/src/main/osd/osd_elements.c index c0889df3e8..504e4c92c1 100644 --- a/src/main/osd/osd_elements.c +++ b/src/main/osd/osd_elements.c @@ -1922,7 +1922,7 @@ void osdUpdateAlarms(void) CLR_BLINK(OSD_HOME_DIST); } } else { - CLR_BLINK(OSD_HOME_DIST);; + CLR_BLINK(OSD_HOME_DIST); } #endif diff --git a/src/main/osd/osd_warnings.c b/src/main/osd/osd_warnings.c index d0f823c5e1..997049cce4 100644 --- a/src/main/osd/osd_warnings.c +++ b/src/main/osd/osd_warnings.c @@ -129,7 +129,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_FAIL_SAFE) && failsafeIsActive()) { tfp_sprintf(warningText, "FAIL SAFE"); *displayAttr = DISPLAYPORT_ATTR_CRITICAL; - *blinking = true;; + *blinking = true; return; } @@ -161,7 +161,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) // Blink the message if the throttle is within 10% of the launch setting if ( calculateThrottlePercent() >= MAX(currentPidProfile->launchControlThrottlePercent - 10, 0)) { - *blinking = true;; + *blinking = true; } *displayAttr = DISPLAYPORT_ATTR_INFO; @@ -173,7 +173,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_RSSI) && (getRssiPercent() < osdConfig()->rssi_alarm)) { tfp_sprintf(warningText, "RSSI LOW"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } #ifdef USE_RX_RSSI_DBM @@ -181,7 +181,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_RSSI_DBM) && (getRssiDbm() < osdConfig()->rssi_dbm_alarm)) { tfp_sprintf(warningText, "RSSI DBM"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } #endif // USE_RX_RSSI_DBM @@ -191,7 +191,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_LINK_QUALITY) && (rxGetLinkQualityPercent() < osdConfig()->link_quality_alarm)) { tfp_sprintf(warningText, "LINK QUALITY"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } #endif // USE_RX_LINK_QUALITY_INFO @@ -199,7 +199,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_BATTERY_CRITICAL) && batteryState == BATTERY_CRITICAL) { tfp_sprintf(warningText, " LAND NOW"); *displayAttr = DISPLAYPORT_ATTR_CRITICAL; - *blinking = true;; + *blinking = true; return; } @@ -211,7 +211,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) !gpsRescueIsAvailable()) { tfp_sprintf(warningText, "RESCUE N/A"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } @@ -224,7 +224,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (cmpTimeUs(stats->armed_time, OSD_GPS_RESCUE_DISABLED_WARNING_DURATION_US) < 0) { tfp_sprintf(warningText, "RESCUE OFF"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } } @@ -235,7 +235,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (FLIGHT_MODE(HEADFREE_MODE)) { tfp_sprintf(warningText, "HEADFREE"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } @@ -244,7 +244,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_CORE_TEMPERATURE) && coreTemperature >= osdConfig()->core_temp_alarm) { tfp_sprintf(warningText, "CORE %c: %3d%c", SYM_TEMPERATURE, osdConvertTemperatureToSelectedUnit(coreTemperature), osdGetTemperatureSymbolForSelectedUnit()); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } #endif // USE_ADC_INTERNAL @@ -296,7 +296,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (escWarningCount > 0) { tfp_sprintf(warningText, "%s", escWarningMsg); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } } @@ -305,7 +305,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_BATTERY_WARNING) && batteryState == BATTERY_WARNING) { tfp_sprintf(warningText, "LOW BATTERY"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } @@ -314,7 +314,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_RC_SMOOTHING) && ARMING_FLAG(ARMED) && !rcSmoothingInitializationComplete()) { tfp_sprintf(warningText, "RCSMOOTHING"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } #endif // USE_RC_SMOOTHING_FILTER @@ -323,7 +323,7 @@ void renderOsdWarning(char *warningText, bool *blinking, uint8_t *displayAttr) if (osdWarnGetState(OSD_WARNING_OVER_CAP) && ARMING_FLAG(ARMED) && osdConfig()->cap_alarm > 0 && getMAhDrawn() >= osdConfig()->cap_alarm) { tfp_sprintf(warningText, "OVER CAP"); *displayAttr = DISPLAYPORT_ATTR_WARNING; - *blinking = true;; + *blinking = true; return; } diff --git a/src/test/unit/flight_failsafe_unittest.cc b/src/test/unit/flight_failsafe_unittest.cc index a03e754506..ec728e7d5c 100644 --- a/src/test/unit/flight_failsafe_unittest.cc +++ b/src/test/unit/flight_failsafe_unittest.cc @@ -207,7 +207,7 @@ TEST(FlightFailsafeTest, TestFailsafeDetectsRxLossAndStartsLanding) EXPECT_FALSE(isArmingDisabled()); // simulate an Rx loss for the stage 1 duration - sysTickUptime += (failsafeConfig()->failsafe_delay * MILLIS_PER_TENTH_SECOND);; + sysTickUptime += (failsafeConfig()->failsafe_delay * MILLIS_PER_TENTH_SECOND); failsafeOnValidDataFailed(); failsafeUpdateState(); @@ -342,7 +342,7 @@ TEST(FlightFailsafeTest, TestFailsafeDetectsRxLossAndJustDisarms) EXPECT_FALSE(isArmingDisabled()); // simulate an Rx loss for the stage 1 duration - sysTickUptime += (failsafeConfig()->failsafe_delay * MILLIS_PER_TENTH_SECOND);; + sysTickUptime += (failsafeConfig()->failsafe_delay * MILLIS_PER_TENTH_SECOND); failsafeOnValidDataFailed(); failsafeUpdateState(); @@ -671,7 +671,7 @@ TEST(FlightFailsafeTest, TestFailsafeNotActivatedWhenDisarmedAndRXLossIsDetected EXPECT_FALSE(isArmingDisabled()); // simulate an Rx loss for the stage 1 duration - sysTickUptime += (failsafeConfig()->failsafe_delay * MILLIS_PER_TENTH_SECOND);; + sysTickUptime += (failsafeConfig()->failsafe_delay * MILLIS_PER_TENTH_SECOND); failsafeOnValidDataFailed(); failsafeUpdateState(); diff --git a/src/test/unit/rx_crsf_unittest.cc b/src/test/unit/rx_crsf_unittest.cc index ccb4e80510..976c4a1219 100644 --- a/src/test/unit/rx_crsf_unittest.cc +++ b/src/test/unit/rx_crsf_unittest.cc @@ -166,7 +166,7 @@ TEST(CrossFireTest, TestCrsfFrameStatusUnpacking) { crsfFrameDone = true; crsfFrame.frame.deviceAddress = CRSF_ADDRESS_CRSF_RECEIVER; - crsfFrame.frame.frameLength = CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE + CRSF_FRAME_LENGTH_TYPE_CRC;; + crsfFrame.frame.frameLength = CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE + CRSF_FRAME_LENGTH_TYPE_CRC; crsfFrame.frame.type = CRSF_FRAMETYPE_RC_CHANNELS_PACKED; // 16 11-bit channels packed into 22 bytes of data crsfFrame.frame.payload[0] = 0xFF; // bits 0-7