STM32 ANALOGOUT : correct GPIO free

jeromecoutant · jeromecoutant · commit 720312582791 · 2021-03-18T14:53:00.000+01:00
diff --git a/targets/TARGET_STM/TARGET_STM32F0/analogout_device.c b/targets/TARGET_STM/TARGET_STM32F0/analogout_device.c
@@ -84,8 +84,8 @@ void analogout_free(dac_t *obj)
     __HAL_RCC_DAC1_RELEASE_RESET();
     __HAL_RCC_DAC1_CLK_DISABLE();
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32F1/analogout_device.c b/targets/TARGET_STM/TARGET_STM32F1/analogout_device.c
@@ -96,8 +96,8 @@ void analogout_free(dac_t *obj)
     __HAL_RCC_DAC_RELEASE_RESET();
     __HAL_RCC_DAC_CLK_DISABLE();
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c b/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c
@@ -96,8 +96,8 @@ void analogout_free(dac_t *obj)
     __HAL_RCC_DAC_RELEASE_RESET();
     __HAL_RCC_DAC_CLK_DISABLE();
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32F3/analogout_device.c b/targets/TARGET_STM/TARGET_STM32F3/analogout_device.c
@@ -158,8 +158,8 @@ void analogout_free(dac_t *obj)
     }
 #endif
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32G0/analogout_device.c b/targets/TARGET_STM/TARGET_STM32G0/analogout_device.c
@@ -118,8 +118,8 @@ void analogout_free(dac_t *obj)
         __HAL_RCC_DAC1_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c b/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c
@@ -146,8 +146,8 @@ void analogout_free(dac_t *obj)
     }
 #endif
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32L0/analogout_device.c b/targets/TARGET_STM/TARGET_STM32L0/analogout_device.c
@@ -120,8 +120,8 @@ void analogout_free(dac_t *obj)
         __DAC_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32L1/analogout_device.c b/targets/TARGET_STM/TARGET_STM32L1/analogout_device.c
@@ -99,8 +99,8 @@ void analogout_free(dac_t *obj)
         __DAC_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32L4/analogout_device.c b/targets/TARGET_STM/TARGET_STM32L4/analogout_device.c
@@ -131,8 +131,8 @@ void analogout_free(dac_t *obj)
         __HAL_RCC_DAC1_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 
     sleep_manager_unlock_deep_sleep();
 }
diff --git a/targets/TARGET_STM/TARGET_STM32L5/analogout_device.c b/targets/TARGET_STM/TARGET_STM32L5/analogout_device.c
@@ -125,8 +125,8 @@ void analogout_free(dac_t *obj)
         __HAL_RCC_DAC1_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32WL/analogout_device.c b/targets/TARGET_STM/TARGET_STM32WL/analogout_device.c
@@ -99,8 +99,8 @@ void analogout_free(dac_t *obj)
     __HAL_RCC_DAC_RELEASE_RESET();
     __HAL_RCC_DAC_CLK_DISABLE();
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,8 @@ void analogout_free(dac_t *obj)`
`84`	`84`	`__HAL_RCC_DAC1_RELEASE_RESET();`
`85`	`85`	`__HAL_RCC_DAC1_CLK_DISABLE();`
`86`	`86`
`87`		`- // Configure GPIO`
`88`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`87`	`+ // Configure GPIO back to reset value`
	`88`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`const PinMap *analogout_pinmap()`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ void analogout_free(dac_t *obj)`
`96`	`96`	`__HAL_RCC_DAC_RELEASE_RESET();`
`97`	`97`	`__HAL_RCC_DAC_CLK_DISABLE();`
`98`	`98`
`99`		`- // Configure GPIO`
`100`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`99`	`+ // Configure GPIO back to reset value`
	`100`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`const PinMap *analogout_pinmap()`
Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,8 @@ void analogout_free(dac_t *obj)`
`158`	`158`	`}`
`159`	`159`	`#endif`
`160`	`160`
`161`		`- // Configure GPIO`
`162`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`161`	`+ // Configure GPIO back to reset value`
	`162`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`const PinMap *analogout_pinmap()`
Original file line number	Diff line number	Diff line change
`@@ -118,8 +118,8 @@ void analogout_free(dac_t *obj)`
`118`	`118`	`__HAL_RCC_DAC1_CLK_DISABLE();`
`119`	`119`	`}`
`120`	`120`
`121`		`- // Configure GPIO`
`122`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`121`	`+ // Configure GPIO back to reset value`
	`122`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`const PinMap *analogout_pinmap()`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,8 @@ void analogout_free(dac_t *obj)`
`146`	`146`	`}`
`147`	`147`	`#endif`
`148`	`148`
`149`		`- // Configure GPIO`
`150`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`149`	`+ // Configure GPIO back to reset value`
	`150`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`const PinMap *analogout_pinmap()`
Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ void analogout_free(dac_t *obj)`
`120`	`120`	`__DAC_CLK_DISABLE();`
`121`	`121`	`}`
`122`	`122`
`123`		`- // Configure GPIO`
`124`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`123`	`+ // Configure GPIO back to reset value`
	`124`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`const PinMap *analogout_pinmap()`
Original file line number	Diff line number	Diff line change
`@@ -99,8 +99,8 @@ void analogout_free(dac_t *obj)`
`99`	`99`	`__DAC_CLK_DISABLE();`
`100`	`100`	`}`
`101`	`101`
`102`		`- // Configure GPIO`
`103`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`102`	`+ // Configure GPIO back to reset value`
	`103`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`const PinMap *analogout_pinmap()`
Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,8 @@ void analogout_free(dac_t *obj)`
`131`	`131`	`__HAL_RCC_DAC1_CLK_DISABLE();`
`132`	`132`	`}`
`133`	`133`
`134`		`- // Configure GPIO`
`135`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`134`	`+ // Configure GPIO back to reset value`
	`135`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`136`	`136`
`137`	`137`	`sleep_manager_unlock_deep_sleep();`
`138`	`138`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,8 @@ void analogout_free(dac_t *obj)`
`125`	`125`	`__HAL_RCC_DAC1_CLK_DISABLE();`
`126`	`126`	`}`
`127`	`127`
`128`		`- // Configure GPIO`
`129`		`- pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));`
	`128`	`+ // Configure GPIO back to reset value`
	`129`	`+ pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`const PinMap *analogout_pinmap()`