summaryrefslogtreecommitdiffstats
path: root/src/nbproject
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2018-02-02 12:12:18 +0100
committerNao Pross <naopross@thearcway.org>2018-02-02 12:12:18 +0100
commit18abece8f8a8af17a3b5e80dc1baf61457409600 (patch)
tree66f64fb9ea91d8a26c56af95c66e5bb7b8f8b5c3 /src/nbproject
parentMove to version control (diff)
downloadXilofono-18abece8f8a8af17a3b5e80dc1baf61457409600.tar.gz
Xilofono-18abece8f8a8af17a3b5e80dc1baf61457409600.zip
2 February 2018
Documentation: - new API documentation - datasheets for new components - update BOM - update documentation data Hardware: - update schematic for MIDI connector Software: - new MIDI API - update prject target to PIC18F45K22
Diffstat (limited to 'src/nbproject')
-rw-r--r--src/nbproject/Makefile-default.mk28
-rw-r--r--src/nbproject/Makefile-genesis.properties4
-rw-r--r--src/nbproject/configurations.xml4
-rw-r--r--src/nbproject/private/SuppressibleMessageMemo.properties3
-rw-r--r--src/nbproject/private/configurations.xml2
-rw-r--r--src/nbproject/private/private.xml4
6 files changed, 33 insertions, 12 deletions
diff --git a/src/nbproject/Makefile-default.mk b/src/nbproject/Makefile-default.mk
index da7a02a..bbe49af 100644
--- a/src/nbproject/Makefile-default.mk
+++ b/src/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.c rs232.c
+SOURCEFILES_QUOTED_IF_SPACED=main.c rs232.c midi.c
# Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/main.p1 ${OBJECTDIR}/rs232.p1
-POSSIBLE_DEPFILES=${OBJECTDIR}/main.p1.d ${OBJECTDIR}/rs232.p1.d
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/main.p1 ${OBJECTDIR}/rs232.p1 ${OBJECTDIR}/midi.p1
+POSSIBLE_DEPFILES=${OBJECTDIR}/main.p1.d ${OBJECTDIR}/rs232.p1.d ${OBJECTDIR}/midi.p1.d
# Object Files
-OBJECTFILES=${OBJECTDIR}/main.p1 ${OBJECTDIR}/rs232.p1
+OBJECTFILES=${OBJECTDIR}/main.p1 ${OBJECTDIR}/rs232.p1 ${OBJECTDIR}/midi.p1
# Source Files
-SOURCEFILES=main.c rs232.c
+SOURCEFILES=main.c rs232.c midi.c
CFLAGS=
@@ -89,7 +89,7 @@ ifneq ($(INFORMATION_MESSAGE), )
endif
${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/src.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-MP_PROCESSOR_OPTION=18F44K22
+MP_PROCESSOR_OPTION=18F45K22
# ------------------------------------------------------------------------------------
# Rules for buildStep: compile
ifeq ($(TYPE_IMAGE), DEBUG_RUN)
@@ -109,6 +109,14 @@ ${OBJECTDIR}/rs232.p1: rs232.c nbproject/Makefile-${CND_CONF}.mk
@-${MV} ${OBJECTDIR}/rs232.d ${OBJECTDIR}/rs232.p1.d
@${FIXDEPS} ${OBJECTDIR}/rs232.p1.d $(SILENT) -rsi ${MP_CC_DIR}../
+${OBJECTDIR}/midi.p1: midi.c nbproject/Makefile-${CND_CONF}.mk
+ @${MKDIR} "${OBJECTDIR}"
+ @${RM} ${OBJECTDIR}/midi.p1.d
+ @${RM} ${OBJECTDIR}/midi.p1
+ ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G -D__DEBUG=1 --debugger=icd3 --double=24 --float=24 --emi=wordwrite --opt=+asm,+asmfile,-speed,+space,-debug,-local --addrqual=ignore --mode=free -P -N255 --warn=-3 --asmlist -DXPRJ_default=$(CND_CONF) --summary=default,-psect,-class,+mem,-hex,-file --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-download,+config,+clib,-plib $(COMPARISON_BUILD) --output=-mcof,+elf:multilocs --stack=compiled:auto:auto:auto "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s" -o${OBJECTDIR}/midi.p1 midi.c
+ @-${MV} ${OBJECTDIR}/midi.d ${OBJECTDIR}/midi.p1.d
+ @${FIXDEPS} ${OBJECTDIR}/midi.p1.d $(SILENT) -rsi ${MP_CC_DIR}../
+
else
${OBJECTDIR}/main.p1: main.c nbproject/Makefile-${CND_CONF}.mk
@${MKDIR} "${OBJECTDIR}"
@@ -126,6 +134,14 @@ ${OBJECTDIR}/rs232.p1: rs232.c nbproject/Makefile-${CND_CONF}.mk
@-${MV} ${OBJECTDIR}/rs232.d ${OBJECTDIR}/rs232.p1.d
@${FIXDEPS} ${OBJECTDIR}/rs232.p1.d $(SILENT) -rsi ${MP_CC_DIR}../
+${OBJECTDIR}/midi.p1: midi.c nbproject/Makefile-${CND_CONF}.mk
+ @${MKDIR} "${OBJECTDIR}"
+ @${RM} ${OBJECTDIR}/midi.p1.d
+ @${RM} ${OBJECTDIR}/midi.p1
+ ${MP_CC} --pass1 $(MP_EXTRA_CC_PRE) --chip=$(MP_PROCESSOR_OPTION) -Q -G --double=24 --float=24 --emi=wordwrite --opt=+asm,+asmfile,-speed,+space,-debug,-local --addrqual=ignore --mode=free -P -N255 --warn=-3 --asmlist -DXPRJ_default=$(CND_CONF) --summary=default,-psect,-class,+mem,-hex,-file --output=default,-inhx032 --runtime=default,+clear,+init,-keep,-no_startup,-download,+config,+clib,-plib $(COMPARISON_BUILD) --output=-mcof,+elf:multilocs --stack=compiled:auto:auto:auto "--errformat=%f:%l: error: (%n) %s" "--warnformat=%f:%l: warning: (%n) %s" "--msgformat=%f:%l: advisory: (%n) %s" -o${OBJECTDIR}/midi.p1 midi.c
+ @-${MV} ${OBJECTDIR}/midi.d ${OBJECTDIR}/midi.p1.d
+ @${FIXDEPS} ${OBJECTDIR}/midi.p1.d $(SILENT) -rsi ${MP_CC_DIR}../
+
endif
# ------------------------------------------------------------------------------------
diff --git a/src/nbproject/Makefile-genesis.properties b/src/nbproject/Makefile-genesis.properties
index b7e886f..251d7a2 100644
--- a/src/nbproject/Makefile-genesis.properties
+++ b/src/nbproject/Makefile-genesis.properties
@@ -1,7 +1,7 @@
#
-#Tue Jan 09 08:34:18 CET 2018
+#Thu Feb 01 16:10:54 CET 2018
default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc8\\v1.44\\bin
-configurations-xml=e53636da3f169dff17c4b629d53a8e38
+configurations-xml=af2f7bf849f43cec780e74f66603aaa1
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5d30ff5128b14865c8a3796a8f0bb8a0
default.languagetoolchain.version=1.44
host.platform=windows
diff --git a/src/nbproject/configurations.xml b/src/nbproject/configurations.xml
index c04bafb..fd080e3 100644
--- a/src/nbproject/configurations.xml
+++ b/src/nbproject/configurations.xml
@@ -5,6 +5,7 @@
displayName="Header Files"
projectFiles="true">
<itemPath>rs232.h</itemPath>
+ <itemPath>midi.h</itemPath>
</logicalFolder>
<logicalFolder name="LinkerScript"
displayName="Linker Files"
@@ -15,6 +16,7 @@
projectFiles="true">
<itemPath>main.c</itemPath>
<itemPath>rs232.c</itemPath>
+ <itemPath>midi.c</itemPath>
</logicalFolder>
<logicalFolder name="ExternalFiles"
displayName="Important Files"
@@ -27,7 +29,7 @@
<conf name="default" type="2">
<toolsSet>
<developmentServer>localhost</developmentServer>
- <targetDevice>PIC18F44K22</targetDevice>
+ <targetDevice>PIC18F45K22</targetDevice>
<targetHeader></targetHeader>
<targetPluginBoard></targetPluginBoard>
<platformTool>ICD3PlatformTool</platformTool>
diff --git a/src/nbproject/private/SuppressibleMessageMemo.properties b/src/nbproject/private/SuppressibleMessageMemo.properties
new file mode 100644
index 0000000..957bae2
--- /dev/null
+++ b/src/nbproject/private/SuppressibleMessageMemo.properties
@@ -0,0 +1,3 @@
+#
+#Thu Feb 01 11:22:19 CET 2018
+icd3/CHECK_4_HIGH_VOLTAGE_VPP=true
diff --git a/src/nbproject/private/configurations.xml b/src/nbproject/private/configurations.xml
index 492dbe3..58a3971 100644
--- a/src/nbproject/private/configurations.xml
+++ b/src/nbproject/private/configurations.xml
@@ -4,7 +4,7 @@
<defaultConf>0</defaultConf>
<confs>
<conf name="default" type="2">
- <platformToolSN></platformToolSN>
+ <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>9009:=&lt;rev>0100:=&lt;man>Microchip Technology, Inc. (www.microchip.com):=&lt;prod>MPLAB ICD3 tm (www.microchip.com):=&lt;sn>JIT153520759:=&lt;drv>x:=&lt;xpt>b:=end</platformToolSN>
<languageToolchainDir>C:\Program Files\Microchip\xc8\v1.44\bin</languageToolchainDir>
<mdbdebugger version="1">
<placeholder1>place holder 1</placeholder1>
diff --git a/src/nbproject/private/private.xml b/src/nbproject/private/private.xml
index f742160..790aed3 100644
--- a/src/nbproject/private/private.xml
+++ b/src/nbproject/private/private.xml
@@ -4,8 +4,8 @@
<open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
<group name="Corso Kamm">
<file>file:/Z:/SAMB_4/projects/xilofono/src/main.c</file>
- <file>file:/Z:/SAMB_4/projects/xilofono/src/rs232.h</file>
- <file>file:/Z:/SAMB_4/projects/xilofono/src/rs232.c</file>
+ <file>file:/Z:/SAMB_4/projects/xilofono/src/midi.h</file>
+ <file>file:/Z:/SAMB_4/projects/xilofono/src/midi.c</file>
</group>
</open-files>
</project-private>