summaryrefslogtreecommitdiffstats
path: root/nbproject
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2018-05-05 17:47:13 +0200
committerNao Pross <naopross@thearcway.org>2018-05-05 17:53:20 +0200
commitb51fb2210af1b6eb4ee8dbc31f77a14a3f3d5230 (patch)
treee6fe4c0ce6164e289bd8014773eaae0553ede163 /nbproject
parentAdd led class (diff)
downloadSAMLiquidSmoke-b51fb2210af1b6eb4ee8dbc31f77a14a3f3d5230.tar.gz
SAMLiquidSmoke-b51fb2210af1b6eb4ee8dbc31f77a14a3f3d5230.zip
Add command selection code, note: split() does't work yet
Diffstat (limited to '')
-rw-r--r--nbproject/Makefile-default.mk36
-rw-r--r--nbproject/Makefile-genesis.properties4
-rw-r--r--nbproject/configurations.xml98
3 files changed, 124 insertions, 14 deletions
diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk
index 920c95b..3dcd31b 100644
--- a/nbproject/Makefile-default.mk
+++ b/nbproject/Makefile-default.mk
@@ -57,17 +57,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
# Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=main.cpp hal/hwconfig.cpp
+SOURCEFILES_QUOTED_IF_SPACED=hal/hwconfig.cpp main.cpp led.cpp
# Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/main.o ${OBJECTDIR}/hal/hwconfig.o
-POSSIBLE_DEPFILES=${OBJECTDIR}/main.o.d ${OBJECTDIR}/hal/hwconfig.o.d
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/hal/hwconfig.o ${OBJECTDIR}/main.o ${OBJECTDIR}/led.o
+POSSIBLE_DEPFILES=${OBJECTDIR}/hal/hwconfig.o.d ${OBJECTDIR}/main.o.d ${OBJECTDIR}/led.o.d
# Object Files
-OBJECTFILES=${OBJECTDIR}/main.o ${OBJECTDIR}/hal/hwconfig.o
+OBJECTFILES=${OBJECTDIR}/hal/hwconfig.o ${OBJECTDIR}/main.o ${OBJECTDIR}/led.o
# Source Files
-SOURCEFILES=main.cpp hal/hwconfig.cpp
+SOURCEFILES=hal/hwconfig.cpp main.cpp led.cpp
CFLAGS=
@@ -112,30 +112,42 @@ endif
# ------------------------------------------------------------------------------------
# Rules for buildStep: compileCPP
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
+${OBJECTDIR}/hal/hwconfig.o: hal/hwconfig.cpp nbproject/Makefile-${CND_CONF}.mk
+ @${MKDIR} "${OBJECTDIR}/hal"
+ @${RM} ${OBJECTDIR}/hal/hwconfig.o.d
+ @${RM} ${OBJECTDIR}/hal/hwconfig.o
+ @${FIXDEPS} "${OBJECTDIR}/hal/hwconfig.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CPPC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -DPKOBSKDEPlatformTool=1 -fframe-base-loclist -x c++ -c -mprocessor=$(MP_PROCESSOR_OPTION) -frtti -fexceptions -fno-check-new -fenforce-eh-specs -MMD -MF "${OBJECTDIR}/hal/hwconfig.o.d" -o ${OBJECTDIR}/hal/hwconfig.o hal/hwconfig.cpp -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD)
+
${OBJECTDIR}/main.o: main.cpp nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@${RM} ${OBJECTDIR}/main.o.d
@${RM} ${OBJECTDIR}/main.o
@${FIXDEPS} "${OBJECTDIR}/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CPPC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -DPKOBSKDEPlatformTool=1 -fframe-base-loclist -x c++ -c -mprocessor=$(MP_PROCESSOR_OPTION) -frtti -fexceptions -fno-check-new -fenforce-eh-specs -MMD -MF "${OBJECTDIR}/main.o.d" -o ${OBJECTDIR}/main.o main.cpp -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD)
+${OBJECTDIR}/led.o: led.cpp nbproject/Makefile-${CND_CONF}.mk
+ @${MKDIR} "${OBJECTDIR}"
+ @${RM} ${OBJECTDIR}/led.o.d
+ @${RM} ${OBJECTDIR}/led.o
+ @${FIXDEPS} "${OBJECTDIR}/led.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CPPC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -DPKOBSKDEPlatformTool=1 -fframe-base-loclist -x c++ -c -mprocessor=$(MP_PROCESSOR_OPTION) -frtti -fexceptions -fno-check-new -fenforce-eh-specs -MMD -MF "${OBJECTDIR}/led.o.d" -o ${OBJECTDIR}/led.o led.cpp -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD)
+
+else
${OBJECTDIR}/hal/hwconfig.o: hal/hwconfig.cpp nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}/hal"
@${RM} ${OBJECTDIR}/hal/hwconfig.o.d
@${RM} ${OBJECTDIR}/hal/hwconfig.o
- @${FIXDEPS} "${OBJECTDIR}/hal/hwconfig.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CPPC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -DPKOBSKDEPlatformTool=1 -fframe-base-loclist -x c++ -c -mprocessor=$(MP_PROCESSOR_OPTION) -frtti -fexceptions -fno-check-new -fenforce-eh-specs -MMD -MF "${OBJECTDIR}/hal/hwconfig.o.d" -o ${OBJECTDIR}/hal/hwconfig.o hal/hwconfig.cpp -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD)
+ @${FIXDEPS} "${OBJECTDIR}/hal/hwconfig.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CPPC} $(MP_EXTRA_CC_PRE) -g -x c++ -c -mprocessor=$(MP_PROCESSOR_OPTION) -frtti -fexceptions -fno-check-new -fenforce-eh-specs -MMD -MF "${OBJECTDIR}/hal/hwconfig.o.d" -o ${OBJECTDIR}/hal/hwconfig.o hal/hwconfig.cpp -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD)
-else
${OBJECTDIR}/main.o: main.cpp nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@${RM} ${OBJECTDIR}/main.o.d
@${RM} ${OBJECTDIR}/main.o
@${FIXDEPS} "${OBJECTDIR}/main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CPPC} $(MP_EXTRA_CC_PRE) -g -x c++ -c -mprocessor=$(MP_PROCESSOR_OPTION) -frtti -fexceptions -fno-check-new -fenforce-eh-specs -MMD -MF "${OBJECTDIR}/main.o.d" -o ${OBJECTDIR}/main.o main.cpp -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD)
-${OBJECTDIR}/hal/hwconfig.o: hal/hwconfig.cpp nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}/hal"
- @${RM} ${OBJECTDIR}/hal/hwconfig.o.d
- @${RM} ${OBJECTDIR}/hal/hwconfig.o
- @${FIXDEPS} "${OBJECTDIR}/hal/hwconfig.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CPPC} $(MP_EXTRA_CC_PRE) -g -x c++ -c -mprocessor=$(MP_PROCESSOR_OPTION) -frtti -fexceptions -fno-check-new -fenforce-eh-specs -MMD -MF "${OBJECTDIR}/hal/hwconfig.o.d" -o ${OBJECTDIR}/hal/hwconfig.o hal/hwconfig.cpp -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD)
+${OBJECTDIR}/led.o: led.cpp nbproject/Makefile-${CND_CONF}.mk
+ @${MKDIR} "${OBJECTDIR}"
+ @${RM} ${OBJECTDIR}/led.o.d
+ @${RM} ${OBJECTDIR}/led.o
+ @${FIXDEPS} "${OBJECTDIR}/led.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ -c ${MP_CPPC} $(MP_EXTRA_CC_PRE) -g -x c++ -c -mprocessor=$(MP_PROCESSOR_OPTION) -frtti -fexceptions -fno-check-new -fenforce-eh-specs -MMD -MF "${OBJECTDIR}/led.o.d" -o ${OBJECTDIR}/led.o led.cpp -DXPRJ_default=$(CND_CONF) $(COMPARISON_BUILD)
endif
diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index a13ad0c..bd9d9ba 100644
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,8 +1,8 @@
#
-#Fri May 04 18:20:47 CEST 2018
+#Sat May 05 14:33:20 CEST 2018
default.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=fcf9db1a3d46b4ef4e0a46afcbf02251
default.languagetoolchain.dir=/opt/microchip/xc32/v2.05/bin
-configurations-xml=1b1713a10a7ac2a1a8df14051c73140a
+configurations-xml=4957a7627114c3c1c982e099652971a3
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=c8c2915d32f5d7e4be49831bc9827ab0
default.languagetoolchain.version=2.05
host.platform=linux
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index bbc3864..8f500b7 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -40,6 +40,8 @@
<itemPath>mcc_generated_files/uart1.c</itemPath>
</logicalFolder>
<itemPath>main.cpp</itemPath>
+ <itemPath>led.hpp</itemPath>
+ <itemPath>led.cpp</itemPath>
</logicalFolder>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
@@ -244,22 +246,118 @@
<item path="mcc_generated_files/interrupt_manager.c"
ex="true"
overriding="false">
+ <C32>
+ </C32>
+ <C32-AR>
+ </C32-AR>
+ <C32-AS>
+ </C32-AS>
+ <C32-LD>
+ </C32-LD>
+ <C32CPP>
+ </C32CPP>
+ <C32Global>
+ </C32Global>
</item>
<item path="mcc_generated_files/interrupt_manager.h"
ex="true"
overriding="false">
+ <C32>
+ </C32>
+ <C32-AR>
+ </C32-AR>
+ <C32-AS>
+ </C32-AS>
+ <C32-LD>
+ </C32-LD>
+ <C32CPP>
+ </C32CPP>
+ <C32Global>
+ </C32Global>
</item>
<item path="mcc_generated_files/mcc.c" ex="true" overriding="false">
+ <C32>
+ </C32>
+ <C32-AR>
+ </C32-AR>
+ <C32-AS>
+ </C32-AS>
+ <C32-LD>
+ </C32-LD>
+ <C32CPP>
+ </C32CPP>
+ <C32Global>
+ </C32Global>
</item>
<item path="mcc_generated_files/mcc.h" ex="true" overriding="false">
+ <C32>
+ </C32>
+ <C32-AR>
+ </C32-AR>
+ <C32-AS>
+ </C32-AS>
+ <C32-LD>
+ </C32-LD>
+ <C32CPP>
+ </C32CPP>
+ <C32Global>
+ </C32Global>
</item>
<item path="mcc_generated_files/pin_manager.c" ex="true" overriding="false">
+ <C32>
+ </C32>
+ <C32-AR>
+ </C32-AR>
+ <C32-AS>
+ </C32-AS>
+ <C32-LD>
+ </C32-LD>
+ <C32CPP>
+ </C32CPP>
+ <C32Global>
+ </C32Global>
</item>
<item path="mcc_generated_files/pin_manager.h" ex="true" overriding="false">
+ <C32>
+ </C32>
+ <C32-AR>
+ </C32-AR>
+ <C32-AS>
+ </C32-AS>
+ <C32-LD>
+ </C32-LD>
+ <C32CPP>
+ </C32CPP>
+ <C32Global>
+ </C32Global>
</item>
<item path="mcc_generated_files/uart1.c" ex="true" overriding="false">
+ <C32>
+ </C32>
+ <C32-AR>
+ </C32-AR>
+ <C32-AS>
+ </C32-AS>
+ <C32-LD>
+ </C32-LD>
+ <C32CPP>
+ </C32CPP>
+ <C32Global>
+ </C32Global>
</item>
<item path="mcc_generated_files/uart1.h" ex="true" overriding="false">
+ <C32>
+ </C32>
+ <C32-AR>
+ </C32-AR>
+ <C32-AS>
+ </C32-AS>
+ <C32-LD>
+ </C32-LD>
+ <C32CPP>
+ </C32CPP>
+ <C32Global>
+ </C32Global>
</item>
</conf>
</confs>