From 7a0132598808e3f6a7d2ac06fe4c2f03470b8c99 Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 3 May 2023 09:05:19 +0200 Subject: [PATCH] Various cleanups --- radio/src/targets/horus/board.cpp | 2 +- radio/src/targets/taranis/board.cpp | 2 +- radio/src/targets/taranis/board.h | 2 +- radio/src/targets/taranis/diskio.cpp | 4 ++-- radio/src/targets/taranis/hal.h | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp index 8a8302af8..49b33ff8e 100644 --- a/radio/src/targets/horus/board.cpp +++ b/radio/src/targets/horus/board.cpp @@ -209,7 +209,7 @@ void boardInit() usbChargerInit(); #endif -#if defined(RTCLOCK) && !defined(COPROCESSOR) +#if defined(RTCLOCK) ledRed(); rtcInit(); // RTC must be initialized before rambackupRestore() is called #endif diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp index 2ed0e0a69..17bd5bc83 100644 --- a/radio/src/targets/taranis/board.cpp +++ b/radio/src/targets/taranis/board.cpp @@ -273,7 +273,7 @@ void boardInit() initHeadphoneTrainerSwitch(); -#if defined(RTCLOCK) && !defined(COPROCESSOR) +#if defined(RTCLOCK) rtcInit(); // RTC must be initialized before rambackupRestore() is called #endif diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 2b4530fbc..b84d9aab0 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -91,7 +91,7 @@ void sdMount(); void sdDone(); void sdPoll10ms(); uint32_t sdMounted(); -#define SD_CARD_PRESENT() ((SD_GPIO_PRESENT_GPIO->IDR & SD_GPIO_PRESENT_GPIO_PIN) == 0) +#define SD_CARD_PRESENT() ((SD_PRESENT_GPIO->IDR & SD_PRESENT_GPIO_PIN) == 0) #endif // Flash Write driver diff --git a/radio/src/targets/taranis/diskio.cpp b/radio/src/targets/taranis/diskio.cpp index d64057f1b..3d7b63236 100644 --- a/radio/src/targets/taranis/diskio.cpp +++ b/radio/src/targets/taranis/diskio.cpp @@ -316,12 +316,12 @@ void power_on (void) card_power(1); - GPIO_InitStructure.GPIO_Pin = SD_GPIO_PRESENT_GPIO_PIN; + GPIO_InitStructure.GPIO_Pin = SD_PRESENT_GPIO_PIN; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_OType = GPIO_OType_OD; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; - GPIO_Init(SD_GPIO_PRESENT_GPIO, &GPIO_InitStructure); + GPIO_Init(SD_PRESENT_GPIO, &GPIO_InitStructure); for (uint32_t Timer = 25000; Timer>0;Timer--); /* Wait for 250ms */ diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 2d28900bf..9e801a266 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -2442,13 +2442,13 @@ // SD - SPI2 #define SD_RCC_AHB1Periph (RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) #define SD_RCC_APB1Periph RCC_APB1Periph_SPI2 -#define SD_GPIO_PRESENT_GPIO GPIOD +#define SD_PRESENT_GPIO GPIOD #if defined(PCBXLITE) || defined(PCBX9LITE) - #define SD_GPIO_PRESENT_GPIO_PIN GPIO_Pin_10 // PD.10 + #define SD_PRESENT_GPIO_PIN GPIO_Pin_10 // PD.10 #elif defined(RADIO_COMMANDO8) - #define SD_GPIO_PRESENT_GPIO_PIN GPIO_Pin_8 // PD.08 + #define SD_PRESENT_GPIO_PIN GPIO_Pin_8 // PD.08 #else - #define SD_GPIO_PRESENT_GPIO_PIN GPIO_Pin_9 // PD.09 + #define SD_PRESENT_GPIO_PIN GPIO_Pin_9 // PD.09 #endif #define SD_GPIO GPIOB #define SD_GPIO_PIN_CS GPIO_Pin_12 // PB.12