diff --git a/hardware/pic32/libraries/SD/utility/Sd2PinMap.h b/hardware/pic32/libraries/SD/utility/Sd2PinMap.h
index d3b6a0d55..f471cb70e 100755
--- a/hardware/pic32/libraries/SD/utility/Sd2PinMap.h
+++ b/hardware/pic32/libraries/SD/utility/Sd2PinMap.h
@@ -42,6 +42,25 @@
 	#define latSCK				LATG
 	#define bnSCK				BIT_6
 
+#elif defined(_BOARD_WF32_)
+        //uc Pin 52
+        #define prtSDO				IOPORT_G
+        #define	trisSDO				TRISG
+        #define	latSDO				LATG
+        #define	bnSDO				BIT_13
+
+        //uc Pin 49
+        #define prtSDI				IOPORT_G
+        #define trisSDI				TRISG
+        #define	latSDI				LATG
+        #define bnSDI				BIT_15
+
+        //uc Pin 50
+        #define prtSCK				IOPORT_G
+        #define trisSCK				TRISG
+        #define latSCK				LATG
+        #define bnSCK				BIT_14
+
 #elif defined(_BOARD_PONTECH_QUICK240_USB_)
         //uc Pin 72
         #define prtSDO				IOPORT_D
@@ -60,6 +79,7 @@
         #define trisSCK				TRISD
         #define latSCK				LATD
         #define bnSCK				BIT_10
+
 #elif defined(_BOARD_CEREBOT_MX3CK_)
 
 	#define	prtSDO				IOPORT_F	//JC
diff --git a/hardware/pic32/variants/Cerebot_32MX4/Board_Data.c b/hardware/pic32/variants/Cerebot_32MX4/Board_Data.c
index 6605b69ad..ee2becd10 100755
--- a/hardware/pic32/variants/Cerebot_32MX4/Board_Data.c
+++ b/hardware/pic32/variants/Cerebot_32MX4/Board_Data.c
@@ -301,7 +301,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 ** compare number, input capture number, and timer external clock
 ** input associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
     // Connector JA
 	NOT_ON_TIMER,	// 0 RE 0		PMD0
 	NOT_ON_TIMER,	// 1 RE 1		PMD1		
diff --git a/hardware/pic32/variants/Cerebot_32MX4/Board_Defs.h b/hardware/pic32/variants/Cerebot_32MX4/Board_Defs.h
index 6ed491211..91a87b844 100644
--- a/hardware/pic32/variants/Cerebot_32MX4/Board_Defs.h
+++ b/hardware/pic32/variants/Cerebot_32MX4/Board_Defs.h
@@ -254,7 +254,7 @@ const static uint8_t SCK  = 11;		// PIC32 SCK2
 extern const uint32_t	port_to_tris_PGM[];
 extern const uint8_t	digital_pin_to_port_PGM[];
 extern const uint16_t	digital_pin_to_bit_mask_PGM[];
-extern const uint8_t	digital_pin_to_timer_PGM[];
+extern const uint16_t	digital_pin_to_timer_PGM[];
 extern const uint8_t 	digital_pin_to_analog_PGM[];
 extern const uint8_t	analog_pin_to_channel_PGM[];
 
