Merge pull request #165 from MikroElektronika/new-feature/xc8-rework

SDK 2.12.2

AUTHORS.md

@@ -3,6 +3,7 @@
 - Bojan Konstantinovic
 - Branislav Marton
 - Branko Jaksic
+- Danilo Milenkovic
 - Esma Niksic
 - Filip Grujcic
 - Filip Jankovic
@@ -23,6 +24,7 @@
 - Nikola Novakovic
 - Stefan Djordjevic
 - Stefan Filipovic
+- Stevan Zecic
 - Strahinja Jacimovic
 - Tanja Kovacevic
 - Uros Cvetinovic

api/log/lib/include/uart/log.h

@@ -108,8 +108,8 @@ typedef struct
  *        - `x` represents port name ( A, B, C ... )
  *        - `y` represents pin ( 1,2,3...15...31 )
  *      Example:
- *        #define USB_UART_RX PA14
- *        #define USB_UART_TX PC0
+ *        #define USB_UART_RX GPIO_PA14
+ *        #define USB_UART_TX GPIO_PC0
  */
 #define LOG_MAP_USB_UART(cfg) \
     cfg.rx_pin = USB_UART_RX; \

bsp/board/include/boards/board_arduino_mega_2560_rev3/board.h

@@ -58,99 +58,99 @@ extern "C"{
 #include "shield.h"
 
 // Mapping
-#define HEADER_CONNECTOR_D0  PE0
-#define HEADER_CONNECTOR_D1  PE1
-#define HEADER_CONNECTOR_D2  PE4
-#define HEADER_CONNECTOR_D3  PE5
-#define HEADER_CONNECTOR_D4  PG5
-#define HEADER_CONNECTOR_D5  PE3
-#define HEADER_CONNECTOR_D6  PH3
-#define HEADER_CONNECTOR_D7  PH4
-#define HEADER_CONNECTOR_D8  PH5
-#define HEADER_CONNECTOR_D9  PH6
-#define HEADER_CONNECTOR_D10 PB4
-#define HEADER_CONNECTOR_D11 PB5
-#define HEADER_CONNECTOR_D12 PB6
-#define HEADER_CONNECTOR_D13 PB7
-#define HEADER_CONNECTOR_D14 PJ1
-#define HEADER_CONNECTOR_D15 PJ0
-#define HEADER_CONNECTOR_D16 PH1
-#define HEADER_CONNECTOR_D17 PH0
-#define HEADER_CONNECTOR_D18 PD3
-#define HEADER_CONNECTOR_D19 PD2
-#define HEADER_CONNECTOR_D20 PD1
-#define HEADER_CONNECTOR_D21 PD0
-
-#define HEADER_CONNECTOR_D22 PA0
-#define HEADER_CONNECTOR_D23 PA1
-#define HEADER_CONNECTOR_D24 PA2
-#define HEADER_CONNECTOR_D25 PA3
-#define HEADER_CONNECTOR_D26 PA4
-#define HEADER_CONNECTOR_D27 PA5
-#define HEADER_CONNECTOR_D28 PA6
-#define HEADER_CONNECTOR_D29 PA7
-#define HEADER_CONNECTOR_D30 PC7
-#define HEADER_CONNECTOR_D31 PC6
-#define HEADER_CONNECTOR_D32 PC5
-#define HEADER_CONNECTOR_D33 PC4
-#define HEADER_CONNECTOR_D34 PC3
-#define HEADER_CONNECTOR_D35 PC2
-#define HEADER_CONNECTOR_D36 PC1
-#define HEADER_CONNECTOR_D37 PC0
-#define HEADER_CONNECTOR_D38 PD7
-#define HEADER_CONNECTOR_D39 PG2
-#define HEADER_CONNECTOR_D40 PG1
-#define HEADER_CONNECTOR_D41 PG0
-#define HEADER_CONNECTOR_D42 PL7
-#define HEADER_CONNECTOR_D43 PL6
-#define HEADER_CONNECTOR_D44 PL5
-#define HEADER_CONNECTOR_D45 PL4
-#define HEADER_CONNECTOR_D46 PL3
-#define HEADER_CONNECTOR_D47 PL2
-#define HEADER_CONNECTOR_D48 PL1
-#define HEADER_CONNECTOR_D49 PL0
-#define HEADER_CONNECTOR_D50 PB3
-#define HEADER_CONNECTOR_D51 PB2
-#define HEADER_CONNECTOR_D52 PB1
-#define HEADER_CONNECTOR_D53 PB0
-
-#define HEADER_CONNECTOR_D54 PF0
-#define HEADER_CONNECTOR_D55 PF1
-#define HEADER_CONNECTOR_D56 PF2
-#define HEADER_CONNECTOR_D57 PF3
-#define HEADER_CONNECTOR_D58 PF4
-#define HEADER_CONNECTOR_D59 PF5
-#define HEADER_CONNECTOR_D60 PF6
-#define HEADER_CONNECTOR_D61 PF7
-#define HEADER_CONNECTOR_D62 PK0
-#define HEADER_CONNECTOR_D63 PK1
-#define HEADER_CONNECTOR_D64 PK2
-#define HEADER_CONNECTOR_D65 PK3
-#define HEADER_CONNECTOR_D66 PK4
-#define HEADER_CONNECTOR_D67 PK5
-#define HEADER_CONNECTOR_D68 PK6
-#define HEADER_CONNECTOR_D69 PK7
+#define HEADER_CONNECTOR_D0  GPIO_PE0
+#define HEADER_CONNECTOR_D1  GPIO_PE1
+#define HEADER_CONNECTOR_D2  GPIO_PE4
+#define HEADER_CONNECTOR_D3  GPIO_PE5
+#define HEADER_CONNECTOR_D4  GPIO_PG5
+#define HEADER_CONNECTOR_D5  GPIO_PE3
+#define HEADER_CONNECTOR_D6  GPIO_PH3
+#define HEADER_CONNECTOR_D7  GPIO_PH4
+#define HEADER_CONNECTOR_D8  GPIO_PH5
+#define HEADER_CONNECTOR_D9  GPIO_PH6
+#define HEADER_CONNECTOR_D10 GPIO_PB4
+#define HEADER_CONNECTOR_D11 GPIO_PB5
+#define HEADER_CONNECTOR_D12 GPIO_PB6
+#define HEADER_CONNECTOR_D13 GPIO_PB7
+#define HEADER_CONNECTOR_D14 GPIO_PJ1
+#define HEADER_CONNECTOR_D15 GPIO_PJ0
+#define HEADER_CONNECTOR_D16 GPIO_PH1
+#define HEADER_CONNECTOR_D17 GPIO_PH0
+#define HEADER_CONNECTOR_D18 GPIO_PD3
+#define HEADER_CONNECTOR_D19 GPIO_PD2
+#define HEADER_CONNECTOR_D20 GPIO_PD1
+#define HEADER_CONNECTOR_D21 GPIO_PD0
+
+#define HEADER_CONNECTOR_D22 GPIO_PA0
+#define HEADER_CONNECTOR_D23 GPIO_PA1
+#define HEADER_CONNECTOR_D24 GPIO_PA2
+#define HEADER_CONNECTOR_D25 GPIO_PA3
+#define HEADER_CONNECTOR_D26 GPIO_PA4
+#define HEADER_CONNECTOR_D27 GPIO_PA5
+#define HEADER_CONNECTOR_D28 GPIO_PA6
+#define HEADER_CONNECTOR_D29 GPIO_PA7
+#define HEADER_CONNECTOR_D30 GPIO_PC7
+#define HEADER_CONNECTOR_D31 GPIO_PC6
+#define HEADER_CONNECTOR_D32 GPIO_PC5
+#define HEADER_CONNECTOR_D33 GPIO_PC4
+#define HEADER_CONNECTOR_D34 GPIO_PC3
+#define HEADER_CONNECTOR_D35 GPIO_PC2
+#define HEADER_CONNECTOR_D36 GPIO_PC1
+#define HEADER_CONNECTOR_D37 GPIO_PC0
+#define HEADER_CONNECTOR_D38 GPIO_PD7
+#define HEADER_CONNECTOR_D39 GPIO_PG2
+#define HEADER_CONNECTOR_D40 GPIO_PG1
+#define HEADER_CONNECTOR_D41 GPIO_PG0
+#define HEADER_CONNECTOR_D42 GPIO_PL7
+#define HEADER_CONNECTOR_D43 GPIO_PL6
+#define HEADER_CONNECTOR_D44 GPIO_PL5
+#define HEADER_CONNECTOR_D45 GPIO_PL4
+#define HEADER_CONNECTOR_D46 GPIO_PL3
+#define HEADER_CONNECTOR_D47 GPIO_PL2
+#define HEADER_CONNECTOR_D48 GPIO_PL1
+#define HEADER_CONNECTOR_D49 GPIO_PL0
+#define HEADER_CONNECTOR_D50 GPIO_PB3
+#define HEADER_CONNECTOR_D51 GPIO_PB2
+#define HEADER_CONNECTOR_D52 GPIO_PB1
+#define HEADER_CONNECTOR_D53 GPIO_PB0
+
+#define HEADER_CONNECTOR_D54 GPIO_PF0
+#define HEADER_CONNECTOR_D55 GPIO_PF1
+#define HEADER_CONNECTOR_D56 GPIO_PF2
+#define HEADER_CONNECTOR_D57 GPIO_PF3
+#define HEADER_CONNECTOR_D58 GPIO_PF4
+#define HEADER_CONNECTOR_D59 GPIO_PF5
+#define HEADER_CONNECTOR_D60 GPIO_PF6
+#define HEADER_CONNECTOR_D61 GPIO_PF7
+#define HEADER_CONNECTOR_D62 GPIO_PK0
+#define HEADER_CONNECTOR_D63 GPIO_PK1
+#define HEADER_CONNECTOR_D64 GPIO_PK2
+#define HEADER_CONNECTOR_D65 GPIO_PK3
+#define HEADER_CONNECTOR_D66 GPIO_PK4
+#define HEADER_CONNECTOR_D67 GPIO_PK5
+#define HEADER_CONNECTOR_D68 GPIO_PK6
+#define HEADER_CONNECTOR_D69 GPIO_PK7
 
 // LEDs
-#define TX_LED PD5
-#define RX_LED PD4
-#define LED_BUILTIN PB7
+#define TX_LED GPIO_PD5
+#define RX_LED GPIO_PD4
+#define LED_BUILTIN GPIO_PB7
 
 // UART
-#define HEADER_CONNECTOR_TX0 PE1
-#define HEADER_CONNECTOR_RX0 PE0
+#define HEADER_CONNECTOR_TX0 GPIO_PE1
+#define HEADER_CONNECTOR_RX0 GPIO_PE0
 
-#define HEADER_CONNECTOR_TX1 PD3
-#define HEADER_CONNECTOR_RX1 PD2
+#define HEADER_CONNECTOR_TX1 GPIO_PD3
+#define HEADER_CONNECTOR_RX1 GPIO_PD2
 
-#define HEADER_CONNECTOR_TX2 PH1
-#define HEADER_CONNECTOR_RX2 PH0
+#define HEADER_CONNECTOR_TX2 GPIO_PH1
+#define HEADER_CONNECTOR_RX2 GPIO_PH0
 
-#define HEADER_CONNECTOR_TX3 PJ1
-#define HEADER_CONNECTOR_RX3 PJ0
+#define HEADER_CONNECTOR_TX3 GPIO_PJ1
+#define HEADER_CONNECTOR_RX3 GPIO_PJ0
 
-#define HEADER_CONNECTOR_SDA PD1
-#define HEADER_CONNECTOR_SCL PD0
+#define HEADER_CONNECTOR_SDA GPIO_PD1
+#define HEADER_CONNECTOR_SCL GPIO_PD0
 
 #ifdef __cplusplus
 }

