diff --git a/src/main/common/colorconversion.c b/src/main/common/colorconversion.c index 45f13fbcb8..a37bc821ab 100644 --- a/src/main/common/colorconversion.c +++ b/src/main/common/colorconversion.c @@ -39,7 +39,7 @@ rgbColor24bpp_t* hsvToRgb24(const hsvColor_t* c) r.rgb.b = val; } else { - base = ((255- sat) * val) >> 8; + base = ((255 - sat) * val) >> 8; switch (hue / 60) { case 0: diff --git a/src/main/drivers/display_ug2864hsweg01.c b/src/main/drivers/display_ug2864hsweg01.c index 957948afad..d8475fb7f5 100644 --- a/src/main/drivers/display_ug2864hsweg01.c +++ b/src/main/drivers/display_ug2864hsweg01.c @@ -182,7 +182,7 @@ void i2c_OLED_clear_display(void) i2c_OLED_send_cmd(0x40); // Display start line register to 0 i2c_OLED_send_cmd(0); // Set low col address to 0 i2c_OLED_send_cmd(0x10); // Set high col address to 0 - for(uint16_t i=0; i<1024; i++) { // fill the display's RAM with graphic... 128*64 pixel picture + for(uint16_t i = 0; i < 1024; i++) { // fill the display's RAM with graphic... 128*64 pixel picture i2c_OLED_send_byte(0x00); // clear } i2c_OLED_send_cmd(0x81); // Setup CONTRAST CONTROL, following byte is the contrast Value... always a 2 byte instruction @@ -196,7 +196,7 @@ void i2c_OLED_clear_display_quick(void) i2c_OLED_send_cmd(0x40); // Display start line register to 0 i2c_OLED_send_cmd(0); // Set low col address to 0 i2c_OLED_send_cmd(0x10); // Set high col address to 0 - for(uint16_t i=0; i<1024; i++) { // fill the display's RAM with graphic... 128*64 pixel picture + for(uint16_t i = 0; i < 1024; i++) { // fill the display's RAM with graphic... 128*64 pixel picture i2c_OLED_send_byte(0x00); // clear } } diff --git a/src/main/drivers/light_ws2811strip.c b/src/main/drivers/light_ws2811strip.c index 23977536d9..d9bd58b65b 100644 --- a/src/main/drivers/light_ws2811strip.c +++ b/src/main/drivers/light_ws2811strip.c @@ -106,7 +106,7 @@ STATIC_UNIT_TESTED void fastUpdateLEDDMABuffer(rgbColor24bpp_t *color) STATIC_UNIT_TESTED void updateLEDDMABuffer(uint8_t componentValue) { uint8_t bitIndex; - + for (bitIndex = 0; bitIndex < 8; bitIndex++) { if ((componentValue << bitIndex) & 0x80 ) // data sent MSB first, j = 0 is MSB j = 7 is LSB diff --git a/src/main/drivers/system_stm32f30x.c b/src/main/drivers/system_stm32f30x.c index b59552cae5..b530e4802a 100644 --- a/src/main/drivers/system_stm32f30x.c +++ b/src/main/drivers/system_stm32f30x.c @@ -57,7 +57,7 @@ void enableGPIOPowerUsageAndNoiseReductions(void) gpio.mode = Mode_AIN; - gpio.pin = Pin_All & ~(Pin_13|Pin_14|Pin_15); // Leave JTAG pins alone + gpio.pin = Pin_All & ~(Pin_13 | Pin_14 | Pin_15); // Leave JTAG pins alone gpioInit(GPIOA, &gpio); gpio.pin = Pin_All; diff --git a/src/main/io/serial.c b/src/main/io/serial.c index 99bb2c4375..301bd45b6f 100644 --- a/src/main/io/serial.c +++ b/src/main/io/serial.c @@ -220,12 +220,12 @@ static void sortSerialPortFunctions(serialPortFunction_t *serialPortFunctions, u int index1; int index2; - + // bubble-sort array (TODO - port selection can be implemented as repeated minimum search with bitmask marking used elements) for (index1 = 0; index1 < (elements - 1); index1++) { for (index2 = 0; index2 < elements - index1 - 1; index2++) { if(serialPortFunctionMostSpecificFirstComparator(&serialPortFunctions[index2], &serialPortFunctions[index2 + 1]) > 0) { - swap=serialPortFunctions[index2]; + swap = serialPortFunctions[index2]; serialPortFunctions[index2] = serialPortFunctions[index2 + 1]; serialPortFunctions[index2 + 1] = swap; } diff --git a/src/main/mw.c b/src/main/mw.c index 6a4931bd44..4f2fa1915e 100755 --- a/src/main/mw.c +++ b/src/main/mw.c @@ -159,7 +159,7 @@ bool isCalibrating() void annexCode(void) { int32_t tmp, tmp2; - int32_t axis, prop1, prop2; + int32_t axis, prop1 = 0, prop2; static uint8_t batteryWarningEnabled = false; static uint8_t vbatTimer = 0; diff --git a/src/main/startup/startup_stm32f30x_md_gcc.S b/src/main/startup/startup_stm32f30x_md_gcc.S index 74156f4d51..be696fd0bc 100644 --- a/src/main/startup/startup_stm32f30x_md_gcc.S +++ b/src/main/startup/startup_stm32f30x_md_gcc.S @@ -9,8 +9,8 @@ * - Set the initial SP * - Set the initial PC == Reset_Handler, * - Set the vector table entries with the exceptions ISR address - * - Configure the clock system and the external SRAM mounted on - * STM3230C-EVAL board to be used as data memory (optional, + * - Configure the clock system and the external SRAM mounted on + * STM3230C-EVAL board to be used as data memory (optional, * to be enabled by user) * - Branches to main in the C library (which eventually * calls main()). @@ -27,15 +27,15 @@ * * http://www.st.com/software_license_agreement_liberty_v2 * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. * ****************************************************************************** */ - + .syntax unified .cpu cortex-m4 .fpu softvfp @@ -44,10 +44,10 @@ .global g_pfnVectors .global Default_Handler -/* start address for the initialization values of the .data section. +/* start address for the initialization values of the .data section. defined in linker script */ .word _sidata -/* start address for the .data section. defined in linker script */ +/* start address for the .data section. defined in linker script */ .word _sdata /* end address for the .data section. defined in linker script */ .word _edata @@ -61,7 +61,7 @@ defined in linker script */ * @brief This is the code that gets called when the processor first * starts execution following a reset event. Only the absolutely * necessary set is performed, after which the application - * supplied main() routine is called. + * supplied main() routine is called. * @param None * @retval : None */ @@ -69,9 +69,9 @@ defined in linker script */ .section .text.Reset_Handler .weak Reset_Handler .type Reset_Handler, %function -Reset_Handler: +Reset_Handler: -/* Copy the data segment initializers from flash to SRAM */ +/* Copy the data segment initializers from flash to SRAM */ movs r1, #0 b LoopCopyDataInit @@ -80,7 +80,7 @@ CopyDataInit: ldr r3, [r3, r1] str r3, [r0, r1] adds r1, r1, #4 - + LoopCopyDataInit: ldr r0, =_sdata ldr r3, =_edata @@ -89,11 +89,11 @@ LoopCopyDataInit: bcc CopyDataInit ldr r2, =_sbss b LoopFillZerobss -/* Zero fill the bss segment. */ +/* Zero fill the bss segment. */ FillZerobss: movs r3, #0 str r3, [r2], #4 - + LoopFillZerobss: ldr r3, = _ebss cmp r2, r3 @@ -103,15 +103,15 @@ LoopFillZerobss: bl SystemInit /* Call the application's entry point.*/ bl main - bx lr + bx lr .size Reset_Handler, .-Reset_Handler /** - * @brief This is the code that gets called when the processor receives an + * @brief This is the code that gets called when the processor receives an * unexpected interrupt. This simply enters an infinite loop, preserving * the system state for examination by a debugger. - * @param None - * @retval None + * @param None + * @retval None */ .section .text.Default_Handler,"ax",%progbits Default_Handler: @@ -123,13 +123,13 @@ Infinite_Loop: * The minimal vector table for a Cortex M4. Note that the proper constructs * must be placed on this to ensure that it ends up at physical address * 0x0000.0000. -* +* *******************************************************************************/ .section .isr_vector,"a",%progbits .type g_pfnVectors, %object .size g_pfnVectors, .-g_pfnVectors - - + + g_pfnVectors: .word _estack .word Reset_Handler @@ -440,26 +440,26 @@ g_pfnVectors: .thumb_set DMA2_Channel5_IRQHandler,Default_Handler .weak ADC4_IRQHandler - .thumb_set ADC4_IRQHandler,Default_Handler - + .thumb_set ADC4_IRQHandler,Default_Handler + .weak COMP1_2_3_IRQHandler .thumb_set COMP1_2_3_IRQHandler,Default_Handler - + .weak COMP4_5_6_IRQHandler .thumb_set COMP4_5_6_IRQHandler,Default_Handler - + .weak COMP7_IRQHandler - .thumb_set COMP7_IRQHandler,Default_Handler - + .thumb_set COMP7_IRQHandler,Default_Handler + .weak USB_HP_IRQHandler .thumb_set USB_HP_IRQHandler,Default_Handler - + .weak USB_LP_IRQHandler .thumb_set USB_LP_IRQHandler,Default_Handler - + .weak USBWakeUp_RMP_IRQHandler .thumb_set USBWakeUp_RMP_IRQHandler,Default_Handler - + .weak FPU_IRQHandler .thumb_set FPU_IRQHandler,Default_Handler /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/src/main/telemetry/frsky.c b/src/main/telemetry/frsky.c index 5dea46a1a5..fb44aa22f6 100644 --- a/src/main/telemetry/frsky.c +++ b/src/main/telemetry/frsky.c @@ -181,7 +181,7 @@ static void sendThrottleOrBatterySizeAsRpm(void) if (ARMING_FLAG(ARMED)) { serialize16(rcCommand[THROTTLE] / BLADE_NUMBER_DIVIDER); } else { - serialize16((telemetryConfig->batterySize / BLADE_NUMBER_DIVIDER)); + serialize16((telemetryConfig->batterySize / BLADE_NUMBER_DIVIDER)); } } @@ -252,7 +252,7 @@ static void GPStoDDDMM_MMMM(int32_t mwiigps, gpsCoordinateDDDMMmmmm_t *result) if (telemetryConfig->frsky_coordinate_format == FRSKY_FORMAT_DMS) { result->dddmm = deg * 100 + min; } else { - result->dddmm = deg * 60 + min; + result->dddmm = deg * 60 + min; } result->mmmm = (absgps - min * GPS_DEGREES_DIVIDER) / 1000; @@ -274,7 +274,7 @@ static void sendGPS(void) // Send dummy GPS Data in order to display compass value localGPS_coord[LAT] = (telemetryConfig->gpsNoFixLatitude * GPS_DEGREES_DIVIDER); localGPS_coord[LON] = (telemetryConfig->gpsNoFixLongitude * GPS_DEGREES_DIVIDER); - } + } gpsCoordinateDDDMMmmmm_t coordinate; GPStoDDDMM_MMMM(localGPS_coord[LAT], &coordinate); diff --git a/src/main/vcp/hw_config.c b/src/main/vcp/hw_config.c index 835cb8293d..59cb84eb79 100644 --- a/src/main/vcp/hw_config.c +++ b/src/main/vcp/hw_config.c @@ -215,7 +215,6 @@ void USB_Interrupts_Config(void) *******************************************************************************/ void USB_Cable_Config(FunctionalState NewState) { - } /*******************************************************************************