From f77fd5040d1da7359ec79d38d1edb3fcc4939ba4 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Wed, 5 Oct 2022 11:04:10 +0300 Subject: [PATCH] state-handler: fix constructor args --- I2C/.gitignore | 1 + LiquidCrystal/.gitignore | 1 + StateHandler/Debug/makefile | 78 ++++++++++++++++++++++++++ StateHandler/Debug/objects.mk | 8 +++ StateHandler/Debug/sources.mk | 28 +++++++++ StateHandler/Debug/src/Counter.su | 5 ++ StateHandler/Debug/src/StateHandler.su | 5 ++ StateHandler/Debug/src/subdir.mk | 27 +++++++++ StateHandler/src/StateHandler.cpp | 2 +- 9 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 I2C/.gitignore create mode 100644 LiquidCrystal/.gitignore create mode 100644 StateHandler/Debug/makefile create mode 100644 StateHandler/Debug/objects.mk create mode 100644 StateHandler/Debug/sources.mk create mode 100644 StateHandler/Debug/src/Counter.su create mode 100644 StateHandler/Debug/src/StateHandler.su create mode 100644 StateHandler/Debug/src/subdir.mk diff --git a/I2C/.gitignore b/I2C/.gitignore new file mode 100644 index 0000000..3df573f --- /dev/null +++ b/I2C/.gitignore @@ -0,0 +1 @@ +/Debug/ diff --git a/LiquidCrystal/.gitignore b/LiquidCrystal/.gitignore new file mode 100644 index 0000000..3df573f --- /dev/null +++ b/LiquidCrystal/.gitignore @@ -0,0 +1 @@ +/Debug/ diff --git a/StateHandler/Debug/makefile b/StateHandler/Debug/makefile new file mode 100644 index 0000000..853c844 --- /dev/null +++ b/StateHandler/Debug/makefile @@ -0,0 +1,78 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +-include ../makefile.init + +RM := rm -rf + +# All of the sources participating in the build are defined here +-include sources.mk +-include src/subdir.mk +-include subdir.mk +-include objects.mk + +ifneq ($(MAKECMDGOALS),clean) +ifneq ($(strip $(CC_DEPS)),) +-include $(CC_DEPS) +endif +ifneq ($(strip $(C++_DEPS)),) +-include $(C++_DEPS) +endif +ifneq ($(strip $(C_UPPER_DEPS)),) +-include $(C_UPPER_DEPS) +endif +ifneq ($(strip $(CXX_DEPS)),) +-include $(CXX_DEPS) +endif +ifneq ($(strip $(CPP_DEPS)),) +-include $(CPP_DEPS) +endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_DEPS) +endif +endif + +-include ../makefile.defs + +OPTIONAL_TOOL_DEPS := \ +$(wildcard ../makefile.defs) \ +$(wildcard ../makefile.init) \ +$(wildcard ../makefile.targets) \ + + +BUILD_ARTIFACT_NAME := StateHandler +BUILD_ARTIFACT_EXTENSION := a +BUILD_ARTIFACT_PREFIX := lib +BUILD_ARTIFACT := $(BUILD_ARTIFACT_PREFIX)$(BUILD_ARTIFACT_NAME)$(if $(BUILD_ARTIFACT_EXTENSION),.$(BUILD_ARTIFACT_EXTENSION),) + +# Add inputs and outputs from these tool invocations to the build variables + +# All Target +all: + +@$(MAKE) --no-print-directory main-build && $(MAKE) --no-print-directory post-build + +# Main-build Target +main-build: libStateHandler.a + +# Tool invocations +libStateHandler.a: $(OBJS) $(USER_OBJS) makefile objects.mk $(OPTIONAL_TOOL_DEPS) + @echo 'Building target: $@' + @echo 'Invoking: MCU Archiver' + arm-none-eabi-ar -r "libStateHandler.a" $(OBJS) $(USER_OBJS) $(LIBS) + @echo 'Finished building target: $@' + @echo ' ' + +# Other Targets +clean: + -$(RM) $(CC_DEPS)$(C++_DEPS)$(C_UPPER_DEPS)$(CXX_DEPS)$(OBJS)$(ARCHIVES)$(CPP_DEPS)$(C_DEPS) libStateHandler.a + -@echo ' ' + +post-build: + -@echo 'Performing post-build steps' + -arm-none-eabi-size "libStateHandler.a" ; # arm-none-eabi-objdump -h -S "libStateHandler.a" >"libStateHandler.lss" + -@echo ' ' + +.PHONY: all clean dependents post-build + +-include ../makefile.targets diff --git a/StateHandler/Debug/objects.mk b/StateHandler/Debug/objects.mk new file mode 100644 index 0000000..742c2da --- /dev/null +++ b/StateHandler/Debug/objects.mk @@ -0,0 +1,8 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +USER_OBJS := + +LIBS := + diff --git a/StateHandler/Debug/sources.mk b/StateHandler/Debug/sources.mk new file mode 100644 index 0000000..8687df8 --- /dev/null +++ b/StateHandler/Debug/sources.mk @@ -0,0 +1,28 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +C_UPPER_SRCS := +CXX_SRCS := +C++_SRCS := +OBJ_SRCS := +S_SRCS := +CC_SRCS := +ASM_SRCS := +CPP_SRCS := +C_SRCS := +S_UPPER_SRCS := +O_SRCS := +CC_DEPS := +C++_DEPS := +C_UPPER_DEPS := +CXX_DEPS := +OBJS := +ARCHIVES := +CPP_DEPS := +C_DEPS := + +# Every subdirectory with source files must be described here +SUBDIRS := \ +src \ + diff --git a/StateHandler/Debug/src/Counter.su b/StateHandler/Debug/src/Counter.su new file mode 100644 index 0000000..cb97ac2 --- /dev/null +++ b/StateHandler/Debug/src/Counter.su @@ -0,0 +1,5 @@ +../src/Counter.cpp:12:6:void Counter::inc() 16 static +../src/Counter.cpp:20:6:void Counter::dec() 16 static +../src/Counter.cpp:29:5:int Counter::getInit() 16 static +../src/Counter.cpp:33:1:Counter::Counter(int, int) 24 static +../src/Counter.cpp:45:6:void Counter::setInit(int) 16 static diff --git a/StateHandler/Debug/src/StateHandler.su b/StateHandler/Debug/src/StateHandler.su new file mode 100644 index 0000000..6b60dbb --- /dev/null +++ b/StateHandler/Debug/src/StateHandler.su @@ -0,0 +1,5 @@ +../src/StateHandler.cpp:10:1:StateHandler::StateHandler(EVENT_HANDL) 16 static +../src/StateHandler.cpp:15:1:StateHandler::~StateHandler() 16 static +../src/StateHandler.cpp:15:1:virtual StateHandler::~StateHandler() 16 static +../src/StateHandler.cpp:19:5:int StateHandler::getSetPresuure() 16 static +../src/StateHandler.cpp:24:5:int StateHandler::getSetSpeed() 16 static diff --git a/StateHandler/Debug/src/subdir.mk b/StateHandler/Debug/src/subdir.mk new file mode 100644 index 0000000..3725b64 --- /dev/null +++ b/StateHandler/Debug/src/subdir.mk @@ -0,0 +1,27 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +# Add inputs and outputs from these tool invocations to the build variables +CPP_SRCS += \ +../src/Counter.cpp \ +../src/StateHandler.cpp + +OBJS += \ +./src/Counter.o \ +./src/StateHandler.o + +CPP_DEPS += \ +./src/Counter.d \ +./src/StateHandler.d + + +# Each subdirectory must supply rules for building sources it contributes +src/%.o: ../src/%.cpp src/subdir.mk + @echo 'Building file: $<' + @echo 'Invoking: MCU C++ Compiler' + arm-none-eabi-c++ -DDEBUG -D__CODE_RED -D__NEWLIB__ -DCORE_M3 -D__USE_LPCOPEN -D__LPC15XX__ -I"/home/tylen/Desktop/Programming/Projects_Metropolia/ESP-Ventilation/StateHandler/inc" -I"/home/tylen/Desktop/Programming/Projects_Metropolia/ESP-Ventilation/lpc_board_nxp_lpcxpresso_1549/inc" -I"/home/tylen/Desktop/Programming/Projects_Metropolia/ESP-Ventilation/lpc_chip_15xx/inc" -I"/home/tylen/Desktop/Programming/Projects_Metropolia/ESP-Ventilation/DigitalIoPin/inc" -O0 -fno-common -g3 -Wall -c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections -fno-rtti -fno-exceptions -fmerge-constants -fmacro-prefix-map="$( -StateHandler::StateHandler(EVENT_HANDL * btns) { +StateHandler::StateHandler(EVENT_HANDL btns) { // TODO Auto-generated constructor stub }