mainscnt/mains-frequency-counter-stm32
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changes, fixes

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2021-02-16 11:52:20 +01:00
parent 3334b5d9da
commit 7dd27d374f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cube/Makefile
View File

@ -86,7 +86,7 @@ Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \ Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \
Core/Src/system_stm32f1xx.c Core/Src/system_stm32f1xx.c
ifeq ($(NETWORK), "LAN") ifeq ($(NETWORK), LAN)
C_SOURCES += \ C_SOURCES += \
User/Src/ports.c \ User/Src/ports.c \
User/Src/wizHelper.c \ User/Src/wizHelper.c \
@ -159,7 +159,7 @@ C_INCLUDES = \
-IDrivers/CMSIS/Include -IDrivers/CMSIS/Include
ifeq ($(NETWORK), "LAN") ifeq ($(NETWORK), LAN)
C_INCLUDES += \ C_INCLUDES += \
-IioLibrary_Driver/Internet/SNTP \ -IioLibrary_Driver/Internet/SNTP \
-IioLibrary_Driver/Internet/DNS \ -IioLibrary_Driver/Internet/DNS \
@ -204,7 +204,7 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET
OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o))) OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o)))
vpath %.c $(sort $(dir $(C_SOURCES))) vpath %.c $(sort $(dir $(C_SOURCES)))
ifeq ($(NETWORK), "LAN") ifeq ($(NETWORK), LAN)
OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a) OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a)
endif endif
@ -212,7 +212,7 @@ endif
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o))) OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
vpath %.s $(sort $(dir $(ASM_SOURCES))) vpath %.s $(sort $(dir $(ASM_SOURCES)))
ifeq ($(NETWORK), "LAN") ifeq ($(NETWORK), LAN)
$(BUILD_DIR)/w5500.a: $(BUILD_DIR)/w5500.a:
(cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..) (cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..)
endif endif

1
cube/User/Src/counter.c
View File

@ -8,7 +8,6 @@
#include <logger.h> #include <logger.h>
#include <PontCoopScheduler.h> #include <PontCoopScheduler.h>
#include <config.h> #include <config.h>
#include <socket.h>
#include <sinkStruct.h> #include <sinkStruct.h>
#include <sha256.h> #include <sha256.h>
#include <eeprom.h> #include <eeprom.h>