You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
82 lines
2.1 KiB
82 lines
2.1 KiB
Index: Inc/main.h
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
--- Inc/main.h (date 1511207348000)
|
|
+++ Inc/main.h (revision )
|
|
@@ -58,26 +58,12 @@
|
|
/* Private define ------------------------------------------------------------*/
|
|
|
|
/* ########################## Assert Selection ############################## */
|
|
-/**
|
|
- * @brief Uncomment the line below to expanse the "assert_param" macro in the
|
|
- * HAL drivers code
|
|
- */
|
|
- #define USE_FULL_ASSERT 1U
|
|
|
|
/* USER CODE BEGIN Private defines */
|
|
#include "stm32_assert.h"
|
|
|
|
/* USER CODE END Private defines */
|
|
|
|
-#ifdef __cplusplus
|
|
- extern "C" {
|
|
-#endif
|
|
-void _Error_Handler(char *, int);
|
|
-
|
|
-#define Error_Handler() _Error_Handler(__FILE__, __LINE__)
|
|
-#ifdef __cplusplus
|
|
-}
|
|
-#endif
|
|
|
|
/**
|
|
* @}
|
|
Index: Src/main.c
|
|
IDEA additional info:
|
|
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
|
<+>UTF-8
|
|
===================================================================
|
|
--- Src/main.c (date 1511207348000)
|
|
+++ Src/main.c (revision )
|
|
@@ -212,40 +212,7 @@
|
|
/* USER CODE END Callback 1 */
|
|
}
|
|
|
|
-/**
|
|
- * @brief This function is executed in case of error occurrence.
|
|
- * @param None
|
|
- * @retval None
|
|
- */
|
|
-void _Error_Handler(char * file, int line)
|
|
-{
|
|
- /* USER CODE BEGIN Error_Handler_Debug */
|
|
- /* User can add his own implementation to report the HAL error return state */
|
|
- while(1)
|
|
- {
|
|
- }
|
|
- /* USER CODE END Error_Handler_Debug */
|
|
-}
|
|
|
|
-#ifdef USE_FULL_ASSERT
|
|
-
|
|
-/**
|
|
- * @brief Reports the name of the source file and the source line number
|
|
- * where the assert_param error has occurred.
|
|
- * @param file: pointer to the source file name
|
|
- * @param line: assert_param error line source number
|
|
- * @retval None
|
|
- */
|
|
-void assert_failed(uint8_t* file, uint32_t line)
|
|
-{
|
|
- /* USER CODE BEGIN 6 */
|
|
- /* User can add his own implementation to report the file name and line number,
|
|
- ex: printf("Wrong parameters value: file %s on line %d\r\n", file, line) */
|
|
- /* USER CODE END 6 */
|
|
-
|
|
-}
|
|
-
|
|
-#endif
|
|
|
|
/**
|
|
* @}
|
|
|