Skip to content

Commit

Permalink
Merge pull request #108 from MikroElektronika/fix/SWMIKSDK-1233
Browse files Browse the repository at this point in the history
Fixed all mcu_card headers to have correct TFT mappings
  • Loading branch information
StrahinjaJacimovic authored Oct 17, 2024
2 parents 93a5a94 + 537f3a3 commit 9dd349b
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ extern "C"{
#define LCD_TFT_CH0_8BIT_MASK 0xFF

#define LCD_TFT_16BIT_CH0 HAL_PORT_NC
#define LCD_TFT_16BIT_CH0_MASK 0xFF
#define LCD_TFT_16BIT_CH0_MASK 0x00

#define LCD_TFT_16BIT_CH1 HAL_PORT_NC
#define LCD_TFT_16BIT_CH1_MASK 0x00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ extern "C"{
#define LCD_TFT_16BIT_CH0_MASK 0x00FF

#define LCD_TFT_16BIT_CH1 PORT_C
#define LCD_TFT_16BIT_CH1_MASK 0xFF00
#define LCD_TFT_16BIT_CH1_MASK 0x00FF

#ifdef __cplusplus
}
Expand Down
2 changes: 1 addition & 1 deletion bsp/board/include/mcu_cards/mcu_card_for_pic32/mcu_card.h
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ extern "C"{
#define LCD_TFT_CH0_8BIT_MASK 0xFF

#define LCD_TFT_16BIT_CH0 HAL_PORT_NC
#define LCD_TFT_16BIT_CH0_MASK 0xFF
#define LCD_TFT_16BIT_CH0_MASK 0x00

#define LCD_TFT_16BIT_CH1 HAL_PORT_NC
#define LCD_TFT_16BIT_CH1_MASK 0x00
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,11 @@ extern "C"{
#define LCD_TFT_8BIT_CH0 PORT_H
#define LCD_TFT_CH0_8BIT_MASK 0xFF

#define LCD_TFT_16BIT_CH0 PORT_H
#define LCD_TFT_16BIT_CH0_MASK 0xFF
#define LCD_TFT_16BIT_CH0 HAL_PORT_NC
#define LCD_TFT_16BIT_CH0_MASK 0x00

#define LCD_TFT_16BIT_CH1 // Pin not routed.
#define LCD_TFT_16BIT_CH1_MASK 0xFF00
#define LCD_TFT_16BIT_CH1 HAL_PORT_NC
#define LCD_TFT_16BIT_CH1_MASK 0x00

#ifdef __cplusplus
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,11 @@ extern "C"{
#define LCD_TFT_8BIT_CH0 PORT_E
#define LCD_TFT_CH0_8BIT_MASK 0xFF

#define LCD_TFT_16BIT_CH0 PORT_E
#define LCD_TFT_16BIT_CH0_MASK 0xFF
#define LCD_TFT_16BIT_CH0 HAL_PORT_NC
#define LCD_TFT_16BIT_CH0_MASK 0x00

#define LCD_TFT_16BIT_CH1 // Pin not routed.
#define LCD_TFT_16BIT_CH1_MASK 0xFF00
#define LCD_TFT_16BIT_CH1 HAL_PORT_NC
#define LCD_TFT_16BIT_CH1_MASK 0x00

#ifdef __cplusplus
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,11 @@ extern "C"{
#define LCD_TFT_8BIT_CH0 PORT_H
#define LCD_TFT_CH0_8BIT_MASK 0xFF

#define LCD_TFT_16BIT_CH0 PORT_H
#define LCD_TFT_16BIT_CH0_MASK 0xFF
#define LCD_TFT_16BIT_CH0 HAL_PORT_NC
#define LCD_TFT_16BIT_CH0_MASK 0x00

#define LCD_TFT_16BIT_CH1 // Pin not routed.
#define LCD_TFT_16BIT_CH1_MASK 0xFF00
#define LCD_TFT_16BIT_CH1 HAL_PORT_NC
#define LCD_TFT_16BIT_CH1_MASK 0x00

#ifdef __cplusplus
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,11 @@ extern "C"{
#define LCD_TFT_8BIT_CH0 PORT_E
#define LCD_TFT_CH0_8BIT_MASK 0xFF

#define LCD_TFT_16BIT_CH0 PORT_E
#define LCD_TFT_16BIT_CH0_MASK 0xFF
#define LCD_TFT_16BIT_CH0 HAL_PORT_NC
#define LCD_TFT_16BIT_CH0_MASK 0x00

#define LCD_TFT_16BIT_CH1 // Pin not routed.
#define LCD_TFT_16BIT_CH1_MASK 0xFF00
#define LCD_TFT_16BIT_CH1 HAL_PORT_NC
#define LCD_TFT_16BIT_CH1_MASK 0x00

#ifdef __cplusplus
}
Expand Down

0 comments on commit 9dd349b

Please sign in to comment.