From eea5d7269531c1b2744db2663412674ac121407e Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Sat, 19 Jun 2021 23:43:02 +0800
Subject: [PATCH] Add Lux and Noisy ADC sensors support

---
 src/ISKv1/ISKv1.ioc |  203 ++++++++++++++++++++++++++++----------------------
 1 files changed, 114 insertions(+), 89 deletions(-)

diff --git a/src/ISKv1/ISKv1.ioc b/src/ISKv1/ISKv1.ioc
index a125cc3..66ed874 100644
--- a/src/ISKv1/ISKv1.ioc
+++ b/src/ISKv1/ISKv1.ioc
@@ -1,173 +1,198 @@
 #MicroXplorer Configuration settings - do not modify
 Mcu.Family=STM32F1
-RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE
 SH.GPXTI1.0=GPIO_EXTI1
 ProjectManager.MainLocation=Core/Src
 RCC.MCOFreq_Value=72000000
-ProjectManager.ProjectFileName=ISKv1.ioc
-PD1-OSC_OUT.Mode=HSE-External-Oscillator
-PB9.GPIO_Label=Key3
 ProjectManager.KeepUserCode=true
-PA10.Mode=Asynchronous
 Mcu.UserName=STM32F103C8Tx
-PA15.GPIOParameters=PinState,GPIO_Label
-Mcu.PinsNb=17
-ProjectManager.NoMain=false
 SH.GPXTI9.0=GPIO_EXTI9
 RCC.PLLCLKFreq_Value=72000000
 PB14.GPIO_Label=W1Dat
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART1_UART_Init-USART1-false-HAL-true,4-MX_TIM4_Init-TIM4-false-HAL-true
-SH.GPXTI0.ConfNb=1
-RCC.ADCFreqValue=36000000
-ProjectManager.DefaultFWLocation=true
-PD0-OSC_IN.Signal=RCC_OSC_IN
-ProjectManager.DeletePrevious=true
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_USART1_UART_Init-USART1-false-HAL-true,4-MX_TIM4_Init-TIM4-false-HAL-true,5-MX_ADC1_Init-ADC1-false-HAL-true
+RCC.ADCFreqValue=12000000
+PB0.GPIO_Label=AdcMic
 USART1.IPParameters=VirtualMode
-PB14.Locked=true
-RCC.APB1CLKDivider=RCC_HCLK_DIV2
 PB15.Signal=GPIO_Output
 PinOutPanel.RotationAngle=0
-PA0-WKUP.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
-RCC.FamilyName=M
 RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
 ProjectManager.StackSize=0x400
-PA0-WKUP.GPIO_Label=Key1
 PB5.GPIOParameters=PinState,GPIO_Label
-PA0-WKUP.Signal=GPXTI0
-PA0-WKUP.Locked=true
 PD1-OSC_OUT.Signal=RCC_OSC_OUT
-PB9.GPIOParameters=GPIO_Label,GPIO_ModeDefaultEXTI
-PA13.Signal=SYS_JTMS-SWDIO
-Mcu.IP4=USART1
+Mcu.IP4=TIM4
 RCC.FCLKCortexFreq_Value=72000000
+Mcu.IP5=USART1
 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-Mcu.IP2=SYS
-Mcu.IP3=TIM4
+Mcu.IP2=RCC
+Mcu.IP3=SYS
 PB4.GPIOParameters=PinState,GPIO_Label
 PA15.GPIO_Label=RedLed
-Mcu.IP0=NVIC
-PA15.Locked=true
-PA9.Mode=Asynchronous
+Mcu.IP0=ADC1
+Mcu.IP1=NVIC
 NVIC.EXTI1_IRQn=true\:2\:0\:true\:false\:true\:true\:true
-Mcu.IP1=RCC
 Mcu.UserConstants=
-VP_TIM4_VS_ClockSourceINT.Signal=TIM4_VS_ClockSourceINT
-ProjectManager.TargetToolchain=STM32CubeIDE
-TIM4.IPParameters=Prescaler,Period
 PB3.PinState=GPIO_PIN_SET
 Mcu.ThirdPartyNb=0
+ADC1.Channel-3\#ChannelRegularConversion=ADC_CHANNEL_9
 RCC.HCLKFreq_Value=72000000
-Mcu.IPNb=5
+Mcu.IPNb=6
 ProjectManager.PreviousToolchain=
 RCC.APB2TimFreq_Value=72000000
-PA9.Signal=USART1_TX
 PB5.PinState=GPIO_PIN_SET
-PB5.Locked=true
-PB9.Locked=true
-Mcu.Pin6=PA9
+Mcu.Pin6=PB14
 PB9.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
-Mcu.Pin7=PA10
-ProjectManager.RegisterCallBack=
-Mcu.Pin8=PA13
-RCC.USBFreq_Value=72000000
-Mcu.Pin9=PA14
-TIM4.Prescaler=72-1
-PA1.Signal=GPXTI1
+Mcu.Pin7=PB15
+Mcu.Pin8=PA9
+Mcu.Pin9=PA10
 RCC.AHBFreq_Value=72000000
 Mcu.Pin0=PD0-OSC_IN
 Mcu.Pin1=PD1-OSC_OUT
 GPIO.groupedBy=Group By Peripherals
 Mcu.Pin2=PA0-WKUP
