revert git being a dumb

hierophect · hierophect · commit 39dbcb529aa9 · 2019-11-06T14:54:07.000-05:00
diff --git a/ports/stm32f4/boards/feather_stm32f405_express/board.c b/ports/stm32f4/boards/feather_stm32f405_express/board.c
@@ -25,12 +25,13 @@
  */
 
 #include "boards/board.h"
+#include "mpconfigboard.h"
 
 void board_init(void) {
 }
 
 bool board_requests_safe_mode(void) {
-  return false;
+	return false;
 }
 
 void reset_board(void) {
diff --git a/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h b/ports/stm32f4/boards/feather_stm32f405_express/mpconfigboard.h
@@ -3,8 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (c) 2016 Glenn Ruben Bakke
- * Copyright (c) 2018 Dan Halbert for Adafruit Industries
+ * Copyright (c) 2019 Lucian Copeland for Adafruit Industries
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -41,3 +40,13 @@
 #define SPI_FLASH_MISO_PIN          &pin_PB04
 #define SPI_FLASH_SCK_PIN           &pin_PB03
 #define SPI_FLASH_CS_PIN            &pin_PA15
+
+#define DEFAULT_I2C_BUS_SCL (&pin_PB06)
+#define DEFAULT_I2C_BUS_SDA (&pin_PB07)
+
+#define DEFAULT_SPI_BUS_SCK (&pin_PB13)
+#define DEFAULT_SPI_BUS_MOSI (&pin_PB15)
+#define DEFAULT_SPI_BUS_MISO (&pin_PB14)
+
+#define DEFAULT_UART_BUS_RX (&pin_PB11)
+#define DEFAULT_UART_BUS_TX (&pin_PB10)
diff --git a/ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.h b/ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.h
@@ -35,3 +35,5 @@
 #define AUTORESET_DELAY_MS 500
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000)
 
+#define DEFAULT_I2C_BUS_SCL (&pin_PB10)
+#define DEFAULT_I2C_BUS_SDA (&pin_PB09)

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,13 @@`
`25`	`25`	`*/`
`26`	`26`
`27`	`27`	`#include "boards/board.h"`
	`28`	`+#include "mpconfigboard.h"`
`28`	`29`
`29`	`30`	`void board_init(void) {`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`bool board_requests_safe_mode(void) {`
`33`		`- return false;`
	`34`	`+ return false;`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`void reset_board(void) {`