Fixed AN pins for PIC18FxxJ94 MCUs

changelog/v2.14.5/changelog.md

@@ -0,0 +1,40 @@
+<p align="center">
+  <img src="http://www.mikroe.com/img/designs/beta/logo_small.png?raw=true" alt="MikroElektronika"/>
+</p>
+
+---
+
+**[BACK TO MAIN FILE](../../changelog.md)**
+
+---
+
+# `v2.14.5`
+
++ released: 2025-05-29
+
+## Changes
+
++ [`v2.14.5`](#v2145)
+  + [Changes](#changes)
+    + [Fixes](#fixes)
+      + [mikroSDK](#mikrosdk)
+    + [NEW HARDWARE](#new-hardware)
+
+### Fixes
+
+#### mikroSDK
+
++ Fixed analog pin definitions for PIC18FXXJ94 MCUs
+
+### NEW HARDWARE
+
+> NOTE:
+>> If any new hardware was added to current version, it will be listed here.
+
+Support added for following hardware:
+
+---
+
+**[BACK TO MAIN FILE](../../changelog.md)**
+
+---

targets/pic_8bit/mikroe/common/include/mcu_definitions/PIC18F65J94/mcu_definitions.h

@@ -56,30 +56,30 @@
 #define HAL_LL_RA2_AN2_ANCON1 2
 #define HAL_LL_RA3_AN3_ANCON1_BIT 3
 #define HAL_LL_RA3_AN3_ANCON1 3
-#define HAL_LL_RA4_AN4_ANCON1_BIT 4
-#define HAL_LL_RA4_AN4_ANCON1 4
-#define HAL_LL_RA5_AN5_ANCON1_BIT 5
-#define HAL_LL_RA5_AN5_ANCON1 5
-#define HAL_LL_RF2_AN6_ANCON1_BIT 6
-#define HAL_LL_RF2_AN6_ANCON1 6
-#define HAL_LL_RG0_AN7_ANCON1_BIT 7
-#define HAL_LL_RG0_AN7_ANCON1 7
-#define HAL_LL_RC2_AN8_ANCON2_BIT 0
-#define HAL_LL_RC2_AN8_ANCON2 8
-#define HAL_LL_RF5_AN9_ANCON2_BIT 1
-#define HAL_LL_RF5_AN9_ANCON2 9
-#define HAL_LL_RF6_AN10_ANCON2_BIT 2
-#define HAL_LL_RF6_AN10_ANCON2 10
-#define HAL_LL_RF7_AN11_ANCON2_BIT 3
-#define HAL_LL_RF7_AN11_ANCON2 11
-#define HAL_LL_RG1_AN12_ANCON2_BIT 4
-#define HAL_LL_RG1_AN12_ANCON2 12
-#define HAL_LL_RG2_AN13_ANCON2_BIT 5
-#define HAL_LL_RG2_AN13_ANCON2 13
-#define HAL_LL_RG3_AN14_ANCON2_BIT 6
-#define HAL_LL_RG3_AN14_ANCON2 14
-#define HAL_LL_RG4_AN15_ANCON2_BIT 7
-#define HAL_LL_RG4_AN15_ANCON2 15
+#define HAL_LL_RA4_AN6_ANCON1_BIT 6
+#define HAL_LL_RA4_AN6_ANCON1 6
+#define HAL_LL_RA5_AN4_ANCON1_BIT 4
+#define HAL_LL_RA5_AN4_ANCON1 4
+#define HAL_LL_RF2_AN7_ANCON1_BIT 7
+#define HAL_LL_RF2_AN7_ANCON1 7
+#define HAL_LL_RG0_AN8_ANCON2_BIT 0
+#define HAL_LL_RG0_AN8_ANCON2 8
+#define HAL_LL_RC2_AN9_ANCON2_BIT 1
+#define HAL_LL_RC2_AN9_ANCON2 9
+#define HAL_LL_RF5_AN10_ANCON2_BIT 2
+#define HAL_LL_RF5_AN10_ANCON2 10
+#define HAL_LL_RF6_AN11_ANCON2_BIT 3
+#define HAL_LL_RF6_AN11_ANCON2 11
+#define HAL_LL_RF7_AN5_ANCON1_BIT 5
+#define HAL_LL_RF7_AN5_ANCON1 5
+#define HAL_LL_RG1_AN19_ANCON3_BIT 3
+#define HAL_LL_RG1_AN19_ANCON3 19
+#define HAL_LL_RG2_AN18_ANCON3_BIT 2
+#define HAL_LL_RG2_AN18_ANCON3 18
+#define HAL_LL_RG3_AN17_ANCON3_BIT 1
+#define HAL_LL_RG3_AN17_ANCON3 17
+#define HAL_LL_RG4_AN16_ANCON3_BIT 0
+#define HAL_LL_RG4_AN16_ANCON3 16
 
 
 #define HAL_LL_ADCBUF0_ADDRESS 0xFC2U

targets/pic_8bit/mikroe/common/include/mcu_definitions/PIC18F66J94/mcu_definitions.h

@@ -56,30 +56,30 @@
 #define HAL_LL_RA2_AN2_ANCON1 2
 #define HAL_LL_RA3_AN3_ANCON1_BIT 3
 #define HAL_LL_RA3_AN3_ANCON1 3
-#define HAL_LL_RA4_AN4_ANCON1_BIT 4
-#define HAL_LL_RA4_AN4_ANCON1 4
-#define HAL_LL_RA5_AN5_ANCON1_BIT 5
-#define HAL_LL_RA5_AN5_ANCON1 5
-#define HAL_LL_RF2_AN6_ANCON1_BIT 6
-#define HAL_LL_RF2_AN6_ANCON1 6
-#define HAL_LL_RG0_AN7_ANCON1_BIT 7
-#define HAL_LL_RG0_AN7_ANCON1 7
-#define HAL_LL_RC2_AN8_ANCON2_BIT 0
-#define HAL_LL_RC2_AN8_ANCON2 8
-#define HAL_LL_RF5_AN9_ANCON2_BIT 1
-#define HAL_LL_RF5_AN9_ANCON2 9
-#define HAL_LL_RF6_AN10_ANCON2_BIT 2
-#define HAL_LL_RF6_AN10_ANCON2 10
-#define HAL_LL_RF7_AN11_ANCON2_BIT 3
-#define HAL_LL_RF7_AN11_ANCON2 11
-#define HAL_LL_RG1_AN12_ANCON2_BIT 4
-#define HAL_LL_RG1_AN12_ANCON2 12
-#define HAL_LL_RG2_AN13_ANCON2_BIT 5
-#define HAL_LL_RG2_AN13_ANCON2 13
-#define HAL_LL_RG3_AN14_ANCON2_BIT 6
-#define HAL_LL_RG3_AN14_ANCON2 14
-#define HAL_LL_RG4_AN15_ANCON2_BIT 7
-#define HAL_LL_RG4_AN15_ANCON2 15
+#define HAL_LL_RA4_AN6_ANCON1_BIT 6
+#define HAL_LL_RA4_AN6_ANCON1 6
+#define HAL_LL_RA5_AN4_ANCON1_BIT 4
+#define HAL_LL_RA5_AN4_ANCON1 4
+#define HAL_LL_RF2_AN7_ANCON1_BIT 7
+#define HAL_LL_RF2_AN7_ANCON1 7
+#define HAL_LL_RG0_AN8_ANCON2_BIT 0
+#define HAL_LL_RG0_AN8_ANCON2 8
+#define HAL_LL_RC2_AN9_ANCON2_BIT 1
+#define HAL_LL_RC2_AN9_ANCON2 9
+#define HAL_LL_RF5_AN10_ANCON2_BIT 2
+#define HAL_LL_RF5_AN10_ANCON2 10
+#define HAL_LL_RF6_AN11_ANCON2_BIT 3
+#define HAL_LL_RF6_AN11_ANCON2 11
+#define HAL_LL_RF7_AN5_ANCON1_BIT 5
+#define HAL_LL_RF7_AN5_ANCON1 5
+#define HAL_LL_RG1_AN19_ANCON3_BIT 3
+#define HAL_LL_RG1_AN19_ANCON3 19
+#define HAL_LL_RG2_AN18_ANCON3_BIT 2
+#define HAL_LL_RG2_AN18_ANCON3 18
+#define HAL_LL_RG3_AN17_ANCON3_BIT 1
+#define HAL_LL_RG3_AN17_ANCON3 17
+#define HAL_LL_RG4_AN16_ANCON3_BIT 0
+#define HAL_LL_RG4_AN16_ANCON3 16
 
 
 #define HAL_LL_ADCBUF0_ADDRESS 0xFC2U

targets/pic_8bit/mikroe/common/include/mcu_definitions/PIC18F67J94/mcu_definitions.h

@@ -56,30 +56,30 @@
 #define HAL_LL_RA2_AN2_ANCON1 2
 #define HAL_LL_RA3_AN3_ANCON1_BIT 3
 #define HAL_LL_RA3_AN3_ANCON1 3
-#define HAL_LL_RA4_AN4_ANCON1_BIT 4
-#define HAL_LL_RA4_AN4_ANCON1 4
-#define HAL_LL_RA5_AN5_ANCON1_BIT 5
-#define HAL_LL_RA5_AN5_ANCON1 5
-#define HAL_LL_RF2_AN6_ANCON1_BIT 6
-#define HAL_LL_RF2_AN6_ANCON1 6
-#define HAL_LL_RG0_AN7_ANCON1_BIT 7
-#define HAL_LL_RG0_AN7_ANCON1 7
-#define HAL_LL_RC2_AN8_ANCON2_BIT 0
-#define HAL_LL_RC2_AN8_ANCON2 8
-#define HAL_LL_RF5_AN9_ANCON2_BIT 1
-#define HAL_LL_RF5_AN9_ANCON2 9
-#define HAL_LL_RF6_AN10_ANCON2_BIT 2
-#define HAL_LL_RF6_AN10_ANCON2 10
-#define HAL_LL_RF7_AN11_ANCON2_BIT 3
-#define HAL_LL_RF7_AN11_ANCON2 11
-#define HAL_LL_RG1_AN12_ANCON2_BIT 4
-#define HAL_LL_RG1_AN12_ANCON2 12
-#define HAL_LL_RG2_AN13_ANCON2_BIT 5
-#define HAL_LL_RG2_AN13_ANCON2 13
-#define HAL_LL_RG3_AN14_ANCON2_BIT 6
-#define HAL_LL_RG3_AN14_ANCON2 14
-#define HAL_LL_RG4_AN15_ANCON2_BIT 7
-#define HAL_LL_RG4_AN15_ANCON2 15
+#define HAL_LL_RA4_AN6_ANCON1_BIT 6
+#define HAL_LL_RA4_AN6_ANCON1 6
+#define HAL_LL_RA5_AN4_ANCON1_BIT 4
+#define HAL_LL_RA5_AN4_ANCON1 4
+#define HAL_LL_RF2_AN7_ANCON1_BIT 7
+#define HAL_LL_RF2_AN7_ANCON1 7
+#define HAL_LL_RG0_AN8_ANCON2_BIT 0
+#define HAL_LL_RG0_AN8_ANCON2 8
+#define HAL_LL_RC2_AN9_ANCON2_BIT 1
+#define HAL_LL_RC2_AN9_ANCON2 9
+#define HAL_LL_RF5_AN10_ANCON2_BIT 2
+#define HAL_LL_RF5_AN10_ANCON2 10
+#define HAL_LL_RF6_AN11_ANCON2_BIT 3
+#define HAL_LL_RF6_AN11_ANCON2 11
+#define HAL_LL_RF7_AN5_ANCON1_BIT 5
+#define HAL_LL_RF7_AN5_ANCON1 5
+#define HAL_LL_RG1_AN19_ANCON3_BIT 3
+#define HAL_LL_RG1_AN19_ANCON3 19
+#define HAL_LL_RG2_AN18_ANCON3_BIT 2
+#define HAL_LL_RG2_AN18_ANCON3 18
+#define HAL_LL_RG3_AN17_ANCON3_BIT 1
+#define HAL_LL_RG3_AN17_ANCON3 17
+#define HAL_LL_RG4_AN16_ANCON3_BIT 0
+#define HAL_LL_RG4_AN16_ANCON3 16
 
 
 #define HAL_LL_ADCBUF0_ADDRESS 0xFC2U

targets/pic_8bit/mikroe/common/include/mcu_definitions/PIC18F85J94/mcu_definitions.h

@@ -56,46 +56,46 @@
 #define HAL_LL_RA2_AN2_ANCON1 2
 #define HAL_LL_RA3_AN3_ANCON1_BIT 3
 #define HAL_LL_RA3_AN3_ANCON1 3
-#define HAL_LL_RA4_AN4_ANCON1_BIT 4
-#define HAL_LL_RA4_AN4_ANCON1 4
-#define HAL_LL_RA5_AN5_ANCON1_BIT 5
-#define HAL_LL_RA5_AN5_ANCON1 5
-#define HAL_LL_RF2_AN6_ANCON1_BIT 6
-#define HAL_LL_RF2_AN6_ANCON1 6
-#define HAL_LL_RG0_AN7_ANCON1_BIT 7
-#define HAL_LL_RG0_AN7_ANCON1 7
-#define HAL_LL_RC2_AN8_ANCON2_BIT 0
-#define HAL_LL_RC2_AN8_ANCON2 8
-#define HAL_LL_RF5_AN9_ANCON2_BIT 1
-#define HAL_LL_RF5_AN9_ANCON2 9
-#define HAL_LL_RF6_AN10_ANCON2_BIT 2
-#define HAL_LL_RF6_AN10_ANCON2 10
-#define HAL_LL_RF7_AN11_ANCON2_BIT 3
-#define HAL_LL_RF7_AN11_ANCON2 11
-#define HAL_LL_RG1_AN12_ANCON2_BIT 4
-#define HAL_LL_RG1_AN12_ANCON2 12
-#define HAL_LL_RG2_AN13_ANCON2_BIT 5
-#define HAL_LL_RG2_AN13_ANCON2 13
-#define HAL_LL_RG3_AN14_ANCON2_BIT 6
-#define HAL_LL_RG3_AN14_ANCON2 14
-#define HAL_LL_RG4_AN15_ANCON2_BIT 7
-#define HAL_LL_RG4_AN15_ANCON2 15
-#define HAL_LL_RH0_AN16_ANCON3_BIT 0
-#define HAL_LL_RH0_AN16_ANCON3 16
-#define HAL_LL_RH1_AN17_ANCON3_BIT 1
-#define HAL_LL_RH1_AN17_ANCON3 17
-#define HAL_LL_RH2_AN18_ANCON3_BIT 2
-#define HAL_LL_RH2_AN18_ANCON3 18
-#define HAL_LL_RH3_AN19_ANCON3_BIT 3
-#define HAL_LL_RH3_AN19_ANCON3 19
-#define HAL_LL_RH4_AN20_ANCON3_BIT 4
-#define HAL_LL_RH4_AN20_ANCON3 20
-#define HAL_LL_RH5_AN21_ANCON3_BIT 5
-#define HAL_LL_RH5_AN21_ANCON3 21
-#define HAL_LL_RH6_AN22_ANCON3_BIT 6
-#define HAL_LL_RH6_AN22_ANCON3 22
-#define HAL_LL_RH7_AN23_ANCON3_BIT 7
-#define HAL_LL_RH7_AN23_ANCON3 23
+#define HAL_LL_RA4_AN6_ANCON1_BIT 6
+#define HAL_LL_RA4_AN6_ANCON1 6
+#define HAL_LL_RA5_AN4_ANCON1_BIT 4
+#define HAL_LL_RA5_AN4_ANCON1 4
+#define HAL_LL_RF2_AN7_ANCON1_BIT 7
+#define HAL_LL_RF2_AN7_ANCON1 7
+#define HAL_LL_RG0_AN8_ANCON2_BIT 0
+#define HAL_LL_RG0_AN8_ANCON2 8
+#define HAL_LL_RC2_AN9_ANCON2_BIT 1
+#define HAL_LL_RC2_AN9_ANCON2 9
+#define HAL_LL_RF5_AN10_ANCON2_BIT 2
+#define HAL_LL_RF5_AN10_ANCON2 10
+#define HAL_LL_RF6_AN11_ANCON2_BIT 3
+#define HAL_LL_RF6_AN11_ANCON2 11
+#define HAL_LL_RF7_AN5_ANCON1_BIT 5
+#define HAL_LL_RF7_AN5_ANCON1 5
+#define HAL_LL_RG1_AN19_ANCON3_BIT 3
+#define HAL_LL_RG1_AN19_ANCON3 19
+#define HAL_LL_RG2_AN18_ANCON3_BIT 2
+#define HAL_LL_RG2_AN18_ANCON3 18
+#define HAL_LL_RG3_AN17_ANCON3_BIT 1
+#define HAL_LL_RG3_AN17_ANCON3 17
+#define HAL_LL_RG4_AN16_ANCON3_BIT 0
+#define HAL_LL_RG4_AN16_ANCON3 16
+#define HAL_LL_RH0_AN23_ANCON3_BIT 7
+#define HAL_LL_RH0_AN23_ANCON3 23
+#define HAL_LL_RH1_AN22_ANCON3_BIT 6
+#define HAL_LL_RH1_AN22_ANCON3 22
+#define HAL_LL_RH2_AN21_ANCON3_BIT 5
+#define HAL_LL_RH2_AN21_ANCON3 21
+#define HAL_LL_RH3_AN20_ANCON3_BIT 4
+#define HAL_LL_RH3_AN20_ANCON3 20
+#define HAL_LL_RH4_AN12_ANCON2_BIT 4
+#define HAL_LL_RH4_AN12_ANCON2 12
+#define HAL_LL_RH5_AN13_ANCON2_BIT 5
+#define HAL_LL_RH5_AN13_ANCON2 13
+#define HAL_LL_RH6_AN14_ANCON2_BIT 6
+#define HAL_LL_RH6_AN14_ANCON2 14
+#define HAL_LL_RH7_AN15_ANCON2_BIT 7
+#define HAL_LL_RH7_AN15_ANCON2 15
 
 
 #define HAL_LL_ADCBUF0_ADDRESS 0xFC2U

targets/pic_8bit/mikroe/common/include/mcu_definitions/PIC18F86J94/mcu_definitions.h

@@ -56,46 +56,46 @@
 #define HAL_LL_RA2_AN2_ANCON1 2
 #define HAL_LL_RA3_AN3_ANCON1_BIT 3
 #define HAL_LL_RA3_AN3_ANCON1 3
-#define HAL_LL_RA4_AN4_ANCON1_BIT 4
-#define HAL_LL_RA4_AN4_ANCON1 4
-#define HAL_LL_RA5_AN5_ANCON1_BIT 5
-#define HAL_LL_RA5_AN5_ANCON1 5
-#define HAL_LL_RF2_AN6_ANCON1_BIT 6
-#define HAL_LL_RF2_AN6_ANCON1 6
-#define HAL_LL_RG0_AN7_ANCON1_BIT 7
-#define HAL_LL_RG0_AN7_ANCON1 7
-#define HAL_LL_RC2_AN8_ANCON2_BIT 0
-#define HAL_LL_RC2_AN8_ANCON2 8
-#define HAL_LL_RF5_AN9_ANCON2_BIT 1
-#define HAL_LL_RF5_AN9_ANCON2 9
-#define HAL_LL_RF6_AN10_ANCON2_BIT 2
-#define HAL_LL_RF6_AN10_ANCON2 10
-#define HAL_LL_RF7_AN11_ANCON2_BIT 3
-#define HAL_LL_RF7_AN11_ANCON2 11
-#define HAL_LL_RG1_AN12_ANCON2_BIT 4
-#define HAL_LL_RG1_AN12_ANCON2 12
-#define HAL_LL_RG2_AN13_ANCON2_BIT 5
-#define HAL_LL_RG2_AN13_ANCON2 13
-#define HAL_LL_RG3_AN14_ANCON2_BIT 6
-#define HAL_LL_RG3_AN14_ANCON2 14
-#define HAL_LL_RG4_AN15_ANCON2_BIT 7
-#define HAL_LL_RG4_AN15_ANCON2 15
-#define HAL_LL_RH0_AN16_ANCON3_BIT 0
-#define HAL_LL_RH0_AN16_ANCON3 16
-#define HAL_LL_RH1_AN17_ANCON3_BIT 1
-#define HAL_LL_RH1_AN17_ANCON3 17
-#define HAL_LL_RH2_AN18_ANCON3_BIT 2
-#define HAL_LL_RH2_AN18_ANCON3 18
-#define HAL_LL_RH3_AN19_ANCON3_BIT 3
-#define HAL_LL_RH3_AN19_ANCON3 19
-#define HAL_LL_RH4_AN20_ANCON3_BIT 4
-#define HAL_LL_RH4_AN20_ANCON3 20
-#define HAL_LL_RH5_AN21_ANCON3_BIT 5
-#define HAL_LL_RH5_AN21_ANCON3 21
-#define HAL_LL_RH6_AN22_ANCON3_BIT 6
-#define HAL_LL_RH6_AN22_ANCON3 22
-#define HAL_LL_RH7_AN23_ANCON3_BIT 7
-#define HAL_LL_RH7_AN23_ANCON3 23
+#define HAL_LL_RA4_AN6_ANCON1_BIT 6
+#define HAL_LL_RA4_AN6_ANCON1 6
+#define HAL_LL_RA5_AN4_ANCON1_BIT 4
+#define HAL_LL_RA5_AN4_ANCON1 4
+#define HAL_LL_RF2_AN7_ANCON1_BIT 7
+#define HAL_LL_RF2_AN7_ANCON1 7
+#define HAL_LL_RG0_AN8_ANCON2_BIT 0
+#define HAL_LL_RG0_AN8_ANCON2 8
+#define HAL_LL_RC2_AN9_ANCON2_BIT 1
+#define HAL_LL_RC2_AN9_ANCON2 9
+#define HAL_LL_RF5_AN10_ANCON2_BIT 2
+#define HAL_LL_RF5_AN10_ANCON2 10
+#define HAL_LL_RF6_AN11_ANCON2_BIT 3
+#define HAL_LL_RF6_AN11_ANCON2 11
+#define HAL_LL_RF7_AN5_ANCON1_BIT 5
+#define HAL_LL_RF7_AN5_ANCON1 5
+#define HAL_LL_RG1_AN19_ANCON3_BIT 3
+#define HAL_LL_RG1_AN19_ANCON3 19
+#define HAL_LL_RG2_AN18_ANCON3_BIT 2
+#define HAL_LL_RG2_AN18_ANCON3 18
+#define HAL_LL_RG3_AN17_ANCON3_BIT 1
+#define HAL_LL_RG3_AN17_ANCON3 17
+#define HAL_LL_RG4_AN16_ANCON3_BIT 0
+#define HAL_LL_RG4_AN16_ANCON3 16
+#define HAL_LL_RH0_AN23_ANCON3_BIT 7
+#define HAL_LL_RH0_AN23_ANCON3 23
+#define HAL_LL_RH1_AN22_ANCON3_BIT 6
+#define HAL_LL_RH1_AN22_ANCON3 22
+#define HAL_LL_RH2_AN21_ANCON3_BIT 5
+#define HAL_LL_RH2_AN21_ANCON3 21
+#define HAL_LL_RH3_AN20_ANCON3_BIT 4
+#define HAL_LL_RH3_AN20_ANCON3 20
+#define HAL_LL_RH4_AN12_ANCON2_BIT 4
+#define HAL_LL_RH4_AN12_ANCON2 12
+#define HAL_LL_RH5_AN13_ANCON2_BIT 5
+#define HAL_LL_RH5_AN13_ANCON2 13
+#define HAL_LL_RH6_AN14_ANCON2_BIT 6
+#define HAL_LL_RH6_AN14_ANCON2 14
+#define HAL_LL_RH7_AN15_ANCON2_BIT 7
+#define HAL_LL_RH7_AN15_ANCON2 15
 
 
 #define HAL_LL_ADCBUF0_ADDRESS 0xFC2U