therm Changeset - a3acc7c3a063 · protofusion repositories

Changeset - a3acc7c3a063

Parent rev.

Child rev.

[Not reviewed]

cortex-f0

4 2 3

Ethan Zonca - 10 years ago 2015-01-03 00:12:55
ez@ethanzonca.com

Removed old system files, fixed _it files

8 files changed with 162 insertions and 597 deletions:

Makefile

platform_config.h

stm32f0xx_conf.h

stm32f0xx_it.c

stm32f0xx_it.h

stm32l1xx_it.h

system_stm32l1xx.c

399

system_stm32l1xx.h

106

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -33,9 +33,8 @@ ASRC=startup_stm32f042.s @@
 # Project Source Files
 SRC=main.c
 SRC+=stm32l1xx_it.c
 SRC+=system_stm32l1xx.c
 SRC+=stm32l100c_discovery.c
 SRC+=stm32f0xx_it.c
 SRC+=system_stm32f0xx.c
 SRC+=ssd1306.c
 SRC+=eeprom_min.c
 SRC+=gpio.c

platform_config.h

➞

Show inline comments

@@ @@ -31,7 +31,7 @@ @@
 #define __PLATFORM_CONFIG_H
 /* Includes ------------------------------------------------------------------*/
-#include "stm32l1xx.h"
+#include "stm32f0xx.h"
 /* Exported types ------------------------------------------------------------*/

stm32f0xx_conf.h

➞

Show inline comments

@@ new file 100644 @@
 /**
   ******************************************************************************
   * @file    stm32F0xx_conf.h
   * @author  MCD Application Team
   * @version V1.0.0
   * @date    23-March-2012
   * @brief   Library configuration file.
   ******************************************************************************
   * @attention
+  *
   * <h2><center>&copy; COPYRIGHT 2012 STMicroelectronics</center></h2>
+  *
   * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
   * You may not use this file except in compliance with the License.
   * You may obtain a copy of the License at:
+  *
   *        http://www.st.com/software_license_agreement_liberty_v2
+  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
+  *
   ******************************************************************************
   */
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F0XX_CONF_H
 #define __STM32F0XX_CONF_H
 /* Includes ------------------------------------------------------------------*/
 /* Comment the line below to disable peripheral header file inclusion */
 /* #include "stm32f0xx_adc.h" */
 #include "stm32f0xx_cec.h"
 #include "stm32f0xx_crc.h"
 #include "stm32f0xx_comp.h"
 #include "stm32f0xx_dac.h"
 #include "stm32f0xx_dbgmcu.h"
 #include "stm32f0xx_dma.h"
 #include "stm32f0xx_exti.h"
 #include "stm32f0xx_flash.h"
 #include "stm32f0xx_gpio.h"
 #include "stm32f0xx_syscfg.h"
 #include "stm32f0xx_i2c.h"
 #include "stm32f0xx_iwdg.h"
 #include "stm32f0xx_pwr.h"
 #include "stm32f0xx_rcc.h"
 #include "stm32f0xx_rtc.h"
 #include "stm32f0xx_spi.h"
 #include "stm32f0xx_tim.h"
 #include "stm32f0xx_usart.h"
 #include "stm32f0xx_wwdg.h"
 #include "stm32f0xx_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 /* __STM32F0XX_CONF_H */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

stm32f0xx_it.c

➞

Show inline comments

@@ file renamed from stm32l1xx_it.c to stm32f0xx_it.c @@
 /**
   ******************************************************************************
-  * @file    stm32l1xx_it.c
+  * @file    stm32f0xx_it.c
   * @author  MCD Application Team
   * @version V1.0.0
   * @date    29-July-2013
@@ @@ -29,14 +29,10 @@ @@
 /* Includes ------------------------------------------------------------------*/
 #include "hw_config.h"
-#include "stm32l1xx_it.h"
+#include "stm32f0xx_it.h"
 #include "main.h"
 #include "usb_lib.h"
 #include "usb_istr.h"
 /** @addtogroup STM32L100C-Discovery_Demo
   * @{
   */
 //#include "usb_lib.h"
 //#include "usb_istr.h"
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
@@ @@ -160,10 +156,10 @@ void SysTick_Handler(void) @@
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void USB_LP_IRQHandler(void)
+{
   USB_Istr();
+}
 //void USB_LP_IRQHandler(void)
 //{
 //  USB_Istr();
 //}
 /*******************************************************************************
 * Function Name  : USB_FS_WKUP_IRQHandler
@@ @@ -172,10 +168,10 @@ void USB_LP_IRQHandler(void) @@
 * Output         : None
 * Return         : None
 *******************************************************************************/
 void USB_FS_WKUP_IRQHandler(void)
+{
   EXTI_ClearITPendingBit(EXTI_Line18);
+}
 //void USB_FS_WKUP_IRQHandler(void)
 //{
 //  EXTI_ClearITPendingBit(EXTI_Line18);
 //}
@@ @@ -198,12 +194,5 @@ void USB_FS_WKUP_IRQHandler(void) @@
+{
 }*/
 /**
   * @}
   */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

stm32f0xx_it.h

➞

Show inline comments

@@ new file 100644 @@
 /**
   ******************************************************************************
   * @file    stm32f0xx_it.h
   * @author  MCD Application Team
   * @version V1.0.0
   * @date    29-July-2013
   * @brief   This file contains the headers of the interrupt handlers.
   ******************************************************************************
   * @attention
+  *
   * <h2><center>&copy; COPYRIGHT 2013 STMicroelectronics</center></h2>
+  *
   * Licensed under MCD-ST Liberty SW License Agreement V2, (the "License");
   * You may not use this file except in compliance with the License.
   * You may obtain a copy of the License at:
+  *
   *        http://www.st.com/software_license_agreement_liberty_v2
+  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
   * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   * See the License for the specific language governing permissions and
   * limitations under the License.
+  *
   ******************************************************************************
   */
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __STM32F0xx_IT_H
 #define __STM32F0xx_IT_H
 #ifdef __cplusplus
  extern "C" {
 #endif
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f0xx.h"
 #include "platform_config.h"
 /* Exported types ------------------------------------------------------------*/
 /* Exported constants --------------------------------------------------------*/
 /* Exported macro ------------------------------------------------------------*/
 /* Exported functions ------------------------------------------------------- */
 void NMI_Handler(void);
 void HardFault_Handler(void);
 void MemManage_Handler(void);
 void BusFault_Handler(void);
 void UsageFault_Handler(void);
 void SVC_Handler(void);
 void DebugMon_Handler(void);
 void PendSV_Handler(void);
 void SysTick_Handler(void);
 void USBWakeUp_IRQHandler(void);
 void USB_FS_WKUP_IRQHandler(void);
 #ifdef __cplusplus
+}
 #endif
 #endif /* __STM32F0xx_IT_H */
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

stm32l1xx_it.h

➞

Show inline comments

deleted file

system_stm32l1xx.c

➞

Show inline comments

deleted file

system_stm32l1xx.h

➞

Show inline comments

deleted file

0 comments (0 inline, 0 general)