-PD0-OSC_IN.Mode=HSE-External-Oscillator
 Mcu.Pin3=PA1
 PA0-WKUP.GPIOParameters=GPIO_Label,GPIO_ModeDefaultEXTI
-Mcu.Pin4=PB14
-PB14.Signal=GPIO_Output
-Mcu.Pin5=PB15
+Mcu.Pin4=PB0
+Mcu.Pin5=PB1
+ADC1.Channel-0\#ChannelRegularConversion=ADC_CHANNEL_8
 ProjectManager.ProjectBuild=false
 NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-board=custom
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
-ProjectManager.LastFirmware=true
 RCC.PLLMUL=RCC_PLL_MUL9
-RCC.VCOOutput2Freq_Value=8000000
 ProjectManager.FirmwarePackage=STM32Cube FW_F1 V1.8.4
-PA15.PinState=GPIO_PIN_SET
 MxDb.Version=DB.6.0.21
-RCC.APB2Freq_Value=72000000
+PB0.GPIOParameters=GPIO_Label
 PA1.GPIOParameters=GPIO_Label,GPIO_ModeDefaultEXTI
 ProjectManager.BackupPrevious=false
+PA14.Mode=Serial_Wire
+PB1.GPIO_Label=AdcLux
+File.Version=6
+SH.ADCx_IN8.0=ADC1_IN8,IN8
+PB3.GPIOParameters=PinState,GPIO_Label
+NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+TIM4.Period=1
+ProjectManager.HalAssertFull=false
+ADC1.SamplingTime-0\#ChannelRegularConversion=ADC_SAMPLETIME_1CYCLE_5
+ProjectManager.ProjectName=ISKv1
+RCC.PLLMCOFreq_Value=36000000
+Mcu.Package=LQFP48
+PB9.Signal=GPXTI9
+PB14.GPIO_PuPd=GPIO_PULLUP
+PB1.Signal=ADCx_IN9
+ProjectManager.ToolChainLocation=
+SH.GPXTI0.0=GPIO_EXTI0
+VP_SYS_VS_Systick.Signal=SYS_VS_Systick
+PA10.Signal=USART1_RX
+PA15.Signal=GPIO_Output
+SH.ADCx_IN9.0=ADC1_IN9,IN9
+PB14.GPIOParameters=GPIO_PuPd,GPIO_Label
+PB5.GPIO_Label=SysLed
+RCC.APB1TimFreq_Value=72000000
+NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+SH.ADCx_IN9.ConfNb=1
+PB4.PinState=GPIO_PIN_SET
+PA1.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
+ProjectManager.CustomerFirmwarePackage=
+PB15.Locked=true
+PB3.Locked=true
+PB4.Signal=GPIO_Output
+PB3.GPIO_Label=GreenLed
+RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE
+ProjectManager.ProjectFileName=ISKv1.ioc
+ADC1.Rank-0\#ChannelRegularConversion=1
+PD1-OSC_OUT.Mode=HSE-External-Oscillator
+PB9.GPIO_Label=Key3
+PA10.Mode=Asynchronous
+PA15.GPIOParameters=PinState,GPIO_Label
+Mcu.PinsNb=19
+ProjectManager.NoMain=false
+ADC1.IPParameters=Rank-0\#ChannelRegularConversion,Channel-0\#ChannelRegularConversion,SamplingTime-0\#ChannelRegularConversion,NbrOfConversionFlag,master,NbrOfConversion,DiscontinuousConvMode,Rank-3\#ChannelRegularConversion,Channel-3\#ChannelRegularConversion,SamplingTime-3\#ChannelRegularConversion
+ADC1.DiscontinuousConvMode=ENABLE
+SH.GPXTI0.ConfNb=1
+ProjectManager.DefaultFWLocation=true
+PD0-OSC_IN.Signal=RCC_OSC_IN
+ProjectManager.DeletePrevious=true
+PB14.Locked=true
+RCC.APB1CLKDivider=RCC_HCLK_DIV2
+PA0-WKUP.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
+RCC.FamilyName=M
+PA0-WKUP.GPIO_Label=Key1
+PA0-WKUP.Signal=GPXTI0
+PA0-WKUP.Locked=true
+PB9.GPIOParameters=GPIO_Label,GPIO_ModeDefaultEXTI
+RCC.ADCPresc=RCC_ADCPCLK2_DIV6
+PA13.Signal=SYS_JTMS-SWDIO
+PA9.Mode=Asynchronous
+PA15.Locked=true
+VP_TIM4_VS_ClockSourceINT.Signal=TIM4_VS_ClockSourceINT
+ProjectManager.TargetToolchain=STM32CubeIDE
+TIM4.IPParameters=Prescaler,Period
+PA9.Signal=USART1_TX
+PB5.Locked=true
+PB9.Locked=true
+ProjectManager.RegisterCallBack=
+RCC.USBFreq_Value=72000000
+TIM4.Prescaler=72-1
+PA1.Signal=GPXTI1
+PD0-OSC_IN.Mode=HSE-External-Oscillator
+PB14.Signal=GPIO_Output
+board=custom
+ProjectManager.LastFirmware=true
+RCC.VCOOutput2Freq_Value=8000000
+PA15.PinState=GPIO_PIN_SET
+RCC.APB2Freq_Value=72000000
 MxCube.Version=6.2.1
 PB4.GPIO_Label=BlueLed
 PB15.GPIO_Label=Relay
