Merge branch 'release/v0.9.1'

Author: thejpster

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 * None
 
+## v0.9.1
+
+* Swapped BUTTON_PWR and SYS_RESET to avoid DRC issue
+* Split PSU and BMC into two separate sheets
+* Swapped some pins on the STM32 to make it compatible with more alternatives
+
 ## v0.9.0
 
 * Changed STM32 pinout to add 4-wire UART and move to SPI bus

CubeMX/STM32 Board Management Controller.ioc

@@ -1,37 +1,37 @@
 #MicroXplorer Configuration settings - do not modify
 Mcu.Family=STM32F0
 ProjectManager.MainLocation=Core/Src
-RCC.MCOFreq_Value=48000000
 PA6.Mode=Full_Duplex_Slave
-RCC.USART1Freq_Value=48000000
-I2C1.I2C_Speed_Mode=I2C_Standard
 ProjectManager.KeepUserCode=true
-Mcu.UserName=STM32F031K6Tx
+Mcu.UserName=STM32F030K6Tx
 SPI1.VirtualType=VM_SLAVE
-I2C1.GeneralCallMode=I2C_GENERALCALL_DISABLE
-RCC.PLLCLKFreq_Value=48000000
-VP_IWDG_VS_IWDG.Mode=IWDG_Activate
+RCC.PLLCLKFreq_Value=8000000
+PA14.GPIO_Label=SWD_CLK
 PA0.GPIO_Label=MON_3V3
-ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_ADC_Init-ADC-false-HAL-true,4-MX_I2C1_Init-I2C1-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true,6-MX_WWDG_Init-WWDG-false-HAL-true,7-MX_TIM2_Init-TIM2-false-HAL-true,8-MX_IWDG_Init-IWDG-false-HAL-true,9-MX_SPI1_Init-SPI1-false-HAL-true
+PA12.GPIOParameters=GPIO_Label
+ProjectManager.functionlistsort=1-MX_GPIO_Init-GPIO-false-HAL-true,2-SystemClock_Config-RCC-false-HAL-false,3-MX_ADC_Init-ADC-false-HAL-true
+PA9.GPIOParameters=GPIO_Label
+PA11.GPIOParameters=GPIO_Label
 PA11.Mode=CTS_RTS
 PA3.GPIOParameters=GPIO_Label
-PB0.GPIO_Label=BUTTON_RST
+PA6.GPIO_Label=SPI_CIPO
+PB0.GPIO_Label=LED0
+PB6.GPIO_Label=I2C_SCL
 NVIC.SVC_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 USART1.IPParameters=VirtualMode-Asynchronous
 PA2.GPIOParameters=GPIO_Label
 PinOutPanel.RotationAngle=0
-RCC.SYSCLKSource=RCC_SYSCLKSOURCE_PLLCLK
+TIM3.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
 ProjectManager.StackSize=0x400
-PB5.GPIOParameters=PinState,GPIO_Label,GPIO_ModeDefaultOutputPP
-Mcu.IP4=RCC
-RCC.FCLKCortexFreq_Value=48000000
-Mcu.IP5=SPI1
-I2C1.IPParameters=Timing,I2C_Speed_Mode,GeneralCallMode
-Mcu.IP2=IWDG
-Mcu.IP3=NVIC
+PB5.GPIOParameters=GPIO_Label
+Mcu.IP4=SPI1
+Mcu.IP5=SYS
+Mcu.IP2=NVIC
+Mcu.IP3=RCC
 PA15.GPIO_Label=PS2_CLK0
 PB4.GPIOParameters=GPIO_Label
 Mcu.IP0=ADC
+PA12.Locked=true
 Mcu.IP1=I2C1
 PA12.Signal=USART1_RTS
 SH.GPXTI3.ConfNb=1
@@ -40,178 +40,190 @@ VP_ADC_Vref_Input.Signal=ADC_Vref_Input
 PA4.Mode=NSS_Signal_Hard_Input
 Mcu.ThirdPartyNb=0
 SPI1.Direction=SPI_DIRECTION_2LINES
-RCC.HCLKFreq_Value=48000000
-Mcu.IPNb=10
-TIM2.IPParameters=Channel-PWM Generation3 CH3,Channel-PWM Generation4 CH4
+Mcu.IPNb=8
 ProjectManager.PreviousToolchain=
 PB6.Signal=I2C1_SCL
-PB5.PinState=GPIO_PIN_SET
 PB6.Mode=I2C
 PA8.GPIOParameters=GPIO_Label
 Mcu.Pin6=PA4
 Mcu.Pin7=PA5
 Mcu.Pin8=PA6
 Mcu.Pin9=PA7
-RCC.AHBFreq_Value=48000000
 Mcu.Pin0=PF0-OSC_IN
 Mcu.Pin1=PF1-OSC_OUT
