diff --git a/src/main/cms/cms_menu_imu.c b/src/main/cms/cms_menu_imu.c index 79d8826dc5..3ad64fcabd 100644 --- a/src/main/cms/cms_menu_imu.c +++ b/src/main/cms/cms_menu_imu.c @@ -455,10 +455,10 @@ static long cmsx_CopyControlRateProfile(displayPort_t *pDisplay, const void *ptr return 0; } -static OSD_Entry cmsx_menuCopyProfileEntries[] = +static OSD_Entry cmsx_menuCopyProfileEntries[] = { { "-- COPY PROFILE --", OME_Label, NULL, NULL, 0}, - + { "CPY PID PROF TO", OME_TAB, NULL, &cmsx_PidProfileTable, 0 }, { "COPY PP", OME_Funcall, cmsx_CopyPidProfile, NULL, 0 }, { "CPY RATE PROF TO", OME_TAB, NULL, &cmsx_ControlRateProfileTable, 0 }, diff --git a/src/main/drivers/barometer/barometer_lps.c b/src/main/drivers/barometer/barometer_lps.c index d46bf3f086..53518c3d2e 100644 --- a/src/main/drivers/barometer/barometer_lps.c +++ b/src/main/drivers/barometer/barometer_lps.c @@ -14,7 +14,7 @@ #include "drivers/io.h" #include "drivers/time.h" -//====================================Registers Addresses=========================================// +//====================================Registers Addresses=========================================// #define LPS_REF_P_XL 0x08 #define LPS_REF_P_L 0x09 #define LPS_REF_P_H 0x0A @@ -134,7 +134,7 @@ #define LPS_THS_PH 0x31 #define LPS_RPDS_L 0x39 #define LPS_RPDS_H 0x3A -//=======================================Constants=============================================// +//=======================================Constants=============================================// #define LPS22_ID 0xB1 #define LPS25_ID 0xBD #define LPS33_ID 0xB1 diff --git a/src/main/drivers/compass/compass_hmc5883l.c b/src/main/drivers/compass/compass_hmc5883l.c index 50feb9b6a0..f28b3e886a 100644 --- a/src/main/drivers/compass/compass_hmc5883l.c +++ b/src/main/drivers/compass/compass_hmc5883l.c @@ -188,7 +188,7 @@ static void hmc5883lConfigureDataReadyInterruptHandling(magDev_t* mag) #ifdef USE_MAG_SPI_HMC5883 static void hmc5883SpiInit(busDevice_t *busdev) -{ +{ IOHi(busdev->busdev_u.spi.csnPin); // Disable IOInit(busdev->busdev_u.spi.csnPin, OWNER_COMPASS_CS, 0); diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c index b55a75b359..54e8bb115c 100644 --- a/src/main/drivers/pwm_output.c +++ b/src/main/drivers/pwm_output.c @@ -140,7 +140,7 @@ static void pwmWriteDshot(uint8_t index, float value) static uint8_t loadDmaBufferDshot(uint32_t *dmaBuffer, int stride, uint16_t packet) { for (int i = 0; i < 16; i++) { - dmaBuffer[i * stride] = (packet & 0x8000) ? MOTOR_BIT_1 : MOTOR_BIT_0; // MSB first + dmaBuffer[i * stride] = (packet & 0x8000) ? MOTOR_BIT_1 : MOTOR_BIT_0; // MSB first packet <<= 1; } diff --git a/src/main/drivers/rx/rx_a7105.h b/src/main/drivers/rx/rx_a7105.h index ede80e8e0f..315327010d 100644 --- a/src/main/drivers/rx/rx_a7105.h +++ b/src/main/drivers/rx/rx_a7105.h @@ -85,7 +85,7 @@ typedef enum { A7105_32_FILTER_TEST = 0x32, } A7105Reg_t; -/* Register: A7105_00_MODE */ +/* Register: A7105_00_MODE */ #define A7105_MODE_FECF 0x40 // [0]: FEC pass. [1]: FEC error. (FECF is read only, it is updated internally while receiving every packet.) #define A7105_MODE_CRCF 0x20 // [0]: CRC pass. [1]: CRC error. (CRCF is read only, it is updated internally while receiving every packet.) #define A7105_MODE_CER 0x10 // [0]: RF chip is disabled. [1]: RF chip is enabled. diff --git a/src/main/drivers/sdio_stdlib.c b/src/main/drivers/sdio_stdlib.c index 984ccf57a1..8969a190ca 100644 --- a/src/main/drivers/sdio_stdlib.c +++ b/src/main/drivers/sdio_stdlib.c @@ -4,50 +4,50 @@ * @author MCD Application Team * @version V1.0.3 * @date 13-November-2013 - * @brief This file provides a set of functions needed to manage the SDIO SD - * Card memory mounted on STM324x9I-EVAL evaluation board. - * - * + * @brief This file provides a set of functions needed to manage the SDIO SD + * Card memory mounted on STM324x9I-EVAL evaluation board. + * + * * @verbatim * * =================================================================== * How to use this driver * =================================================================== - * It implements a high level communication layer for read and write - * from/to this memory. The needed STM32 hardware resources (SDIO and - * GPIO) are defined in stm324x9i_eval.h file, and the initialization is - * performed in SD_LowLevel_Init() function declared in stm324x9i_eval.c + * It implements a high level communication layer for read and write + * from/to this memory. The needed STM32 hardware resources (SDIO and + * GPIO) are defined in stm324x9i_eval.h file, and the initialization is + * performed in SD_LowLevel_Init() function declared in stm324x9i_eval.c * file. - * You can easily tailor this driver to any other development board, - * by just adapting the defines for hardware resources and + * You can easily tailor this driver to any other development board, + * by just adapting the defines for hardware resources and * SD_LowLevel_Init() function. * * A - SD Card Initialization and configuration - * ============================================ - * - To initialize the SD Card, use the SD_Init() function. It - * Initializes the SD Card and put it into StandBy State (Ready + * ============================================ + * - To initialize the SD Card, use the SD_Init() function. It + * Initializes the SD Card and put it into StandBy State (Ready * for data transfer). This function provides the following operations: * * 1 - Apply the SD Card initialization process at 400KHz and check - * the SD Card type (Standard Capacity or High Capacity). You - * can change or adapt this frequency by adjusting the - * "SDIO_INIT_CLK_DIV" define inside the stm324x9i_eval.h file. + * the SD Card type (Standard Capacity or High Capacity). You + * can change or adapt this frequency by adjusting the + * "SDIO_INIT_CLK_DIV" define inside the stm324x9i_eval.h file. * The SD Card frequency (SDIO_CK) is computed as follows: * * +---------------------------------------------+ * | SDIO_CK = SDIOCLK / (SDIO_INIT_CLK_DIV + 2) | * +---------------------------------------------+ * - * In initialization mode and according to the SD Card standard, + * In initialization mode and according to the SD Card standard, * make sure that the SDIO_CK frequency doesn't exceed 400KHz. * * 2 - Get the SD CID and CSD data. All these information are * managed by the SDCardInfo structure. This structure provides - * also ready computed SD Card capacity and Block size. + * also ready computed SD Card capacity and Block size. * * 3 - Configure the SD Card Data transfer frequency. By Default, * the card transfer frequency is set to 24MHz. You can change - * or adapt this frequency by adjusting the "SDIO_TRANSFER_CLK_DIV" + * or adapt this frequency by adjusting the "SDIO_TRANSFER_CLK_DIV" * define inside the stm324x9i_eval.h file. * The SD Card frequency (SDIO_CK) is computed as follows: * @@ -55,11 +55,11 @@ * | SDIO_CK = SDIOCLK / (SDIO_INIT_CLK_DIV + 2) | * +---------------------------------------------+ * - * In transfer mode and according to the SD Card standard, + * In transfer mode and according to the SD Card standard, * make sure that the SDIO_CK frequency doesn't exceed 25MHz * and 50MHz in High-speed mode switch. * To be able to use a frequency higher than 24MHz, you should - * use the SDIO peripheral in bypass mode. Refer to the + * use the SDIO peripheral in bypass mode. Refer to the * corresponding reference manual for more details. * * 4 - Select the corresponding SD Card according to the address @@ -68,69 +68,69 @@ * 5 - Configure the SD Card in wide bus mode: 4-bits data. * * B - SD Card Read operation - * ========================== + * ========================== * - You can read SD card by using two functions : SD_ReadBlock() and * SD_ReadMultiBlocks() functions. These functions support only * 512-byte block length. * - The SD_ReadBlock() function reads only one block (512-byte). This - * function can transfer the data using DMA controller or using - * polling mode. To select between DMA or polling mode refer to + * function can transfer the data using DMA controller or using + * polling mode. To select between DMA or polling mode refer to * "SD_DMA_MODE" or "SD_POLLING_MODE" inside the stm324x9i_eval_sdio_sd.h * file and uncomment the corresponding line. By default the SD DMA - * mode is selected - * - The SD_ReadMultiBlocks() function reads only mutli blocks (multiple - * of 512-byte). + * mode is selected + * - The SD_ReadMultiBlocks() function reads only mutli blocks (multiple + * of 512-byte). * - Any read operation should be followed by two functions to check * if the DMA Controller and SD Card status. * - SD_ReadWaitOperation(): this function insure that the DMA * controller has finished all data transfer. - * - SD_GetStatus(): to check that the SD Card has finished the + * - SD_GetStatus(): to check that the SD Card has finished the * data transfer and it is ready for data. * - * - The DMA transfer is finished by the SDIO Data End interrupt. + * - The DMA transfer is finished by the SDIO Data End interrupt. * User has to call the SD_ProcessIRQ() function inside the SDIO_IRQHandler() * and SD_ProcessDMAIRQ() function inside the DMA2_Streamx_IRQHandler(). - * Don't forget to enable the SDIO_IRQn and DMA2_Stream3_IRQn or + * Don't forget to enable the SDIO_IRQn and DMA2_Stream3_IRQn or * DMA2_Stream6_IRQn interrupts using the NVIC controller. * * C - SD Card Write operation - * =========================== + * =========================== * - You can write SD card by using two function: SD_WriteBlock() and * SD_WriteMultiBlocks() functions. These functions support only - * 512-byte block length. + * 512-byte block length. * - The SD_WriteBlock() function write only one block (512-byte). This - * function can transfer the data using DMA controller or using - * polling mode. To select between DMA or polling mode refer to + * function can transfer the data using DMA controller or using + * polling mode. To select between DMA or polling mode refer to * "SD_DMA_MODE" or "SD_POLLING_MODE" inside the stm324x9i_eval_sdio_sd.h * file and uncomment the corresponding line. By default the SD DMA - * mode is selected - * - The SD_WriteMultiBlocks() function write only mutli blocks (multiple - * of 512-byte). + * mode is selected + * - The SD_WriteMultiBlocks() function write only mutli blocks (multiple + * of 512-byte). * - Any write operation should be followed by two functions to check * if the DMA Controller and SD Card status. * - SD_ReadWaitOperation(): this function insure that the DMA * controller has finished all data transfer. - * - SD_GetStatus(): to check that the SD Card has finished the + * - SD_GetStatus(): to check that the SD Card has finished the * data transfer and it is ready for data. * - * - The DMA transfer is finished by the SDIO Data End interrupt. + * - The DMA transfer is finished by the SDIO Data End interrupt. * User has to call the SD_ProcessIRQ() function inside the SDIO_IRQHandler() * and SD_ProcessDMAIRQ() function inside the DMA2_Streamx_IRQHandler(). - * Don't forget to enable the SDIO_IRQn and DMA2_Stream3_IRQn or + * Don't forget to enable the SDIO_IRQn and DMA2_Stream3_IRQn or * DMA2_Stream6_IRQn interrupts using the NVIC controller. * * * D - SD card status - * ================== + * ================== * - At any time, you can check the SD Card status and get the SD card * state by using the SD_GetStatus() function. This function checks * first if the SD card is still connected and then get the internal - * SD Card transfer state. - * - You can also get the SD card SD Status register by using the + * SD Card transfer state. + * - You can also get the SD card SD Status register by using the * SD_SendSDStatus() function. * * E - Programming Model (Selecting DMA for SDIO data Transfer) - * ============================================================ + * ============================================================ * Status = SD_Init(); // Initialization Step as described in section A * * // SDIO Interrupt ENABLE @@ -143,7 +143,7 @@ * NVIC_InitStructure.NVIC_IRQChannel = SD_SDIO_DMA_IRQn; * NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 1; * NVIC_Init(&NVIC_InitStructure); - * + * * // Write operation as described in Section C * Status = SD_WriteBlock(buffer, address, 512); * Status = SD_WaitWriteOperation(); @@ -162,27 +162,27 @@ * Status = SD_WaitReadOperation(); * while(SD_GetStatus() != SD_TRANSFER_OK); * - * - Add the SDIO and DMA2 StreamX (3 or 6) IRQ Handlers: + * - Add the SDIO and DMA2 StreamX (3 or 6) IRQ Handlers: * void SDIO_IRQHandler(void) * { - * SD_ProcessIRQ(); - * } + * SD_ProcessIRQ(); + * } * void SD_SDIO_DMA_IRQHANDLER(void) * { - * SD_ProcessDMAIRQ(); - * } + * SD_ProcessDMAIRQ(); + * } * * F - Programming Model (Selecting Polling for SDIO data Transfer) * ================================================================ - * //Only SD Card Single Block operation are managed. + * //Only SD Card Single Block operation are managed. * Status = SD_Init(); // Initialization Step as described in section - * + * * // Write operation as described in Section C * Status = SD_WriteBlock(buffer, address, 512); * * // Read operation as described in Section B * Status = SD_ReadBlock(buffer, address, 512); - * + * * STM32 SDIO Pin assignment * ========================= * +-----------------------------------------------------------+ @@ -213,14 +213,14 @@ * * 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. * ****************************************************************************** - */ + */ /* Includes ------------------------------------------------------------------*/ #include "sdio_stdlib.h" @@ -241,14 +241,14 @@ #define HIGH 1 #define LOW 0 -/** - * @brief SDIO Static flags, TimeOut, FIFO Address +/** + * @brief SDIO Static flags, TimeOut, FIFO Address */ #define SDIO_STATIC_FLAGS ((uint32_t)0x000005FF) #define SDIO_CMD0TIMEOUT ((uint32_t)0x00010000) -/** - * @brief Mask for errors Card Status R1 (OCR Register) +/** + * @brief Mask for errors Card Status R1 (OCR Register) */ #define SD_OCR_ADDR_OUT_OF_RANGE ((uint32_t)0x80000000) #define SD_OCR_ADDR_MISALIGNED ((uint32_t)0x40000000) @@ -271,8 +271,8 @@ #define SD_OCR_AKE_SEQ_ERROR ((uint32_t)0x00000008) #define SD_OCR_ERRORBITS ((uint32_t)0xFDFFE008) -/** - * @brief Masks for R6 Response +/** + * @brief Masks for R6 Response */ #define SD_R6_GENERAL_UNKNOWN_ERROR ((uint32_t)0x00002000) #define SD_R6_ILLEGAL_CMD ((uint32_t)0x00004000) @@ -300,29 +300,29 @@ #define SD_HALFFIFO ((uint32_t)0x00000008) #define SD_HALFFIFOBYTES ((uint32_t)0x00000020) -/** - * @brief Command Class Supported +/** + * @brief Command Class Supported */ #define SD_CCCC_LOCK_UNLOCK ((uint32_t)0x00000080) #define SD_CCCC_WRITE_PROT ((uint32_t)0x00000040) #define SD_CCCC_ERASE ((uint32_t)0x00000020) -/** +/** * @brief Following commands are SD Card Specific commands. - * SDIO_APP_CMD should be sent before sending these commands. + * SDIO_APP_CMD should be sent before sending these commands. */ #define SDIO_SEND_IF_COND ((uint32_t)0x00000008) /** * @} - */ + */ /** @defgroup STM324x9I_EVAL_SDIO_SD_Private_Macros * @{ */ /** * @} - */ + */ /** @defgroup STM324x9I_EVAL_SDIO_SD_Private_Variables * @{ @@ -341,7 +341,7 @@ SDIO_CmdInitTypeDef SDIO_CmdInitStructure; SDIO_DataInitTypeDef SDIO_DataInitStructure; /** * @} - */ + */ /** @defgroup STM324x9I_EVAL_SDIO_SD_Private_Function_Prototypes @@ -357,57 +357,57 @@ static SD_Error SDEnWideBus(FunctionalState NewState); static SD_Error IsCardProgramming(uint8_t *pstatus); static SD_Error FindSCR(uint16_t rca, uint32_t *pscr); uint8_t convert_from_bytes_to_power_of_two(uint16_t NumberOfBytes); - + /** * @} - */ + */ /** @defgroup STM324x9I_EVAL_SDIO_SD_Private_Functions * @{ - */ + */ -#define SDIO_DATA IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_100MHz, GPIO_OType_PP, GPIO_PuPd_NOPULL) -#define SDIO_CMD IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_100MHz, GPIO_OType_PP, GPIO_PuPd_NOPULL) -#define SDIO_CLK IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_100MHz, GPIO_OType_PP, GPIO_PuPd_NOPULL) -#define SDIO_DET IOCFG_IPU +#define SDIO_DATA IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_100MHz, GPIO_OType_PP, GPIO_PuPd_NOPULL) +#define SDIO_CMD IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_100MHz, GPIO_OType_PP, GPIO_PuPd_NOPULL) +#define SDIO_CLK IO_CONFIG(GPIO_Mode_AF, GPIO_Speed_100MHz, GPIO_OType_PP, GPIO_PuPd_NOPULL) +#define SDIO_DET IOCFG_IPU static void SD_LowLevel_Init(void) { - RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD, ENABLE); + RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD, ENABLE); - //Configure Pins - const IO_t d0 = IOGetByTag(IO_TAG(PC8)); - const IO_t d1 = IOGetByTag(IO_TAG(PC9)); - const IO_t d2 = IOGetByTag(IO_TAG(PC10)); - const IO_t d3 = IOGetByTag(IO_TAG(PC11)); - const IO_t clk = IOGetByTag(IO_TAG(PC12)); - const IO_t cmd = IOGetByTag(IO_TAG(PD2)); + //Configure Pins + const IO_t d0 = IOGetByTag(IO_TAG(PC8)); + const IO_t d1 = IOGetByTag(IO_TAG(PC9)); + const IO_t d2 = IOGetByTag(IO_TAG(PC10)); + const IO_t d3 = IOGetByTag(IO_TAG(PC11)); + const IO_t clk = IOGetByTag(IO_TAG(PC12)); + const IO_t cmd = IOGetByTag(IO_TAG(PD2)); - IOInit(d0, OWNER_SDCARD, 0); - IOInit(d1, OWNER_SDCARD, 0); - IOInit(d2, OWNER_SDCARD, 0); - IOInit(d3, OWNER_SDCARD, 0); - IOInit(clk, OWNER_SDCARD, 0); - IOInit(cmd, OWNER_SDCARD, 0); + IOInit(d0, OWNER_SDCARD, 0); + IOInit(d1, OWNER_SDCARD, 0); + IOInit(d2, OWNER_SDCARD, 0); + IOInit(d3, OWNER_SDCARD, 0); + IOInit(clk, OWNER_SDCARD, 0); + IOInit(cmd, OWNER_SDCARD, 0); - IOConfigGPIOAF(d0, SDIO_DATA, GPIO_AF_SDIO); - IOConfigGPIOAF(d1, SDIO_DATA, GPIO_AF_SDIO); - IOConfigGPIOAF(d2, SDIO_DATA, GPIO_AF_SDIO); - IOConfigGPIOAF(d3, SDIO_DATA, GPIO_AF_SDIO); - IOConfigGPIOAF(clk, SDIO_CLK, GPIO_AF_SDIO); - IOConfigGPIOAF(cmd, SDIO_CMD, GPIO_AF_SDIO); + IOConfigGPIOAF(d0, SDIO_DATA, GPIO_AF_SDIO); + IOConfigGPIOAF(d1, SDIO_DATA, GPIO_AF_SDIO); + IOConfigGPIOAF(d2, SDIO_DATA, GPIO_AF_SDIO); + IOConfigGPIOAF(d3, SDIO_DATA, GPIO_AF_SDIO); + IOConfigGPIOAF(clk, SDIO_CLK, GPIO_AF_SDIO); + IOConfigGPIOAF(cmd, SDIO_CMD, GPIO_AF_SDIO); #ifdef SDCARD_DETECT_PIN - const IO_t sd_det = IOGetByTag(IO_TAG(SDCARD_DETECT_PIN)); - IOInit(sd_det, OWNER_SDCARD, 0); - IOConfigGPIO(sd_det, SDIO_DET); + const IO_t sd_det = IOGetByTag(IO_TAG(SDCARD_DETECT_PIN)); + IOInit(sd_det, OWNER_SDCARD, 0); + IOConfigGPIO(sd_det, SDIO_DET); #endif - /* Enable the SDIO APB2 Clock */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_SDIO, ENABLE); + /* Enable the SDIO APB2 Clock */ + RCC_APB2PeriphClockCmd(RCC_APB2Periph_SDIO, ENABLE); - /* Enable the DMA2 Clock */ - RCC_AHB1PeriphClockCmd(SD_SDIO_DMA_CLK, ENABLE); + /* Enable the DMA2 Clock */ + RCC_AHB1PeriphClockCmd(SD_SDIO_DMA_CLK, ENABLE); NVIC_InitTypeDef NVIC_InitStructure; NVIC_InitStructure.NVIC_IRQChannel = SDIO_IRQn; @@ -419,128 +419,128 @@ static void SD_LowLevel_Init(void) { static void SD_LowLevel_DeInit(void) { - NVIC_InitTypeDef NVIC_InitStructure; - NVIC_InitStructure.NVIC_IRQChannel = SDIO_IRQn; - NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(1); - NVIC_InitStructure.NVIC_IRQChannelSubPriority = NVIC_PRIORITY_SUB(2); - NVIC_InitStructure.NVIC_IRQChannelCmd = DISABLE; - NVIC_Init(&NVIC_InitStructure); + NVIC_InitTypeDef NVIC_InitStructure; + NVIC_InitStructure.NVIC_IRQChannel = SDIO_IRQn; + NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = NVIC_PRIORITY_BASE(1); + NVIC_InitStructure.NVIC_IRQChannelSubPriority = NVIC_PRIORITY_SUB(2); + NVIC_InitStructure.NVIC_IRQChannelCmd = DISABLE; + NVIC_Init(&NVIC_InitStructure); - /*!< Disable SDIO Clock */ - SDIO_ClockCmd(DISABLE); + /*!< Disable SDIO Clock */ + SDIO_ClockCmd(DISABLE); - /*!< Set Power State to OFF */ - SDIO_SetPowerState(SDIO_PowerState_OFF); + /*!< Set Power State to OFF */ + SDIO_SetPowerState(SDIO_PowerState_OFF); - /*!< DeInitializes the SDIO peripheral */ - SDIO_DeInit(); + /*!< DeInitializes the SDIO peripheral */ + SDIO_DeInit(); - /* Disable the SDIO APB2 Clock */ - RCC_APB2PeriphClockCmd(RCC_APB2Periph_SDIO, DISABLE); + /* Disable the SDIO APB2 Clock */ + RCC_APB2PeriphClockCmd(RCC_APB2Periph_SDIO, DISABLE); - //Configure Pins - const IO_t d0 = IOGetByTag(IO_TAG(PC8)); - const IO_t d1 = IOGetByTag(IO_TAG(PC9)); - const IO_t d2 = IOGetByTag(IO_TAG(PC10)); - const IO_t d3 = IOGetByTag(IO_TAG(PC11)); - const IO_t clk = IOGetByTag(IO_TAG(PC12)); - const IO_t cmd = IOGetByTag(IO_TAG(PD2)); + //Configure Pins + const IO_t d0 = IOGetByTag(IO_TAG(PC8)); + const IO_t d1 = IOGetByTag(IO_TAG(PC9)); + const IO_t d2 = IOGetByTag(IO_TAG(PC10)); + const IO_t d3 = IOGetByTag(IO_TAG(PC11)); + const IO_t clk = IOGetByTag(IO_TAG(PC12)); + const IO_t cmd = IOGetByTag(IO_TAG(PD2)); - IOInit(d0, OWNER_FREE, 0); - IOInit(d1, OWNER_FREE, 0); - IOInit(d2, OWNER_FREE, 0); - IOInit(d3, OWNER_FREE, 0); - IOInit(clk, OWNER_FREE, 0); - IOInit(cmd, OWNER_FREE, 0); + IOInit(d0, OWNER_FREE, 0); + IOInit(d1, OWNER_FREE, 0); + IOInit(d2, OWNER_FREE, 0); + IOInit(d3, OWNER_FREE, 0); + IOInit(clk, OWNER_FREE, 0); + IOInit(cmd, OWNER_FREE, 0); - IOConfigGPIOAF(d0, IOCFG_IN_FLOATING, GPIO_AF_SDIO); - IOConfigGPIOAF(d1, IOCFG_IN_FLOATING, GPIO_AF_SDIO); - IOConfigGPIOAF(d2, IOCFG_IN_FLOATING, GPIO_AF_SDIO); - IOConfigGPIOAF(d3, IOCFG_IN_FLOATING, GPIO_AF_SDIO); - IOConfigGPIOAF(clk, IOCFG_IN_FLOATING, GPIO_AF_SDIO); - IOConfigGPIOAF(cmd, IOCFG_IN_FLOATING, GPIO_AF_SDIO); + IOConfigGPIOAF(d0, IOCFG_IN_FLOATING, GPIO_AF_SDIO); + IOConfigGPIOAF(d1, IOCFG_IN_FLOATING, GPIO_AF_SDIO); + IOConfigGPIOAF(d2, IOCFG_IN_FLOATING, GPIO_AF_SDIO); + IOConfigGPIOAF(d3, IOCFG_IN_FLOATING, GPIO_AF_SDIO); + IOConfigGPIOAF(clk, IOCFG_IN_FLOATING, GPIO_AF_SDIO); + IOConfigGPIOAF(cmd, IOCFG_IN_FLOATING, GPIO_AF_SDIO); #ifdef SDCARD_DETECT_PIN - const IO_t sd_det = IOGetByTag(IO_TAG(SDCARD_DETECT_PIN)); - IOInit(sd_det, OWNER_FREE, 0); - IOConfigGPIO(cmd, SDIO_DET); + const IO_t sd_det = IOGetByTag(IO_TAG(SDCARD_DETECT_PIN)); + IOInit(sd_det, OWNER_FREE, 0); + IOConfigGPIO(cmd, SDIO_DET); #endif } void SD_LowLevel_DMA_TxConfig(uint32_t *BufferSRC, uint32_t BufferSize) { - DMA_InitTypeDef SDDMA_InitStructure; + DMA_InitTypeDef SDDMA_InitStructure; - DMA_ClearFlag(SD_SDIO_DMA_STREAM, SD_SDIO_DMA_FLAG_FEIF | SD_SDIO_DMA_FLAG_DMEIF | SD_SDIO_DMA_FLAG_TEIF | SD_SDIO_DMA_FLAG_HTIF | SD_SDIO_DMA_FLAG_TCIF); + DMA_ClearFlag(SD_SDIO_DMA_STREAM, SD_SDIO_DMA_FLAG_FEIF | SD_SDIO_DMA_FLAG_DMEIF | SD_SDIO_DMA_FLAG_TEIF | SD_SDIO_DMA_FLAG_HTIF | SD_SDIO_DMA_FLAG_TCIF); - /* DMA2 Stream3 or Stream6 disable */ - DMA_Cmd(SD_SDIO_DMA_STREAM, DISABLE); + /* DMA2 Stream3 or Stream6 disable */ + DMA_Cmd(SD_SDIO_DMA_STREAM, DISABLE); - /* DMA2 Stream3 or Stream6 Config */ - DMA_DeInit(SD_SDIO_DMA_STREAM); + /* DMA2 Stream3 or Stream6 Config */ + DMA_DeInit(SD_SDIO_DMA_STREAM); - SDDMA_InitStructure.DMA_Channel = SD_SDIO_DMA_CHANNEL; - SDDMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)SDIO_FIFO_ADDRESS; - SDDMA_InitStructure.DMA_Memory0BaseAddr = (uint32_t)BufferSRC; - SDDMA_InitStructure.DMA_DIR = DMA_DIR_MemoryToPeripheral; - SDDMA_InitStructure.DMA_BufferSize = BufferSize; - SDDMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; - SDDMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; - SDDMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word; - SDDMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word; - SDDMA_InitStructure.DMA_Mode = DMA_Mode_Normal; - SDDMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh; - SDDMA_InitStructure.DMA_FIFOMode = DMA_FIFOMode_Enable; - SDDMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_Full; - SDDMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_INC4; - SDDMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_INC4; + SDDMA_InitStructure.DMA_Channel = SD_SDIO_DMA_CHANNEL; + SDDMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)SDIO_FIFO_ADDRESS; + SDDMA_InitStructure.DMA_Memory0BaseAddr = (uint32_t)BufferSRC; + SDDMA_InitStructure.DMA_DIR = DMA_DIR_MemoryToPeripheral; + SDDMA_InitStructure.DMA_BufferSize = BufferSize; + SDDMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; + SDDMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; + SDDMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word; + SDDMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word; + SDDMA_InitStructure.DMA_Mode = DMA_Mode_Normal; + SDDMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh; + SDDMA_InitStructure.DMA_FIFOMode = DMA_FIFOMode_Enable; + SDDMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_Full; + SDDMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_INC4; + SDDMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_INC4; - dmaInit(dmaGetIdentifier(DMA2_Stream3), OWNER_SDCARD, 0); - DMA_Init(SD_SDIO_DMA_STREAM, &SDDMA_InitStructure); - dmaSetHandler(dmaGetIdentifier(SD_SDIO_DMA_STREAM), SD_ProcessDMAIRQ, 2, 0); - DMA_ITConfig(SD_SDIO_DMA_STREAM, DMA_IT_TC, ENABLE); - DMA_FlowControllerConfig(SD_SDIO_DMA_STREAM, DMA_FlowCtrl_Peripheral); + dmaInit(dmaGetIdentifier(DMA2_Stream3), OWNER_SDCARD, 0); + DMA_Init(SD_SDIO_DMA_STREAM, &SDDMA_InitStructure); + dmaSetHandler(dmaGetIdentifier(SD_SDIO_DMA_STREAM), SD_ProcessDMAIRQ, 2, 0); + DMA_ITConfig(SD_SDIO_DMA_STREAM, DMA_IT_TC, ENABLE); + DMA_FlowControllerConfig(SD_SDIO_DMA_STREAM, DMA_FlowCtrl_Peripheral); - /* DMA2 Stream3 or Stream6 enable */ - DMA_Cmd(SD_SDIO_DMA_STREAM, ENABLE); + /* DMA2 Stream3 or Stream6 enable */ + DMA_Cmd(SD_SDIO_DMA_STREAM, ENABLE); } void SD_LowLevel_DMA_RxConfig(uint32_t *BufferDST, uint32_t BufferSize) { - DMA_InitTypeDef SDDMA_InitStructure; + DMA_InitTypeDef SDDMA_InitStructure; - DMA_ClearFlag(SD_SDIO_DMA_STREAM, SD_SDIO_DMA_FLAG_FEIF | SD_SDIO_DMA_FLAG_DMEIF | SD_SDIO_DMA_FLAG_TEIF | SD_SDIO_DMA_FLAG_HTIF | SD_SDIO_DMA_FLAG_TCIF); + DMA_ClearFlag(SD_SDIO_DMA_STREAM, SD_SDIO_DMA_FLAG_FEIF | SD_SDIO_DMA_FLAG_DMEIF | SD_SDIO_DMA_FLAG_TEIF | SD_SDIO_DMA_FLAG_HTIF | SD_SDIO_DMA_FLAG_TCIF); - /* DMA2 Stream3 or Stream6 disable */ - DMA_Cmd(SD_SDIO_DMA_STREAM, DISABLE); + /* DMA2 Stream3 or Stream6 disable */ + DMA_Cmd(SD_SDIO_DMA_STREAM, DISABLE); - /* DMA2 Stream3 or Stream6 Config */ - DMA_DeInit(SD_SDIO_DMA_STREAM); + /* DMA2 Stream3 or Stream6 Config */ + DMA_DeInit(SD_SDIO_DMA_STREAM); - SDDMA_InitStructure.DMA_Channel = SD_SDIO_DMA_CHANNEL; - SDDMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)SDIO_FIFO_ADDRESS; - SDDMA_InitStructure.DMA_Memory0BaseAddr = (uint32_t)BufferDST; - SDDMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralToMemory; - SDDMA_InitStructure.DMA_BufferSize = BufferSize; - SDDMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; - SDDMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; - SDDMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word; - SDDMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word; - SDDMA_InitStructure.DMA_Mode = DMA_Mode_Normal; - SDDMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh; - SDDMA_InitStructure.DMA_FIFOMode = DMA_FIFOMode_Enable; - SDDMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_Full; - SDDMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_INC4; - SDDMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_INC4; + SDDMA_InitStructure.DMA_Channel = SD_SDIO_DMA_CHANNEL; + SDDMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)SDIO_FIFO_ADDRESS; + SDDMA_InitStructure.DMA_Memory0BaseAddr = (uint32_t)BufferDST; + SDDMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralToMemory; + SDDMA_InitStructure.DMA_BufferSize = BufferSize; + SDDMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; + SDDMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; + SDDMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Word; + SDDMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Word; + SDDMA_InitStructure.DMA_Mode = DMA_Mode_Normal; + SDDMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh; + SDDMA_InitStructure.DMA_FIFOMode = DMA_FIFOMode_Enable; + SDDMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_Full; + SDDMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_INC4; + SDDMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_INC4; - dmaInit(dmaGetIdentifier(DMA2_Stream3), OWNER_SDCARD, 0); - DMA_Init(SD_SDIO_DMA_STREAM, &SDDMA_InitStructure); - dmaSetHandler(dmaGetIdentifier(SD_SDIO_DMA_STREAM), SD_ProcessDMAIRQ, 2, 0); - DMA_ITConfig(SD_SDIO_DMA_STREAM, DMA_IT_TC, ENABLE); - DMA_FlowControllerConfig(SD_SDIO_DMA_STREAM, DMA_FlowCtrl_Peripheral); + dmaInit(dmaGetIdentifier(DMA2_Stream3), OWNER_SDCARD, 0); + DMA_Init(SD_SDIO_DMA_STREAM, &SDDMA_InitStructure); + dmaSetHandler(dmaGetIdentifier(SD_SDIO_DMA_STREAM), SD_ProcessDMAIRQ, 2, 0); + DMA_ITConfig(SD_SDIO_DMA_STREAM, DMA_IT_TC, ENABLE); + DMA_FlowControllerConfig(SD_SDIO_DMA_STREAM, DMA_FlowCtrl_Peripheral); - /* DMA2 Stream3 or Stream6 enable */ - DMA_Cmd(SD_SDIO_DMA_STREAM, ENABLE); + /* DMA2 Stream3 or Stream6 enable */ + DMA_Cmd(SD_SDIO_DMA_STREAM, ENABLE); } /** @@ -554,7 +554,7 @@ void SD_DeInit(void) } /** - * @brief Initializes the SD Card and put it into StandBy State (Ready for data + * @brief Initializes the SD Card and put it into StandBy State (Ready for data * transfer). * @param None * @retval SD_Error: SD Card Error code. @@ -562,7 +562,7 @@ void SD_DeInit(void) SD_Error SD_Init(void) { __IO SD_Error errorstatus = SD_OK; - + /* SDIO Peripheral Low Level Init */ //TODO:Init pins here @@ -609,7 +609,7 @@ SD_Error SD_Init(void) if (errorstatus == SD_OK) { errorstatus = SD_EnableWideBusOperation(SDIO_BusWide_4b); - } + } return(errorstatus); } @@ -618,7 +618,7 @@ SD_Error SD_Init(void) * @brief Gets the cuurent sd card data transfer status. * @param None * @retval SDTransferState: Data Transfer state. - * This value can be: + * This value can be: * - SD_TRANSFER_OK: No data transfer is acting * - SD_TRANSFER_BUSY: Data transfer is acting */ @@ -627,7 +627,7 @@ SDTransferState SD_GetStatus(void) SDCardState cardstate = SD_CARD_TRANSFER; cardstate = SD_GetState(); - + if (cardstate == SD_CARD_TRANSFER) { return(SD_TRANSFER_OK); @@ -650,7 +650,7 @@ SDTransferState SD_GetStatus(void) SDCardState SD_GetState(void) { uint32_t resp1 = 0; - + if(SD_Detect()== SD_PRESENT) { if (SD_SendStatus(&resp1) != SD_OK) @@ -689,7 +689,7 @@ uint8_t SD_Detect(void) } /** - * @brief Enquires cards about their operating voltage and configures + * @brief Enquires cards about their operating voltage and configures * clock controls. * @param None * @retval SD_Error: SD Card Error code. @@ -704,7 +704,7 @@ SD_Error SD_PowerON(void) /*!< Configure the SDIO peripheral */ /*!< SDIO_CK = SDIOCLK / (SDIO_INIT_CLK_DIV + 2) */ /*!< on STM32F4xx devices, SDIOCLK is fixed to 48MHz */ - /*!< SDIO_CK for initialization should not exceed 400 KHz */ + /*!< SDIO_CK for initialization should not exceed 400 KHz */ SDIO_InitStructure.SDIO_ClockDiv = SDIO_INIT_CLK_DIV; SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising; SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable; @@ -852,7 +852,7 @@ SD_Error SD_PowerOFF(void) } /** - * @brief Intialises all cards or single card as the case may be Card(s) come + * @brief Intialises all cards or single card as the case may be Card(s) come * into standby state. * @param None * @retval SD_Error: SD Card Error code. @@ -942,7 +942,7 @@ SD_Error SD_InitializeCards(void) /** * @brief Returns information about specific card. - * @param cardinfo: pointer to a SD_CardInfo structure that contains all SD card + * @param cardinfo: pointer to a SD_CardInfo structure that contains all SD card * information. * @retval SD_Error: SD Card Error code. */ @@ -1012,7 +1012,7 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo) /*!< Byte 10 */ tmp = (uint8_t)((CSD_Tab[2] & 0x0000FF00) >> 8); cardinfo->SD_csd.DeviceSizeMul |= (tmp & 0x80) >> 7; - + cardinfo->CardCapacity = (cardinfo->SD_csd.DeviceSize + 1) ; cardinfo->CardCapacity *= (1 << (cardinfo->SD_csd.DeviceSizeMul + 2)); cardinfo->CardBlockSize = 1 << (cardinfo->SD_csd.RdBlockLen); @@ -1036,9 +1036,9 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo) /*!< Byte 10 */ tmp = (uint8_t)((CSD_Tab[2] & 0x0000FF00) >> 8); - + cardinfo->CardCapacity = ((uint64_t)cardinfo->SD_csd.DeviceSize + 1) * 512 * 1024; - cardinfo->CardBlockSize = 512; + cardinfo->CardBlockSize = 512; } @@ -1144,14 +1144,14 @@ SD_Error SD_GetCardInfo(SD_CardInfo *cardinfo) tmp = (uint8_t)(CID_Tab[3] & 0x000000FF); cardinfo->SD_cid.CID_CRC = (tmp & 0xFE) >> 1; cardinfo->SD_cid.Reserved2 = 1; - + return(errorstatus); } /** - * @brief Enables wide bus opeartion for the requeseted card if supported by + * @brief Enables wide bus opeartion for the requeseted card if supported by * card. - * @param WideMode: Specifies the SD card wide bus mode. + * @param WideMode: Specifies the SD card wide bus mode. * This parameter can be one of the following values: * @arg SDIO_BusWide_8b: 8-bit data transfer (Only for MMC) * @arg SDIO_BusWide_4b: 4-bit data transfer @@ -1229,14 +1229,14 @@ SD_Error SD_GetCardStatus(SD_CardStatus *cardstatus) /*!< Byte 13 */ tmp = (uint8_t)((SDSTATUS_Tab[13] & 0x3)); cardstatus->ERASE_OFFSET = tmp; - + return(errorstatus); } /** - * @brief Enables wide bus opeartion for the requeseted card if supported by + * @brief Enables wide bus opeartion for the requeseted card if supported by * card. - * @param WideMode: Specifies the SD card wide bus mode. + * @param WideMode: Specifies the SD card wide bus mode. * This parameter can be one of the following values: * @arg SDIO_BusWide_8b: 8-bit data transfer (Only for MMC) * @arg SDIO_BusWide_4b: 4-bit data transfer @@ -1267,7 +1267,7 @@ SD_Error SD_EnableWideBusOperation(uint32_t WideMode) if (SD_OK == errorstatus) { /*!< Configure the SDIO peripheral */ - SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV; + SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV; SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising; SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable; SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable; @@ -1283,7 +1283,7 @@ SD_Error SD_EnableWideBusOperation(uint32_t WideMode) if (SD_OK == errorstatus) { /*!< Configure the SDIO peripheral */ - SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV; + SDIO_InitStructure.SDIO_ClockDiv = SDIO_TRANSFER_CLK_DIV; SDIO_InitStructure.SDIO_ClockEdge = SDIO_ClockEdge_Rising; SDIO_InitStructure.SDIO_ClockBypass = SDIO_ClockBypass_Disable; SDIO_InitStructure.SDIO_ClockPowerSave = SDIO_ClockPowerSave_Disable; @@ -1321,29 +1321,29 @@ SD_Error SD_SelectDeselect(uint64_t addr) /** * @brief Allows to read one block from a specified address in a card. The Data - * transfer can be managed by DMA mode or Polling mode. - * @note This operation should be followed by two functions to check if the + * transfer can be managed by DMA mode or Polling mode. + * @note This operation should be followed by two functions to check if the * DMA Controller and SD Card status. * - SD_ReadWaitOperation(): this function insure that the DMA * controller has finished all data transfer. - * - SD_GetStatus(): to check that the SD Card has finished the - * data transfer and it is ready for data. + * - SD_GetStatus(): to check that the SD Card has finished the + * data transfer and it is ready for data. * @param readbuff: pointer to the buffer that will contain the received data - * @param ReadAddr: Address from where data are to be read. + * @param ReadAddr: Address from where data are to be read. * @param BlockSize: the SD card Data block size. The Block size should be 512. * @retval SD_Error: SD Card Error code. */ SD_Error SD_ReadBlock(uint8_t *readbuff, uint64_t ReadAddr, uint16_t BlockSize) { SD_Error errorstatus = SD_OK; -#if defined (SD_POLLING_MODE) +#if defined (SD_POLLING_MODE) uint32_t count = 0, *tempbuff = (uint32_t *)readbuff; #endif TransferError = SD_OK; TransferEnd = 0; StopCondition = 0; - + SDIO->DCTRL = 0x0; #if defined (SD_DMA_MODE) @@ -1351,14 +1351,14 @@ SD_Error SD_ReadBlock(uint8_t *readbuff, uint64_t ReadAddr, uint16_t BlockSize) SDIO_DMACmd(ENABLE); SD_LowLevel_DMA_RxConfig((uint32_t *)readbuff, BlockSize); #endif - + if (CardType == SDIO_HIGH_CAPACITY_SD_CARD) { BlockSize = 512; ReadAddr /= 512; } - /* Set Block Size for Card */ + /* Set Block Size for Card */ SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize; SDIO_CmdInitStructure.SDIO_CmdIndex = SD_CMD_SET_BLOCKLEN; SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short; @@ -1372,7 +1372,7 @@ SD_Error SD_ReadBlock(uint8_t *readbuff, uint64_t ReadAddr, uint16_t BlockSize) { return(errorstatus); } - + SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT; SDIO_DataInitStructure.SDIO_DataLength = BlockSize; SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) 9 << 4; @@ -1396,7 +1396,7 @@ SD_Error SD_ReadBlock(uint8_t *readbuff, uint64_t ReadAddr, uint16_t BlockSize) return(errorstatus); } -#if defined (SD_POLLING_MODE) +#if defined (SD_POLLING_MODE) /*!< In case of single block transfer, no need of stop transfer at all.*/ /*!< Polling mode */ while (!(SDIO->STA &(SDIO_FLAG_RXOVERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_DBCKEND | SDIO_FLAG_STBITERR))) @@ -1442,7 +1442,7 @@ SD_Error SD_ReadBlock(uint8_t *readbuff, uint64_t ReadAddr, uint16_t BlockSize) tempbuff++; count--; } - + /*!< Clear all the static flags */ SDIO_ClearFlag(SDIO_STATIC_FLAGS); @@ -1453,13 +1453,13 @@ SD_Error SD_ReadBlock(uint8_t *readbuff, uint64_t ReadAddr, uint16_t BlockSize) /** * @brief Allows to read blocks from a specified address in a card. The Data - * transfer can be managed by DMA mode or Polling mode. - * @note This operation should be followed by two functions to check if the + * transfer can be managed by DMA mode or Polling mode. + * @note This operation should be followed by two functions to check if the * DMA Controller and SD Card status. * - SD_ReadWaitOperation(): this function insure that the DMA * controller has finished all data transfer. - * - SD_GetStatus(): to check that the SD Card has finished the - * data transfer and it is ready for data. + * - SD_GetStatus(): to check that the SD Card has finished the + * data transfer and it is ready for data. * @param readbuff: pointer to the buffer that will contain the received data. * @param ReadAddr: Address from where data are to be read. * @param BlockSize: the SD card Data block size. The Block size should be 512. @@ -1472,7 +1472,7 @@ SD_Error SD_ReadMultiBlocks(uint8_t *readbuff, uint64_t ReadAddr, uint16_t Block TransferError = SD_OK; TransferEnd = 0; StopCondition = 1; - + SDIO->DCTRL = 0x0; SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_RXOVERR | SDIO_IT_STBITERR, ENABLE); @@ -1499,7 +1499,7 @@ SD_Error SD_ReadMultiBlocks(uint8_t *readbuff, uint64_t ReadAddr, uint16_t Block { return(errorstatus); } - + SDIO_DataInitStructure.SDIO_DataTimeOut = SD_DATATIMEOUT; SDIO_DataInitStructure.SDIO_DataLength = NumberOfBlocks * BlockSize; SDIO_DataInitStructure.SDIO_DataBlockSize = (uint32_t) 9 << 4; @@ -1527,9 +1527,9 @@ SD_Error SD_ReadMultiBlocks(uint8_t *readbuff, uint64_t ReadAddr, uint16_t Block } /** - * @brief This function waits until the SDIO DMA data transfer is finished. + * @brief This function waits until the SDIO DMA data transfer is finished. * This function should be called after SDIO_ReadMultiBlocks() function - * to insure that all data sent by the card are already transferred by + * to insure that all data sent by the card are already transferred by * the DMA controller. * @param None. * @retval SD_Error: SD Card Error code. @@ -1541,20 +1541,20 @@ SD_Error SD_WaitReadOperation(void) uint32_t timeout; timeout = SD_DATATIMEOUT; - + if ((DMAEndOfTransfer == 0x00) && (TransferEnd == 0) && (TransferError == SD_OK) && (timeout > 0)) { timeout--; return SD_REQUEST_PENDING; } - + DMAEndOfTransfer = 0x00; timeout = SD_DATATIMEOUT; - + while(((SDIO->STA & SDIO_FLAG_RXACT)) && (timeout > 0)) { - timeout--; + timeout--; } if (StopCondition == 1) @@ -1562,12 +1562,12 @@ SD_Error SD_WaitReadOperation(void) errorstatus = SD_StopTransfer(); StopCondition = 0; } - + if ((timeout == 0) && (errorstatus == SD_OK)) { errorstatus = SD_DATA_TIMEOUT; } - + /*!< Clear all the static flags */ SDIO_ClearFlag(SDIO_STATIC_FLAGS); @@ -1577,21 +1577,21 @@ SD_Error SD_WaitReadOperation(void) } else { - return(errorstatus); + return(errorstatus); } } /** * @brief Allows to write one block starting from a specified address in a card. * The Data transfer can be managed by DMA mode or Polling mode. - * @note This operation should be followed by two functions to check if the + * @note This operation should be followed by two functions to check if the * DMA Controller and SD Card status. * - SD_ReadWaitOperation(): this function insure that the DMA * controller has finished all data transfer. - * - SD_GetStatus(): to check that the SD Card has finished the - * data transfer and it is ready for data. + * - SD_GetStatus(): to check that the SD Card has finished the + * data transfer and it is ready for data. * @param writebuff: pointer to the buffer that contain the data to be transferred. - * @param WriteAddr: Address from where data are to be read. + * @param WriteAddr: Address from where data are to be read. * @param BlockSize: the SD card Data block size. The Block size should be 512. * @retval SD_Error: SD Card Error code. */ @@ -1607,7 +1607,7 @@ SD_Error SD_WriteBlock(uint8_t *writebuff, uint64_t WriteAddr, uint16_t BlockSiz TransferError = SD_OK; TransferEnd = 0; StopCondition = 0; - + SDIO->DCTRL = 0x0; #if defined (SD_DMA_MODE) @@ -1622,7 +1622,7 @@ SD_Error SD_WriteBlock(uint8_t *writebuff, uint64_t WriteAddr, uint16_t BlockSiz WriteAddr /= 512; } - /* Set Block Size for Card */ + /* Set Block Size for Card */ SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize; SDIO_CmdInitStructure.SDIO_CmdIndex = SD_CMD_SET_BLOCKLEN; SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short; @@ -1636,7 +1636,7 @@ SD_Error SD_WriteBlock(uint8_t *writebuff, uint64_t WriteAddr, uint16_t BlockSiz { return(errorstatus); } - + /*!< Send CMD24 WRITE_SINGLE_BLOCK */ SDIO_CmdInitStructure.SDIO_Argument = (uint32_t)WriteAddr; SDIO_CmdInitStructure.SDIO_CmdIndex = SD_CMD_WRITE_SINGLE_BLOCK; @@ -1661,7 +1661,7 @@ SD_Error SD_WriteBlock(uint8_t *writebuff, uint64_t WriteAddr, uint16_t BlockSiz SDIO_DataConfig(&SDIO_DataInitStructure); /*!< In case of single data block transfer no need of stop command at all */ -#if defined (SD_POLLING_MODE) +#if defined (SD_POLLING_MODE) while (!(SDIO->STA & (SDIO_FLAG_DBCKEND | SDIO_FLAG_TXUNDERR | SDIO_FLAG_DCRCFAIL | SDIO_FLAG_DTIMEOUT | SDIO_FLAG_STBITERR))) { if (SDIO_GetFlagStatus(SDIO_FLAG_TXFIFOHE) != RESET) @@ -1717,13 +1717,13 @@ SD_Error SD_WriteBlock(uint8_t *writebuff, uint64_t WriteAddr, uint16_t BlockSiz /** * @brief Allows to write blocks starting from a specified address in a card. - * The Data transfer can be managed by DMA mode only. - * @note This operation should be followed by two functions to check if the + * The Data transfer can be managed by DMA mode only. + * @note This operation should be followed by two functions to check if the * DMA Controller and SD Card status. * - SD_ReadWaitOperation(): this function insure that the DMA * controller has finished all data transfer. - * - SD_GetStatus(): to check that the SD Card has finished the - * data transfer and it is ready for data. + * - SD_GetStatus(): to check that the SD Card has finished the + * data transfer and it is ready for data. * @param WriteAddr: Address from where data are to be read. * @param writebuff: pointer to the buffer that contain the data to be transferred. * @param BlockSize: the SD card Data block size. The Block size should be 512. @@ -1738,7 +1738,7 @@ SD_Error SD_WriteMultiBlocks(uint8_t *writebuff, uint64_t WriteAddr, uint16_t Bl TransferEnd = 0; StopCondition = 1; SDIO->DCTRL = 0x0; - + SDIO_ITConfig(SDIO_IT_DCRCFAIL | SDIO_IT_DTIMEOUT | SDIO_IT_DATAEND | SDIO_IT_TXUNDERR | SDIO_IT_STBITERR, ENABLE); SD_LowLevel_DMA_TxConfig((uint32_t *)writebuff, (NumberOfBlocks * BlockSize)); SDIO_DMACmd(ENABLE); @@ -1749,7 +1749,7 @@ SD_Error SD_WriteMultiBlocks(uint8_t *writebuff, uint64_t WriteAddr, uint16_t Bl WriteAddr /= 512; } - /* Set Block Size for Card */ + /* Set Block Size for Card */ SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) BlockSize; SDIO_CmdInitStructure.SDIO_CmdIndex = SD_CMD_SET_BLOCKLEN; SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short; @@ -1763,7 +1763,7 @@ SD_Error SD_WriteMultiBlocks(uint8_t *writebuff, uint64_t WriteAddr, uint16_t Bl { return(errorstatus); } - + /*!< To improve performance */ SDIO_CmdInitStructure.SDIO_Argument = (uint32_t) (RCA << 16); SDIO_CmdInitStructure.SDIO_CmdIndex = SD_CMD_APP_CMD; @@ -1822,10 +1822,10 @@ SD_Error SD_WriteMultiBlocks(uint8_t *writebuff, uint64_t WriteAddr, uint16_t Bl } /** - * @brief This function waits until the SDIO DMA data transfer is finished. + * @brief This function waits until the SDIO DMA data transfer is finished. * This function should be called after SDIO_WriteBlock() and - * SDIO_WriteMultiBlocks() function to insure that all data sent by the - * card are already transferred by the DMA controller. + * SDIO_WriteMultiBlocks() function to insure that all data sent by the + * card are already transferred by the DMA controller. * @param None. * @retval SD_Error: SD Card Error code. */ @@ -1835,21 +1835,21 @@ SD_Error SD_WaitWriteOperation(void) uint32_t timeout; timeout = SD_DATATIMEOUT; - + if ((DMAEndOfTransfer == 0x00) && (TransferEnd == 0) && (TransferError == SD_OK) && (timeout > 0)) { timeout--; return SD_REQUEST_PENDING; } - + DMAEndOfTransfer = 0x00; //TODO: This is bullshit it should be handled inside IRQn timeout = SD_DATATIMEOUT; - + while(((SDIO->STA & SDIO_FLAG_TXACT)) && (timeout > 0)) { - timeout--; + timeout--; } if (StopCondition == 1) @@ -1857,15 +1857,15 @@ SD_Error SD_WaitWriteOperation(void) errorstatus = SD_StopTransfer(); StopCondition = 0; } - + if ((timeout == 0) && (errorstatus == SD_OK)) { errorstatus = SD_DATA_TIMEOUT; } - + /*!< Clear all the static flags */ SDIO_ClearFlag(SDIO_STATIC_FLAGS); - + if (TransferError != SD_OK) { return(TransferError); @@ -1880,7 +1880,7 @@ SD_Error SD_WaitWriteOperation(void) * @brief Gets the cuurent data transfer state. * @param None * @retval SDTransferState: Data Transfer state. - * This value can be: + * This value can be: * - SD_TRANSFER_OK: No data transfer is acting * - SD_TRANSFER_BUSY: Data transfer is acting */ @@ -1951,7 +1951,7 @@ SD_Error SD_Erase(uint64_t startaddr, uint64_t endaddr) startaddr /= 512; endaddr /= 512; } - + /*!< According to sd-card spec 1.0 ERASE_GROUP_START (CMD32) and erase_group_end(CMD33) */ if ((SDIO_STD_CAPACITY_SD_CARD_V1_1 == CardType) || (SDIO_STD_CAPACITY_SD_CARD_V2_0 == CardType) || (SDIO_HIGH_CAPACITY_SD_CARD == CardType)) { @@ -2016,7 +2016,7 @@ SD_Error SD_Erase(uint64_t startaddr, uint64_t endaddr) /** * @brief Returns the current card's status. - * @param pcardstatus: pointer to the buffer that will contain the SD card + * @param pcardstatus: pointer to the buffer that will contain the SD card * status (Card Status register). * @retval SD_Error: SD Card Error code. */ @@ -2051,7 +2051,7 @@ SD_Error SD_SendStatus(uint32_t *pcardstatus) /** * @brief Returns the current SD card's status. - * @param psdstatus: pointer to the buffer that will contain the SD card status + * @param psdstatus: pointer to the buffer that will contain the SD card status * (SD Status register). * @retval SD_Error: SD Card Error code. */ @@ -2173,13 +2173,13 @@ SD_Error SD_SendSDStatus(uint32_t *psdstatus) * @retval SD_Error: SD Card Error code. */ SD_Error SD_ProcessIRQSrc(void) -{ +{ if (SDIO_GetITStatus(SDIO_IT_DATAEND) != RESET) { TransferError = SD_OK; SDIO_ClearITPendingBit(SDIO_IT_DATAEND); TransferEnd = 1; - } + } else if (SDIO_GetITStatus(SDIO_IT_DCRCFAIL) != RESET) { SDIO_ClearITPendingBit(SDIO_IT_DCRCFAIL); @@ -2213,7 +2213,7 @@ SD_Error SD_ProcessIRQSrc(void) } /** - * @brief This function waits until the SDIO DMA data transfer is finished. + * @brief This function waits until the SDIO DMA data transfer is finished. * @param None. * @retval None. */ @@ -2506,8 +2506,8 @@ static SD_Error CmdResp2Error(void) /** * @brief Checks for error conditions for R6 (RCA) response. * @param cmd: The sent command index. - * @param prca: pointer to the variable that will contain the SD card relative - * address RCA. + * @param prca: pointer to the variable that will contain the SD card relative + * address RCA. * @retval SD_Error: SD Card Error code. */ static SD_Error CmdResp6Error(uint8_t cmd, uint16_t *prca) @@ -2976,9 +2976,9 @@ uint8_t convert_from_bytes_to_power_of_two(uint16_t NumberOfBytes) } /** -* @brief Switch mode High-Speed +* @brief Switch mode High-Speed * @note This function must be used after "Transfer State" -* @note This operation should be followed by the configuration +* @note This operation should be followed by the configuration * of PLL to have SDIOCK clock between 67 and 75 MHz * @param None * @retval SD_Error: SD Card Error code. @@ -3004,7 +3004,7 @@ SD_Error SD_HighSpeed (void) return(errorstatus); } - /* Test the Version supported by the card*/ + /* Test the Version supported by the card*/ SD_SPEC = (scr[1] & 0x01000000)||(scr[1] & 0x02000000); if (SD_SPEC != SD_ALLZERO) @@ -3035,7 +3035,7 @@ SD_Error SD_HighSpeed (void) SDIO_CmdInitStructure.SDIO_Response = SDIO_Response_Short; SDIO_CmdInitStructure.SDIO_Wait = SDIO_Wait_No; SDIO_CmdInitStructure.SDIO_CPSM = SDIO_CPSM_Enable; - SDIO_SendCommand(&SDIO_CmdInitStructure); + SDIO_SendCommand(&SDIO_CmdInitStructure); errorstatus = CmdResp1Error(SD_CMD_HS_SWITCH); if (errorstatus != SD_OK) @@ -3053,7 +3053,7 @@ SD_Error SD_HighSpeed (void) tempbuff += 8; } } - + if (SDIO_GetFlagStatus(SDIO_FLAG_DTIMEOUT) != RESET) { SDIO_ClearFlag(SDIO_FLAG_DTIMEOUT); @@ -3097,7 +3097,7 @@ SD_Error SD_HighSpeed (void) else { errorstatus=SD_UNSUPPORTED_FEATURE ; - } + } } return(errorstatus); } @@ -3108,7 +3108,7 @@ SD_Error SD_HighSpeed (void) //IRQ Handler void SDIO_IRQHandler(void) { - SD_ProcessIRQSrc(); + SD_ProcessIRQSrc(); } /** @@ -3117,6 +3117,6 @@ void SDIO_IRQHandler(void) { /** * @} - */ + */ /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ diff --git a/src/main/drivers/sdio_stdlib.h b/src/main/drivers/sdio_stdlib.h index c17720c6ec..27dd46f58f 100644 --- a/src/main/drivers/sdio_stdlib.h +++ b/src/main/drivers/sdio_stdlib.h @@ -4,7 +4,7 @@ * @author MCD Application Team * @version V1.0.3 * @date 13-November-2013 - * @brief This file contains all the functions prototypes for the SD Card + * @brief This file contains all the functions prototypes for the SD Card * stm324x9i_eval_sdio_sd driver firmware library. ****************************************************************************** * @attention @@ -17,14 +17,14 @@ * * 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. * ****************************************************************************** - */ + */ /* Define to prevent recursive inclusion -------------------------------------*/ #ifndef __SD_STDLIB_DRV @@ -43,9 +43,9 @@ typedef enum { -/** - * @brief SDIO specific error defines - */ +/** + * @brief SDIO specific error defines + */ SD_CMD_CRC_FAIL = (1), /*!< Command response received (but CRC check failed) */ SD_DATA_CRC_FAIL = (2), /*!< Data bock sent/received (CRC check Failed) */ SD_CMD_RSP_TIMEOUT = (3), /*!< Command response timeout */ @@ -80,23 +80,23 @@ typedef enum SD_SDIO_FUNCTION_FAILED = (32), SD_SDIO_UNKNOWN_FUNCTION = (33), -/** - * @brief Standard error defines - */ - SD_INTERNAL_ERROR, +/** + * @brief Standard error defines + */ + SD_INTERNAL_ERROR, SD_NOT_CONFIGURED, - SD_REQUEST_PENDING, - SD_REQUEST_NOT_APPLICABLE, - SD_INVALID_PARAMETER, - SD_UNSUPPORTED_FEATURE, - SD_UNSUPPORTED_HW, - SD_ERROR, - SD_OK = 0 + SD_REQUEST_PENDING, + SD_REQUEST_NOT_APPLICABLE, + SD_INVALID_PARAMETER, + SD_UNSUPPORTED_FEATURE, + SD_UNSUPPORTED_HW, + SD_ERROR, + SD_OK = 0 } SD_Error; -/** - * @brief SDIO Transfer state - */ +/** + * @brief SDIO Transfer state + */ typedef enum { SD_TRANSFER_OK = 0, @@ -104,9 +104,9 @@ typedef enum SD_TRANSFER_ERROR } SDTransferState; -/** - * @brief SD Card States - */ +/** + * @brief SD Card States + */ typedef enum { SD_CARD_READY = ((uint32_t)0x00000001), @@ -121,9 +121,9 @@ typedef enum }SDCardState; -/** - * @brief Card Specific Data: CSD Register - */ +/** + * @brief Card Specific Data: CSD Register + */ typedef struct { __IO uint8_t CSDStruct; /*!< CSD structure */ @@ -165,8 +165,8 @@ typedef struct __IO uint8_t Reserved4; /*!< always 1*/ } SD_CSD; -/** - * @brief Card Identification Data: CID Register +/** + * @brief Card Identification Data: CID Register */ typedef struct { @@ -182,8 +182,8 @@ typedef struct __IO uint8_t Reserved2; /*!< always 1 */ } SD_CID; -/** - * @brief SD Card Status +/** + * @brief SD Card Status */ typedef struct { @@ -200,8 +200,8 @@ typedef struct } SD_CardStatus; -/** - * @brief SD Card information +/** + * @brief SD Card information */ typedef struct { @@ -213,8 +213,8 @@ typedef struct uint8_t CardType; } SD_CardInfo; -/** - * @brief SDIO Commands Index +/** + * @brief SDIO Commands Index */ #define SD_CMD_GO_IDLE_STATE ((uint8_t)0) #define SD_CMD_SEND_OP_COND ((uint8_t)1) @@ -263,9 +263,9 @@ typedef struct #define SD_CMD_GEN_CMD ((uint8_t)56) #define SD_CMD_NO_CMD ((uint8_t)64) -/** +/** * @brief Following commands are SD Card Specific commands. - * SDIO_APP_CMD should be sent before sending these commands. + * SDIO_APP_CMD should be sent before sending these commands. */ #define SD_CMD_APP_SD_SET_BUSWIDTH ((uint8_t)6) /*!< For SD Card only */ #define SD_CMD_SD_APP_STAUS ((uint8_t)13) /*!< For SD Card only */ @@ -276,9 +276,9 @@ typedef struct #define SD_CMD_SDIO_RW_DIRECT ((uint8_t)52) /*!< For SD I/O Card only */ #define SD_CMD_SDIO_RW_EXTENDED ((uint8_t)53) /*!< For SD I/O Card only */ -/** +/** * @brief Following commands are SD Card Specific security commands. - * SDIO_APP_CMD should be sent before sending these commands. + * SDIO_APP_CMD should be sent before sending these commands. */ #define SD_CMD_SD_APP_GET_MKB ((uint8_t)43) /*!< For SD Card only */ #define SD_CMD_SD_APP_GET_MID ((uint8_t)44) /*!< For SD Card only */ @@ -291,8 +291,8 @@ typedef struct #define SD_CMD_SD_APP_SECURE_ERASE ((uint8_t)38) /*!< For SD Card only */ #define SD_CMD_SD_APP_CHANGE_SECURE_AREA ((uint8_t)49) /*!< For SD Card only */ #define SD_CMD_SD_APP_SECURE_WRITE_MKB ((uint8_t)48) /*!< For SD Card only */ - -/* Uncomment the following line to select the SDIO Data transfer mode */ + +/* Uncomment the following line to select the SDIO Data transfer mode */ #if !defined (SD_DMA_MODE) && !defined (SD_POLLING_MODE) #define SD_DMA_MODE ((uint32_t)0x00000000) /*#define SD_POLLING_MODE ((uint32_t)0x00000002)*/ @@ -309,8 +309,8 @@ typedef struct */ #define SD_DETECT_PIN IO16_Pin_15 -/** - * @brief Supported SD Memory Cards +/** + * @brief Supported SD Memory Cards */ #define SDIO_STD_CAPACITY_SD_CARD_V1_1 ((uint32_t)0x00000000) #define SDIO_STD_CAPACITY_SD_CARD_V2_0 ((uint32_t)0x00000001) @@ -338,7 +338,7 @@ typedef struct #define SD_SDIO_DMA DMA2 #define SD_SDIO_DMA_CLK RCC_AHB1Periph_DMA2 -#define SD_SDIO_DMA_STREAM3 3 +#define SD_SDIO_DMA_STREAM3 3 #ifdef SD_SDIO_DMA_STREAM3 #define SD_SDIO_DMA_STREAM DMA2_Stream3 diff --git a/src/main/flight/pid.c b/src/main/flight/pid.c index a6e070566d..27b4fe6d43 100644 --- a/src/main/flight/pid.c +++ b/src/main/flight/pid.c @@ -543,5 +543,5 @@ void pidController(const pidProfile_t *pidProfile, const rollAndPitchTrims_t *an bool crashRecoveryModeActive(void) { - return inCrashRecoveryMode; + return inCrashRecoveryMode; } diff --git a/src/main/interface/cli.c b/src/main/interface/cli.c index b3c08652a0..6d41be7f80 100644 --- a/src/main/interface/cli.c +++ b/src/main/interface/cli.c @@ -2998,7 +2998,7 @@ static void cliStatus(char *cmdline) UNUSED(cmdline); cliPrintLinef("System Uptime: %d seconds", millis() / 1000); - + #ifdef USE_RTC_TIME char buf[FORMATTED_DATE_TIME_BUFSIZE]; dateTime_t dt; diff --git a/src/main/io/ledstrip.c b/src/main/io/ledstrip.c index 437d676672..a501525a1e 100644 --- a/src/main/io/ledstrip.c +++ b/src/main/io/ledstrip.c @@ -458,7 +458,7 @@ static void applyLedFixedLayers(void) hsvColor_t previousColor = ledStripConfig()->colors[(ledGetColor(ledConfig) - 1 + LED_CONFIGURABLE_COLOR_COUNT) % LED_CONFIGURABLE_COLOR_COUNT]; if (ledGetOverlayBit(ledConfig, LED_OVERLAY_THROTTLE)) { //smooth fade with selected Aux channel of all HSV values from previousColor through color to nextColor - int centerPWM = (PWM_RANGE_MIN + PWM_RANGE_MAX) / 2; + int centerPWM = (PWM_RANGE_MIN + PWM_RANGE_MAX) / 2; if (auxInput < centerPWM) { color.h = scaleRange(auxInput, PWM_RANGE_MIN, centerPWM, previousColor.h, color.h); color.s = scaleRange(auxInput, PWM_RANGE_MIN, centerPWM, previousColor.s, color.s); diff --git a/src/main/io/rcdevice.c b/src/main/io/rcdevice.c index befd3b2833..4815b45b0f 100644 --- a/src/main/io/rcdevice.c +++ b/src/main/io/rcdevice.c @@ -118,7 +118,7 @@ static uint8_t runcamDeviceReceivePacket(runcamDevice_t *device, uint8_t command if (!runcamDeviceIsResponseReceiveDone(command, data, dataPos, &isDone)) { return 0; } - + if (isDone) { responseDataLen = dataPos; break; @@ -180,11 +180,11 @@ static void runcamDeviceSendPacket(runcamDevice_t *device, uint8_t command, uint static bool runcamDeviceSendRequestAndWaitingResp(runcamDevice_t *device, uint8_t commandID, uint8_t *paramData, uint8_t paramDataLen, uint8_t *outputBuffer, uint8_t *outputBufferLen) { int max_retries = 1; - // here using 1000ms as timeout, because the response from 5 key simulation command need a long time about >= 600ms, + // here using 1000ms as timeout, because the response from 5 key simulation command need a long time about >= 600ms, // so set a max value to ensure we can receive the response - int timeoutMs = 1000; + int timeoutMs = 1000; - // only the command sending on initializing step need retry logic, + // only the command sending on initializing step need retry logic, // otherwise, the timeout of 1000 ms is enough for the response from device if (commandID == RCDEVICE_PROTOCOL_COMMAND_GET_DEVICE_INFO) { max_retries = 5; @@ -254,7 +254,7 @@ static void sendCtrlCommand(runcamDevice_t *device, rcsplit_ctrl_argument_e argu // get the device info(firmware version, protocol version and features, see the // definition of runcamDeviceInfo_t to know more) -static bool runcamDeviceGetDeviceInfo(runcamDevice_t *device, uint8_t *outputBuffer) +static bool runcamDeviceGetDeviceInfo(runcamDevice_t *device, uint8_t *outputBuffer) { // Send "who are you" command to device to detect the device whether is running RCSplit FW1.0 or RCSplit FW1.1 int max_retries = 2; @@ -301,7 +301,7 @@ static bool runcamDeviceGetDeviceInfo(runcamDevice_t *device, uint8_t *outputBuf } } - return runcamDeviceSendRequestAndWaitingResp(device, RCDEVICE_PROTOCOL_COMMAND_GET_DEVICE_INFO, NULL, 0, outputBuffer, NULL); + return runcamDeviceSendRequestAndWaitingResp(device, RCDEVICE_PROTOCOL_COMMAND_GET_DEVICE_INFO, NULL, 0, outputBuffer, NULL); } static bool runcamDeviceSend5KeyOSDCableConnectionEvent(runcamDevice_t *device, uint8_t operation, uint8_t *outActionID, uint8_t *outErrorCode) @@ -514,7 +514,7 @@ static bool runcamDeviceDecodeSettings(sbuf_t *buf, runcamDeviceSetting_t *outSe case RCDP_SETTING_PARSE_WAITING_ID: { settingIterator->id = sbufReadU8(buf); parseStep = RCDP_SETTING_PARSE_WAITING_NAME; - } + } break; case RCDP_SETTING_PARSE_WAITING_NAME: { const char *str = (const char *)sbufConstPtr(buf); @@ -522,9 +522,9 @@ static bool runcamDeviceDecodeSettings(sbuf_t *buf, runcamDeviceSetting_t *outSe memset(settingIterator->name, 0, RCDEVICE_PROTOCOL_MAX_SETTING_NAME_LENGTH); strncpy(settingIterator->name, str, RCDEVICE_PROTOCOL_MAX_SETTING_NAME_LENGTH); sbufAdvance(buf, nameLen); - + parseStep = RCDP_SETTING_PARSE_WAITING_VALUE; - } + } break; case RCDP_SETTING_PARSE_WAITING_VALUE: { const char *str = (const char *)sbufConstPtr(buf); @@ -535,7 +535,7 @@ static bool runcamDeviceDecodeSettings(sbuf_t *buf, runcamDeviceSetting_t *outSe parseStep = RCDP_SETTING_PARSE_WAITING_ID; settingIterator++; - } + } break; } } @@ -627,7 +627,7 @@ bool runcamDeviceGetSettings(runcamDevice_t *device, uint8_t parentSettingID, ru if (!runcamDeviceDecodeSettings(&dataBuf, outSettingList, maxSettingItemCount)) { return false; } - + return true; } @@ -648,13 +648,13 @@ static bool runcamDeviceDecodeSettingDetail(sbuf_t *buf, runcamDeviceSettingDeta outSettingDetail->stepSize = sbufReadU8(buf); break; case RCDEVICE_PROTOCOL_SETTINGTYPE_UINT16: - case RCDEVICE_PROTOCOL_SETTINGTYPE_INT16: + case RCDEVICE_PROTOCOL_SETTINGTYPE_INT16: outSettingDetail->value = sbufReadU16(buf); outSettingDetail->minValue = sbufReadU16(buf); outSettingDetail->maxValue = sbufReadU16(buf); outSettingDetail->stepSize = sbufReadU8(buf); break; - case RCDEVICE_PROTOCOL_SETTINGTYPE_FLOAT: + case RCDEVICE_PROTOCOL_SETTINGTYPE_FLOAT: outSettingDetail->value = sbufReadU32(buf); outSettingDetail->minValue = sbufReadU32(buf); outSettingDetail->maxValue = sbufReadU32(buf); @@ -684,7 +684,7 @@ static bool runcamDeviceDecodeSettingDetail(sbuf_t *buf, runcamDeviceSettingDeta result = strtok(NULL, delims); i++; } - } + } break; case RCDEVICE_PROTOCOL_SETTINGTYPE_STRING: { const char *tmp = (const char *)sbufConstPtr(buf); @@ -692,7 +692,7 @@ static bool runcamDeviceDecodeSettingDetail(sbuf_t *buf, runcamDeviceSettingDeta sbufAdvance(buf, strlen(tmp) + 1); outSettingDetail->maxStringSize = sbufReadU8(buf); - } + } break; case RCDEVICE_PROTOCOL_SETTINGTYPE_FOLDER: break; @@ -743,7 +743,7 @@ bool runcamDeviceWriteSetting(runcamDevice_t *device, uint8_t settingID, uint8_t } memset(response, 0, sizeof(runcamDeviceWriteSettingResponse_t)); - response->resultCode = 1; // initialize the result code to failed + response->resultCode = 1; // initialize the result code to failed uint8_t paramsBufLen = sizeof(uint8_t) + paramDataLen; uint8_t paramsBuf[RCDEVICE_PROTOCOL_MAX_DATA_SIZE]; diff --git a/src/main/io/rcdevice.h b/src/main/io/rcdevice.h index d1e4c2f79a..cff3c72700 100644 --- a/src/main/io/rcdevice.h +++ b/src/main/io/rcdevice.h @@ -88,9 +88,9 @@ typedef enum { } rcdevice_5key_simulation_operation_e; // Operation of RCDEVICE_PROTOCOL_COMMAND_5KEY_CONNECTION -typedef enum { - RCDEVICE_PROTOCOL_5KEY_CONNECTION_OPEN = 0x01, - RCDEVICE_PROTOCOL_5KEY_CONNECTION_CLOSE = 0x02 +typedef enum { + RCDEVICE_PROTOCOL_5KEY_CONNECTION_OPEN = 0x01, + RCDEVICE_PROTOCOL_5KEY_CONNECTION_CLOSE = 0x02 } RCDEVICE_5key_connection_event_e; typedef enum { diff --git a/src/main/io/rcdevice_cam.c b/src/main/io/rcdevice_cam.c index 4b27895c16..a06c233387 100644 --- a/src/main/io/rcdevice_cam.c +++ b/src/main/io/rcdevice_cam.c @@ -239,7 +239,7 @@ static void rcdevice5KeySimulationProcess(timeUs_t currentTimeUs) needRelease = false; } else { rcdeviceInMenu = false; - } + } } } return; diff --git a/src/main/io/rcdevice_osd.c b/src/main/io/rcdevice_osd.c index 77dc89bc28..ecad5c6227 100644 --- a/src/main/io/rcdevice_osd.c +++ b/src/main/io/rcdevice_osd.c @@ -230,9 +230,9 @@ uint32_t rcdeviceOSDTxBytesFree(const displayPort_t *displayPort) return INT32_MAX; } -int rcdeviceScreenSize(const displayPort_t *displayPort) -{ - return displayPort->rows * displayPort->cols; +int rcdeviceScreenSize(const displayPort_t *displayPort) +{ + return displayPort->rows * displayPort->cols; } #endif diff --git a/src/main/io/spektrum_rssi.c b/src/main/io/spektrum_rssi.c index 18c624f11e..c16c6b8780 100644 --- a/src/main/io/spektrum_rssi.c +++ b/src/main/io/spektrum_rssi.c @@ -17,7 +17,7 @@ #include "platform.h" #ifdef USE_SERIAL_RX -#if defined(USE_SPEKTRUM_REAL_RSSI) || defined(USE_SPEKTRUM_FAKE_RSSI) +#if defined(USE_SPEKTRUM_REAL_RSSI) || defined(USE_SPEKTRUM_FAKE_RSSI) #include "config/feature.h" #include "common/utils.h" @@ -189,5 +189,5 @@ void spektrumHandleRSSI(volatile uint8_t spekFrame[]) { } #endif // USE_SPEKTRUM_FAKE_RSSI } -#endif // USE_SPEKTRUM_REAL_RSSI || USE_SPEKTRUM_FAKE_RSSI +#endif // USE_SPEKTRUM_REAL_RSSI || USE_SPEKTRUM_FAKE_RSSI #endif // USE_SERIAL_RX diff --git a/src/main/io/vtx_smartaudio.c b/src/main/io/vtx_smartaudio.c index c5cab52364..a79b6d3695 100644 --- a/src/main/io/vtx_smartaudio.c +++ b/src/main/io/vtx_smartaudio.c @@ -761,16 +761,16 @@ void vtxSAProcess(timeUs_t currentTimeUs) // dprintf(("process: resending 0x%x\r\n", sa_outstanding)); // XXX Todo: Resend termination and possible offline transition saResendCmd(); - lastCommandSentMs = nowMs; + lastCommandSentMs = nowMs; } else if (!saQueueEmpty()) { // Command pending. Send it. // dprintf(("process: sending queue\r\n")); saSendQueue(); - lastCommandSentMs = nowMs; + lastCommandSentMs = nowMs; } else if ((nowMs - lastCommandSentMs < SMARTAUDIO_POLLING_WINDOW) && (nowMs - sa_lastTransmissionMs >= SMARTAUDIO_POLLING_INTERVAL)) { - //dprintf(("process: sending status change polling\r\n")); - saGetSettings(); - saSendQueue(); + //dprintf(("process: sending status change polling\r\n")); + saGetSettings(); + saSendQueue(); } } @@ -779,123 +779,123 @@ void vtxSAProcess(timeUs_t currentTimeUs) vtxDevType_e vtxSAGetDeviceType(void) { - return VTXDEV_SMARTAUDIO; + return VTXDEV_SMARTAUDIO; } bool vtxSAIsReady(void) { - return !(saDevice.version == 0); + return !(saDevice.version == 0); } void vtxSASetBandAndChannel(uint8_t band, uint8_t channel) { - if (saValidateBandAndChannel(band, channel)) { - saSetBandAndChannel(band - 1, channel - 1); - } + if (saValidateBandAndChannel(band, channel)) { + saSetBandAndChannel(band - 1, channel - 1); + } } void vtxSASetPowerByIndex(uint8_t index) { - if (index == 0) { - // SmartAudio doesn't support power off. - return; - } + if (index == 0) { + // SmartAudio doesn't support power off. + return; + } - saSetPowerByIndex(index - 1); + saSetPowerByIndex(index - 1); } void vtxSASetPitMode(uint8_t onoff) { - if (!(vtxSAIsReady() && (saDevice.version == 2))) { - return; - } + if (!(vtxSAIsReady() && (saDevice.version == 2))) { + return; + } - if (onoff) { - // SmartAudio can not turn pit mode on by software. - return; - } + if (onoff) { + // SmartAudio can not turn pit mode on by software. + return; + } - uint8_t newmode = SA_MODE_CLR_PITMODE; + uint8_t newmode = SA_MODE_CLR_PITMODE; - if (saDevice.mode & SA_MODE_GET_IN_RANGE_PITMODE) { - newmode |= SA_MODE_SET_IN_RANGE_PITMODE; - } + if (saDevice.mode & SA_MODE_GET_IN_RANGE_PITMODE) { + newmode |= SA_MODE_SET_IN_RANGE_PITMODE; + } - if (saDevice.mode & SA_MODE_GET_OUT_RANGE_PITMODE) { - newmode |= SA_MODE_SET_OUT_RANGE_PITMODE; - } + if (saDevice.mode & SA_MODE_GET_OUT_RANGE_PITMODE) { + newmode |= SA_MODE_SET_OUT_RANGE_PITMODE; + } - saSetMode(newmode); + saSetMode(newmode); - return; + return; } void vtxSASetFreq(uint16_t freq) { - if (saValidateFreq(freq)) { - saSetMode(0); //need to be in FREE mode to set freq - saSetFreq(freq); - } + if (saValidateFreq(freq)) { + saSetMode(0); //need to be in FREE mode to set freq + saSetFreq(freq); + } } bool vtxSAGetBandAndChannel(uint8_t *pBand, uint8_t *pChannel) { - if (!vtxSAIsReady()) { - return false; - } + if (!vtxSAIsReady()) { + return false; + } - // if in user-freq mode then report band as zero - *pBand = (saDevice.mode & SA_MODE_GET_FREQ_BY_FREQ) ? 0 : - (SA_DEVICE_CHVAL_TO_BAND(saDevice.channel) + 1); - *pChannel = SA_DEVICE_CHVAL_TO_CHANNEL(saDevice.channel) + 1; - return true; + // if in user-freq mode then report band as zero + *pBand = (saDevice.mode & SA_MODE_GET_FREQ_BY_FREQ) ? 0 : + (SA_DEVICE_CHVAL_TO_BAND(saDevice.channel) + 1); + *pChannel = SA_DEVICE_CHVAL_TO_CHANNEL(saDevice.channel) + 1; + return true; } bool vtxSAGetPowerIndex(uint8_t *pIndex) { - if (!vtxSAIsReady()) { - return false; - } + if (!vtxSAIsReady()) { + return false; + } - *pIndex = ((saDevice.version == 1) ? saDacToPowerIndex(saDevice.power) : saDevice.power) + 1; - return true; + *pIndex = ((saDevice.version == 1) ? saDacToPowerIndex(saDevice.power) : saDevice.power) + 1; + return true; } bool vtxSAGetPitMode(uint8_t *pOnOff) { - if (!(vtxSAIsReady() && (saDevice.version == 2))) { - return false; - } + if (!(vtxSAIsReady() && (saDevice.version == 2))) { + return false; + } - *pOnOff = (saDevice.mode & SA_MODE_GET_PITMODE) ? 1 : 0; - return true; + *pOnOff = (saDevice.mode & SA_MODE_GET_PITMODE) ? 1 : 0; + return true; } bool vtxSAGetFreq(uint16_t *pFreq) { - if (!vtxSAIsReady()) { - return false; - } + if (!vtxSAIsReady()) { + return false; + } - // if not in user-freq mode then convert band/chan to frequency - *pFreq = (saDevice.mode & SA_MODE_GET_FREQ_BY_FREQ) ? saDevice.freq : + // if not in user-freq mode then convert band/chan to frequency + *pFreq = (saDevice.mode & SA_MODE_GET_FREQ_BY_FREQ) ? saDevice.freq : vtx58_Bandchan2Freq(SA_DEVICE_CHVAL_TO_BAND(saDevice.channel) + 1, SA_DEVICE_CHVAL_TO_CHANNEL(saDevice.channel) + 1); - return true; + return true; } static const vtxVTable_t saVTable = { - .process = vtxSAProcess, - .getDeviceType = vtxSAGetDeviceType, - .isReady = vtxSAIsReady, - .setBandAndChannel = vtxSASetBandAndChannel, - .setPowerByIndex = vtxSASetPowerByIndex, - .setPitMode = vtxSASetPitMode, - .setFrequency = vtxSASetFreq, - .getBandAndChannel = vtxSAGetBandAndChannel, - .getPowerIndex = vtxSAGetPowerIndex, - .getPitMode = vtxSAGetPitMode, - .getFrequency = vtxSAGetFreq, + .process = vtxSAProcess, + .getDeviceType = vtxSAGetDeviceType, + .isReady = vtxSAIsReady, + .setBandAndChannel = vtxSASetBandAndChannel, + .setPowerByIndex = vtxSASetPowerByIndex, + .setPitMode = vtxSASetPitMode, + .setFrequency = vtxSASetFreq, + .getBandAndChannel = vtxSAGetBandAndChannel, + .getPowerIndex = vtxSAGetPowerIndex, + .getPitMode = vtxSAGetPitMode, + .getFrequency = vtxSAGetFreq, }; #endif // VTX_COMMON diff --git a/src/main/rx/cc2500_frsky_x.c b/src/main/rx/cc2500_frsky_x.c index 6abb94980a..94ca0820ec 100644 --- a/src/main/rx/cc2500_frsky_x.c +++ b/src/main/rx/cc2500_frsky_x.c @@ -333,7 +333,7 @@ rx_spi_received_e frSkyXHandlePacket(uint8_t * const packet, uint8_t * const pro FALLTHROUGH; // here FS code could be - case STATE_DATA: + case STATE_DATA: if (IORead(gdoPin) && (frameReceived == false)){ uint8_t ccLen = cc2500ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F; ccLen = cc2500ReadReg(CC2500_3B_RXBYTES | CC2500_READ_BURST) & 0x7F; // read 2 times to avoid reading errors @@ -341,7 +341,7 @@ rx_spi_received_e frSkyXHandlePacket(uint8_t * const packet, uint8_t * const pro ccLen = 32; } if (ccLen) { - cc2500ReadFifo(packet, ccLen); + cc2500ReadFifo(packet, ccLen); uint16_t lcrc= calculateCrc(&packet[3], (ccLen - 7)); if((lcrc >> 8) == packet[ccLen-4] && (lcrc&0x00FF) == packet[ccLen - 3]){ // check calculateCrc if (packet[0] == 0x1D) { @@ -419,7 +419,7 @@ rx_spi_received_e frSkyXHandlePacket(uint8_t * const packet, uint8_t * const pro packetTimerUs = micros(); frameReceived = true; // no need to process frame again. } - } + } } } } diff --git a/src/main/sensors/rangefinder.c b/src/main/sensors/rangefinder.c index d1de908b71..990a08dae1 100644 --- a/src/main/sensors/rangefinder.c +++ b/src/main/sensors/rangefinder.c @@ -64,7 +64,7 @@ rangefinder_t rangefinder; #define RANGEFINDER_HARDWARE_TIMEOUT_MS 500 // Accept 500ms of non-responsive sensor, report HW failure otherwise #define RANGEFINDER_DYNAMIC_THRESHOLD 600 //Used to determine max. usable rangefinder disatance -#define RANGEFINDER_DYNAMIC_FACTOR 75 +#define RANGEFINDER_DYNAMIC_FACTOR 75 PG_REGISTER_WITH_RESET_TEMPLATE(rangefinderConfig_t, rangefinderConfig, PG_RANGEFINDER_CONFIG, 0); @@ -274,7 +274,7 @@ bool isSurfaceAltitudeValid() { /* * Preconditions: raw and calculated altidude > 0 * SNR lower than threshold - */ + */ if ( rangefinder.calculatedAltitude > 0 && rangefinder.rawAltitude > 0 && diff --git a/src/main/sensors/rangefinder.h b/src/main/sensors/rangefinder.h index b7532d611e..5acc20f5c0 100644 --- a/src/main/sensors/rangefinder.h +++ b/src/main/sensors/rangefinder.h @@ -47,7 +47,7 @@ typedef struct rangefinder_s { int32_t rawAltitude; int32_t calculatedAltitude; timeMs_t lastValidResponseTimeMs; - + bool snrThresholdReached; int32_t dynamicDistanceThreshold; int16_t snr; diff --git a/src/main/target/AIRHEROF3/target.c b/src/main/target/AIRHEROF3/target.c index 4f5c5f5e5a..0e61be7599 100644 --- a/src/main/target/AIRHEROF3/target.c +++ b/src/main/target/AIRHEROF3/target.c @@ -41,14 +41,14 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { { TIM4, IO_TAG(PB8), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0}, // PWM13 - OUT5 { TIM4, IO_TAG(PB9), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_2, NULL, 0} // PWM14 - OUT6 */ - DEF_TIM(TIM2, CH1, PA0, TIM_USE_PPM | TIM_USE_PWM, 0), - DEF_TIM(TIM2, CH2, PA1, TIM_USE_PWM, 0), - DEF_TIM(TIM2, CH3, PA2, TIM_USE_PWM, 0), - DEF_TIM(TIM2, CH4, PA3, TIM_USE_PWM, 0), - DEF_TIM(TIM3, CH1, PA6, TIM_USE_PWM | TIM_USE_LED, 0), - DEF_TIM(TIM3, CH2, PA7, TIM_USE_PWM, 0), - DEF_TIM(TIM3, CH3, PB0, TIM_USE_PWM, 0), - DEF_TIM(TIM3, CH4, PB1, TIM_USE_PWM, 0), + DEF_TIM(TIM2, CH1, PA0, TIM_USE_PPM | TIM_USE_PWM, 0), + DEF_TIM(TIM2, CH2, PA1, TIM_USE_PWM, 0), + DEF_TIM(TIM2, CH3, PA2, TIM_USE_PWM, 0), + DEF_TIM(TIM2, CH4, PA3, TIM_USE_PWM, 0), + DEF_TIM(TIM3, CH1, PA6, TIM_USE_PWM | TIM_USE_LED, 0), + DEF_TIM(TIM3, CH2, PA7, TIM_USE_PWM, 0), + DEF_TIM(TIM3, CH3, PB0, TIM_USE_PWM, 0), + DEF_TIM(TIM3, CH4, PB1, TIM_USE_PWM, 0), DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), // DMA1_CH2 DEF_TIM(TIM4, CH1, PA11, TIM_USE_MOTOR, 0), // DMA1_CH1 DEF_TIM(TIM8, CH1, PB6, TIM_USE_MOTOR, 0), // DMA2_CH3 diff --git a/src/main/target/ALIENWHOOP/config.c b/src/main/target/ALIENWHOOP/config.c index e4b557a3d1..1f7750826f 100644 --- a/src/main/target/ALIENWHOOP/config.c +++ b/src/main/target/ALIENWHOOP/config.c @@ -100,7 +100,7 @@ void targetConfiguration(void) featureSet((FEATURE_DYNAMIC_FILTER | FEATURE_AIRMODE | FEATURE_ANTI_GRAVITY) ^ FEATURE_RX_PARALLEL_PWM); - /* AlienWhoop PIDs based on Ole Gravy Leg (aka Matt Williamson's) PIDs + /* AlienWhoop PIDs based on Ole Gravy Leg (aka Matt Williamson's) PIDs */ for (uint8_t pidProfileIndex = 0; pidProfileIndex < MAX_PROFILE_COUNT; pidProfileIndex++) { pidProfile_t *pidProfile = pidProfilesMutable(pidProfileIndex); diff --git a/src/main/target/ALIENWHOOP/target.c b/src/main/target/ALIENWHOOP/target.c index 7d12807243..16a993578c 100644 --- a/src/main/target/ALIENWHOOP/target.c +++ b/src/main/target/ALIENWHOOP/target.c @@ -45,10 +45,10 @@ * taken to ensure functionality on both F4 and F7 (STM32F405RGT and STM32F722RET) */ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM3, CH3, PC8, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM3, CH3, PC8, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM5, CH1, PA0, TIM_USE_LED, 0, 0), + DEF_TIM(TIM5, CH1, PA0, TIM_USE_LED, 0, 0), }; diff --git a/src/main/target/BEEBRAIN_V2F/target.c b/src/main/target/BEEBRAIN_V2F/target.c index 8fd8c08c94..d140755d67 100644 --- a/src/main/target/BEEBRAIN_V2F/target.c +++ b/src/main/target/BEEBRAIN_V2F/target.c @@ -29,5 +29,5 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM15, CH1, PB14, TIM_USE_MOTOR, 0), // PWM2 - PB14 - DMA1_CH5 - TIM1_CH2N, *TIM15_CH1 DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), // PWM3 - PA8 - DMA1_CH2 - *TIM1_CH1, TIM4_ETR DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0), // PWM4 - PB0 - DMA2_CH5 - TIM3_CH3, TIM1_CH2N, *TIM8_CH2N - DEF_TIM(TIM16, CH1, PB8, TIM_USE_TRANSPONDER, 0), + DEF_TIM(TIM16, CH1, PB8, TIM_USE_TRANSPONDER, 0), }; diff --git a/src/main/target/CC3D/target.c b/src/main/target/CC3D/target.c index 2642d3b0f6..18c149f37f 100644 --- a/src/main/target/CC3D/target.c +++ b/src/main/target/CC3D/target.c @@ -38,7 +38,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0), // S3_OUT DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), // S4_OUT DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0), // S1_IN/ - // DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 1), // S5_OUT <--Moved to allow Parallel PWM with proper ESC +// DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 1), // S5_OUT <--Moved to allow Parallel PWM with proper ESC DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0), // S6_OUT }; diff --git a/src/main/target/COLIBRI_RACE/target.c b/src/main/target/COLIBRI_RACE/target.c index 71a4dcad35..2ce4a93ad0 100644 --- a/src/main/target/COLIBRI_RACE/target.c +++ b/src/main/target/COLIBRI_RACE/target.c @@ -64,7 +64,7 @@ void targetBusInit(void) i2cHardwareConfigure(i2cConfig()); i2cInit(I2CDEV_2); - + bstInit(BST_DEVICE); } #endif diff --git a/src/main/target/EACHIF3/target.c b/src/main/target/EACHIF3/target.c index ee27b70c44..8e2c80f878 100644 --- a/src/main/target/EACHIF3/target.c +++ b/src/main/target/EACHIF3/target.c @@ -25,10 +25,10 @@ #include "drivers/dma.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM2, CH4, PA3, TIM_USE_PPM, 0), - DEF_TIM(TIM17, CH1N, PB7, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH1, PB6, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH3, PB9, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0), - DEF_TIM(TIM16, CH1, PA6, TIM_USE_LED, 0), + DEF_TIM(TIM2, CH4, PA3, TIM_USE_PPM, 0), + DEF_TIM(TIM17, CH1N, PB7, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH1, PB6, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH3, PB9, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0), + DEF_TIM(TIM16, CH1, PA6, TIM_USE_LED, 0), }; diff --git a/src/main/target/FF_PIKOBLX/target.c b/src/main/target/FF_PIKOBLX/target.c index fce122b27a..a3959d8114 100644 --- a/src/main/target/FF_PIKOBLX/target.c +++ b/src/main/target/FF_PIKOBLX/target.c @@ -33,7 +33,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM2, CH2, PA1, TIM_USE_MOTOR, 0), // PWM5 - PA1 - *TIM2_CH2, TIM15_CH1N DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0), // PWM6 - PA2 - *TIM2_CH3, !TIM15_CH1 DEF_TIM(TIM3, CH2, PA4, TIM_USE_PPM, 0), // PPM - PA4 - DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0), + DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0), DEF_TIM(TIM1, CH1, PA8, TIM_USE_TRANSPONDER, 0), // TRANSPONDER - PA8 #else DEF_TIM(TIM3, CH2, PA4, TIM_USE_MOTOR, 0), // PWM1 - PA4 - *TIM3_CH2 @@ -43,7 +43,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM2, CH2, PA1, TIM_USE_MOTOR, 0), // PWM5 - PA1 - *TIM2_CH2, TIM15_CH1N DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0), // PWM6 - PA2 - *TIM2_CH3, !TIM15_CH1 DEF_TIM(TIM17, CH1, PA7, TIM_USE_PPM, 0), // PPM - PA7 - *TIM17_CH1, TIM1_CH1N, TIM8_CH1 - DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0), + DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0), DEF_TIM(TIM1, CH1, PA8, TIM_USE_TRANSPONDER, 0), // TRANSPONDER - PA8 #endif }; diff --git a/src/main/target/KAKUTEF7/target.c b/src/main/target/KAKUTEF7/target.c index 4b51fe2727..7ff658a1e8 100644 --- a/src/main/target/KAKUTEF7/target.c +++ b/src/main/target/KAKUTEF7/target.c @@ -31,7 +31,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM1, CH2, PE11, TIM_USE_MOTOR, 0, 1), // M4 , DMA2_ST4 DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // M5 , DMA2_ST7 DEF_TIM(TIM5, CH4, PA3, TIM_USE_MOTOR, 0, 0), // M6 , DMA1_ST1 - + DEF_TIM(TIM4, CH1, PD12, TIM_USE_LED, 0, 0), // LED_TRIP , DMA1_ST0 }; diff --git a/src/main/target/KAKUTEF7/target.h b/src/main/target/KAKUTEF7/target.h index 7ec7d930da..81f547a17a 100644 --- a/src/main/target/KAKUTEF7/target.h +++ b/src/main/target/KAKUTEF7/target.h @@ -147,8 +147,8 @@ #define USE_I2C #define USE_I2C_DEVICE_1 #define I2C_DEVICE (I2CDEV_1) -#define I2C1_SCL PB6 -#define I2C1_SDA PB7 +#define I2C1_SCL PB6 +#define I2C1_SDA PB7 #define USE_BARO #define USE_BARO_BMP280 diff --git a/src/main/target/KISSFC/target.c b/src/main/target/KISSFC/target.c index 02c1662efe..5f3a474da6 100644 --- a/src/main/target/KISSFC/target.c +++ b/src/main/target/KISSFC/target.c @@ -26,24 +26,24 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { #ifdef KISSCC - DEF_TIM(TIM1, CH2N, PB14, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0), - DEF_TIM(TIM15, CH1N, PB15, TIM_USE_MOTOR, 0), - DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), - DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR, 0), - DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, 0), - DEF_TIM(TIM16, CH1N, PA13, TIM_USE_PWM, 0), + DEF_TIM(TIM1, CH2N, PB14, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, 0), + DEF_TIM(TIM15, CH1N, PB15, TIM_USE_MOTOR, 0), + DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), + DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR, 0), + DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, 0), + DEF_TIM(TIM16, CH1N, PA13, TIM_USE_PWM, 0), #else - DEF_TIM(TIM1, CH2N, PB14, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), - DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), - DEF_TIM(TIM15, CH1N, PB15, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), - DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), + DEF_TIM(TIM1, CH2N, PB14, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), + DEF_TIM(TIM8, CH2N, PB0, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), + DEF_TIM(TIM15, CH1N, PB15, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), + DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_INVERTED), - DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), + DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, TIMER_OUTPUT_INVERTED), DEF_TIM(TIM4, CH3, PA13, TIM_USE_PWM, 0), // On KISSFC TIM16 did not work, using TIM4 works #endif - DEF_TIM(TIM2, CH2, PB3, TIM_USE_PWM | TIM_USE_PPM, 0), - DEF_TIM(TIM2, CH1, PA15, TIM_USE_PWM, 0), - DEF_TIM(TIM2, CH3, PA2, TIM_USE_PWM, 0), - DEF_TIM(TIM2, CH4, PB11, TIM_USE_PWM, 0), + DEF_TIM(TIM2, CH2, PB3, TIM_USE_PWM | TIM_USE_PPM, 0), + DEF_TIM(TIM2, CH1, PA15, TIM_USE_PWM, 0), + DEF_TIM(TIM2, CH3, PA2, TIM_USE_PWM, 0), + DEF_TIM(TIM2, CH4, PB11, TIM_USE_PWM, 0), }; diff --git a/src/main/target/KISSFCV2F7/config.c b/src/main/target/KISSFCV2F7/config.c index c804f8866b..82c4584a92 100644 --- a/src/main/target/KISSFCV2F7/config.c +++ b/src/main/target/KISSFCV2F7/config.c @@ -29,8 +29,9 @@ #ifdef USE_TARGET_CONFIG -void targetConfiguration(void){ - rxConfigMutable()->halfDuplex = true; - serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(SERIAL_PORT_UART4)].functionMask = FUNCTION_MSP; +void targetConfiguration(void) +{ + rxConfigMutable()->halfDuplex = true; + serialConfigMutable()->portConfigs[findSerialPortIndexByIdentifier(SERIAL_PORT_UART4)].functionMask = FUNCTION_MSP; } #endif diff --git a/src/main/target/KISSFCV2F7/target.c b/src/main/target/KISSFCV2F7/target.c index d027d9ff2c..e0414ed4f6 100644 --- a/src/main/target/KISSFCV2F7/target.c +++ b/src/main/target/KISSFCV2F7/target.c @@ -26,17 +26,17 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM9, CH1, PA2, TIM_USE_PWM | TIM_USE_PPM, 0, 0), - - DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), - - DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), - - DEF_TIM(TIM2, CH2, PB3, TIM_USE_LED, 0, 0) + DEF_TIM(TIM9, CH1, PA2, TIM_USE_PWM | TIM_USE_PPM, 0, 0), + + DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), + + DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), + + DEF_TIM(TIM2, CH2, PB3, TIM_USE_LED, 0, 0) }; diff --git a/src/main/target/KIWIF4/target.c b/src/main/target/KIWIF4/target.c index dbc39c699b..67fb8fe7f0 100644 --- a/src/main/target/KIWIF4/target.c +++ b/src/main/target/KIWIF4/target.c @@ -25,10 +25,10 @@ #include "drivers/timer_def.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1), - DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1), + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0, 0), #if defined(PLUMF4) || defined(KIWIF4V2) // DEF_TIM(TIM4, CH1, PA0, TIM_USE_LED, TIMER_OUTPUT_STANDARD, 0), //LED //Switch LED_STRIP back to VTX.DTA, since the LED pad does not seem to be working: diff --git a/src/main/target/LUX_RACE/target.c b/src/main/target/LUX_RACE/target.c index dc2eed570e..f583a4c1b2 100644 --- a/src/main/target/LUX_RACE/target.c +++ b/src/main/target/LUX_RACE/target.c @@ -39,6 +39,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM15, CH1, PB14, TIM_USE_MOTOR, 0), // PWM10 - PB14 DEF_TIM(TIM15, CH2, PB15, TIM_USE_MOTOR, 0), // PWM11 - PB15 #endif - DEF_TIM(TIM16, CH1, PA6, TIM_USE_LED, 0), + DEF_TIM(TIM16, CH1, PA6, TIM_USE_LED, 0), }; diff --git a/src/main/target/MATEKF411/target.c b/src/main/target/MATEKF411/target.c index e2c8345870..44de231806 100644 --- a/src/main/target/MATEKF411/target.c +++ b/src/main/target/MATEKF411/target.c @@ -25,17 +25,17 @@ #include "drivers/timer_def.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), // PPM IN + DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), // PPM IN - DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 0), // S1_OUT - DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 0), // S2_OUT - DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // S3_OUT - DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // S4_OUT + DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 0), // S1_OUT + DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 0), // S2_OUT + DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // S3_OUT + DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // S4_OUT - DEF_TIM(TIM2, CH2, PB3, TIM_USE_MOTOR, 0, 0), // S5 - DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 0, 0), // S6 - DEF_TIM(TIM5, CH1, PA0, TIM_USE_ANY, 0, 0), // RSSI pad - DEF_TIM(TIM5, CH3, PA2, TIM_USE_ANY, 0, 0), // TX2 + DEF_TIM(TIM2, CH2, PB3, TIM_USE_MOTOR, 0, 0), // S5 + DEF_TIM(TIM2, CH3, PB10, TIM_USE_MOTOR, 0, 0), // S6 + DEF_TIM(TIM5, CH1, PA0, TIM_USE_ANY, 0, 0), // RSSI pad + DEF_TIM(TIM5, CH3, PA2, TIM_USE_ANY, 0, 0), // TX2 - DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 0, 0), // LED + DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 0, 0), // LED }; diff --git a/src/main/target/MATEKF411/target.h b/src/main/target/MATEKF411/target.h index bb68def888..684786883b 100644 --- a/src/main/target/MATEKF411/target.h +++ b/src/main/target/MATEKF411/target.h @@ -31,8 +31,8 @@ #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 @@ -95,8 +95,8 @@ // *************** 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 diff --git a/src/main/target/MATEKF722/target.h b/src/main/target/MATEKF722/target.h index 061b0337ef..2c9ba7504f 100644 --- a/src/main/target/MATEKF722/target.h +++ b/src/main/target/MATEKF722/target.h @@ -73,9 +73,9 @@ #define USE_BARO_MS5611 #define USE_BARO_BMP085 -//*********** Magnetometer / Compass ************* -#define USE_MAG -#define USE_MAG_HMC5883 +//*********** Magnetometer / Compass ************* +#define USE_MAG +#define USE_MAG_HMC5883 // *************** SD Card ************************** #define USE_SDCARD diff --git a/src/main/target/MIDELICF3/target.h b/src/main/target/MIDELICF3/target.h index fd4c832dd8..ebe2919e94 100644 --- a/src/main/target/MIDELICF3/target.h +++ b/src/main/target/MIDELICF3/target.h @@ -102,7 +102,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/target/NUCLEOF722/target.c b/src/main/target/NUCLEOF722/target.c index a3e1e6d49b..6678533e68 100644 --- a/src/main/target/NUCLEOF722/target.c +++ b/src/main/target/NUCLEOF722/target.c @@ -26,16 +26,16 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM12, CH2, PB15, TIM_USE_PWM | TIM_USE_PPM, 0, 0), - DEF_TIM(TIM8, CH1, PC6, TIM_USE_PWM, 0, 0), - DEF_TIM(TIM8, CH2, PC7, TIM_USE_PWM, 0, 0), - DEF_TIM(TIM8, CH4, PC9, TIM_USE_PWM, 0, 0), - DEF_TIM(TIM8, CH3, PC8, TIM_USE_PWM, 0, 0), + DEF_TIM(TIM12, CH2, PB15, TIM_USE_PWM | TIM_USE_PPM, 0, 0), + DEF_TIM(TIM8, CH1, PC6, TIM_USE_PWM, 0, 0), + DEF_TIM(TIM8, CH2, PC7, TIM_USE_PWM, 0, 0), + DEF_TIM(TIM8, CH4, PC9, TIM_USE_PWM, 0, 0), + DEF_TIM(TIM8, CH3, PC8, TIM_USE_PWM, 0, 0), - DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1), - DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM9, CH2, PE6, TIM_USE_MOTOR, 0, 0), - DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM4, CH3, PB8, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1), + DEF_TIM(TIM3, CH2, PB5, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM4, CH4, PB9, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM9, CH2, PE6, TIM_USE_MOTOR, 0, 0), + DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 0), }; diff --git a/src/main/target/OMNIBUSF4/target.h b/src/main/target/OMNIBUSF4/target.h index af10194fa7..556871fcd0 100644 --- a/src/main/target/OMNIBUSF4/target.h +++ b/src/main/target/OMNIBUSF4/target.h @@ -87,7 +87,7 @@ #define ACC_MPU6000_ALIGN CW270_DEG #elif defined(XRACERF4) || defined(EXUAVF4PRO) #define GYRO_MPU6000_ALIGN CW90_DEG -#define ACC_MPU6000_ALIGN CW90_DEG +#define ACC_MPU6000_ALIGN CW90_DEG #else #define GYRO_MPU6000_ALIGN CW180_DEG #define ACC_MPU6000_ALIGN CW180_DEG diff --git a/src/main/target/RACEBASE/target.c b/src/main/target/RACEBASE/target.c index e1cf2ac782..54bf4a1e11 100644 --- a/src/main/target/RACEBASE/target.c +++ b/src/main/target/RACEBASE/target.c @@ -25,7 +25,7 @@ #include "drivers/dma.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM2, CH1, PA0, TIM_USE_PPM, 0), + DEF_TIM(TIM2, CH1, PA0, TIM_USE_PPM, 0), DEF_TIM(TIM8, CH1, PB6, TIM_USE_MOTOR, 0), // PWM1 - DMA2 CH3 DEF_TIM(TIM3, CH4, PB7, TIM_USE_MOTOR, 0), // PWM2 - DMA1 CH3 DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0), // PMW3 - DMA2 CH5 diff --git a/src/main/target/RCEXPLORERF3/target.c b/src/main/target/RCEXPLORERF3/target.c index 85f79743f5..0554ad36a1 100644 --- a/src/main/target/RCEXPLORERF3/target.c +++ b/src/main/target/RCEXPLORERF3/target.c @@ -26,11 +26,11 @@ #include "drivers/dma.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), - DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, 0), - DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0), - DEF_TIM(TIM3, CH2, PA4, TIM_USE_MOTOR, 0), - DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0), - DEF_TIM(TIM2, CH2, PA1, TIM_USE_PPM, 0), - DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0), + DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), + DEF_TIM(TIM17, CH1, PA7, TIM_USE_MOTOR, 0), + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0), + DEF_TIM(TIM3, CH2, PA4, TIM_USE_MOTOR, 0), + DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0), + DEF_TIM(TIM2, CH2, PA1, TIM_USE_PPM, 0), + DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0), }; diff --git a/src/main/target/RG_SSD_F3/target.c b/src/main/target/RG_SSD_F3/target.c index 7de96eab88..3b9cfa325f 100644 --- a/src/main/target/RG_SSD_F3/target.c +++ b/src/main/target/RG_SSD_F3/target.c @@ -9,15 +9,15 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM2, CH4, PA3, TIM_USE_PPM, 0), + DEF_TIM(TIM2, CH4, PA3, TIM_USE_PPM, 0), // Main outputs 6 PWM - DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0), - DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH3, PB9, TIM_USE_MOTOR, 0), - DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0), - DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0), + DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0), + DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH2, PB8, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH3, PB9, TIM_USE_MOTOR, 0), + DEF_TIM(TIM3, CH1, PC6, TIM_USE_MOTOR, 0), + DEF_TIM(TIM3, CH2, PC7, TIM_USE_MOTOR, 0), // Additional outputs - DEF_TIM(TIM16, CH1, PA6, TIM_USE_TRANSPONDER, 0), - DEF_TIM(TIM1 , CH1N, PA7, TIM_USE_LED, 0), + DEF_TIM(TIM16, CH1, PA6, TIM_USE_TRANSPONDER, 0), + DEF_TIM(TIM1 , CH1N, PA7, TIM_USE_LED, 0), }; diff --git a/src/main/target/SPRACINGF3NEO/target.c b/src/main/target/SPRACINGF3NEO/target.c index 4c60cf50c6..0f636c9e3e 100644 --- a/src/main/target/SPRACINGF3NEO/target.c +++ b/src/main/target/SPRACINGF3NEO/target.c @@ -54,7 +54,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM2, CH4, PB11, TIM_USE_MOTOR, 0), // PWM4 - PB11 - *TIM2_CH4, UART3_RX (AF7) // with DSHOT DMA1-CH3 conflicts with TIM3_CH4 / ESC1. - DEF_TIM(TIM16, CH1, PB8, TIM_USE_TRANSPONDER, 0), + DEF_TIM(TIM16, CH1, PB8, TIM_USE_TRANSPONDER, 0), - DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 0), + DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 0), }; diff --git a/src/main/target/SPRACINGF3OSD/target.c b/src/main/target/SPRACINGF3OSD/target.c index c6537df084..fa4d8f392a 100644 --- a/src/main/target/SPRACINGF3OSD/target.c +++ b/src/main/target/SPRACINGF3OSD/target.c @@ -31,5 +31,5 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM16, CH1, PB4, TIM_USE_MOTOR, 0), // DMA1_Channel3 or DMA1_Channel6 with Remap (need remap to free SPI1_TX for Flash) DEF_TIM(TIM17, CH1, PB5, TIM_USE_MOTOR, 0), // DMA1_Channel1 or DMA1_Channel7 with Remap (need remap, ADC1 is on DMA1_Channel1) - DEF_TIM(TIM1, CH1, PA8, TIM_USE_TRANSPONDER, 0), + DEF_TIM(TIM1, CH1, PA8, TIM_USE_TRANSPONDER, 0), }; diff --git a/src/main/target/STM32F3DISCOVERY/target.c b/src/main/target/STM32F3DISCOVERY/target.c index 86cee23113..20ef4d4cf4 100644 --- a/src/main/target/STM32F3DISCOVERY/target.c +++ b/src/main/target/STM32F3DISCOVERY/target.c @@ -26,19 +26,19 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { - DEF_TIM(TIM16, CH1, PB8, TIM_USE_PPM | TIM_USE_LED, 0), - DEF_TIM(TIM17, CH1, PB9, 0, 0), - DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0), - DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 0), - DEF_TIM(TIM3, CH4, PB1, 0, 0), - DEF_TIM(TIM3, CH2, PA4, 0, 0), - DEF_TIM(TIM4, CH1, PD12, TIM_USE_BEEPER, 0), - DEF_TIM(TIM4, CH2, PD13, 0, 0), - DEF_TIM(TIM4, CH3, PD14, 0, 0), - DEF_TIM(TIM4, CH4, PD15, 0, 0), - DEF_TIM(TIM2, CH2, PA1, 0, 0), - DEF_TIM(TIM2, CH3, PA2, 0, 0), + DEF_TIM(TIM16, CH1, PB8, TIM_USE_PPM | TIM_USE_LED, 0), + DEF_TIM(TIM17, CH1, PB9, 0, 0), + DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0), + DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 0), + DEF_TIM(TIM3, CH4, PB1, 0, 0), + DEF_TIM(TIM3, CH2, PA4, 0, 0), + DEF_TIM(TIM4, CH1, PD12, TIM_USE_BEEPER, 0), + DEF_TIM(TIM4, CH2, PD13, 0, 0), + DEF_TIM(TIM4, CH3, PD14, 0, 0), + DEF_TIM(TIM4, CH4, PD15, 0, 0), + DEF_TIM(TIM2, CH2, PA1, 0, 0), + DEF_TIM(TIM2, CH3, PA2, 0, 0), }; diff --git a/src/main/target/common_fc_pre.h b/src/main/target/common_fc_pre.h index 7ee3066d68..3f4ad067fc 100644 --- a/src/main/target/common_fc_pre.h +++ b/src/main/target/common_fc_pre.h @@ -125,7 +125,7 @@ #define USE_RESOURCE_MGMT #define USE_SERVOS #endif - + #if (FLASH_SIZE > 128) #define USE_CMS #define USE_TELEMETRY_CRSF diff --git a/src/main/target/system_stm32f7xx.c b/src/main/target/system_stm32f7xx.c index 2edffe3171..c739652fd0 100644 --- a/src/main/target/system_stm32f7xx.c +++ b/src/main/target/system_stm32f7xx.c @@ -172,15 +172,15 @@ RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; RCC_OscInitStruct.PLL.PLLQ = 9; #else - /* Enable HSE Oscillator and activate PLL with HSE as source */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; - RCC_OscInitStruct.HSEState = RCC_HSE_ON; - RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; - RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; - RCC_OscInitStruct.PLL.PLLM = PLL_M; - RCC_OscInitStruct.PLL.PLLN = PLL_N; - RCC_OscInitStruct.PLL.PLLP = PLL_P; - RCC_OscInitStruct.PLL.PLLQ = PLL_Q; + /* Enable HSE Oscillator and activate PLL with HSE as source */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; + RCC_OscInitStruct.PLL.PLLM = PLL_M; + RCC_OscInitStruct.PLL.PLLN = PLL_N; + RCC_OscInitStruct.PLL.PLLP = PLL_P; + RCC_OscInitStruct.PLL.PLLQ = PLL_Q; #endif ret = HAL_RCC_OscConfig(&RCC_OscInitStruct); diff --git a/src/main/telemetry/smartport.c b/src/main/telemetry/smartport.c index 72aee52a22..bdc61e11a0 100644 --- a/src/main/telemetry/smartport.c +++ b/src/main/telemetry/smartport.c @@ -185,7 +185,7 @@ smartPortPayload_t *smartPortDataReceive(uint16_t c, bool *clearToSend, smartPor } else { if (c == FSSP_DLE) { byteStuffing = true; - + return NULL; } else if (byteStuffing) { c ^= FSSP_DLE_XOR; diff --git a/src/main/telemetry/srxl.c b/src/main/telemetry/srxl.c index 052b682ca0..3ed8210584 100644 --- a/src/main/telemetry/srxl.c +++ b/src/main/telemetry/srxl.c @@ -209,10 +209,10 @@ bool srxlFrameFlightPackCurrent(sbuf_t *dst, timeUs_t currentTimeUs) /* typedef struct { - UINT8 identifier; - UINT8 sID; // Secondary ID - UINT8 lineNumber; // Line number to display (0 = title, 1-8 for general, 254 = Refresh backlight, 255 = Erase all text on screen) - char text[13]; // 0-terminated text when < 13 chars + UINT8 identifier; + UINT8 sID; // Secondary ID + UINT8 lineNumber; // Line number to display (0 = title, 1-8 for general, 254 = Refresh backlight, 255 = Erase all text on screen) + char text[13]; // 0-terminated text when < 13 chars } STRU_SPEKTRUM_SRXL_TEXTGEN; */ @@ -225,7 +225,7 @@ static bool lineSent[SPEKTRUM_SRXL_DEVICE_TEXTGEN_ROWS]; #endif //************************************************************************** -// API Running in external client task context. E.g. in the CMS task +// API Running in external client task context. E.g. in the CMS task int spektrumTmTextGenPutChar(uint8_t col, uint8_t row, char c) { if (row < SPEKTRUM_SRXL_TEXTGEN_BUFFER_ROWS && col < SPEKTRUM_SRXL_TEXTGEN_BUFFER_COLS) {