Rev 10 | Rev 13 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 10 | Rev 11 | ||
|---|---|---|---|
| Line 1... | Line 1... | ||
| 1 | ########################################################################################################################## |
1 | ########################################################################################################################## |
| 2 | # File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Fri Nov 06 16:49:19 GMT 2020] |
2 | # File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Fri Dec 25 11:35:41 GMT 2020] |
| 3 | ########################################################################################################################## |
3 | ########################################################################################################################## |
| 4 | 4 | ||
| 5 | # ------------------------------------------------ |
5 | # ------------------------------------------------ |
| 6 | # Generic Makefile (based on gcc) |
6 | # Generic Makefile (based on gcc) |
| 7 | # |
7 | # |
| Line 56... | Line 56... | ||
| 56 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \ |
56 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \ |
| 57 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \ |
57 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \ |
| 58 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \ |
58 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \ |
| 59 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \ |
59 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \ |
| 60 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \ |
60 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \ |
| 61 | Core/Src/system_stm32f1xx.c |
61 | Core/Src/system_stm32f1xx.c \ |
| - | 62 | Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_i2c.c |
|
| 62 | 63 | ||
| 63 | # ASM sources |
64 | # ASM sources |
| 64 | ASM_SOURCES = \ |
65 | ASM_SOURCES = \ |
| 65 | startup_stm32f103xb.s |
66 | startup_stm32f103xb.s |
| 66 | 67 | ||
| Line 134... | Line 135... | ||
| 134 | # New OLED library |
135 | # New OLED library |
| 135 | HAL = stm32_hal |
136 | HAL = stm32_hal |
| 136 | LIBOLED = ../libOLED |
137 | LIBOLED = ../libOLED |
| 137 | include $(LIBOLED)/libOLED.mk |
138 | include $(LIBOLED)/libOLED.mk |
| 138 | 139 | ||
| - | 140 | #sensor Library |
|
| - | 141 | LIBBMP280 = ../libBMP280 |
|
| - | 142 | include $(LIBBMP280)/libBMP280.mk |
|
| - | 143 | ||
| 139 | 144 | ||
| 140 | C_SOURCES += src/nmea.c |
145 | C_SOURCES += src/nmea.c |
| 141 | CPP_SOURCES += src/display.cpp |
146 | CPP_SOURCES += src/display.cpp |
| 142 | 147 | ||
| 143 | 148 | ||