-GPIO.groupedBy=Group By Peripherals
+GPIO.groupedBy=
 Mcu.Pin2=PA0
 Mcu.Pin3=PA1
 Mcu.Pin4=PA2
 Mcu.Pin5=PA3
 ProjectManager.ProjectBuild=false
-PF0-OSC_IN.GPIO_Label=BUTTON_PWR
+PA0.Locked=true
+PF0-OSC_IN.GPIO_Label=nBUTTON_PWR
+PA8.Locked=true
+PA4.Locked=true
 NVIC.SysTick_IRQn=true\:0\:0\:false\:false\:true\:false\:true
-RCC.PLLMUL=RCC_PLL_MUL12
 ProjectManager.FirmwarePackage=STM32Cube FW_F0 V1.11.2
-MxDb.Version=DB.6.0.10
+MxDb.Version=DB.6.0.21
 PB0.GPIOParameters=GPIO_Label
 PA1.GPIOParameters=GPIO_Label
 ProjectManager.BackupPrevious=false
+PF0-OSC_IN.Locked=true
 PA14.Mode=Serial_Wire
-VP_SYS_VS_tim1.Mode=TIM1
-PB1.GPIO_Label=DC_ON
+PB1.GPIO_Label=LED1
 File.Version=6
+PA10.GPIO_Label=UART_RX
 PA0.Mode=IN0
 PB3.GPIOParameters=GPIO_Label
 PB7.Signal=I2C1_SDA
 PA8.Signal=GPIO_Output
 SPI1.VirtualNSS=VM_NSSHARD
+PB6.Locked=true
 NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+PB6.GPIOParameters=GPIO_Label
 ProjectManager.HalAssertFull=false
-ProjectManager.ProjectName=STM32 Board Management Controller
+PB0.Locked=true
+ProjectManager.ProjectName=STM32F0
 PA0.Signal=ADC_IN0
-RCC.PLLMCOFreq_Value=48000000
+PA13.GPIOParameters=GPIO_Label
+RCC.PLLMCOFreq_Value=8000000
+PB7.GPIO_Label=I2C_SDA
 Mcu.Package=LQFP32
-PB1.Signal=GPIO_Output
+PB1.Signal=S_TIM3_CH4
 PA6.Signal=SPI1_MISO
-NVIC.TimeBase=TIM1_BRK_UP_TRG_COM_IRQn
+PA7.Locked=true
+PA5.Locked=true
+PA14.Locked=true
 ProjectManager.ToolChainLocation=
-PA2.GPIO_Label=LED0
-NVIC.TimeBaseIP=TIM1
+PA2.GPIO_Label=nSYS_RESET
+VP_SYS_VS_Systick.Signal=SYS_VS_Systick
 PA10.Signal=USART1_RX
 PA15.Signal=GPXTI15
+PA5.GPIOParameters=GPIO_Label
 PB5.GPIO_Label=PS2_DAT1
-RCC.APB1TimFreq_Value=48000000
-SH.S_TIM2_CH4.ConfNb=1
+PA4.GPIO_Label=nSPI_CS
 ProjectManager.CustomerFirmwarePackage=
-PF1-OSC_OUT.Signal=GPIO_Output
+PF1-OSC_OUT.Signal=GPIO_Input
 PB3.Locked=true
 PB4.Signal=GPIO_Input
-PA3.Signal=S_TIM2_CH4
-VP_WWDG_VS_WWDG.Signal=WWDG_VS_WWDG
+PA3.Signal=GPIO_Output
 PA5.Mode=Full_Duplex_Slave
+PA2.Locked=true
 PB3.GPIO_Label=PS2_CLK1
-PB5.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_OD
-RCC.I2SFreq_Value=48000000
-ProjectManager.ProjectFileName=STM32 Board Management Controller.ioc
-TIM2.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
+PA6.GPIOParameters=GPIO_Label
+ProjectManager.ProjectFileName=STM32F0.ioc
 PA7.Mode=Full_Duplex_Slave
-Mcu.PinsNb=31
+Mcu.PinsNb=28
 PA15.GPIOParameters=GPIO_Label
 PA10.Mode=Asynchronous
 ProjectManager.NoMain=false
 SPI1.IPParameters=VirtualType,Mode,Direction,VirtualNSS
 VP_ADC_TempSens_Input.Mode=IN-TempSens
+PA9.GPIO_Label=UART_TX
 VP_ADC_Vref_Input.Mode=IN-Vrefint
+PA11.GPIO_Label=UART_CTS
 ProjectManager.DefaultFWLocation=true
 ProjectManager.DeletePrevious=true
+PF1-OSC_OUT.Locked=true
+SH.S_TIM3_CH3.0=TIM3_CH3,PWM Generation3 CH3
+PA12.GPIO_Label=UART_RTS
 RCC.FamilyName=M
 USART1.VirtualMode-Asynchronous=VM_ASYNC
 PA13.Signal=SYS_SWDIO
