Revision 5:34cb334d111b, committed 2016-09-15

Comitter:

olympux

Date:

Thu Sep 15 21:16:26 2016 +0000

Parent:

4:535d7082fbb2

Commit message:

Remove _conf.h

Changed in this revision

--- a/eeprom.h	Sun Sep 28 17:34:08 2014 +0000
+++ b/eeprom.h	Thu Sep 15 21:16:26 2016 +0000
@@ -28,11 +28,8 @@
 
 /* Exported constants --------------------------------------------------------*/
 /* Define the STM32F10Xxx Flash page size depending on the used STM32 device */
-#if defined (STM32F10X_LD) || defined (STM32F10X_MD)
-  #define PAGE_SIZE  (uint16_t)0x400  /* Page size = 1KByte */
-#elif defined (STM32F10X_HD) || defined (STM32F10X_CL)
-  #define PAGE_SIZE  (uint16_t)0x800  /* Page size = 2KByte */
-#endif
+#define PAGE_SIZE  (uint16_t)0x400  /* Page size = 1KByte */
+
 
 /* EEPROM start address in Flash */
 #define EEPROM_START_ADDRESS    ((uint32_t)0x08019000) /* EEPROM emulation start address:

--- a/stm32f10x_conf.h	Sun Sep 28 17:34:08 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/**
-  ******************************************************************************
-  * @file    EEPROM_Emulation/inc/stm32f10x_conf.h 
-  * @author  MCD Application Team
-  * @version V3.1.0
-  * @date    07/27/2009
-  * @brief   Library configuration file.
-  ******************************************************************************
-  * @copy
-  *
-  * THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
-  * WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
-  * TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
-  * DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
-  * FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
-  * CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
-  *
-  * <h2><center>&copy; COPYRIGHT 2009 STMicroelectronics</center></h2>
-  */ 
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __STM32F10x_CONF_H
-#define __STM32F10x_CONF_H
-
-/* Includes ------------------------------------------------------------------*/
-/* Uncomment the line below to enable peripheral header file inclusion */
-/* #include "stm32f10x_adc.h" */
-/* #include "stm32f10x_bkp.h" */
-/* #include "stm32f10x_can.h" */
-/* #include "stm32f10x_crc.h" */
-/* #include "stm32f10x_dac.h" */
-/* #include "stm32f10x_dbgmcu.h" */
-/* #include "stm32f10x_dma.h" */
-/* #include "stm32f10x_exti.h" */
-#include "stm32f10x_flash.h"
-/* #include "stm32f10x_fsmc.h" */
-/* #include "stm32f10x_gpio.h" */
-/* #include "stm32f10x_i2c.h" */
-/* #include "stm32f10x_iwdg.h" */
-/* #include "stm32f10x_pwr.h" */
-/* #include "stm32f10x_rcc.h" */
-/* #include "stm32f10x_rtc.h" */
-/* #include "stm32f10x_sdio.h" */
-/* #include "stm32f10x_spi.h" */
-/* #include "stm32f10x_tim.h" */
-/* #include "stm32f10x_usart.h" */
-/* #include "stm32f10x_wwdg.h" */
-/* #include "misc.h" */  /* High level functions for NVIC and SysTick (add-on to CMSIS functions) */
-
-/* Exported types ------------------------------------------------------------*/
-/* Exported constants --------------------------------------------------------*/
-/* Uncomment the line below to expanse the "assert_param" macro in the 
-   Standard Peripheral Library drivers code */
-/* #define USE_FULL_ASSERT    1 */
-
-/* Exported macro ------------------------------------------------------------*/
-#ifdef  USE_FULL_ASSERT
-
-/**
-  * @brief  The assert_param macro is used for function's parameters check.
-  * @param expr: If expr is false, it calls assert_failed function
-  *   which reports the name of the source file and the source
-  *   line number of the call that failed. 
-  *   If expr is true, it returns no value.
-  * @retval : None
-  */
-  #define assert_param(expr) ((expr) ? (void)0 : assert_failed((uint8_t *)__FILE__, __LINE__))
-/* Exported functions ------------------------------------------------------- */
-  void assert_failed(uint8_t* file, uint32_t line);
-#else
-  #define assert_param(expr) ((void)0)
-#endif /* USE_FULL_ASSERT */
-
-#endif /* __STM32F10x_CONF_H */
-
-/******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/
-