Skip to content

Commit

Permalink
Keith Vogel's change for issue #374 applied.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ricklon
ricklon committed Jul 23, 2013
1 parent f9ca1a1 commit eb37989
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 14 deletions.
20 changes: 20 additions & 0 deletions hardware/pic32/libraries/SD/utility/Sd2PinMap.h
View file
Expand Up @@ -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
Expand All @@ -60,6 +79,7 @@
#define trisSCK TRISD
#define latSCK LATD
#define bnSCK BIT_10

#elif defined(_BOARD_CEREBOT_MX3CK_)

#define prtSDO IOPORT_F //JC
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Cerebot_32MX4/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Cerebot_32MX4/Board_Defs.h
View file
Expand Up @@ -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[];

Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Cerebot_32MX7/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Cmod/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/DP32/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Default_100/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Default_100/Board_Defs.h
View file
Expand Up @@ -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[];
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Default_64/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Default_64/Board_Defs.h
View file
Expand Up @@ -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[];
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Fubarino_Mini/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Fubarino_SD/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Fubarino_SD/Board_Defs.h
View file
Expand Up @@ -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[];
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Data.c
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hardware/pic32/variants/Olimex_PIC32_Pinguino/Board_Defs.h
View file
Expand Up @@ -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[];
Expand Down

0 comments on commit eb37989

Please sign in to comment.