diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 96f97e9..c6d18b7 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -6,7 +6,7 @@
-
+
@@ -18,7 +18,7 @@
-
+
diff --git a/Core/Drivers/ANPI_AnalogPortsIn.c b/Core/Drivers/ANPI_AnalogPortsIn.c
index d4f5bef..68daa72 100644
--- a/Core/Drivers/ANPI_AnalogPortsIn.c
+++ b/Core/Drivers/ANPI_AnalogPortsIn.c
@@ -127,15 +127,6 @@ LOCAL CONST FLOAT m_aflOffset[ANPI_eInNumberOfInputs] =
2.5f, // 04 ANPI_eOutputCurrent
};
-// initial values. Order must fit enumeration "ANPI_EnAnalogInput"
-LOCAL CONST FLOAT m_afInitValues[ANPI_eInNumberOfInputs] =
-{
- 0.0f, // 01 ANPI_eSupplyVoltage24V
- 0.0f, // 02 ANPI_eSupplyCurrent24V
- 0.0f, // 03 ANPI_eOutputVoltage
- 0.0f, // 04 ANPI_eOutputCurrent
-};
-
// configuration data for the ADC
// order must fit enumeration EnADC
LOCAL CONST StADCInit m_astADCInit[1] =
@@ -213,9 +204,6 @@ BOOL ANPI_boInitializeModule( VOID )
{
BOOL boOK = TRUE;
- // set the init values
- UTIL_vMemCopyU32( (PU32)m_afInitValues, (PU32)m_aflValues, sizeof(m_aflValues)/sizeof(FLOAT) );
-
boOK &= ((m_pstThreadID = osThreadNew( ANPI_vTask, NULL, &stTaskAttribute )) == NULL ) ? FALSE : TRUE;
boOK &= ((m_pstEventID = osEventFlagsNew( &stEventAttribute )) == NULL) ? FALSE : TRUE;
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 5509eb1..44fab69 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -244,7 +244,7 @@ static void MX_ADC1_Init(void)
hadc1.Init.EOCSelection = ADC_EOC_SEQ_CONV;
hadc1.Init.LowPowerAutoWait = DISABLE;
hadc1.Init.ContinuousConvMode = ENABLE;
- hadc1.Init.NbrOfConversion = 5;
+ hadc1.Init.NbrOfConversion = 4;
hadc1.Init.DiscontinuousConvMode = DISABLE;
hadc1.Init.ExternalTrigConv = ADC_SOFTWARE_START;
hadc1.Init.ExternalTrigConvEdge = ADC_EXTERNALTRIGCONVEDGE_NONE;
@@ -261,7 +261,7 @@ static void MX_ADC1_Init(void)
}
/** Configure Regular Channel
*/
- sConfig.Channel = ADC_CHANNEL_8;
+ sConfig.Channel = ADC_CHANNEL_6;
sConfig.Rank = ADC_REGULAR_RANK_1;
sConfig.SamplingTime = ADC_SAMPLETIME_640CYCLES_5;
sConfig.SingleDiff = ADC_SINGLE_ENDED;
@@ -273,7 +273,7 @@ static void MX_ADC1_Init(void)
}
/** Configure Regular Channel
*/
- sConfig.Channel = ADC_CHANNEL_6;
+ sConfig.Channel = ADC_CHANNEL_16;
sConfig.Rank = ADC_REGULAR_RANK_2;
if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
{
@@ -281,7 +281,7 @@ static void MX_ADC1_Init(void)
}
/** Configure Regular Channel
*/
- sConfig.Channel = ADC_CHANNEL_16;
+ sConfig.Channel = ADC_CHANNEL_7;
sConfig.Rank = ADC_REGULAR_RANK_3;
if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
{
@@ -289,16 +289,8 @@ static void MX_ADC1_Init(void)
}
/** Configure Regular Channel
*/
- sConfig.Channel = ADC_CHANNEL_7;
- sConfig.Rank = ADC_REGULAR_RANK_4;
- if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
- {
- Error_Handler();
- }
- /** Configure Regular Channel
- */
sConfig.Channel = ADC_CHANNEL_15;
- sConfig.Rank = ADC_REGULAR_RANK_5;
+ sConfig.Rank = ADC_REGULAR_RANK_4;
if (HAL_ADC_ConfigChannel(&hadc1, &sConfig) != HAL_OK)
{
Error_Handler();
diff --git a/Core/Src/stm32l4xx_hal_msp.c b/Core/Src/stm32l4xx_hal_msp.c
index 6cfd395..e825b7a 100644
--- a/Core/Src/stm32l4xx_hal_msp.c
+++ b/Core/Src/stm32l4xx_hal_msp.c
@@ -116,11 +116,10 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef* hadc)
/**ADC1 GPIO Configuration
PA1 ------> ADC1_IN6
PA2 ------> ADC1_IN7
- PA3 ------> ADC1_IN8
PB0 ------> ADC1_IN15
PB1 ------> ADC1_IN16
*/
- GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3;
+ GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2;
GPIO_InitStruct.Mode = GPIO_MODE_ANALOG_ADC_CONTROL;
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
@@ -177,11 +176,10 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef* hadc)
/**ADC1 GPIO Configuration
PA1 ------> ADC1_IN6
PA2 ------> ADC1_IN7
- PA3 ------> ADC1_IN8
PB0 ------> ADC1_IN15
PB1 ------> ADC1_IN16
*/
- HAL_GPIO_DeInit(GPIOA, GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3);
+ HAL_GPIO_DeInit(GPIOA, GPIO_PIN_1|GPIO_PIN_2);
HAL_GPIO_DeInit(GPIOB, GPIO_PIN_0|GPIO_PIN_1);
diff --git a/PeltierControllerV3.ioc b/PeltierControllerV3.ioc
index 2caeae7..ae97ef4 100644
--- a/PeltierControllerV3.ioc
+++ b/PeltierControllerV3.ioc
@@ -1,33 +1,29 @@
#MicroXplorer Configuration settings - do not modify
-ADC1.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_8
-ADC1.Channel-1\#ChannelRegularConversion=ADC_CHANNEL_6
-ADC1.Channel-2\#ChannelRegularConversion=ADC_CHANNEL_16
-ADC1.Channel-3\#ChannelRegularConversion=ADC_CHANNEL_7
-ADC1.Channel-4\#ChannelRegularConversion=ADC_CHANNEL_15
+ADC1.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_6
+ADC1.Channel-1\#ChannelRegularConversion=ADC_CHANNEL_16
+ADC1.Channel-2\#ChannelRegularConversion=ADC_CHANNEL_7
+ADC1.Channel-3\#ChannelRegularConversion=ADC_CHANNEL_15
ADC1.ContinuousConvMode=ENABLE
ADC1.DMAContinuousRequests=ENABLE
ADC1.EOCSelection=ADC_EOC_SEQ_CONV
-ADC1.IPParameters=Rank-0\#ChannelRegularConversion,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,OffsetNumber-0\#ChannelRegularConversion,NbrOfConversionFlag,master,NbrOfConversion,ContinuousConvMode,DMAContinuousRequests,Rank-1\#ChannelRegularConversion,Channel-1\#ChannelRegularConversion,SamplingTime-1\#ChannelRegularConversion,OffsetNumber-1\#ChannelRegularConversion,Rank-2\#ChannelRegularConversion,Channel-2\#ChannelRegularConversion,SamplingTime-2\#ChannelRegularConversion,OffsetNumber-2\#ChannelRegularConversion,Rank-3\#ChannelRegularConversion,Channel-3\#ChannelRegularConversion,SamplingTime-3\#ChannelRegularConversion,OffsetNumber-3\#ChannelRegularConversion,Rank-4\#ChannelRegularConversion,Channel-4\#ChannelRegularConversion,SamplingTime-4\#ChannelRegularConversion,OffsetNumber-4\#ChannelRegularConversion,EOCSelection,OversamplingMode,RightBitShift,Ratio
-ADC1.NbrOfConversion=5
+ADC1.IPParameters=Rank-0\#ChannelRegularConversion,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,OffsetNumber-0\#ChannelRegularConversion,NbrOfConversionFlag,NbrOfConversion,ContinuousConvMode,DMAContinuousRequests,Rank-1\#ChannelRegularConversion,Channel-1\#ChannelRegularConversion,SamplingTime-1\#ChannelRegularConversion,OffsetNumber-1\#ChannelRegularConversion,Rank-2\#ChannelRegularConversion,Channel-2\#ChannelRegularConversion,SamplingTime-2\#ChannelRegularConversion,OffsetNumber-2\#ChannelRegularConversion,Rank-3\#ChannelRegularConversion,Channel-3\#ChannelRegularConversion,SamplingTime-3\#ChannelRegularConversion,OffsetNumber-3\#ChannelRegularConversion,EOCSelection,OversamplingMode,RightBitShift,Ratio,master
+ADC1.NbrOfConversion=4
ADC1.NbrOfConversionFlag=1
ADC1.OffsetNumber-0\#ChannelRegularConversion=ADC_OFFSET_NONE
ADC1.OffsetNumber-1\#ChannelRegularConversion=ADC_OFFSET_NONE
ADC1.OffsetNumber-2\#ChannelRegularConversion=ADC_OFFSET_NONE
ADC1.OffsetNumber-3\#ChannelRegularConversion=ADC_OFFSET_NONE
-ADC1.OffsetNumber-4\#ChannelRegularConversion=ADC_OFFSET_NONE
ADC1.OversamplingMode=ENABLE
ADC1.Rank-0\#ChannelRegularConversion=1
ADC1.Rank-1\#ChannelRegularConversion=2
ADC1.Rank-2\#ChannelRegularConversion=3
ADC1.Rank-3\#ChannelRegularConversion=4
-ADC1.Rank-4\#ChannelRegularConversion=5
ADC1.Ratio=ADC_OVERSAMPLING_RATIO_256
ADC1.RightBitShift=ADC_RIGHTBITSHIFT_4
ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_640CYCLES_5
ADC1.SamplingTime-1\#ChannelRegularConversion=ADC_SAMPLETIME_640CYCLES_5
ADC1.SamplingTime-2\#ChannelRegularConversion=ADC_SAMPLETIME_640CYCLES_5
ADC1.SamplingTime-3\#ChannelRegularConversion=ADC_SAMPLETIME_640CYCLES_5
-ADC1.SamplingTime-4\#ChannelRegularConversion=ADC_SAMPLETIME_640CYCLES_5
ADC1.master=1
CAN1.BS1=CAN_BS1_3TQ
CAN1.CalculateBaudRate=1000000
@@ -89,29 +85,28 @@ Mcu.Name=STM32L432K(B-C)Ux
Mcu.Package=UFQFPN32
Mcu.Pin0=PA0
Mcu.Pin1=PA1
-Mcu.Pin10=PA8
-Mcu.Pin11=PA10
-Mcu.Pin12=PA11
-Mcu.Pin13=PA12
-Mcu.Pin14=PA13 (JTMS-SWDIO)
-Mcu.Pin15=PA14 (JTCK-SWCLK)
-Mcu.Pin16=PA15 (JTDI)
-Mcu.Pin17=PB3 (JTDO-TRACESWO)
-Mcu.Pin18=PB4 (NJTRST)
-Mcu.Pin19=PB5
+Mcu.Pin10=PA10
+Mcu.Pin11=PA11
+Mcu.Pin12=PA12
+Mcu.Pin13=PA13 (JTMS-SWDIO)
+Mcu.Pin14=PA14 (JTCK-SWCLK)
+Mcu.Pin15=PA15 (JTDI)
+Mcu.Pin16=PB3 (JTDO-TRACESWO)
+Mcu.Pin17=PB4 (NJTRST)
+Mcu.Pin18=PB5
+Mcu.Pin19=PB6
Mcu.Pin2=PA2
-Mcu.Pin20=PB6
-Mcu.Pin21=PB7
-Mcu.Pin22=VP_FREERTOS_VS_CMSIS_V2
-Mcu.Pin23=VP_SYS_VS_Systick
-Mcu.Pin3=PA3
-Mcu.Pin4=PA4
-Mcu.Pin5=PA5
-Mcu.Pin6=PA6
-Mcu.Pin7=PA7
-Mcu.Pin8=PB0
-Mcu.Pin9=PB1
-Mcu.PinsNb=24
+Mcu.Pin20=PB7
+Mcu.Pin21=VP_FREERTOS_VS_CMSIS_V2
+Mcu.Pin22=VP_SYS_VS_Systick
+Mcu.Pin3=PA4
+Mcu.Pin4=PA5
+Mcu.Pin5=PA6
+Mcu.Pin6=PA7
+Mcu.Pin7=PB0
+Mcu.Pin8=PB1
+Mcu.Pin9=PA8
+Mcu.PinsNb=23
Mcu.ThirdPartyNb=0
Mcu.UserConstants=
Mcu.UserName=STM32L432KBUx
@@ -162,8 +157,6 @@ PA15\ (JTDI).Locked=true
PA15\ (JTDI).Signal=GPIO_Input
PA2.Locked=true
PA2.Signal=ADCx_IN7
-PA3.Locked=true
-PA3.Signal=ADCx_IN8
PA4.Locked=true
PA4.Signal=COMP_DAC11_group
PA5.Mode=Full_Duplex_Master
@@ -215,7 +208,7 @@ ProjectManager.FreePins=false
ProjectManager.HalAssertFull=false
ProjectManager.HeapSize=0x200
ProjectManager.KeepUserCode=true
-ProjectManager.LastFirmware=true
+ProjectManager.LastFirmware=false
ProjectManager.LibraryCopy=1
ProjectManager.MainLocation=Core/Src
ProjectManager.NoMain=false
@@ -283,8 +276,6 @@ SH.ADCx_IN6.0=ADC1_IN6,IN6-Single-Ended
SH.ADCx_IN6.ConfNb=1
SH.ADCx_IN7.0=ADC1_IN7,IN7-Single-Ended
SH.ADCx_IN7.ConfNb=1
-SH.ADCx_IN8.0=ADC1_IN8,IN8-Single-Ended
-SH.ADCx_IN8.ConfNb=1
SH.COMP_DAC11_group.0=DAC1_OUT1,DAC_OUT1
SH.COMP_DAC11_group.ConfNb=1
SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_128