Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-12 19:10:32 +03:00
Code Issues Wiki Activity

Merge pull request #11761 from SteveCEvans/semicolon

Browse source 
Remove superfluous double ;
This commit is contained in:
J Blackman 2022-08-05 08:28:20 +10:00 • committed by GitHub
commit 2bb3fef844
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 310 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/main/CMSIS/Core/Include/cmsis_iccarm.h
View file

@ -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)

12
lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_fast_q15.c
View file

@ -923,7 +923,7 @@ void arm_conv_fast_q15(
#else
c0 = __PKHBT(b, a, 16);;
c0 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -967,7 +967,7 @@ void arm_conv_fast_q15(
#else
c0 = __PKHBT(b, a, 16);;
c0 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1038,7 +1038,7 @@ void arm_conv_fast_q15(
#else
x3 = __PKHBT(b, a, 16);;
x3 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1062,7 +1062,7 @@ void arm_conv_fast_q15(
#else
c0 = __PKHBT(b, a, 16);;
c0 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1104,7 +1104,7 @@ void arm_conv_fast_q15(
#else
c0 = __PKHBT(b, a, 16);;
c0 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1152,7 +1152,7 @@ void arm_conv_fast_q15(
#else
x3 = __PKHBT(b, a, 16);;
x3 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */

12
lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_conv_partial_fast_q15.c
View file

@ -1003,7 +1003,7 @@ arm_status arm_conv_partial_fast_q15(
#else
c0 = __PKHBT(b, a, 16);;
c0 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1047,7 +1047,7 @@ arm_status arm_conv_partial_fast_q15(
#else
c0 = __PKHBT(b, a, 16);;
c0 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1118,7 +1118,7 @@ arm_status arm_conv_partial_fast_q15(
#else
x3 = __PKHBT(b, a, 16);;
x3 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1142,7 +1142,7 @@ arm_status arm_conv_partial_fast_q15(
#else
c0 = __PKHBT(b, a, 16);;
c0 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1184,7 +1184,7 @@ arm_status arm_conv_partial_fast_q15(
#else
c0 = __PKHBT(b, a, 16);;
c0 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */
@ -1232,7 +1232,7 @@ arm_status arm_conv_partial_fast_q15(
#else
x3 = __PKHBT(b, a, 16);;
x3 = __PKHBT(b, a, 16);
#endif /* #ifndef ARM_MATH_BIG_ENDIAN */

2
lib/main/CMSIS/DSP/Source/FilteringFunctions/arm_correlate_fast_q15.c
View file

@ -962,7 +962,7 @@ void arm_correlate_fast_q15(
a = *px;
b = *(px + 1);
px++;;
px++;
#ifndef ARM_MATH_BIG_ENDIAN

2
lib/main/STM32G4/Drivers/STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_cryp.c Executable file → Normal file
View file

@ -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;
}

6
lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cryp.c
View file

@ -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 <EFBFBD>don<EFBFBD>t care<72> 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 <EFBFBD>don<EFBFBD>t care<72> 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;
}

2
lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_eth_ex.c
View file

@ -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;
}
/**

4
lib/main/STM32H7/Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_flash_ex.c
View file

@ -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 */

2
lib/main/STM32_USB_OTG_Driver/src/usb_core.c
View file

@ -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 */

2
src/main/drivers/accgyro/accgyro_spi_bmi160.c
View file

@ -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

2
src/main/drivers/vtx_rtc6705.c
View file

@ -128,7 +128,7 @@ bool rtc6705IOInit(const vtxIOConfig_t *vtxIOConfig)
#endif
}
return false;;
return false;
}
/**

2
src/main/osd/osd_elements.c
View file

@ -1951,7 +1951,7 @@ void osdUpdateAlarms(void)
CLR_BLINK(OSD_HOME_DIST);
}
} else {
CLR_BLINK(OSD_HOME_DIST);;
CLR_BLINK(OSD_HOME_DIST);
}
#endif

28
src/main/osd/osd_warnings.c
View file

@ -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;
}

6
src/test/unit/flight_failsafe_unittest.cc
View file

@ -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();

2
src/test/unit/rx_crsf_unittest.cc
View file

@ -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