+TIM3.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
 PA15.Locked=true
+PA11.Locked=true
 PA9.Mode=Asynchronous
-PA8.GPIO_Label=HOST_NIRQ
-ProjectManager.TargetToolchain=Makefile
+PA8.GPIO_Label=nHOST_IRQ
+ProjectManager.TargetToolchain=EWARM V8.32
+SH.S_TIM3_CH3.ConfNb=1
+PB7.GPIOParameters=GPIO_Label
 PA9.Signal=USART1_TX
-I2C1.Timing=0x20303E5D
 PB5.Locked=true
 ProjectManager.RegisterCallBack=
 PF1-OSC_OUT.GPIOParameters=GPIO_Label
 PA1.Signal=ADC_IN1
+PB1.Locked=true
 PA5.Signal=SPI1_SCK
 board=custom
 SH.GPXTI3.0=GPIO_EXTI3
 ProjectManager.LastFirmware=true
 PA1.Mode=IN1
-MxCube.Version=6.1.2
+MxCube.Version=6.2.1
 PB4.GPIO_Label=PS2_DAT0
-RCC.I2C1Freq_Value=48000000
-SH.S_TIM2_CH3.0=TIM2_CH3,PWM Generation3 CH3
-VP_SYS_VS_tim1.Signal=SYS_VS_tim1
 SPI1.Mode=SPI_MODE_SLAVE
-Mcu.Pin30=VP_WWDG_VS_WWDG
-PF1-OSC_OUT.GPIO_Label=HOST_RST
 PA1.GPIO_Label=MON_5V0
-TIM2.Channel-PWM\ Generation3\ CH3=TIM_CHANNEL_3
-RCC.I2c1ClockSelection=RCC_I2C1CLKSOURCE_SYSCLK
+PF1-OSC_OUT.GPIO_Label=nBUTTON_RST
+PA10.GPIOParameters=GPIO_Label
+VP_SYS_VS_Systick.Mode=SysTick
+TIM3.IPParameters=Channel-PWM Generation4 CH4,Channel-PWM Generation3 CH3
+PA9.Locked=true
 NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-SH.S_TIM2_CH3.ConfNb=1
+PA4.GPIOParameters=GPIO_Label
 PA13.Mode=Serial_Wire
 ProjectManager.FreePins=false
-RCC.IPParameters=AHBFreq_Value,APB1Freq_Value,APB1TimFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,I2C1Freq_Value,I2SFreq_Value,I2c1ClockSelection,MCOFreq_Value,PLLCLKFreq_Value,PLLMCOFreq_Value,PLLMUL,SYSCLKFreq_VALUE,SYSCLKSource,TimSysFreq_Value,USART1Freq_Value
+RCC.IPParameters=FamilyName,PLLCLKFreq_Value,PLLMCOFreq_Value,TimSysFreq_Value
 ProjectManager.AskForMigrate=true
-Mcu.Name=STM32F031K6Tx
+Mcu.Name=STM32F030K6Tx
 Mcu.Pin26=VP_ADC_Vref_Input
-Mcu.Pin27=VP_ADC_Vbat_Input
+Mcu.Pin27=VP_SYS_VS_Systick
+PA2.Signal=GPIO_Output
+PA13.GPIO_Label=SWD_IO
 Mcu.Pin24=PB7
-PA2.Signal=S_TIM2_CH3
 ProjectManager.UnderRoot=false
 Mcu.Pin25=VP_ADC_TempSens_Input
-Mcu.IP8=USART1
-Mcu.IP9=WWDG
-VP_ADC_Vbat_Input.Mode=IN-Vbat
-Mcu.Pin28=VP_IWDG_VS_IWDG
-Mcu.IP6=SYS
-Mcu.Pin29=VP_SYS_VS_tim1
-Mcu.IP7=TIM2
+Mcu.IP6=TIM3
+Mcu.IP7=USART1
 ProjectManager.CoupleFile=false
 PB4.Locked=true
 PB3.Signal=GPXTI3
 PA4.Signal=SPI1_NSS
-RCC.SYSCLKFreq_VALUE=48000000
-VP_ADC_Vbat_Input.Signal=ADC_Vbat_Input
-PB5.Signal=GPIO_Output
+PB5.Signal=GPIO_Input
 Mcu.Pin22=PB5
 Mcu.Pin23=PB6
-RCC.TimSysFreq_Value=48000000
+RCC.TimSysFreq_Value=8000000
+PA1.Locked=true
+PA7.GPIO_Label=SPI_COPI
 Mcu.Pin20=PB3
-VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
+PA3.Locked=true
 Mcu.Pin21=PB4
+VP_ADC_TempSens_Input.Signal=ADC_TempSens_Input
 PA12.Mode=CTS_RTS
