Move disk_init directly after spi init

multi_trace
erikkaashoek 5 years ago
parent 3bd6159abe
commit cec017597e

@ -307,7 +307,7 @@ void spi_DMARxBuffer(uint8_t *buffer, uint16_t len, bool wait) {
} }
#endif // __USE_DISPLAY_DMA__ #endif // __USE_DISPLAY_DMA__
static void spi_init(void) void spi_init(void)
{ {
rccEnableSPI1(FALSE); rccEnableSPI1(FALSE);
LCD_SPI->CR1 = 0; LCD_SPI->CR1 = 0;
@ -528,7 +528,6 @@ void lcd_setBrightness(uint16_t b){
void ili9341_init(void) void ili9341_init(void)
{ {
spi_init();
// Init Brightness if LCD support // Init Brightness if LCD support
lcd_initBrightness(); lcd_initBrightness();

@ -2110,6 +2110,7 @@ int main(void)
#ifdef __USE_RTC__ #ifdef __USE_RTC__
rtc_init(); rtc_init();
#endif #endif
//palSetPadMode(GPIOB, 8, PAL_MODE_ALTERNATE(1) | PAL_STM32_OTYPE_OPENDRAIN); //palSetPadMode(GPIOB, 8, PAL_MODE_ALTERNATE(1) | PAL_STM32_OTYPE_OPENDRAIN);
//palSetPadMode(GPIOB, 9, PAL_MODE_ALTERNATE(1) | PAL_STM32_OTYPE_OPENDRAIN); //palSetPadMode(GPIOB, 9, PAL_MODE_ALTERNATE(1) | PAL_STM32_OTYPE_OPENDRAIN);
#ifdef __VNA__ #ifdef __VNA__
@ -2166,11 +2167,19 @@ int main(void)
} }
#endif #endif
spi_init();
#ifdef TINYSA4
disk_initialize(0);
// SD_PowerOn();
#endif
/* /*
* SPI LCD Initialize * SPI LCD Initialize
*/ */
ili9341_init(); ili9341_init();
/* /*
* Initiate 1 micro second timer * Initiate 1 micro second timer
*/ */

@ -926,6 +926,7 @@ void ili9341_read_memory(int x, int y, int w, int h, uint16_t* out);
void ili9341_line(int x0, int y0, int x1, int y1); void ili9341_line(int x0, int y0, int x1, int y1);
void show_version(void); void show_version(void);
void lcd_setBrightness(uint16_t b); void lcd_setBrightness(uint16_t b);
void spi_init(void);
/* /*
* flash.c * flash.c

Loading…
Cancel
Save

Powered by TurnKey Linux.