v2.10.1

+ released: 2024-02-02 Fixes + Fixed shield.h for shield_curiosity_nano_base_for_click_boards + Resolved macros mismatch with board.h + Fixed baud rate settings in low level CAN implementation for NXP + Default baud rate changed from 500k to 125k + Added checking in hal_ll_can_bit_timing() API if configured baud rate is the same as requested + Fixed guards for CAN PPS pins on PIC32 + Resolved the problem where certain pins were unreachable due to undefined macros in "ifdef" + Transmit FIFO initialization for CAN on PIC32 moved from "hal_ll_can_filter_init" to "hal_ll_can_module_init" + Since filters are not needed for transmitting this change makes using CAN easier and more intuitive
MikroElektronika · Feb 2, 2024 · fa1e2d7 · fa1e2d7
1 parent 9b633cb
commit fa1e2d7
Show file tree

Hide file tree

Showing 49 changed files with 2,858 additions and 2,825 deletions.
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -26,6 +26,7 @@
 - Strahinja Jacimovic
 - Tanja Kovacevic
 - Uros Cvetinovic
+- Vladimir Cvetkovic
 
 ---
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 **VERSIONS:**
 
++ **[v2.10.1](#v2101)**
 + **[v2.10.0](#v2100)**
 + **[v2.9.0](#v290)**
 + **[v2.8.0](#v280)**
@@ -27,6 +28,34 @@
 ---
 ---
 
+## `v2.10.1`
+
++ released: 2024-02-02
+
+### `2.10.1` Changes
+
+1. **[Fixes](#2101-fixes)**
+
+#### `2.10.1` Fixes
+
++ Fixed shield.h for shield_curiosity_nano_base_for_click_boards
+  + Resolved macros mismatch with board.h
++ Fixed baud rate settings in low level CAN implementation for NXP
+  + Default baud rate changed from 500k to 125k
+  + Added checking in hal_ll_can_bit_timing() API if configured baud rate is the same as requested
++ Fixed guards for CAN PPS pins on PIC32
+  + Resolved the problem where certain pins were unreachable due to undefined macros in `ifdef`
++ Transmit FIFO initialization for CAN on PIC32 moved from `hal_ll_can_filter_init` to `hal_ll_can_module_init`
+  + Since filters are not needed for transmitting this change makes using CAN easier and more intuitive
+
+---
+**[BACK TO TOP OF 2.10.1](#v2101)**
+
+---
+**[BACK TO TOP](#changelog)**
+
+---
+
 ## `v2.10.0`
 
 + released: 2024-01-30

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,9 @@
 ## ./CMakeLists.txt
 cmake_minimum_required(VERSION 3.11)
 if (${TOOLCHAIN_LANGUAGE} MATCHES "MikroC")
-    project(MikroSDK VERSION 2.10.0 LANGUAGES MikroC)
+    project(MikroSDK VERSION 2.10.1 LANGUAGES MikroC)
 else()
-    project(MikroSDK VERSION 2.10.0 LANGUAGES C ASM)
+    project(MikroSDK VERSION 2.10.1 LANGUAGES C ASM)
     add_compile_options("-fms-extensions")
 endif()
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # mikroSDK 2.0
 
-[![SDK Version](https://img.shields.io/badge/mikroSDK%20version-2.10.0-gold)](https://github.com/MikroElektronika/mikrosdk_v2/tree/mikroSDK-2.10.0)
+[![SDK Version](https://img.shields.io/badge/mikroSDK%20version-2.10.1-gold)](https://github.com/MikroElektronika/mikrosdk_v2/tree/mikroSDK-2.10.1)
 
 ---
 ## About

diff --git a/REQUIREMENTS.md b/REQUIREMENTS.md
@@ -17,6 +17,9 @@
 
 **SDK requirements by version:**
 
+* **v2.10.1**
+  * [`FLASH1`]
+  * [`RAM1`]
 * **v2.10.0**
   * [`FLASH1`]
   * [`RAM1`]

diff --git a/SUPPORTED_CHIP_LIST.md b/SUPPORTED_CHIP_LIST.md
diff --git a/bsp/board/include/shields/shield_curiosity_nano_base_for_click_boards/shield.h b/bsp/board/include/shields/shield_curiosity_nano_base_for_click_boards/shield.h
@@ -51,71 +51,71 @@ extern "C"{
 #include "mikrobus.h"
 
 // Shield header connections
-#define SHIELD_CONNECTOR_HD1_PIN7  HEADER_CONNECTOR_HD1_PIN7
-#define SHIELD_CONNECTOR_HD1_PIN8  HEADER_CONNECTOR_HD1_PIN8
-#define SHIELD_CONNECTOR_HD1_PIN9  HEADER_CONNECTOR_HD1_PIN9
-#define SHIELD_CONNECTOR_HD1_PIN10 HEADER_CONNECTOR_HD1_PIN10
-#define SHIELD_CONNECTOR_HD1_PIN11 HEADER_CONNECTOR_HD1_PIN11
-#define SHIELD_CONNECTOR_HD1_PIN12 HEADER_CONNECTOR_HD1_PIN12
-#define SHIELD_CONNECTOR_HD1_PIN13 HEADER_CONNECTOR_HD1_PIN13
-#define SHIELD_CONNECTOR_HD1_PIN14 HEADER_CONNECTOR_HD1_PIN14
-#define SHIELD_CONNECTOR_HD1_PIN16 HEADER_CONNECTOR_HD1_PIN16
-#define SHIELD_CONNECTOR_HD1_PIN17 HEADER_CONNECTOR_HD1_PIN17
-#define SHIELD_CONNECTOR_HD1_PIN18 HEADER_CONNECTOR_HD1_PIN18
-#define SHIELD_CONNECTOR_HD1_PIN19 HEADER_CONNECTOR_HD1_PIN19
+#define SHIELD_CONNECTOR_HC1_PIN7  HEADER_CONNECTOR_HC1_PIN7
+#define SHIELD_CONNECTOR_HC1_PIN8  HEADER_CONNECTOR_HC1_PIN8
+#define SHIELD_CONNECTOR_HC1_PIN9  HEADER_CONNECTOR_HC1_PIN9
+#define SHIELD_CONNECTOR_HC1_PIN10 HEADER_CONNECTOR_HC1_PIN10
+#define SHIELD_CONNECTOR_HC1_PIN11 HEADER_CONNECTOR_HC1_PIN11
+#define SHIELD_CONNECTOR_HC1_PIN12 HEADER_CONNECTOR_HC1_PIN12
+#define SHIELD_CONNECTOR_HC1_PIN13 HEADER_CONNECTOR_HC1_PIN13
+#define SHIELD_CONNECTOR_HC1_PIN14 HEADER_CONNECTOR_HC1_PIN14
+#define SHIELD_CONNECTOR_HC1_PIN16 HEADER_CONNECTOR_HC1_PIN16
+#define SHIELD_CONNECTOR_HC1_PIN17 HEADER_CONNECTOR_HC1_PIN17
+#define SHIELD_CONNECTOR_HC1_PIN18 HEADER_CONNECTOR_HC1_PIN18
+#define SHIELD_CONNECTOR_HC1_PIN19 HEADER_CONNECTOR_HC1_PIN19
 
-#define SHIELD_CONNECTOR_HD2_PIN7  HEADER_CONNECTOR_HD2_PIN7
-#define SHIELD_CONNECTOR_HD2_PIN8  HEADER_CONNECTOR_HD2_PIN8
-#define SHIELD_CONNECTOR_HD2_PIN9  HEADER_CONNECTOR_HD2_PIN9
-#define SHIELD_CONNECTOR_HD2_PIN10 HEADER_CONNECTOR_HD2_PIN10
-#define SHIELD_CONNECTOR_HD2_PIN11 HEADER_CONNECTOR_HD2_PIN11
-#define SHIELD_CONNECTOR_HD2_PIN12 HEADER_CONNECTOR_HD2_PIN12
-#define SHIELD_CONNECTOR_HD2_PIN13 HEADER_CONNECTOR_HD2_PIN13
-#define SHIELD_CONNECTOR_HD2_PIN14 HEADER_CONNECTOR_HD2_PIN14
-#define SHIELD_CONNECTOR_HD2_PIN16 HEADER_CONNECTOR_HD2_PIN16
-#define SHIELD_CONNECTOR_HD2_PIN17 HEADER_CONNECTOR_HD2_PIN17
-#define SHIELD_CONNECTOR_HD2_PIN18 HEADER_CONNECTOR_HD2_PIN18
-#define SHIELD_CONNECTOR_HD2_PIN19 HEADER_CONNECTOR_HD2_PIN19
+#define SHIELD_CONNECTOR_HC2_PIN7  HEADER_CONNECTOR_HC2_PIN7
+#define SHIELD_CONNECTOR_HC2_PIN8  HEADER_CONNECTOR_HC2_PIN8
+#define SHIELD_CONNECTOR_HC2_PIN9  HEADER_CONNECTOR_HC2_PIN9
+#define SHIELD_CONNECTOR_HC2_PIN10 HEADER_CONNECTOR_HC2_PIN10
+#define SHIELD_CONNECTOR_HC2_PIN11 HEADER_CONNECTOR_HC2_PIN11
+#define SHIELD_CONNECTOR_HC2_PIN12 HEADER_CONNECTOR_HC2_PIN12
+#define SHIELD_CONNECTOR_HC2_PIN13 HEADER_CONNECTOR_HC2_PIN13
+#define SHIELD_CONNECTOR_HC2_PIN14 HEADER_CONNECTOR_HC2_PIN14
+#define SHIELD_CONNECTOR_HC2_PIN16 HEADER_CONNECTOR_HC2_PIN16
+#define SHIELD_CONNECTOR_HC2_PIN17 HEADER_CONNECTOR_HC2_PIN17
+#define SHIELD_CONNECTOR_HC2_PIN18 HEADER_CONNECTOR_HC2_PIN18
+#define SHIELD_CONNECTOR_HC2_PIN19 HEADER_CONNECTOR_HC2_PIN19
 
 // MikroBUS definitions
-#define SHIELD_MIKROBUS_1_AN   SHIELD_CONNECTOR_HD2_PIN14
-#define SHIELD_MIKROBUS_1_RST  SHIELD_CONNECTOR_HD2_PIN7
-#define SHIELD_MIKROBUS_1_CS   SHIELD_CONNECTOR_HD1_PIN14
-#define SHIELD_MIKROBUS_1_SCK  SHIELD_CONNECTOR_HD1_PIN13
-#define SHIELD_MIKROBUS_1_MISO SHIELD_CONNECTOR_HD1_PIN12
-#define SHIELD_MIKROBUS_1_MOSI SHIELD_CONNECTOR_HD1_PIN11
-#define SHIELD_MIKROBUS_1_PWM  SHIELD_CONNECTOR_HD2_PIN11
-#define SHIELD_MIKROBUS_1_INT  SHIELD_CONNECTOR_HD2_PIN8
-#define SHIELD_MIKROBUS_1_RX   SHIELD_CONNECTOR_HD1_PIN8
-#define SHIELD_MIKROBUS_1_TX   SHIELD_CONNECTOR_HD1_PIN7
-#define SHIELD_MIKROBUS_1_SCL  SHIELD_CONNECTOR_HD1_PIN10
-#define SHIELD_MIKROBUS_1_SDA  SHIELD_CONNECTOR_HD1_PIN9
+#define SHIELD_MIKROBUS_1_AN   SHIELD_CONNECTOR_HC2_PIN14
+#define SHIELD_MIKROBUS_1_RST  SHIELD_CONNECTOR_HC2_PIN7
+#define SHIELD_MIKROBUS_1_CS   SHIELD_CONNECTOR_HC1_PIN14
+#define SHIELD_MIKROBUS_1_SCK  SHIELD_CONNECTOR_HC1_PIN13
+#define SHIELD_MIKROBUS_1_MISO SHIELD_CONNECTOR_HC1_PIN12
+#define SHIELD_MIKROBUS_1_MOSI SHIELD_CONNECTOR_HC1_PIN11
+#define SHIELD_MIKROBUS_1_PWM  SHIELD_CONNECTOR_HC2_PIN11
+#define SHIELD_MIKROBUS_1_INT  SHIELD_CONNECTOR_HC2_PIN8
+#define SHIELD_MIKROBUS_1_RX   SHIELD_CONNECTOR_HC1_PIN8
+#define SHIELD_MIKROBUS_1_TX   SHIELD_CONNECTOR_HC1_PIN7
+#define SHIELD_MIKROBUS_1_SCL  SHIELD_CONNECTOR_HC1_PIN10
+#define SHIELD_MIKROBUS_1_SDA  SHIELD_CONNECTOR_HC1_PIN9
 
-#define SHIELD_MIKROBUS_2_AN   SHIELD_CONNECTOR_HD2_PIN13
-#define SHIELD_MIKROBUS_2_RST  SHIELD_CONNECTOR_HD1_PIN19
-#define SHIELD_MIKROBUS_2_CS   SHIELD_CONNECTOR_HD2_PIN17
-#define SHIELD_MIKROBUS_2_SCK  SHIELD_CONNECTOR_HD1_PIN13
-#define SHIELD_MIKROBUS_2_MISO SHIELD_CONNECTOR_HD1_PIN12
-#define SHIELD_MIKROBUS_2_MOSI SHIELD_CONNECTOR_HD1_PIN11
-#define SHIELD_MIKROBUS_2_PWM  SHIELD_CONNECTOR_HD2_PIN10
-#define SHIELD_MIKROBUS_2_INT  SHIELD_CONNECTOR_HD1_PIN18
-#define SHIELD_MIKROBUS_2_RX   SHIELD_CONNECTOR_HD1_PIN17
-#define SHIELD_MIKROBUS_2_TX   SHIELD_CONNECTOR_HD1_PIN16
-#define SHIELD_MIKROBUS_2_SCL  SHIELD_CONNECTOR_HD1_PIN10
-#define SHIELD_MIKROBUS_2_SDA  SHIELD_CONNECTOR_HD1_PIN9
+#define SHIELD_MIKROBUS_2_AN   SHIELD_CONNECTOR_HC2_PIN13
+#define SHIELD_MIKROBUS_2_RST  SHIELD_CONNECTOR_HC1_PIN19
+#define SHIELD_MIKROBUS_2_CS   SHIELD_CONNECTOR_HC2_PIN17
+#define SHIELD_MIKROBUS_2_SCK  SHIELD_CONNECTOR_HC1_PIN13
+#define SHIELD_MIKROBUS_2_MISO SHIELD_CONNECTOR_HC1_PIN12
+#define SHIELD_MIKROBUS_2_MOSI SHIELD_CONNECTOR_HC1_PIN11
+#define SHIELD_MIKROBUS_2_PWM  SHIELD_CONNECTOR_HC2_PIN10
+#define SHIELD_MIKROBUS_2_INT  SHIELD_CONNECTOR_HC1_PIN18
+#define SHIELD_MIKROBUS_2_RX   SHIELD_CONNECTOR_HC1_PIN17
+#define SHIELD_MIKROBUS_2_TX   SHIELD_CONNECTOR_HC1_PIN16
+#define SHIELD_MIKROBUS_2_SCL  SHIELD_CONNECTOR_HC1_PIN10
+#define SHIELD_MIKROBUS_2_SDA  SHIELD_CONNECTOR_HC1_PIN9
 
-#define SHIELD_MIKROBUS_3_AN   SHIELD_CONNECTOR_HD2_PIN12
-#define SHIELD_MIKROBUS_3_RST  SHIELD_CONNECTOR_HD2_PIN18
-#define SHIELD_MIKROBUS_3_CS   SHIELD_CONNECTOR_HD2_PIN16
-#define SHIELD_MIKROBUS_3_SCK  SHIELD_CONNECTOR_HD1_PIN13
-#define SHIELD_MIKROBUS_3_MISO SHIELD_CONNECTOR_HD1_PIN12
-#define SHIELD_MIKROBUS_3_MOSI SHIELD_CONNECTOR_HD1_PIN11
-#define SHIELD_MIKROBUS_3_PWM  SHIELD_CONNECTOR_HD2_PIN9
-#define SHIELD_MIKROBUS_3_INT  SHIELD_CONNECTOR_HD2_PIN19
-#define SHIELD_MIKROBUS_3_RX   SHIELD_CONNECTOR_HD1_PIN8
-#define SHIELD_MIKROBUS_3_TX   SHIELD_CONNECTOR_HD1_PIN7
-#define SHIELD_MIKROBUS_3_SCL  SHIELD_CONNECTOR_HD1_PIN6
-#define SHIELD_MIKROBUS_3_SDA  SHIELD_CONNECTOR_HD1_PIN5
+#define SHIELD_MIKROBUS_3_AN   SHIELD_CONNECTOR_HC2_PIN12
+#define SHIELD_MIKROBUS_3_RST  SHIELD_CONNECTOR_HC2_PIN18
+#define SHIELD_MIKROBUS_3_CS   SHIELD_CONNECTOR_HC2_PIN16
+#define SHIELD_MIKROBUS_3_SCK  SHIELD_CONNECTOR_HC1_PIN13
+#define SHIELD_MIKROBUS_3_MISO SHIELD_CONNECTOR_HC1_PIN12
+#define SHIELD_MIKROBUS_3_MOSI SHIELD_CONNECTOR_HC1_PIN11
+#define SHIELD_MIKROBUS_3_PWM  SHIELD_CONNECTOR_HC2_PIN9
+#define SHIELD_MIKROBUS_3_INT  SHIELD_CONNECTOR_HC2_PIN19
+#define SHIELD_MIKROBUS_3_RX   SHIELD_CONNECTOR_HC1_PIN8
+#define SHIELD_MIKROBUS_3_TX   SHIELD_CONNECTOR_HC1_PIN7
+#define SHIELD_MIKROBUS_3_SCL  SHIELD_CONNECTOR_HC1_PIN10
+#define SHIELD_MIKROBUS_3_SDA  SHIELD_CONNECTOR_HC1_PIN9
 
 #define MIKROBUS_1 1
 #define MIKROBUS_1_AN   SHIELD_MIKROBUS_1_AN

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
-    "sdk-version": "2.10.0",
+    "sdk-version": "2.10.1",
     "display-name": "mikroSDK",
     "description": "MikroSDK 2.0 is an embedded software development framework designed to simplify and accelerate application development on Mikroe hardware platform, specifically for Click Boards and other extension board drivers, on a broad range of microcontroller vendors and architectures. It includes peripheral libraries and drivers, middleware, board support, and application layer libraries among others.",
     "icon": "images/icon-mikroSDK.png",
-    "manifest-version": "1.0.12"
+    "manifest-version": "1.0.13"
 }
diff --git a/platform/mikrosdk_version/include/mikrosdk_version.h b/platform/mikrosdk_version/include/mikrosdk_version.h
@@ -67,7 +67,7 @@ extern "C"{
   * @note changes in patch version indicate smaller updates,
   * bug fixes and improvements
   */
-#define mikroSDK_PATCH_VERSION 0
+#define mikroSDK_PATCH_VERSION 1
 
 /**
   * @brief mikroSDK_GET_VERSION

diff --git a/targets/arm/mikroe/nxp/src/can/implementation_1/hal_ll_can.c b/targets/arm/mikroe/nxp/src/can/implementation_1/hal_ll_can.c
@@ -231,13 +231,13 @@ typedef enum
 static hal_ll_can_hw_specifics_map_t hal_ll_can_hw_specifics_map[] =
 {
     #ifdef CAN_MODULE_0
-    { HAL_LL_CAN0_BASE_ADDRESS, HAL_LL_CAN0_RXIMR_BASE_ADDRESS, hal_ll_can_module_num( CAN_MODULE_0 ), { HAL_LL_PIN_NC, 0, HAL_LL_PIN_NC, 0 }, HAL_LL_CAN_MODE_NORMAL, 500000 },
+    { HAL_LL_CAN0_BASE_ADDRESS, HAL_LL_CAN0_RXIMR_BASE_ADDRESS, hal_ll_can_module_num( CAN_MODULE_0 ), { HAL_LL_PIN_NC, 0, HAL_LL_PIN_NC, 0 }, HAL_LL_CAN_MODE_NORMAL, 125000 },
     #endif
     #ifdef CAN_MODULE_1
-    { HAL_LL_CAN1_BASE_ADDRESS, HAL_LL_CAN1_RXIMR_BASE_ADDRESS, hal_ll_can_module_num( CAN_MODULE_1 ), { HAL_LL_PIN_NC, 0, HAL_LL_PIN_NC, 0 }, HAL_LL_CAN_MODE_NORMAL, 500000 },
+    { HAL_LL_CAN1_BASE_ADDRESS, HAL_LL_CAN1_RXIMR_BASE_ADDRESS, hal_ll_can_module_num( CAN_MODULE_1 ), { HAL_LL_PIN_NC, 0, HAL_LL_PIN_NC, 0 }, HAL_LL_CAN_MODE_NORMAL, 125000 },
     #endif
     #ifdef CAN_MODULE_2
-    { HAL_LL_CAN2_BASE_ADDRESS, HAL_LL_CAN2_RXIMR_BASE_ADDRESS, hal_ll_can_module_num( CAN_MODULE_2 ), { HAL_LL_PIN_NC, 0, HAL_LL_PIN_NC, 0 }, HAL_LL_CAN_MODE_NORMAL, 500000 },
+    { HAL_LL_CAN2_BASE_ADDRESS, HAL_LL_CAN2_RXIMR_BASE_ADDRESS, hal_ll_can_module_num( CAN_MODULE_2 ), { HAL_LL_PIN_NC, 0, HAL_LL_PIN_NC, 0 }, HAL_LL_CAN_MODE_NORMAL, 125000 },
     #endif
 
     { HAL_LL_MODULE_ERROR, HAL_LL_MODULE_ERROR, HAL_LL_MODULE_ERROR, { HAL_LL_PIN_NC, 0, HAL_LL_PIN_NC, 0 }, HAL_LL_CAN_MODE_NORMAL, 500000 }
@@ -771,7 +771,7 @@ static hal_ll_err_t hal_ll_can_bit_timing( hal_ll_can_hw_specifics_map_t *map )
     SIM_ClocksTypeDef rcc_clocks;
     uint16_t prescaler;
     uint8_t rjw, pseg1, pseg2, temp, propseg;
-    uint32_t baud_rate, can_clock;
+    uint32_t baud_rate, can_clock, actual_baud_rate;
 
     baud_rate = map->frequency;
 
@@ -811,8 +811,9 @@ static hal_ll_err_t hal_ll_can_bit_timing( hal_ll_can_hw_specifics_map_t *map )
     rjw = HAL_LL_CAN_BTR_RJW_VALUE;
 
     prescaler = can_clock / ( baud_rate * ( pseg1 + pseg2 + propseg + 1 ));
+    actual_baud_rate = can_clock / ( prescaler * ( pseg1 + pseg2 + propseg + 1 ));
 
-    if( HAL_LL_CAN_BTR_MAX_PESCALER_VALUE >= prescaler ) {
+    if(( HAL_LL_CAN_BTR_MAX_PESCALER_VALUE >= prescaler ) && ( actual_baud_rate == baud_rate )) {
         uint32_t rjw_val = hal_ll_can_get_btr_element_mask( rjw, HAL_LL_CAN_BTR_RJW_OFFSET );
         uint32_t pseg1_val = hal_ll_can_get_btr_element_mask( pseg1, HAL_LL_CAN_BTR_PSEG1_OFFSET );
         uint32_t pseg2_val = hal_ll_can_get_btr_element_mask( pseg2, HAL_LL_CAN_BTR_PSEG2_OFFSET );

diff --git a/...pic32/include/pps/hal_ll_pps_connection_defs/PIC32MX530F128H/hal_ll_pps_connection_defs.h b/...pic32/include/pps/hal_ll_pps_connection_defs/PIC32MX530F128H/hal_ll_pps_connection_defs.h
@@ -570,31 +570,31 @@ static const hal_ll_pps_pin_map_t hal_ll_pps_input_map[] =
 static const hal_ll_pps_pin_map_t hal_ll_pps_output_map[] =
 {
     // --------- CAN --------- //
-    #if defined(CAN1_TX_RG8) && defined(HAL_LL_RPRG8R_ADDRESS)
+    #if defined(CAN1_TX_RG8) && defined(HAL_LL_RPG8R_ADDRESS)
     {PIN_8, PORT_G, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPG8R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RB5) && defined(HAL_LL_RPRB5R_ADDRESS)
+    #if defined(CAN1_TX_RB5) && defined(HAL_LL_RPB5R_ADDRESS)
     {PIN_5, PORT_B, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPB5R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RB9) && defined(HAL_LL_RPRB9R_ADDRESS)
+    #if defined(CAN1_TX_RB9) && defined(HAL_LL_RPB9R_ADDRESS)
     {PIN_9, PORT_B, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPB9R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RB10) && defined(HAL_LL_RPRB10R_ADDRESS)
+    #if defined(CAN1_TX_RB10) && defined(HAL_LL_RPB10R_ADDRESS)
     {PIN_10, PORT_B, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPB10R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RF4) && defined(HAL_LL_RPRF4R_ADDRESS)
+    #if defined(CAN1_TX_RF4) && defined(HAL_LL_RPF4R_ADDRESS)
     {PIN_4, PORT_F, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPF4R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RD10) && defined(HAL_LL_RPRD10R_ADDRESS)
+    #if defined(CAN1_TX_RD10) && defined(HAL_LL_RPD10R_ADDRESS)
     {PIN_10, PORT_D, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPD10R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RC14) && defined(HAL_LL_RPRC14R_ADDRESS)
+    #if defined(CAN1_TX_RC14) && defined(HAL_LL_RPC14R_ADDRESS)
     {PIN_14, PORT_C, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPC14R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RD2) && defined(HAL_LL_RPRD2R_ADDRESS)
+    #if defined(CAN1_TX_RD2) && defined(HAL_LL_RPD2R_ADDRESS)
     {PIN_2, PORT_D, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPD2R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RF1) && defined(HAL_LL_RPRF1R_ADDRESS)
+    #if defined(CAN1_TX_RF1) && defined(HAL_LL_RPF1R_ADDRESS)
     {PIN_1, PORT_F, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPF1R_ADDRESS},
     #endif
     // ------- EOF CAN ------- //

diff --git a/...pic32/include/pps/hal_ll_pps_connection_defs/PIC32MX530F128L/hal_ll_pps_connection_defs.h b/...pic32/include/pps/hal_ll_pps_connection_defs/PIC32MX530F128L/hal_ll_pps_connection_defs.h
@@ -582,46 +582,46 @@ static const hal_ll_pps_pin_map_t hal_ll_pps_input_map[] =
 static const hal_ll_pps_pin_map_t hal_ll_pps_output_map[] =
 {
     // --------- CAN --------- //
-    #if defined(CAN1_TX_RC1) && defined(HAL_LL_RPRC1R_ADDRESS)
+    #if defined(CAN1_TX_RC1) && defined(HAL_LL_RPC1R_ADDRESS)
     {PIN_1, PORT_C, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPC1R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RG8) && defined(HAL_LL_RPRG8R_ADDRESS)
+    #if defined(CAN1_TX_RG8) && defined(HAL_LL_RPG8R_ADDRESS)
     {PIN_8, PORT_G, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPG8R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RB5) && defined(HAL_LL_RPRB5R_ADDRESS)
+    #if defined(CAN1_TX_RB5) && defined(HAL_LL_RPB5R_ADDRESS)
     {PIN_5, PORT_B, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPB5R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RB9) && defined(HAL_LL_RPRB9R_ADDRESS)
+    #if defined(CAN1_TX_RB9) && defined(HAL_LL_RPB9R_ADDRESS)
     {PIN_9, PORT_B, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPB9R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RB10) && defined(HAL_LL_RPRB10R_ADDRESS)
+    #if defined(CAN1_TX_RB10) && defined(HAL_LL_RPB10R_ADDRESS)
     {PIN_10, PORT_B, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPB10R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RD14) && defined(HAL_LL_RPRD14R_ADDRESS)
+    #if defined(CAN1_TX_RD14) && defined(HAL_LL_RPD14R_ADDRESS)
     {PIN_14, PORT_D, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPD14R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RF4) && defined(HAL_LL_RPRF4R_ADDRESS)
+    #if defined(CAN1_TX_RF4) && defined(HAL_LL_RPF4R_ADDRESS)
     {PIN_4, PORT_F, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPF4R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RF2) && defined(HAL_LL_RPRF2R_ADDRESS)
+    #if defined(CAN1_TX_RF2) && defined(HAL_LL_RPF2R_ADDRESS)
     {PIN_2, PORT_F, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPF2R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RA14) && defined(HAL_LL_RPRA14R_ADDRESS)
+    #if defined(CAN1_TX_RA14) && defined(HAL_LL_RPA14R_ADDRESS)
     {PIN_14, PORT_A, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPA14R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RD10) && defined(HAL_LL_RPRD10R_ADDRESS)
+    #if defined(CAN1_TX_RD10) && defined(HAL_LL_RPD10R_ADDRESS)
     {PIN_10, PORT_D, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPD10R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RC14) && defined(HAL_LL_RPRC14R_ADDRESS)
+    #if defined(CAN1_TX_RC14) && defined(HAL_LL_RPC14R_ADDRESS)
     {PIN_14, PORT_C, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPC14R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RD2) && defined(HAL_LL_RPRD2R_ADDRESS)
+    #if defined(CAN1_TX_RD2) && defined(HAL_LL_RPD2R_ADDRESS)
     {PIN_2, PORT_D, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPD2R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RF1) && defined(HAL_LL_RPRF1R_ADDRESS)
+    #if defined(CAN1_TX_RF1) && defined(HAL_LL_RPF1R_ADDRESS)
     {PIN_1, PORT_F, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPF1R_ADDRESS},
     #endif
-    #if defined(CAN1_TX_RG1) && defined(HAL_LL_RPRG1R_ADDRESS)
+    #if defined(CAN1_TX_RG1) && defined(HAL_LL_RPG1R_ADDRESS)
     {PIN_1, PORT_G, HAL_LL_GPIO_DIGITAL_OUTPUT, HAL_LL_PPS_FUNCTIONALITY_CAN, 0xc, HAL_LL_PPS_MODULE_INDEX_1, HAL_LL_RPG1R_ADDRESS},
     #endif
     // ------- EOF CAN ------- //