state-handler: fix constructor args
This commit is contained in:
parent
19424b0976
commit
f77fd5040d
1
I2C/.gitignore
vendored
Normal file
1
I2C/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/Debug/
|
||||||
1
LiquidCrystal/.gitignore
vendored
Normal file
1
LiquidCrystal/.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/Debug/
|
||||||
78
StateHandler/Debug/makefile
Normal file
78
StateHandler/Debug/makefile
Normal file
@ -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
|
||||||
8
StateHandler/Debug/objects.mk
Normal file
8
StateHandler/Debug/objects.mk
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
################################################################################
|
||||||
|
# Automatically-generated file. Do not edit!
|
||||||
|
################################################################################
|
||||||
|
|
||||||
|
USER_OBJS :=
|
||||||
|
|
||||||
|
LIBS :=
|
||||||
|
|
||||||
28
StateHandler/Debug/sources.mk
Normal file
28
StateHandler/Debug/sources.mk
Normal file
@ -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 \
|
||||||
|
|
||||||
5
StateHandler/Debug/src/Counter.su
Normal file
5
StateHandler/Debug/src/Counter.su
Normal file
@ -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
|
||||||
5
StateHandler/Debug/src/StateHandler.su
Normal file
5
StateHandler/Debug/src/StateHandler.su
Normal file
@ -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
|
||||||
27
StateHandler/Debug/src/subdir.mk
Normal file
27
StateHandler/Debug/src/subdir.mk
Normal file
@ -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="$(<D)/"= -mcpu=cortex-m3 -mthumb -fstack-usage -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.o)" -MT"$(@:%.o=%.d)" -o "$@" "$<"
|
||||||
|
@echo 'Finished building: $<'
|
||||||
|
@echo ' '
|
||||||
|
|
||||||
|
|
||||||
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
#include <StateHandler.h>
|
#include <StateHandler.h>
|
||||||
|
|
||||||
StateHandler::StateHandler(EVENT_HANDL * btns) {
|
StateHandler::StateHandler(EVENT_HANDL btns) {
|
||||||
// TODO Auto-generated constructor stub
|
// TODO Auto-generated constructor stub
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user