+PA5.GPIO_Label=SLK_CLK
+PA10.Locked=true
 NVIC.ForceEnableDMAVector=true
 KeepUserPlacement=false
+PA14.GPIOParameters=GPIO_Label
+PA13.Locked=true
 ProjectManager.CompilerOptimize=6
-PA11.Signal=USART1_CTS
 PB7.Mode=I2C
-VP_IWDG_VS_IWDG.Signal=IWDG_VS_IWDG
+PA11.Signal=USART1_CTS
 PA14.Signal=SYS_SWCLK
 ProjectManager.HeapSize=0x200
-Mcu.Pin15=PA11
 PA0.GPIOParameters=GPIO_Label
+Mcu.Pin15=PA11
 NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
 Mcu.Pin16=PA12
-SH.S_TIM2_CH4.0=TIM2_CH4,PWM Generation4 CH4
 Mcu.Pin13=PA9
 Mcu.Pin14=PA10
-VP_WWDG_VS_WWDG.Mode=WWDG_Activate
 Mcu.Pin19=PA15
 SH.GPXTI15.ConfNb=1
 ProjectManager.ComputerToolchain=false
 Mcu.Pin17=PA13
 Mcu.Pin18=PA14
+SH.S_TIM3_CH4.ConfNb=1
 Mcu.Pin11=PB1
 SH.GPXTI15.0=GPIO_EXTI15
 Mcu.Pin12=PA8
 Mcu.Pin10=PB0
+PB7.Locked=true
 PF0-OSC_IN.Signal=GPIO_Input
 PF0-OSC_IN.GPIOParameters=GPIO_Label
-RCC.APB1Freq_Value=48000000
-PB0.Signal=GPIO_Input
-NVIC.TIM1_BRK_UP_TRG_COM_IRQn=true\:0\:0\:false\:false\:true\:false\:true
-ProjectManager.DeviceId=STM32F031K6Tx
+PB0.Signal=S_TIM3_CH3
+PA7.GPIOParameters=GPIO_Label
+ProjectManager.DeviceId=STM32F030K6Tx
 ProjectManager.LibraryCopy=0
-PA3.GPIO_Label=LED1
+PA3.GPIO_Label=DC_ON
+SH.S_TIM3_CH4.0=TIM3_CH4,PWM Generation4 CH4
 PB1.GPIOParameters=GPIO_Label
 PA7.Signal=SPI1_MOSI
+PA6.Locked=true

Kicad/Neotron-Common-Hardware-cache.lib

@@ -206,33 +206,6 @@ X Pin_5 5 -200 -200 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
-# Connector_Generic_Conn_01x06
-#
-DEF Connector_Generic_Conn_01x06 J 0 40 Y N 1 F N
-F0 "J" 0 300 50 H V C CNN
-F1 "Connector_Generic_Conn_01x06" 0 -400 50 H V C CNN
-F2 "" 0 0 50 H I C CNN
-F3 "" 0 0 50 H I C CNN
-$FPLIST
- Connector*:*_1x??_*
-$ENDFPLIST
-DRAW
-S -50 -295 0 -305 1 1 6 N
-S -50 -195 0 -205 1 1 6 N
-S -50 -95 0 -105 1 1 6 N
-S -50 5 0 -5 1 1 6 N
-S -50 105 0 95 1 1 6 N
-S -50 205 0 195 1 1 6 N
-S -50 250 50 -350 1 1 10 f
-X Pin_1 1 -200 200 150 R 50 50 1 1 P
-X Pin_2 2 -200 100 150 R 50 50 1 1 P
-X Pin_3 3 -200 0 150 R 50 50 1 1 P
-X Pin_4 4 -200 -100 150 R 50 50 1 1 P
-X Pin_5 5 -200 -200 150 R 50 50 1 1 P
-X Pin_6 6 -200 -300 150 R 50 50 1 1 P
-ENDDRAW
-ENDDEF
-#
 # Connector_Generic_Conn_02x05_Odd_Even
 #
 DEF Connector_Generic_Conn_02x05_Odd_Even J 0 40 Y N 1 F N
@@ -1559,6 +1532,7 @@ F0 "#PWR" 0 -150 50 H I C CNN
 F1 "power_+3.3V" 0 140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
+ALIAS +3.3V
 DRAW
 P 2 0 1 0 -30 50 0 100 N
 P 2 0 1 0 0 0 0 100 N
@@ -1589,7 +1563,6 @@ F0 "#PWR" 0 -150 50 H I C CNN
 F1 "power_+3V3" 0 140 50 H V C CNN
 F2 "" 0 0 50 H I C CNN
 F3 "" 0 0 50 H I C CNN
-ALIAS +3.3V
 DRAW
 P 2 0 1 0 -30 50 0 100 N
 P 2 0 1 0 0 0 0 100 N