SSR: Open-drain outputs

diff --git a/ssr/Makefile b/ssr/Makefile
index 764e66bdf686df4a66b7ecc7fb8d4302a2d42f20..0b631edddde1ecd0aaa045c3d54fe269354ac2a7 100644 (file)
--- a/ssr/Makefile
+++ b/ssr/Makefile
@@ -1,5 +1,5 @@
 ##########################################################################################################################
 ##########################################################################################################################

-# File automatically-generated by tool: [projectgenerator] version: [2.27.0] date: [Tue Aug 07 20:46:02 CEST 2018] 
+# File automatically-generated by tool: [projectgenerator] version: [2.27.0] date: [Tue Aug 07 22:22:37 CEST 2018] 

 ##########################################################################################################################
 
 # ------------------------------------------------
 ##########################################################################################################################
 
 # ------------------------------------------------

diff --git a/ssr/Src/main.c b/ssr/Src/main.c
index dc015c0ad0ab1b5e1694cdefb7be22a87fccfa13..19fe3c7a350087bd1acfff5013d15b7166cbba83 100644 (file)
--- a/ssr/Src/main.c
+++ b/ssr/Src/main.c
@@ -347,7 +347,7 @@ static void MX_GPIO_Init(void)
   GPIO_InitStruct.Pin = SSR3_Pin|SSR4_Pin|SSR1_Pin|SSR2_Pin;
   GPIO_InitStruct.Mode = LL_GPIO_MODE_OUTPUT;
   GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_LOW;
   GPIO_InitStruct.Pin = SSR3_Pin|SSR4_Pin|SSR1_Pin|SSR2_Pin;
   GPIO_InitStruct.Mode = LL_GPIO_MODE_OUTPUT;
   GPIO_InitStruct.Speed = LL_GPIO_SPEED_FREQ_LOW;

-  GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_PUSHPULL;
+  GPIO_InitStruct.OutputType = LL_GPIO_OUTPUT_OPENDRAIN;

   LL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
 }
   LL_GPIO_Init(GPIOB, &GPIO_InitStruct);
 
 }

diff --git a/ssr/mx.scratch b/ssr/mx.scratch
index f85390ba0b7e118e136449ee448226c8a0b739c6..8f8d8f889c957d25c0d4e3af3dd3ea4b96926909 100644 (file)
--- a/ssr/mx.scratch
+++ b/ssr/mx.scratch
@@ -9,7 +9,6 @@
 \r
 <filestoremove>\r
     <file>\r
 \r
 <filestoremove>\r
     <file>\r

-    <name>/aux/misc/stm/F1-package/Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_ll_i2c.c</name>\r

     </file>\r
 </filestoremove>\r
 \r
     </file>\r
 </filestoremove>\r
 \r

diff --git a/ssr/ssr.ioc b/ssr/ssr.ioc
index b967e21f4b7e30f8d2e0129d9c30f037f30bafd1..b463c04ca55c1e6b59042924fc76fc3d35b90e68 100644 (file)
--- a/ssr/ssr.ioc
+++ b/ssr/ssr.ioc
@@ -60,20 +60,24 @@ PA14.Mode=Serial_Wire
 PA14.Signal=SYS_JTCK-SWCLK
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX
 PA14.Signal=SYS_JTCK-SWCLK
 PA9.Mode=Asynchronous
 PA9.Signal=USART1_TX

-PB10.GPIOParameters=GPIO_Label
+PB10.GPIOParameters=GPIO_Label,GPIO_ModeDefaultOutputPP

 PB10.GPIO_Label=SSR3
 PB10.GPIO_Label=SSR3

+PB10.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_OD

 PB10.Locked=true
 PB10.Signal=GPIO_Output
 PB10.Locked=true
 PB10.Signal=GPIO_Output

-PB11.GPIOParameters=GPIO_Label
+PB11.GPIOParameters=GPIO_Label,GPIO_ModeDefaultOutputPP

 PB11.GPIO_Label=SSR4
 PB11.GPIO_Label=SSR4

+PB11.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_OD

 PB11.Locked=true
 PB11.Signal=GPIO_Output
 PB11.Locked=true
 PB11.Signal=GPIO_Output

-PB8.GPIOParameters=GPIO_Label
+PB8.GPIOParameters=GPIO_Label,GPIO_ModeDefaultOutputPP

 PB8.GPIO_Label=SSR1
 PB8.GPIO_Label=SSR1

+PB8.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_OD

 PB8.Locked=true
 PB8.Signal=GPIO_Output
 PB8.Locked=true
 PB8.Signal=GPIO_Output

-PB9.GPIOParameters=GPIO_Label
+PB9.GPIOParameters=GPIO_Label,GPIO_ModeDefaultOutputPP

 PB9.GPIO_Label=SSR2
 PB9.GPIO_Label=SSR2

+PB9.GPIO_ModeDefaultOutputPP=GPIO_MODE_OUTPUT_OD

 PB9.Locked=true
 PB9.Signal=GPIO_Output
 PC13-TAMPER-RTC.GPIOParameters=GPIO_Speed,PinState,GPIO_Label,GPIO_ModeDefaultOutputPP
 PB9.Locked=true
 PB9.Signal=GPIO_Output
 PC13-TAMPER-RTC.GPIOParameters=GPIO_Speed,PinState,GPIO_Label,GPIO_ModeDefaultOutputPP