diff --git a/hardware/pic32/variants/Cerebot_32MX7/Board_Data.c b/hardware/pic32/variants/Cerebot_32MX7/Board_Data.c
index f29f8e887..c23a6cd60 100755
--- a/hardware/pic32/variants/Cerebot_32MX7/Board_Data.c
+++ b/hardware/pic32/variants/Cerebot_32MX7/Board_Data.c
@@ -286,7 +286,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 /* This table is used to map from digital pin number to the output
 ** compare number associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
     // Connector JA
 	NOT_ON_TIMER,		//  0 RB2 		AN2/C2IN-/CN4/RB2
 	NOT_ON_TIMER,		//  1 RB3		AN3/C2IN+/CN5/RB3
diff --git a/hardware/pic32/variants/Cmod/Board_Data.c b/hardware/pic32/variants/Cmod/Board_Data.c
index 6ec6230cf..d5255c51b 100755
--- a/hardware/pic32/variants/Cmod/Board_Data.c
+++ b/hardware/pic32/variants/Cmod/Board_Data.c
@@ -205,7 +205,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 ** compare number, input capture number, and timer external clock
 ** input associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
     // Pins 0 through 38
     NOT_A_PIN,      //  0
     NOT_A_PIN,      //  1
diff --git a/hardware/pic32/variants/DP32/Board_Data.c b/hardware/pic32/variants/DP32/Board_Data.c
index a53f3beb9..755c128a9 100644
--- a/hardware/pic32/variants/DP32/Board_Data.c
+++ b/hardware/pic32/variants/DP32/Board_Data.c
@@ -165,7 +165,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 ** compare number, input capture number, and timer external clock
 ** input associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
     // Pins 0 through 18
     NOT_ON_TIMER,                           //  0   J4-1    RB5     USB                     TMS/RPB5/USBID/RB5
     NOT_ON_TIMER,                           //  1   J4-2    RB7     INT0                    TDI/RPB7/CTED3/PMD5/INT0/RB7   
diff --git a/hardware/pic32/variants/Default_100/Board_Data.c b/hardware/pic32/variants/Default_100/Board_Data.c
index 51680c9f9..d081aad4d 100755
--- a/hardware/pic32/variants/Default_100/Board_Data.c
+++ b/hardware/pic32/variants/Default_100/Board_Data.c
@@ -507,7 +507,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 ** compare number, input capture number, and timer external clock
 ** input associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
 //#ifdef _PORTA
 	NOT_ON_TIMER ,	// 0 RA 0
 	NOT_ON_TIMER ,	// 1 RA 1
diff --git a/hardware/pic32/variants/Default_100/Board_Defs.h b/hardware/pic32/variants/Default_100/Board_Defs.h
index fc6c4b51d..c7b7e3924 100644
--- a/hardware/pic32/variants/Default_100/Board_Defs.h
+++ b/hardware/pic32/variants/Default_100/Board_Defs.h
@@ -232,7 +232,7 @@ const static uint8_t SCK  = 102;		// PIC32 SCK2
 extern const uint32_t	port_to_tris_PGM[];
 extern const uint8_t	digital_pin_to_port_PGM[];
 extern const uint16_t	digital_pin_to_bit_mask_PGM[];
-extern const uint8_t	digital_pin_to_timer_PGM[];
+extern const uint16_t	digital_pin_to_timer_PGM[];
 
 #if defined(_NOT_USED_)
 extern const uint8_t 	digital_pin_to_analog_PGM[];
diff --git a/hardware/pic32/variants/Default_64/Board_Data.c b/hardware/pic32/variants/Default_64/Board_Data.c
index 7166dc5da..fd0fbb5e4 100755
--- a/hardware/pic32/variants/Default_64/Board_Data.c
+++ b/hardware/pic32/variants/Default_64/Board_Data.c
@@ -507,7 +507,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 ** compare number, input capture number, and timer external clock
 ** input associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
 //#ifdef _PORTA
 	NOT_ON_TIMER ,	// 0 RA 0
 	NOT_ON_TIMER ,	// 1 RA 1
diff --git a/hardware/pic32/variants/Default_64/Board_Defs.h b/hardware/pic32/variants/Default_64/Board_Defs.h
index 86cdcc3f7..3e494c23d 100644
--- a/hardware/pic32/variants/Default_64/Board_Defs.h
+++ b/hardware/pic32/variants/Default_64/Board_Defs.h
@@ -229,7 +229,7 @@ const static uint8_t SCK  = 102;		// PIC32 SCK2
 extern const uint32_t	port_to_tris_PGM[];
 extern const uint8_t	digital_pin_to_port_PGM[];
 extern const uint16_t	digital_pin_to_bit_mask_PGM[];
-extern const uint8_t	digital_pin_to_timer_PGM[];
+extern const uint16_t	digital_pin_to_timer_PGM[];
 
 #if defined(_NOT_USED_)
 extern const uint8_t 	digital_pin_to_analog_PGM[];
diff --git a/hardware/pic32/variants/Fubarino_Mini/Board_Data.c b/hardware/pic32/variants/Fubarino_Mini/Board_Data.c
index 6e5b901a3..ad4ac4251 100644
--- a/hardware/pic32/variants/Fubarino_Mini/Board_Data.c
+++ b/hardware/pic32/variants/Fubarino_Mini/Board_Data.c
@@ -193,7 +193,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 ** compare number, input capture number, and timer external clock
 ** input associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
 	NOT_ON_TIMER ,	//  0  RB13
 	NOT_ON_TIMER ,	//  1  RA10
 	NOT_ON_TIMER ,	//  2  RA7
diff --git a/hardware/pic32/variants/Fubarino_SD/Board_Data.c b/hardware/pic32/variants/Fubarino_SD/Board_Data.c
index 4a6302b14..cd89ac25e 100644
--- a/hardware/pic32/variants/Fubarino_SD/Board_Data.c
+++ b/hardware/pic32/variants/Fubarino_SD/Board_Data.c
@@ -219,7 +219,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 ** compare number, input capture number, and timer external clock
 ** input associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
 	_TIMER_IC1 ,	// 0  RD8
 	_TIMER_IC2 ,	// 1  RD9
 	_TIMER_IC3 ,	// 2  RD10
diff --git a/hardware/pic32/variants/Fubarino_SD/Board_Defs.h b/hardware/pic32/variants/Fubarino_SD/Board_Defs.h
index 8773ebc62..9551afef9 100644
--- a/hardware/pic32/variants/Fubarino_SD/Board_Defs.h
+++ b/hardware/pic32/variants/Fubarino_SD/Board_Defs.h
@@ -257,7 +257,7 @@ const static uint8_t SCK  = 102;		// PIC32 SCK2
 extern const uint32_t	port_to_tris_PGM[];
 extern const uint8_t	digital_pin_to_port_PGM[];
 extern const uint16_t	digital_pin_to_bit_mask_PGM[];
-extern const uint8_t	digital_pin_to_timer_PGM[];
+extern const uint16_t	digital_pin_to_timer_PGM[];
 
 //#if defined(_NOT_USED_)
 extern const uint8_t 	digital_pin_to_analog_PGM[];
diff --git a/hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Data.c b/hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Data.c
index dcb0d8782..c006dc361 100644
--- a/hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Data.c
+++ b/hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Data.c
@@ -213,7 +213,7 @@ const uint16_t	digital_pin_to_bit_mask_PGM[] = {
 ** compare number, input capture number, and timer external clock
 ** input associated with that pin.
 */
-const uint8_t	digital_pin_to_timer_PGM[] = {
+const uint16_t	digital_pin_to_timer_PGM[] = {
 	_TIMER_OC3 ,	//  0  RD2  D0  U1RX/OC3/RD2
 	_TIMER_OC4 ,	//  1  RD3  D1  U1TX/OC4/RD3
 	_TIMER_OC5 | _TIMER_IC5,	//  2  RD4  D2  OC5/IC5/PMWR/CN13/RD4 BUTTTON
diff --git a/hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Defs.h b/hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Defs.h
index f3cf239bb..0ae2e3b1f 100644
--- a/hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Defs.h
+++ b/hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Defs.h
@@ -252,7 +252,7 @@ const static uint8_t SCK  = 102;		// PIC32 SCK2
 extern const uint32_t	port_to_tris_PGM[];
 extern const uint8_t	digital_pin_to_port_PGM[];
 extern const uint16_t	digital_pin_to_bit_mask_PGM[];
-extern const uint8_t	digital_pin_to_timer_PGM[];
+extern const uint16_t	digital_pin_to_timer_PGM[];
 
 //#if defined(_NOT_USED_)
 extern const uint8_t 	digital_pin_to_analog_PGM[];