bsp/board/include/boards/board_arduino_uno_rev3/board.h

@@ -58,26 +58,26 @@ extern "C"{
 #include "shield.h"
 
 /// Mapping
-#define HEADER_CONNECTOR_D0 PD0
-#define HEADER_CONNECTOR_D1 PD1
-#define HEADER_CONNECTOR_D2 PD2
-#define HEADER_CONNECTOR_D3 PD3
-#define HEADER_CONNECTOR_D4 PD4
-#define HEADER_CONNECTOR_D5 PD5
-#define HEADER_CONNECTOR_D6 PD6
-#define HEADER_CONNECTOR_D7 PD7
-#define HEADER_CONNECTOR_D8 PB0
-#define HEADER_CONNECTOR_D9 PB1
-#define HEADER_CONNECTOR_D10 PB2
-#define HEADER_CONNECTOR_D11 PB3
-#define HEADER_CONNECTOR_D12 PB4
-#define HEADER_CONNECTOR_D13 PB5
-#define HEADER_CONNECTOR_D14 PC0
-#define HEADER_CONNECTOR_D15 PC1
-#define HEADER_CONNECTOR_D16 PC2
-#define HEADER_CONNECTOR_D17 PC3
-#define HEADER_CONNECTOR_D18 PC4
-#define HEADER_CONNECTOR_D19 PC5
+#define HEADER_CONNECTOR_D0 GPIO_PD0
+#define HEADER_CONNECTOR_D1 GPIO_PD1
+#define HEADER_CONNECTOR_D2 GPIO_PD2
+#define HEADER_CONNECTOR_D3 GPIO_PD3
+#define HEADER_CONNECTOR_D4 GPIO_PD4
+#define HEADER_CONNECTOR_D5 GPIO_PD5
+#define HEADER_CONNECTOR_D6 GPIO_PD6
+#define HEADER_CONNECTOR_D7 GPIO_PD7
+#define HEADER_CONNECTOR_D8 GPIO_PB0
+#define HEADER_CONNECTOR_D9 GPIO_PB1
+#define HEADER_CONNECTOR_D10 GPIO_PB2
+#define HEADER_CONNECTOR_D11 GPIO_PB3
+#define HEADER_CONNECTOR_D12 GPIO_PB4
+#define HEADER_CONNECTOR_D13 GPIO_PB5
+#define HEADER_CONNECTOR_D14 GPIO_PC0
+#define HEADER_CONNECTOR_D15 GPIO_PC1
+#define HEADER_CONNECTOR_D16 GPIO_PC2
+#define HEADER_CONNECTOR_D17 GPIO_PC3
+#define HEADER_CONNECTOR_D18 GPIO_PC4
+#define HEADER_CONNECTOR_D19 GPIO_PC5
 
 #define HEADER_CONNECTOR_ANALOG_IN_A0 HEADER_CONNECTOR_D14
 #define HEADER_CONNECTOR_ANALOG_IN_A1 HEADER_CONNECTOR_D15
@@ -93,9 +93,9 @@ extern "C"{
 #define HEADER_CONNECTOR_DIGITAL_COPI HEADER_CONNECTOR_D11
 #define HEADER_CONNECTOR_DIGITAL_SS HEADER_CONNECTOR_D10
 
-#define HEADER_CONNECTOR_DIGITAL_LED_BUILTIN PB5
-#define HEADER_CONNECTOR_DIGITAL_LED_TX PD5
-#define HEADER_CONNECTOR_DIGITAL_LED_RX PD4
+#define HEADER_CONNECTOR_DIGITAL_LED_BUILTIN GPIO_PB5
+#define HEADER_CONNECTOR_DIGITAL_LED_TX GPIO_PD5
+#define HEADER_CONNECTOR_DIGITAL_LED_RX GPIO_PD4
 
 #define USB_UART_TX SHIELD_SW1_TX
 #define USB_UART_RX SHIELD_SW1_RX

bsp/board/include/boards/board_curiosity_hpc/board.h

@@ -86,15 +86,15 @@ extern "C"{
 #define MIKROBUS_2_SCL  MIKROBUS_2_DIP_SCL
 #define MIKROBUS_2_SDA  MIKROBUS_2_DIP_SDA
 
-#define BOARD_CURIOSITY_HPC_D2 PA4
-#define BOARD_CURIOSITY_HPC_D3 PA5
-#define BOARD_CURIOSITY_HPC_D4 PA6
-#define BOARD_CURIOSITY_HPC_D5 PA7
+#define BOARD_CURIOSITY_HPC_D2 GPIO_PA4
+#define BOARD_CURIOSITY_HPC_D3 GPIO_PA5
+#define BOARD_CURIOSITY_HPC_D4 GPIO_PA6
+#define BOARD_CURIOSITY_HPC_D5 GPIO_PA7
 
-#define BOARD_CURIOSITY_HPC_S1 PB4
-#define BOARD_CURIOSITY_HPC_S2 PC5
+#define BOARD_CURIOSITY_HPC_S1 GPIO_PB4
+#define BOARD_CURIOSITY_HPC_S2 GPIO_PC5
 
-#define BOARD_CURIOSITY_HPC_POT1 PA0
+#define BOARD_CURIOSITY_HPC_POT1 GPIO_PA0
 
 #define USB_UART_TX HAL_PIN_NC
 #define USB_UART_RX HAL_PIN_NC

bsp/board/include/boards/board_curiosity_hpc/dip_sockets/dip28/dip_socket.h

@@ -51,31 +51,31 @@ extern "C"{
 #include "hal_target.h"
 
 /// Mapping
-#define MIKROBUS_1_DIP_AN   PA1
+#define MIKROBUS_1_DIP_AN   GPIO_PA1
 #define MIKROBUS_1_DIP_RST      // Pin not routed to mikroBUS.
-#define MIKROBUS_1_DIP_CS   PA3
-#define MIKROBUS_1_DIP_SCK  PB1
-#define MIKROBUS_1_DIP_MISO PB2
-#define MIKROBUS_1_DIP_MOSI PB3
-#define MIKROBUS_1_DIP_PWM  PC2
-#define MIKROBUS_1_DIP_INT  PB5
-#define MIKROBUS_1_DIP_RX   PC7
-#define MIKROBUS_1_DIP_TX   PC6
-#define MIKROBUS_1_DIP_SCL  PC3
-#define MIKROBUS_1_DIP_SDA  PC4
+#define MIKROBUS_1_DIP_CS   GPIO_PA3
+#define MIKROBUS_1_DIP_SCK  GPIO_PB1
+#define MIKROBUS_1_DIP_MISO GPIO_PB2
+#define MIKROBUS_1_DIP_MOSI GPIO_PB3
+#define MIKROBUS_1_DIP_PWM  GPIO_PC2
+#define MIKROBUS_1_DIP_INT  GPIO_PB5
+#define MIKROBUS_1_DIP_RX   GPIO_PC7
+#define MIKROBUS_1_DIP_TX   GPIO_PC6
+#define MIKROBUS_1_DIP_SCL  GPIO_PC3
+#define MIKROBUS_1_DIP_SDA  GPIO_PC4
 
-#define MIKROBUS_2_DIP_AN   PA2
+#define MIKROBUS_2_DIP_AN   GPIO_PA2
 #define MIKROBUS_2_DIP_RST      // Pin not routed to mikroBUS.
 #define MIKROBUS_2_DIP_CS       // Pin not routed to mikroBUS.
-#define MIKROBUS_2_DIP_SCK  PB1
-#define MIKROBUS_2_DIP_MISO PB2
-#define MIKROBUS_2_DIP_MOSI PB3
+#define MIKROBUS_2_DIP_SCK  GPIO_PB1
+#define MIKROBUS_2_DIP_MISO GPIO_PB2
+#define MIKROBUS_2_DIP_MOSI GPIO_PB3
 #define MIKROBUS_2_DIP_PWM      // Pin not routed to mikroBUS.
-#define MIKROBUS_2_DIP_INT  PB0
-#define MIKROBUS_2_DIP_RX   PC0
-#define MIKROBUS_2_DIP_TX   PC1
-#define MIKROBUS_2_DIP_SCL  PC3
-#define MIKROBUS_2_DIP_SDA  PC4
+#define MIKROBUS_2_DIP_INT  GPIO_PB0
+#define MIKROBUS_2_DIP_RX   GPIO_PC0
+#define MIKROBUS_2_DIP_TX   GPIO_PC1
+#define MIKROBUS_2_DIP_SCL  GPIO_PC3
+#define MIKROBUS_2_DIP_SDA  GPIO_PC4
 
 #ifdef __cplusplus
 }