diff --git a/src/main/drivers/sdcard_sdio_stdlib.c b/src/main/drivers/sdcard_sdio_stdlib.c index dfeadd7580..58f5411bae 100644 --- a/src/main/drivers/sdcard_sdio_stdlib.c +++ b/src/main/drivers/sdcard_sdio_stdlib.c @@ -102,14 +102,14 @@ STATIC_ASSERT(sizeof(sdcardCSD_t) == 16, sdcard_csd_bitfields_didnt_pack_properl void sdcardInsertionDetectDeinit(void) { - //Handled by the driver - return; + //Handled by the driver + return; } void sdcardInsertionDetectInit(void) { - //Handled by the driver - return; + //Handled by the driver + return; } /** @@ -163,9 +163,9 @@ typedef enum { */ static sdcardReceiveBlockStatus_e sdcard_receiveDataBlock(uint8_t *buffer, int count) { - UNUSED(buffer); - UNUSED(count); - SD_Error ret = SD_WaitReadOperation(); + UNUSED(buffer); + UNUSED(count); + SD_Error ret = SD_WaitReadOperation(); if (ret == SD_REQUEST_PENDING) { return SDCARD_RECEIVE_BLOCK_IN_PROGRESS; @@ -221,11 +221,11 @@ static bool sdcard_checkInitDone(void) uint8_t ret = SD_GetStatus(); if (ret == SD_TRANSFER_OK) { - SD_CardInfo sdinfo; - SD_GetCardInfo(&sdinfo); + SD_CardInfo sdinfo; + SD_GetCardInfo(&sdinfo); - sdcard.version = (sdinfo.CardType) ? 2 : 1; - sdcard.highCapacity = (sdinfo.CardType == 2) ? 1 : 0; + sdcard.version = (sdinfo.CardType) ? 2 : 1; + sdcard.highCapacity = (sdinfo.CardType == 2) ? 1 : 0; } // When card init is complete, the idle bit in the response becomes zero. @@ -237,18 +237,18 @@ static bool sdcard_checkInitDone(void) */ void sdcard_init(bool useDMA) { - UNUSED(useDMA); - if (SD_Detect() == SD_PRESENT) { - if (SD_Init() != SD_OK) { - sdcard.state = SDCARD_STATE_NOT_PRESENT; - sdcard.failureCount++; - return; - } - } else { - sdcard.state = SDCARD_STATE_NOT_PRESENT; - sdcard.failureCount++; - return; - } + UNUSED(useDMA); + if (SD_Detect() == SD_PRESENT) { + if (SD_Init() != SD_OK) { + sdcard.state = SDCARD_STATE_NOT_PRESENT; + sdcard.failureCount++; + return; + } + } else { + sdcard.state = SDCARD_STATE_NOT_PRESENT; + sdcard.failureCount++; + return; + } sdcard.operationStartTime = millis(); sdcard.state = SDCARD_STATE_RESET; @@ -307,22 +307,22 @@ bool sdcard_poll(void) doMore: switch (sdcard.state) { case SDCARD_STATE_RESET: - //HAL Takes care of voltage crap. - sdcard.state = SDCARD_STATE_CARD_INIT_IN_PROGRESS; - goto doMore; + //HAL Takes care of voltage crap. + sdcard.state = SDCARD_STATE_CARD_INIT_IN_PROGRESS; + goto doMore; break; case SDCARD_STATE_CARD_INIT_IN_PROGRESS: if (sdcard_checkInitDone()) { - // Now fetch the CSD and CID registers - if (sdcard_fetchCSD()) { - sdcard.state = SDCARD_STATE_INITIALIZATION_RECEIVE_CID; - goto doMore; - } else { - sdcard_reset(); - goto doMore; - } - } + // Now fetch the CSD and CID registers + if (sdcard_fetchCSD()) { + sdcard.state = SDCARD_STATE_INITIALIZATION_RECEIVE_CID; + goto doMore; + } else { + sdcard_reset(); + goto doMore; + } + } break; case SDCARD_STATE_INITIALIZATION_RECEIVE_CID: if (sdcard_receiveCID()) { @@ -345,14 +345,14 @@ bool sdcard_poll(void) // Have we finished sending the write yet? if (SD_WaitWriteOperation() == SD_OK) { - // The SD card is now busy committing that write to the card - sdcard.state = SDCARD_STATE_WAITING_FOR_WRITE; - sdcard.operationStartTime = millis(); + // The SD card is now busy committing that write to the card + sdcard.state = SDCARD_STATE_WAITING_FOR_WRITE; + sdcard.operationStartTime = millis(); - // Since we've transmitted the buffer we can go ahead and tell the caller their operation is complete - if (sdcard.pendingOperation.callback) { - sdcard.pendingOperation.callback(SDCARD_BLOCK_OPERATION_WRITE, sdcard.pendingOperation.blockIndex, sdcard.pendingOperation.buffer, sdcard.pendingOperation.callbackData); - } + // Since we've transmitted the buffer we can go ahead and tell the caller their operation is complete + if (sdcard.pendingOperation.callback) { + sdcard.pendingOperation.callback(SDCARD_BLOCK_OPERATION_WRITE, sdcard.pendingOperation.blockIndex, sdcard.pendingOperation.buffer, sdcard.pendingOperation.callbackData); + } } break; case SDCARD_STATE_WAITING_FOR_WRITE: @@ -501,16 +501,16 @@ sdcardOperationStatus_e sdcard_writeBlock(uint32_t blockIndex, uint8_t *buffer, sdcard.state = SDCARD_STATE_SENDING_WRITE; if (SD_WriteBlock(buffer, blockIndex * 512, 1) != SD_OK) { - /* Our write was rejected! This could be due to a bad address but we hope not to attempt that, so assume - * the card is broken and needs reset. - */ - sdcard_reset(); + /* Our write was rejected! This could be due to a bad address but we hope not to attempt that, so assume + * the card is broken and needs reset. + */ + sdcard_reset(); - // Announce write failure: - if (sdcard.pendingOperation.callback) { - sdcard.pendingOperation.callback(SDCARD_BLOCK_OPERATION_WRITE, sdcard.pendingOperation.blockIndex, NULL, sdcard.pendingOperation.callbackData); - } - return SDCARD_OPERATION_FAILURE; + // Announce write failure: + if (sdcard.pendingOperation.callback) { + sdcard.pendingOperation.callback(SDCARD_BLOCK_OPERATION_WRITE, sdcard.pendingOperation.blockIndex, NULL, sdcard.pendingOperation.callbackData); + } + return SDCARD_OPERATION_FAILURE; } return SDCARD_OPERATION_IN_PROGRESS; @@ -571,7 +571,7 @@ sdcardOperationStatus_e sdcard_beginWriteBlocks(uint32_t blockIndex, uint32_t bl bool sdcard_readBlock(uint32_t blockIndex, uint8_t *buffer, sdcard_operationCompleteCallback_c callback, uint32_t callbackData) { if (sdcard.state != SDCARD_STATE_READY) { - return false; + return false; } #ifdef SDCARD_PROFILING @@ -593,15 +593,15 @@ bool sdcard_readBlock(uint32_t blockIndex, uint8_t *buffer, sdcard_operationComp return true; } else { - sdcard_reset(); - if (sdcard.pendingOperation.callback) { - sdcard.pendingOperation.callback( - SDCARD_BLOCK_OPERATION_READ, - sdcard.pendingOperation.blockIndex, - NULL, - sdcard.pendingOperation.callbackData - ); - } + sdcard_reset(); + if (sdcard.pendingOperation.callback) { + sdcard.pendingOperation.callback( + SDCARD_BLOCK_OPERATION_READ, + sdcard.pendingOperation.blockIndex, + NULL, + sdcard.pendingOperation.callbackData + ); + } return false; } } diff --git a/src/main/target/MATEKF411RX/target.c b/src/main/target/MATEKF411RX/target.c index d38cea4db8..4f9e8810af 100644 --- a/src/main/target/MATEKF411RX/target.c +++ b/src/main/target/MATEKF411RX/target.c @@ -25,16 +25,16 @@ #include "drivers/timer_def.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), // PPM/RX2 + DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), // PPM/RX2 - DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 0, 0), // S1_OUT - DMA1_ST1 - DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // S2_OUT - DMA1_ST0 - DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // S3_OUT - DMA1_ST3 - DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), // S4_OUT - DMA1_ST7 + DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 0, 0), // S1_OUT - DMA1_ST1 + DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // S2_OUT - DMA1_ST0 + DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // S3_OUT - DMA1_ST3 + DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), // S4_OUT - DMA1_ST7 - DEF_TIM(TIM5, CH1, PA0, TIM_USE_LED, 0, 0), // 2812LED - DMA1_ST2 + DEF_TIM(TIM5, CH1, PA0, TIM_USE_LED, 0, 0), // 2812LED - DMA1_ST2 - DEF_TIM(TIM9, CH1, PA2, TIM_USE_PWM, 0, 0 ), // TX2 - DEF_TIM(TIM1, CH2, PA9, TIM_USE_PWM, 0, 0 ), // TX1 - DEF_TIM(TIM1, CH3, PA10, TIM_USE_PWM, 0, 0 ), // RX1 + DEF_TIM(TIM9, CH1, PA2, TIM_USE_PWM, 0, 0 ), // TX2 + DEF_TIM(TIM1, CH2, PA9, TIM_USE_PWM, 0, 0 ), // TX1 + DEF_TIM(TIM1, CH3, PA10, TIM_USE_PWM, 0, 0 ), // RX1 }; diff --git a/src/main/target/MATEKF411RX/target.h b/src/main/target/MATEKF411RX/target.h index 8b9b54bb6f..3502c47874 100644 --- a/src/main/target/MATEKF411RX/target.h +++ b/src/main/target/MATEKF411RX/target.h @@ -30,8 +30,8 @@ // *************** SPI1 Gyro & ACC ********************** #define USE_SPI_DEVICE_1 #define SPI1_SCK_PIN PA5 -#define SPI1_MISO_PIN PA6 -#define SPI1_MOSI_PIN PA7 +#define SPI1_MISO_PIN PA6 +#define SPI1_MOSI_PIN PA7 #define MPU6000_CS_PIN PA4 #define MPU6000_SPI_INSTANCE SPI1 @@ -50,8 +50,8 @@ // *************** SPI2 OSD ***************************** #define USE_SPI_DEVICE_2 #define SPI2_SCK_PIN PB13 -#define SPI2_MISO_PIN PB14 -#define SPI2_MOSI_PIN PB15 +#define SPI2_MISO_PIN PB14 +#define SPI2_MOSI_PIN PB15 #define USE_OSD #define USE_MAX7456 @@ -61,8 +61,8 @@ // *************** SPI3 CC2500 *************************** #define USE_SPI_DEVICE_3 #define SPI3_SCK_PIN PB3 -#define SPI3_MISO_PIN PB4 -#define SPI3_MOSI_PIN PB5 +#define SPI3_MISO_PIN PB4 +#define SPI3_MOSI_PIN PB5 #define SPI3_NSS_PIN PA15 #define USE_RX_SPI @@ -90,7 +90,7 @@ #define USE_RX_FRSKY_SPI_D #define USE_RX_FRSKY_SPI_X -#define DEFAULT_RX_FEATURE FEATURE_RX_SPI +#define DEFAULT_RX_FEATURE FEATURE_RX_SPI #define RX_SPI_DEFAULT_PROTOCOL RX_SPI_FRSKY_X #define USE_RX_FRSKY_SPI_TELEMETRY diff --git a/src/main/telemetry/ibus_shared.c b/src/main/telemetry/ibus_shared.c index f8ed0be64b..afa163c8db 100644 --- a/src/main/telemetry/ibus_shared.c +++ b/src/main/telemetry/ibus_shared.c @@ -54,12 +54,12 @@ static uint16_t calculateChecksum(const uint8_t *ibusPacket); #include "io/gps.h" -#define IBUS_TEMPERATURE_OFFSET 400 -#define INVALID_IBUS_ADDRESS 0 -#define IBUS_BUFFSIZE 33 // biggest iBus message seen so far + 1 -#define IBUS_HEADER_FOOTER_SIZE 4 -#define IBUS_2BYTE_SESNSOR 2 -#define IBUS_4BYTE_SESNSOR 4 +#define IBUS_TEMPERATURE_OFFSET 400 +#define INVALID_IBUS_ADDRESS 0 +#define IBUS_BUFFSIZE 33 // biggest iBus message seen so far + 1 +#define IBUS_HEADER_FOOTER_SIZE 4 +#define IBUS_2BYTE_SESNSOR 2 +#define IBUS_4BYTE_SESNSOR 4 typedef uint8_t ibusAddress_t; @@ -78,7 +78,7 @@ typedef enum { IBUS_SENSOR_TYPE_BAT_CURR = 0x05, // battery current A * 100 IBUS_SENSOR_TYPE_FUEL = 0x06, // remaining battery percentage / mah drawn otherwise or fuel level no unit! IBUS_SENSOR_TYPE_RPM = 0x07, // throttle value / battery capacity - IBUS_SENSOR_TYPE_CMP_HEAD = 0x08, //Heading 0..360 deg, 0=north 2bytes + IBUS_SENSOR_TYPE_CMP_HEAD = 0x08, //Heading 0..360 deg, 0=north 2bytes IBUS_SENSOR_TYPE_CLIMB_RATE = 0x09, //2 bytes m/s *100 IBUS_SENSOR_TYPE_COG = 0x0a, //2 bytes Course over ground(NOT heading, but direction of movement) in degrees * 100, 0.0..359.99 degrees. unknown max uint IBUS_SENSOR_TYPE_GPS_STATUS = 0x0b, //2 bytes @@ -104,7 +104,7 @@ typedef enum { IBUS_SENSOR_TYPE_ALT = 0x83, //4bytes signed!!! Alt m*100 IBUS_SENSOR_TYPE_ALT_MAX = 0x84, //4bytes signed MaxAlt m*100 - IBUS_SENSOR_TYPE_ALT_FLYSKY = 0xf9, // Altitude 2 bytes signed in m + IBUS_SENSOR_TYPE_ALT_FLYSKY = 0xf9, // Altitude 2 bytes signed in m #if defined(USE_TELEMETRY_IBUS_EXTENDED) IBUS_SENSOR_TYPE_GPS_FULL = 0xfd, IBUS_SENSOR_TYPE_VOLT_FULL = 0xf0,