mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #303 from dhylands/fix-netduino-disc

Browse Source 
Fix build for netduino and stm32f4disc
This commit is contained in:
Damien George 2014-02-17 09:48:53 +00:00
commit f34947703a
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stm/main.c
View File

@ -54,7 +54,9 @@
int errno;
static FATFS fatfs0;
#if MICROPY_HW_HAS_SDCARD
static FATFS fatfs1;
#endif
void flash_error(int n) {
for (int i = 0; i < n; i++) {

3
stm/stmperiph/stm324x7i_eval.c
View File

@ -89,7 +89,6 @@ void SD_LowLevel_DeInit(void)
* yet still detect when a card is inserted.
*/
void SD_LowLevel_Init_Detect(void) {
GPIO_InitTypeDef GPIO_InitStructure;
/* Periph clock enable */
RCC_AHB1PeriphClockCmd(SD_DETECT_GPIO_CLK, ENABLE);
@ -97,6 +96,7 @@ void SD_LowLevel_Init_Detect(void) {
/*!< Configure SD_SPI_DETECT_PIN pin: SD Card detect pin */
#if defined(PYBOARD3)
// dpgeorge: PYBv2-v3: switch is normally open, connected to VDD when card inserted
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = SD_DETECT_PIN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz; // needs to be 2MHz due to restrictions on PC13
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
@ -104,6 +104,7 @@ void SD_LowLevel_Init_Detect(void) {
GPIO_Init(SD_DETECT_GPIO_PORT, &GPIO_InitStructure);
#elif defined(PYBOARD4)
// dpgeorge: PYBv4: switch is normally open, connected to GND when card inserted
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = SD_DETECT_PIN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;