Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into MX1_MX2

Conflicts:
	hardware/pic32/variants/fubarino_sd_v11/Board_Defs.h
  • Loading branch information...
commit 6180678afeed58cabc863702f3e94493c9027dfb 2 parents e6aa1ff + 5f7817f
@EmbeddedMan authored
Showing with 7 additions and 7 deletions.
  1. +7 −7 hardware/pic32/variants/fubarino_sd_v11/Board_Defs.h
View
14 hardware/pic32/variants/fubarino_sd_v11/Board_Defs.h
@@ -67,7 +67,7 @@
#define NUM_SERIAL_PORTS 2
#define NUM_SPI_PORTS 1
-#define NUM_I2C_PORTS 1
+#define NUM_I2C_PORTS 2
#define NUM_DSPI_PORTS 1
#define NUM_DTWI_PORTS 2
@@ -129,7 +129,7 @@
#define PIN_IC4 4
#define PIN_IC5 11
-#define PIN_TCK1 6
+//#define PIN_TCK1 46 (TCK would be what?)
//#define PIN_TCK2 not available on the chip
//#define PIN_TCK3 not available on the chip
//#define PIN_TCK4 not available on the chip
@@ -139,11 +139,11 @@
/* Interrupt Pin Declarations */
/* ------------------------------------------------------------ */
-#define PIN_INT0 5
-#define PIN_INT1 1
-#define PIN_INT2 2
-#define PIN_INT3 3
-#define PIN_INT4 4
+#define PIN_INT0 4
+#define PIN_INT1 0
+#define PIN_INT2 1
+#define PIN_INT3 2
+#define PIN_INT4 3
/* ------------------------------------------------------------ */
/* SPI Pin Declarations */
Please sign in to comment.
Something went wrong with that request. Please try again.