-PA14.Mode=Serial_Wire
-File.Version=6
 PA1.GPIO_Label=Key2
 VP_SYS_VS_Systick.Mode=SysTick
-PB3.GPIOParameters=PinState,GPIO_Label
 NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-TIM4.Period=1
+SH.ADCx_IN8.ConfNb=1
 PB15.GPIOParameters=GPIO_Label
+ADC1.NbrOfConversion=2
 PA13.Mode=Serial_Wire
 ProjectManager.FreePins=false
-RCC.IPParameters=ADCFreqValue,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,MCOFreq_Value,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLMUL,PLLSourceVirtual,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USBFreq_Value,VCOOutput2Freq_Value
+RCC.IPParameters=ADCFreqValue,ADCPresc,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2Freq_Value,APB2TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,MCOFreq_Value,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLMUL,PLLSourceVirtual,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USBFreq_Value,VCOOutput2Freq_Value
 ProjectManager.AskForMigrate=true
 Mcu.Name=STM32F103C(8-B)Tx
-ProjectManager.HalAssertFull=false
-ProjectManager.ProjectName=ISKv1
 ProjectManager.UnderRoot=true
-RCC.PLLMCOFreq_Value=36000000
 ProjectManager.CoupleFile=true
 PB4.Locked=true
 PB3.Signal=GPIO_Output
 NVIC.EXTI0_IRQn=true\:2\:0\:true\:false\:true\:true\:true
 RCC.SYSCLKFreq_VALUE=72000000
-Mcu.Package=LQFP48
 PB5.Signal=GPIO_Output
-PB9.Signal=GPXTI9
-PB14.GPIO_PuPd=GPIO_PULLUP
 RCC.TimSysFreq_Value=72000000
 PA1.Locked=true
+ADC1.master=1
+ADC1.Rank-3\#ChannelRegularConversion=2
+ADC1.SamplingTime-3\#ChannelRegularConversion=ADC_SAMPLETIME_1CYCLE_5
 NVIC.ForceEnableDMAVector=true
 KeepUserPlacement=false
 NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 USART1.VirtualMode=VM_ASYNC
 ProjectManager.CompilerOptimize=6
-ProjectManager.ToolChainLocation=
-VP_SYS_VS_Systick.Signal=SYS_VS_Systick
-SH.GPXTI0.0=GPIO_EXTI0
 SH.GPXTI9.ConfNb=1
 NVIC.EXTI9_5_IRQn=true\:2\:0\:true\:false\:true\:true\:true
-PA10.Signal=USART1_RX
 PA14.Signal=SYS_JTCK-SWCLK
-PA15.Signal=GPIO_Output
 ProjectManager.HeapSize=0x200
-Mcu.Pin15=VP_SYS_VS_Systick
+Mcu.Pin15=PB5
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-Mcu.Pin16=VP_TIM4_VS_ClockSourceINT
-Mcu.Pin13=PB5
-Mcu.Pin14=PB9
-PB14.GPIOParameters=GPIO_PuPd,GPIO_Label
+Mcu.Pin16=PB9
+Mcu.Pin13=PB3
+Mcu.Pin14=PB4
 ProjectManager.ComputerToolchain=false
+Mcu.Pin17=VP_SYS_VS_Systick
+Mcu.Pin18=VP_TIM4_VS_ClockSourceINT
 VP_TIM4_VS_ClockSourceINT.Mode=Internal
 NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
-Mcu.Pin11=PB3
-Mcu.Pin12=PB4
-PB5.GPIO_Label=SysLed
-Mcu.Pin10=PA15
-RCC.APB1TimFreq_Value=72000000
-NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+ADC1.NbrOfConversionFlag=1
+Mcu.Pin11=PA14
+Mcu.Pin12=PA15
+Mcu.Pin10=PA13
 SH.GPXTI1.ConfNb=1
 RCC.APB1Freq_Value=36000000
-PB4.PinState=GPIO_PIN_SET
-PA1.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_FALLING
-ProjectManager.CustomerFirmwarePackage=
+PB0.Signal=ADCx_IN8
 ProjectManager.DeviceId=STM32F103C8Tx
 ProjectManager.LibraryCopy=1
-PB15.Locked=true
-PB3.Locked=true
-PB4.Signal=GPIO_Output
-PB3.GPIO_Label=GreenLed
+PB1.GPIOParameters=GPIO_Label
 isbadioc=false

--
Gitblit v1.9.1