From 291d17b9d8cf6c9c02a7aff09983f0c77ae0b897 Mon Sep 17 00:00:00 2001 From: mmi Date: Thu, 28 Sep 2017 17:49:02 +0000 Subject: [PATCH] re-organized HAL git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@220 05563f52-14a8-4384-a975-3d1654cca0fa --- .../0 - Code/HAL/Misc/Makefile | 49 ------------------- .../0 - Code/HAL/{Misc => }/inc/IODevice.h | 0 .../HAL/{Keypad => }/inc/keypadMatrix.h | 0 .../0 - Code/HAL/{Display => }/inc/nhd0420.h | 0 .../0 - Code/HAL/{Misc => }/src/IODevice.c | 0 .../HAL/{Keypad => }/src/keypadMatrix.c | 0 .../0 - Code/HAL/{Display => }/src/nhd0420.c | 0 7 files changed, 49 deletions(-) delete mode 100644 S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Misc/Makefile rename S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/{Misc => }/inc/IODevice.h (100%) rename S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/{Keypad => }/inc/keypadMatrix.h (100%) rename S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/{Display => }/inc/nhd0420.h (100%) rename S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/{Misc => }/src/IODevice.c (100%) rename S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/{Keypad => }/src/keypadMatrix.c (100%) rename S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/{Display => }/src/nhd0420.c (100%) diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Misc/Makefile b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Misc/Makefile deleted file mode 100644 index 477ce0a..0000000 --- a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Misc/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -CROSS_COMPILE = arm-none-eabi- -CC = $(CROSS_COMPILE)gcc -LD = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar -OBJCOPY = $(CROSS_COMPILE)objcopy -OBJDUMP = $(CROSS_COMPILE)objdump - -OBJDIR = obj -SRCDIR = src/ -ROOTDIR = ../../ - -LIBRARY_NAME = ../libMisc.a - -CCFLAGS = -c -O2 -Wall -g -fno-common -mcpu=cortex-m3 -mthumb \ --Iinc \ --I../Platform/inc \ --I$(ROOTDIR)/hsb-mrts/inc \ --I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc \ --I$(ROOTDIR)/FreeRTOS/Source/include \ --I$(ROOTDIR)/FreeRTOS/Source/portable/GCC/ARM_CM3 \ --I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x \ --I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport -ARFLAGS = rs - -OBJECTS = \ -IODevice.o - - - -vpath %.o $(OBJDIR) -vpath %.c \ -$(SRCDIR) \ -$(ROOTDIR)/hsb-mrts/src - -all: $(LIBRARY_NAME) - -$(LIBRARY_NAME): $(OBJDIR) $(OBJECTS) - $(AR) $(ARFLAGS) $@ $(addprefix $(OBJDIR)/, $(OBJECTS)) - -%.o: %.c - $(CC) $(CCFLAGS) $< -o $(OBJDIR)/$@ - -$(OBJDIR): - mkdir -p $@ - -clean: - rm -rf $(OBJDIR) $(LIBRARY_NAME) - -.PHONY: all clean diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Misc/inc/IODevice.h b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/IODevice.h similarity index 100% rename from S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Misc/inc/IODevice.h rename to S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/IODevice.h diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Keypad/inc/keypadMatrix.h b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/keypadMatrix.h similarity index 100% rename from S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Keypad/inc/keypadMatrix.h rename to S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/keypadMatrix.h diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Display/inc/nhd0420.h b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/nhd0420.h similarity index 100% rename from S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Display/inc/nhd0420.h rename to S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/inc/nhd0420.h diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Misc/src/IODevice.c b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/IODevice.c similarity index 100% rename from S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Misc/src/IODevice.c rename to S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/IODevice.c diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Keypad/src/keypadMatrix.c b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/keypadMatrix.c similarity index 100% rename from S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Keypad/src/keypadMatrix.c rename to S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/keypadMatrix.c diff --git a/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Display/src/nhd0420.c b/S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/nhd0420.c similarity index 100% rename from S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Display/src/nhd0420.c rename to S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/src/nhd0420.c