Various cleanups

This commit is contained in:
3djc
2023-06-25 14:32:39 +02:00
committed by Malte Langermann
parent c8ac653b4f
commit 7a01325988
5 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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 */
+4 -4
View File
@@ -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