diff --git a/Core/Drivers/ANPI_AnalogPortsIn.c b/Core/Drivers/ANPI_AnalogPortsIn.c index 9a3b744..3d45e46 100644 --- a/Core/Drivers/ANPI_AnalogPortsIn.c +++ b/Core/Drivers/ANPI_AnalogPortsIn.c @@ -55,7 +55,7 @@ #define NR_OF_ADCS 5 // number of internal adc channels // definitions of internal adc -#define INT_ADC_REF_HI (3.3f) // HI int. reference voltage for conversion +#define INT_ADC_REF_HI (3.2968f) // HI int. reference voltage for conversion #define INT_ADC_REF_LO (0.0f) // LO int. reference voltage for conversion #define INT_ADC_REF (INT_ADC_REF_HI-INT_ADC_REF_LO)// int. reference voltage for conversion @@ -126,7 +126,7 @@ LOCAL CONST FLOAT m_aflConversionFactor[ANPI_eInNumberOfInputs] = 34.103f * 1.0f / ADC_RES * INT_ADC_REF, // 00 ANPI_eControlVoltage 10.0f / ADC_RES * INT_ADC_REF, // 01 ANPI_eSupplyVoltage24V -(1.0f / (2.0f / 10.0f)) / ADC_RES * INT_ADC_REF, // 02 ANPI_eSupplyCurrent24V - 34.103f * 1.0f / ADC_RES * INT_ADC_REF, // 03 ANPI_eOutputVoltage + 10.0f * 1.0f / ADC_RES * INT_ADC_REF, // 03 ANPI_eOutputVoltage (1.0f / (2.0f / 10.0f)) / ADC_RES * INT_ADC_REF, // 04 ANPI_eOutputCurrent }; @@ -148,7 +148,7 @@ LOCAL CONST FLOAT m_aflOffset2[ANPI_eInNumberOfInputs] = 20.088f, // 00 ANPI_eControlVoltage 0.0f, // 01 ANPI_eSupplyVoltage24V 0.0f, // 02 ANPI_eSupplyCurrent24V - 20.088f, // 03 ANPI_eOutputVoltage + 4.5f * INT_ADC_REF, // 03 ANPI_eOutputVoltage 0.0f, // 04 ANPI_eOutputCurrent }; diff --git a/Core/Drivers/USFL_UserFlash.c b/Core/Drivers/USFL_UserFlash.c index a68c6b8..4ec5020 100644 --- a/Core/Drivers/USFL_UserFlash.c +++ b/Core/Drivers/USFL_UserFlash.c @@ -134,7 +134,7 @@ BOOL USFL_boInitializeModule( VOID ) { - return( FALSE ); + return( TRUE ); }