From 53ec4e3f2bdd8dab1667e7ed40066a5109f6a258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Noah=20Piqu=C3=A9?= <noahpique03@gmail.com>
Date: Wed, 1 Dec 2021 16:11:28 +0100
Subject: [PATCH] changes analog ports in

---
 .settings/language.settings.xml   |  4 ++--
 Core/Drivers/ANPI_AnalogPortsIn.c | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 344825d..c6d18b7 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="381678979325993580" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="557024645362649502" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="381678979325993580" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="557024645362649502" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/Core/Drivers/ANPI_AnalogPortsIn.c b/Core/Drivers/ANPI_AnalogPortsIn.c
index 60fa224..92296af 100644
--- a/Core/Drivers/ANPI_AnalogPortsIn.c
+++ b/Core/Drivers/ANPI_AnalogPortsIn.c
@@ -52,7 +52,7 @@
 //=================================================================================================
 
 #define ADC_RES         (4096)                       // ADC resolution: 12 bits
-#define NR_OF_ADCS   		5                            // number of internal adc channels
+#define NR_OF_ADCS   		ANPI_eInNumberOfInputs                            // number of internal adc channels
 
 #define INT_ADC_REF    (3.2968f)// int. reference voltage for conversion
 
@@ -240,8 +240,8 @@ VOID ANPI_vTask( PVOID arg )
 {
   U32 u32Flags;
   U16 u16Offset;
-  FLOAT u_adc;
-  static U32 m_au32ADCRawData[ANPI_eInNumberOfInputs];
+  FLOAT flUadc;
+  U32 m_au32ADCRawData[ANPI_eInNumberOfInputs];
   
   osDelay( 1 ); // Wait 1ms to have a Valid Value
   
@@ -265,8 +265,8 @@ VOID ANPI_vTask( PVOID arg )
     // multiply conversion factor and add the offset
     for(U16 u16Cnt = 0; u16Cnt < ANPI_eInNumberOfInputs; u16Cnt++ )
     {
-      u_adc = (FLOAT)m_au32ADCRawData[u16Cnt] / OVERSAMPLING_DIVISOR / ADC_RES * INT_ADC_REF;
-      m_aflValues[u16Cnt] = u_adc * m_aflConversionFactor[u16Cnt] - m_aflOffset[u16Cnt];
+      flUadc = (FLOAT)m_au32ADCRawData[u16Cnt] / OVERSAMPLING_DIVISOR / ADC_RES * INT_ADC_REF;
+      m_aflValues[u16Cnt] = flUadc * m_aflConversionFactor[u16Cnt] - m_aflOffset[u16Cnt];
     }
     
     osMutexRelease( m_pstMutexID );                   															// release mutex