IDE MPLABXで使えるようにする

xc16-gccのオプション, Option Categories: Optimization, Do not override 'inline'　チェックを入れる
_CONFIG2変更 定数定義が変わっているので

diff --git a/.gitignore b/.gitignore
index 72779a7..f9e4152 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+build\r
+debug\r
 *.o\r
 *.out\r
 *.hex\r

diff --git a/build/default/production/byte2var.o.d b/build/default/production/byte2var.o.d
deleted file mode 100644 (file)
index 0bb2ddd..0000000
--- a/build/default/production/byte2var.o.d
+++ /dev/null
@@ -1 +0,0 @@
-build/default/production/byte2var.o: byte2var.c

diff --git a/build/default/production/debug_print.o.d b/build/default/production/debug_print.o.d
deleted file mode 100644 (file)
index 75b56fb..0000000
--- a/build/default/production/debug_print.o.d
+++ /dev/null
@@ -1 +0,0 @@
-build/default/production/debug_print.o: debug_print.c myuart.h

diff --git a/build/default/production/main.o.d b/build/default/production/main.o.d
deleted file mode 100644 (file)
index eb15ee6..0000000
--- a/build/default/production/main.o.d
+++ /dev/null
@@ -1,2 +0,0 @@
-build/default/production/main.o: main.c myuart.h myspi.h debug_print.h \
-  ublox.h myad.h delay.h ring.h byte2var.h myint.h mysts.h util.h

diff --git a/build/default/production/myad.o.d b/build/default/production/myad.o.d
deleted file mode 100644 (file)
index c4ddc0c..0000000
--- a/build/default/production/myad.o.d
+++ /dev/null
@@ -1 +0,0 @@
-build/default/production/myad.o: myad.c delay.h myspi.h myad.h

diff --git a/build/default/production/myspi.o.d b/build/default/production/myspi.o.d
deleted file mode 100644 (file)
index 2dd1485..0000000
--- a/build/default/production/myspi.o.d
+++ /dev/null
@@ -1 +0,0 @@
-build/default/production/myspi.o: myspi.c myspi.h

diff --git a/build/default/production/myuart.o.d b/build/default/production/myuart.o.d
deleted file mode 100644 (file)
index c6bff6b..0000000
--- a/build/default/production/myuart.o.d
+++ /dev/null
@@ -1 +0,0 @@
-build/default/production/myuart.o: myuart.c myuart.h

diff --git a/build/default/production/ring.o.d b/build/default/production/ring.o.d
deleted file mode 100644 (file)
index 24b4505..0000000
--- a/build/default/production/ring.o.d
+++ /dev/null
@@ -1 +0,0 @@
-build/default/production/ring.o: ring.c ring.h

diff --git a/build/default/production/ublox.o.d b/build/default/production/ublox.o.d
deleted file mode 100644 (file)
index e6d7022..0000000
--- a/build/default/production/ublox.o.d
+++ /dev/null
@@ -1 +0,0 @@
-build/default/production/ublox.o: ublox.c ublox.h myuart.h byte2var.h

diff --git a/dist/default/production/cpu2010_v11.production.elf b/dist/default/production/cpu2010_v11.production.elf
new file mode 100644 (file)
index 0000000..9370baa
Binary files /dev/null and b/dist/default/production/cpu2010_v11.production.elf differ

diff --git a/main.c b/main.c
index c8c2887..b86961c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -3,6 +3,12 @@
  * sciLogger サブCPU
  * PIC24Fj64GA004
  * 8MHz
+
+ **** Ver1.1
+ * 2016/2
+ * IDE MPLABXで使えるようにするため
+ * xc16-gccのオプション, Option Categories: Optimization, Do not override 'inline'　チェックを入れる
+ * _CONFIG2変更 定数定義が変わっているので
  *
  * Created on February 9, 2010, 10:53 AM
  */
@@ -26,7 +32,9 @@
 
 _CONFIG1( JTAGEN_OFF & GCP_OFF & GWRP_OFF & COE_OFF & FWDTEN_OFF & ICS_PGx2 )
 //_CONFIG2( FCKSM_CSDCMD & OSCIOFNC_ON & POSCMOD_OFF & FNOSC_FRC)
-#pragma config FCKSM = CSDCMD, OSCIOFNC = ON, POSCMOD = OFF, FNOSC = FRC, FPBDIV = DIV_8
+//#pragma config FCKSM = CSDCMD, OSCIOFNC = ON, POSCMOD = OFF, FNOSC = FRC, FPBDIV = DIV_8
+_CONFIG2(POSCMOD_NONE & IOL1WAY_OFF & OSCIOFNC_ON & FCKSM_CSDCMD & FCKSM_CSECMD & FNOSC_FRC)  // RC 8MHz
+
 
 //#define CPU_CLOCK        10000000                         // クロック[ Hz ]
 //#define CPU_PLL          8                                // PLL

diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk
index 7217270..67fbb6b 100644 (file)
--- a/nbproject/Makefile-default.mk
+++ b/nbproject/Makefile-default.mk
@@ -8,12 +8,18 @@
 
 
 # Include project Makefile
+ifeq "${IGNORE_LOCAL}" "TRUE"
+# do not include local makefile. User is passing all local related variables already
+else
 include Makefile
+# Include makefile containing local settings
+ifeq "$(wildcard nbproject/Makefile-local-default.mk)" "nbproject/Makefile-local-default.mk"
+include nbproject/Makefile-local-default.mk
+endif
+endif
 
 # Environment
-# Adding MPLAB X bin directory to path
-PATH:=/opt/microchip/mplabx/mplab_ide/mplab_ide/modules/../../bin/:$(PATH)
-MKDIR=mkdir -p
+MKDIR=gnumkdir -p
 RM=rm -f 
 MV=mv 
 CP=cp 
@@ -22,10 +28,14 @@ CP=cp
 CND_CONF=default
 ifeq ($(TYPE_IMAGE), DEBUG_RUN)
 IMAGE_TYPE=debug
-FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out
+OUTPUT_SUFFIX=elf
+DEBUGGABLE_SUFFIX=elf
+FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
 else
 IMAGE_TYPE=production
-FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out
+OUTPUT_SUFFIX=hex
+DEBUGGABLE_SUFFIX=elf
+FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
 endif
 
 # Object Directory
@@ -34,210 +44,231 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
 # Distribution Directory
 DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
 
+# Source Files Quoted if spaced
+SOURCEFILES_QUOTED_IF_SPACED=byte2var.c debug_print.c main.c myad.c myspi.c mysts.c myuart.c ring.c test.c ublox.c
+
 # Object Files Quoted if spaced
 OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/byte2var.o ${OBJECTDIR}/debug_print.o ${OBJECTDIR}/main.o ${OBJECTDIR}/myad.o ${OBJECTDIR}/myspi.o ${OBJECTDIR}/mysts.o ${OBJECTDIR}/myuart.o ${OBJECTDIR}/ring.o ${OBJECTDIR}/test.o ${OBJECTDIR}/ublox.o
+POSSIBLE_DEPFILES=${OBJECTDIR}/byte2var.o.d ${OBJECTDIR}/debug_print.o.d ${OBJECTDIR}/main.o.d ${OBJECTDIR}/myad.o.d ${OBJECTDIR}/myspi.o.d ${OBJECTDIR}/mysts.o.d ${OBJECTDIR}/myuart.o.d ${OBJECTDIR}/ring.o.d ${OBJECTDIR}/test.o.d ${OBJECTDIR}/ublox.o.d
 
 # Object Files
 OBJECTFILES=${OBJECTDIR}/byte2var.o ${OBJECTDIR}/debug_print.o ${OBJECTDIR}/main.o ${OBJECTDIR}/myad.o ${OBJECTDIR}/myspi.o ${OBJECTDIR}/mysts.o ${OBJECTDIR}/myuart.o ${OBJECTDIR}/ring.o ${OBJECTDIR}/test.o ${OBJECTDIR}/ublox.o
 
+# Source Files
+SOURCEFILES=byte2var.c debug_print.c main.c myad.c myspi.c mysts.c myuart.c ring.c test.c ublox.c
+
 
 CFLAGS=
 ASFLAGS=
 LDLIBSOPTIONS=
 
-# Path to java used to run MPLAB X when this makefile was created
-MP_JAVA_PATH="/usr/lib/jvm/java-6-openjdk/jre/bin/"
-OS_CURRENT="$(shell uname -s)"
 ############# Tool locations ##########################################
 # If you copy a project from one host to another, the path where the  #
 # compiler is installed may be different.                             #
 # If you open this project with MPLAB X in the new host, this         #
 # makefile will be regenerated and the paths will be corrected.       #
 #######################################################################
-MP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc"
-# MP_BC is not defined
-MP_AS="/opt/microchip/mplabc30/v3.30c/bin/pic30-as"
-MP_LD="/opt/microchip/mplabc30/v3.30c/bin/pic30-ld"
-MP_AR="/opt/microchip/mplabc30/v3.30c/bin/pic30-ar"
-DEP_GEN=${MP_JAVA_PATH}java -jar "/opt/microchip/mplabx/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar" 
 # fixDeps replaces a bunch of sed/cat/printf statements that slow down the build
 FIXDEPS=fixDeps
-MP_CC_DIR="/opt/microchip/mplabc30/v3.30c/bin"
-# MP_BC_DIR is not defined
-MP_AS_DIR="/opt/microchip/mplabc30/v3.30c/bin"
-MP_LD_DIR="/opt/microchip/mplabc30/v3.30c/bin"
-MP_AR_DIR="/opt/microchip/mplabc30/v3.30c/bin"
-# MP_BC_DIR is not defined
 
 .build-conf:  ${BUILD_SUBPROJECTS}
-       ${MAKE}  -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out
-
-MP_PROCESSOR_OPTION=24FJ64GA004
-MP_LINKER_FILE_OPTION=,-Tp24FJ64GA004.gld
-# ------------------------------------------------------------------------------------
-# Rules for buildStep: assemble
-ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-else
-endif
-
-# ------------------------------------------------------------------------------------
-# Rules for buildStep: assembleWithPreprocess
-ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-else
+ifneq ($(INFORMATION_MESSAGE), )
+       @echo $(INFORMATION_MESSAGE)
 endif
+       ${MAKE}  -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
 
+MP_PROCESSOR_OPTION=24FJ64GA004
+MP_LINKER_FILE_OPTION=,--script=p24FJ64GA004.gld
 # ------------------------------------------------------------------------------------
 # Rules for buildStep: compile
 ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-${OBJECTDIR}/test.o: test.c  nbproject/Makefile-${CND_CONF}.mk
-       @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/test.o.d 
-       @${RM} ${OBJECTDIR}/test.o.ok ${OBJECTDIR}/test.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/test.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/test.o.d" -o ${OBJECTDIR}/test.o test.c   -Winline
-       
 ${OBJECTDIR}/byte2var.o: byte2var.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
        @${RM} ${OBJECTDIR}/byte2var.o.d 
-       @${RM} ${OBJECTDIR}/byte2var.o.ok ${OBJECTDIR}/byte2var.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/byte2var.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/byte2var.o.d" -o ${OBJECTDIR}/byte2var.o byte2var.c   -Winline
-       
-${OBJECTDIR}/myuart.o: myuart.c  nbproject/Makefile-${CND_CONF}.mk
-       @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/myuart.o.d 
-       @${RM} ${OBJECTDIR}/myuart.o.ok ${OBJECTDIR}/myuart.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/myuart.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/myuart.o.d" -o ${OBJECTDIR}/myuart.o myuart.c   -Winline
+       @${RM} ${OBJECTDIR}/byte2var.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  byte2var.c  -o ${OBJECTDIR}/byte2var.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/byte2var.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/byte2var.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
 ${OBJECTDIR}/debug_print.o: debug_print.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
        @${RM} ${OBJECTDIR}/debug_print.o.d 
-       @${RM} ${OBJECTDIR}/debug_print.o.ok ${OBJECTDIR}/debug_print.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/debug_print.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/debug_print.o.d" -o ${OBJECTDIR}/debug_print.o debug_print.c   -Winline
-       
-${OBJECTDIR}/mysts.o: mysts.c  nbproject/Makefile-${CND_CONF}.mk
-       @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/mysts.o.d 
-       @${RM} ${OBJECTDIR}/mysts.o.ok ${OBJECTDIR}/mysts.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/mysts.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/mysts.o.d" -o ${OBJECTDIR}/mysts.o mysts.c   -Winline
+       @${RM} ${OBJECTDIR}/debug_print.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  debug_print.c  -o ${OBJECTDIR}/debug_print.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/debug_print.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/debug_print.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/ublox.o: ublox.c  nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/main.o: main.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/ublox.o.d 
-       @${RM} ${OBJECTDIR}/ublox.o.ok ${OBJECTDIR}/ublox.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/ublox.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/ublox.o.d" -o ${OBJECTDIR}/ublox.o ublox.c   -Winline
+       @${RM} ${OBJECTDIR}/main.o.d 
+       @${RM} ${OBJECTDIR}/main.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  main.c  -o ${OBJECTDIR}/main.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/main.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/main.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
 ${OBJECTDIR}/myad.o: myad.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
        @${RM} ${OBJECTDIR}/myad.o.d 
-       @${RM} ${OBJECTDIR}/myad.o.ok ${OBJECTDIR}/myad.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/myad.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/myad.o.d" -o ${OBJECTDIR}/myad.o myad.c   -Winline
+       @${RM} ${OBJECTDIR}/myad.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  myad.c  -o ${OBJECTDIR}/myad.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/myad.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/myad.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/main.o: main.c  nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/myspi.o: myspi.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/main.o.d 
-       @${RM} ${OBJECTDIR}/main.o.ok ${OBJECTDIR}/main.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/main.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/main.o.d" -o ${OBJECTDIR}/main.o main.c   -Winline
+       @${RM} ${OBJECTDIR}/myspi.o.d 
+       @${RM} ${OBJECTDIR}/myspi.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  myspi.c  -o ${OBJECTDIR}/myspi.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/myspi.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/myspi.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/ring.o: ring.c  nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/mysts.o: mysts.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/ring.o.d 
-       @${RM} ${OBJECTDIR}/ring.o.ok ${OBJECTDIR}/ring.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/ring.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/ring.o.d" -o ${OBJECTDIR}/ring.o ring.c   -Winline
+       @${RM} ${OBJECTDIR}/mysts.o.d 
+       @${RM} ${OBJECTDIR}/mysts.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  mysts.c  -o ${OBJECTDIR}/mysts.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/mysts.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/mysts.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/myspi.o: myspi.c  nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/myuart.o: myuart.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/myspi.o.d 
-       @${RM} ${OBJECTDIR}/myspi.o.ok ${OBJECTDIR}/myspi.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/myspi.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE) -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/myspi.o.d" -o ${OBJECTDIR}/myspi.o myspi.c   -Winline
+       @${RM} ${OBJECTDIR}/myuart.o.d 
+       @${RM} ${OBJECTDIR}/myuart.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  myuart.c  -o ${OBJECTDIR}/myuart.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/myuart.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/myuart.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
+       
+${OBJECTDIR}/ring.o: ring.c  nbproject/Makefile-${CND_CONF}.mk
+       @${MKDIR} ${OBJECTDIR} 
+       @${RM} ${OBJECTDIR}/ring.o.d 
+       @${RM} ${OBJECTDIR}/ring.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  ring.c  -o ${OBJECTDIR}/ring.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/ring.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/ring.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-else
 ${OBJECTDIR}/test.o: test.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
        @${RM} ${OBJECTDIR}/test.o.d 
-       @${RM} ${OBJECTDIR}/test.o.ok ${OBJECTDIR}/test.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/test.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/test.o.d" -o ${OBJECTDIR}/test.o test.c   -Winline
+       @${RM} ${OBJECTDIR}/test.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  test.c  -o ${OBJECTDIR}/test.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/test.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/test.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/byte2var.o: byte2var.c  nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/ublox.o: ublox.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/byte2var.o.d 
-       @${RM} ${OBJECTDIR}/byte2var.o.ok ${OBJECTDIR}/byte2var.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/byte2var.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/byte2var.o.d" -o ${OBJECTDIR}/byte2var.o byte2var.c   -Winline
+       @${RM} ${OBJECTDIR}/ublox.o.d 
+       @${RM} ${OBJECTDIR}/ublox.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  ublox.c  -o ${OBJECTDIR}/ublox.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/ublox.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1    -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/ublox.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/myuart.o: myuart.c  nbproject/Makefile-${CND_CONF}.mk
+else
+${OBJECTDIR}/byte2var.o: byte2var.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/myuart.o.d 
-       @${RM} ${OBJECTDIR}/myuart.o.ok ${OBJECTDIR}/myuart.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/myuart.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/myuart.o.d" -o ${OBJECTDIR}/myuart.o myuart.c   -Winline
+       @${RM} ${OBJECTDIR}/byte2var.o.d 
+       @${RM} ${OBJECTDIR}/byte2var.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  byte2var.c  -o ${OBJECTDIR}/byte2var.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/byte2var.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/byte2var.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
 ${OBJECTDIR}/debug_print.o: debug_print.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
        @${RM} ${OBJECTDIR}/debug_print.o.d 
-       @${RM} ${OBJECTDIR}/debug_print.o.ok ${OBJECTDIR}/debug_print.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/debug_print.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/debug_print.o.d" -o ${OBJECTDIR}/debug_print.o debug_print.c   -Winline
+       @${RM} ${OBJECTDIR}/debug_print.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  debug_print.c  -o ${OBJECTDIR}/debug_print.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/debug_print.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/debug_print.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/mysts.o: mysts.c  nbproject/Makefile-${CND_CONF}.mk
-       @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/mysts.o.d 
-       @${RM} ${OBJECTDIR}/mysts.o.ok ${OBJECTDIR}/mysts.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/mysts.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/mysts.o.d" -o ${OBJECTDIR}/mysts.o mysts.c   -Winline
-       
-${OBJECTDIR}/ublox.o: ublox.c  nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/main.o: main.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/ublox.o.d 
-       @${RM} ${OBJECTDIR}/ublox.o.ok ${OBJECTDIR}/ublox.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/ublox.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/ublox.o.d" -o ${OBJECTDIR}/ublox.o ublox.c   -Winline
+       @${RM} ${OBJECTDIR}/main.o.d 
+       @${RM} ${OBJECTDIR}/main.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  main.c  -o ${OBJECTDIR}/main.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/main.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/main.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
 ${OBJECTDIR}/myad.o: myad.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
        @${RM} ${OBJECTDIR}/myad.o.d 
-       @${RM} ${OBJECTDIR}/myad.o.ok ${OBJECTDIR}/myad.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/myad.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/myad.o.d" -o ${OBJECTDIR}/myad.o myad.c   -Winline
+       @${RM} ${OBJECTDIR}/myad.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  myad.c  -o ${OBJECTDIR}/myad.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/myad.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/myad.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/main.o: main.c  nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/myspi.o: myspi.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/main.o.d 
-       @${RM} ${OBJECTDIR}/main.o.ok ${OBJECTDIR}/main.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/main.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/main.o.d" -o ${OBJECTDIR}/main.o main.c   -Winline
+       @${RM} ${OBJECTDIR}/myspi.o.d 
+       @${RM} ${OBJECTDIR}/myspi.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  myspi.c  -o ${OBJECTDIR}/myspi.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/myspi.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/myspi.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
+       
+${OBJECTDIR}/mysts.o: mysts.c  nbproject/Makefile-${CND_CONF}.mk
+       @${MKDIR} ${OBJECTDIR} 
+       @${RM} ${OBJECTDIR}/mysts.o.d 
+       @${RM} ${OBJECTDIR}/mysts.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  mysts.c  -o ${OBJECTDIR}/mysts.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/mysts.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/mysts.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
+       
+${OBJECTDIR}/myuart.o: myuart.c  nbproject/Makefile-${CND_CONF}.mk
+       @${MKDIR} ${OBJECTDIR} 
+       @${RM} ${OBJECTDIR}/myuart.o.d 
+       @${RM} ${OBJECTDIR}/myuart.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  myuart.c  -o ${OBJECTDIR}/myuart.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/myuart.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/myuart.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
 ${OBJECTDIR}/ring.o: ring.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
        @${RM} ${OBJECTDIR}/ring.o.d 
-       @${RM} ${OBJECTDIR}/ring.o.ok ${OBJECTDIR}/ring.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/ring.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/ring.o.d" -o ${OBJECTDIR}/ring.o ring.c   -Winline
+       @${RM} ${OBJECTDIR}/ring.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  ring.c  -o ${OBJECTDIR}/ring.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/ring.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/ring.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
-${OBJECTDIR}/myspi.o: myspi.c  nbproject/Makefile-${CND_CONF}.mk
+${OBJECTDIR}/test.o: test.c  nbproject/Makefile-${CND_CONF}.mk
        @${MKDIR} ${OBJECTDIR} 
-       @${RM} ${OBJECTDIR}/myspi.o.d 
-       @${RM} ${OBJECTDIR}/myspi.o.ok ${OBJECTDIR}/myspi.o.err 
-       @${FIXDEPS} "${OBJECTDIR}/myspi.o.d" $(SILENT) -c ${MP_CC} $(MP_EXTRA_CC_PRE)  -g -omf=elf -x c -c -mcpu=$(MP_PROCESSOR_OPTION) -mlarge-data -O1 -MMD -MF "${OBJECTDIR}/myspi.o.d" -o ${OBJECTDIR}/myspi.o myspi.c   -Winline
+       @${RM} ${OBJECTDIR}/test.o.d 
+       @${RM} ${OBJECTDIR}/test.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  test.c  -o ${OBJECTDIR}/test.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/test.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/test.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
+       
+${OBJECTDIR}/ublox.o: ublox.c  nbproject/Makefile-${CND_CONF}.mk
+       @${MKDIR} ${OBJECTDIR} 
+       @${RM} ${OBJECTDIR}/ublox.o.d 
+       @${RM} ${OBJECTDIR}/ublox.o 
+       ${MP_CC} $(MP_EXTRA_CC_PRE)  ublox.c  -o ${OBJECTDIR}/ublox.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/ublox.o.d"        -g -omf=elf -mlarge-data -O1 -mno-override-inline -msmart-io=1 -msfr-warn=off -Winline
+       @${FIXDEPS} "${OBJECTDIR}/ublox.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
        
 endif
 
 # ------------------------------------------------------------------------------------
+# Rules for buildStep: assemble
+ifeq ($(TYPE_IMAGE), DEBUG_RUN)
+else
+endif
+
+# ------------------------------------------------------------------------------------
+# Rules for buildStep: assemblePreproc
+ifeq ($(TYPE_IMAGE), DEBUG_RUN)
+else
+endif
+
+# ------------------------------------------------------------------------------------
 # Rules for buildStep: link
 ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk
+dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk    
        @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} 
-       ${MP_CC} $(MP_EXTRA_LD_PRE)  -omf=elf -mcpu=$(MP_PROCESSOR_OPTION)  -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1 -o dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out ${OBJECTFILES_QUOTED_IF_SPACED}        -Wl,--defsym=__MPLAB_BUILD=1,--heap=40,--no-check-sections$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION),--defsym=__MPLAB_DEBUG=1,--defsym=__ICD2RAM=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_ICD3=1
+       ${MP_CC} $(MP_EXTRA_LD_PRE)  -o dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${OUTPUT_SUFFIX}  ${OBJECTFILES_QUOTED_IF_SPACED}      -mcpu=$(MP_PROCESSOR_OPTION)        -D__DEBUG -D__MPLAB_DEBUGGER_ICD3=1  -omf=elf  -mreserve=data@0x800:0x81F -mreserve=data@0x820:0x821 -mreserve=data@0x822:0x823 -mreserve=data@0x824:0x825 -mreserve=data@0x826:0x84F   -Wl,,--defsym=__MPLAB_BUILD=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_ICD3=1,$(MP_LINKER_FILE_OPTION),--heap=40,--no-check-sections,--data-init,--pack-data,--handles,--isr,--no-gc-sections,--fill-upper=0,--stackguard=16,--no-force-link,--smart-io$(MP_EXTRA_LD_POST) 
+       
 else
-dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk
+dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk   
        @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} 
-       ${MP_CC} $(MP_EXTRA_LD_PRE)  -omf=elf -mcpu=$(MP_PROCESSOR_OPTION)  -o dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out ${OBJECTFILES_QUOTED_IF_SPACED}        -Wl,--defsym=__MPLAB_BUILD=1,--heap=40,--no-check-sections$(MP_EXTRA_LD_POST)$(MP_LINKER_FILE_OPTION)
-       ${MP_CC_DIR}/pic30-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out -omf=elf
+       ${MP_CC} $(MP_EXTRA_LD_PRE)  -o dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX}  ${OBJECTFILES_QUOTED_IF_SPACED}      -mcpu=$(MP_PROCESSOR_OPTION)        -omf=elf -Wl,,--defsym=__MPLAB_BUILD=1,$(MP_LINKER_FILE_OPTION),--heap=40,--no-check-sections,--data-init,--pack-data,--handles,--isr,--no-gc-sections,--fill-upper=0,--stackguard=16,--no-force-link,--smart-io$(MP_EXTRA_LD_POST) 
+       ${MP_CC_DIR}\\xc16-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -a  -omf=elf  
+       
 endif
 
 
 # Subprojects
 .build-subprojects:
 
+
+# Subprojects
+.clean-subprojects:
+
 # Clean Targets
-.clean-conf:
+.clean-conf: ${CLEAN_SUBPROJECTS}
        ${RM} -r build/default
        ${RM} -r dist/default
 
 # Enable dependency checking
 .dep.inc: .depcheck-impl
 
-DEPFILES=$(wildcard $(addsuffix .d, ${OBJECTFILES}))
+DEPFILES=$(shell mplabwildcard ${POSSIBLE_DEPFILES})
 ifneq (${DEPFILES},)
 include ${DEPFILES}
 endif

diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index 936162b..4b180a7 100644 (file)
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,8 +1,8 @@
-#
-#Fri Dec 16 21:32:52 JST 2011
-default.languagetoolchain.dir=/opt/microchip/mplabc30/v3.30c/bin
-com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=11bb82e71763925c87fa30f6c65473b1
-default.languagetoolchain.version=3_30
-default.com-microchip-mplab-nbide-toolchainC30-C30LanguageToolchain.md5=17df7e8733752d3b984a90d5cec1213a
-host.platform=linux
-conf.ids=default
+#\r
+#Mon Feb 22 21:32:46 JST 2016\r
+default.com-microchip-mplab-nbide-toolchainXC16-XC16LanguageToolchain.md5=aa594b660c17cad8c6f9c67ea975ae76\r
+default.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc16\\v1.23\\bin\r
+com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=667d68090e68ae2b85172ad466b984c0\r
+default.languagetoolchain.version=1.23\r
+host.platform=windows\r
+conf.ids=default\r

diff --git a/nbproject/Makefile-impl.mk b/nbproject/Makefile-impl.mk
index 6827723..eebab3f 100644 (file)
--- a/nbproject/Makefile-impl.mk
+++ b/nbproject/Makefile-impl.mk
@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
 
 
 # Project Name
-PROJECTNAME=cpu2010
+PROJECTNAME=cpu2010_v11
 
 # Active Configuration
 DEFAULTCONF=default
@@ -43,6 +43,18 @@ ALLCONFS=default
 .clean-impl: .clean-pre
        ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf
 
+# clobber
+.clobber-impl: .clobber-pre .depcheck-impl
+           ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=default clean
+
+
+
+# all
+.all-impl: .all-pre .depcheck-impl
+           ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=default build
+
+
+
 # dependency checking support
 .depcheck-impl:
 #      @echo "# This code depends on make tool being used" >.dep.inc

diff --git a/nbproject/Makefile-local-default.mk b/nbproject/Makefile-local-default.mk
new file mode 100644 (file)
index 0000000..3dca5fc
--- /dev/null
+++ b/nbproject/Makefile-local-default.mk
@@ -0,0 +1,37 @@
+#
+# Generated Makefile - do not edit!
+#
+#
+# This file contains information about the location of compilers and other tools.
+# If you commmit this file into your revision control server, you will be able to 
+# to checkout the project and build it from the command line with make. However,
+# if more than one person works on the same project, then this file might show
+# conflicts since different users are bound to have compilers in different places.
+# In that case you might choose to not commit this file and let MPLAB X recreate this file
+# for each user. The disadvantage of not commiting this file is that you must run MPLAB X at
+# least once so the file gets created and the project can be built. Finally, you can also
+# avoid using this file at all if you are only building from the command line with make.
+# You can invoke make with the values of the macros:
+# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...  
+#
+SHELL=cmd.exe
+PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../bin/
+# Adding MPLAB X bin directory to path.
+PATH:=C:/Program Files (x86)/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../bin/:$(PATH)
+# Path to java used to run MPLAB X when this makefile was created
+MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\sys\java\jre1.7.0_67/bin/"
+OS_CURRENT="$(shell uname -s)"
+MP_CC="C:\Program Files (x86)\Microchip\xc16\v1.23\bin\xc16-gcc.exe"
+# MP_CPPC is not defined
+# MP_BC is not defined
+MP_AS="C:\Program Files (x86)\Microchip\xc16\v1.23\bin\xc16-as.exe"
+# MP_LD is not defined
+MP_AR="C:\Program Files (x86)\Microchip\xc16\v1.23\bin\xc16-ar.exe"
+DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+MP_CC_DIR="C:\Program Files (x86)\Microchip\xc16\v1.23\bin"
+# MP_CPPC_DIR is not defined
+# MP_BC_DIR is not defined
+MP_AS_DIR="C:\Program Files (x86)\Microchip\xc16\v1.23\bin"
+# MP_LD_DIR is not defined
+MP_AR_DIR="C:\Program Files (x86)\Microchip\xc16\v1.23\bin"
+# MP_BC_DIR is not defined

diff --git a/nbproject/Makefile-variables.mk b/nbproject/Makefile-variables.mk
index 1bc283b..cc5d467 100644 (file)
--- a/nbproject/Makefile-variables.mk
+++ b/nbproject/Makefile-variables.mk
@@ -6,8 +6,8 @@
 CND_BASEDIR=`pwd`
 # default configuration
 CND_ARTIFACT_DIR_default=dist/default/production
-CND_ARTIFACT_NAME_default=cpu2010.production.out
-CND_ARTIFACT_PATH_default=dist/default/production/cpu2010.production.out
+CND_ARTIFACT_NAME_default=cpu2010_v11.production.hex
+CND_ARTIFACT_PATH_default=dist/default/production/cpu2010_v11.production.hex
 CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package
-CND_PACKAGE_NAME_default=cpu2010.tar
-CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/cpu2010.tar
+CND_PACKAGE_NAME_default=cpu2010v11.tar
+CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/cpu2010v11.tar

diff --git a/nbproject/Package-default.bash b/nbproject/Package-default.bash
index 8a9dbee..2c71b74 100644 (file)
--- a/nbproject/Package-default.bash
+++ b/nbproject/Package-default.bash
@@ -10,9 +10,9 @@ CND_CONF=default
 CND_DISTDIR=dist
 TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010.${IMAGE_TYPE}.out
-OUTPUT_BASENAME=cpu2010.${IMAGE_TYPE}.out
-PACKAGE_TOP_DIR=cpu2010/
+OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/cpu2010_v11.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+OUTPUT_BASENAME=cpu2010_v11.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+PACKAGE_TOP_DIR=cpu2010v11/
 
 # Functions
 function checkReturnCode
@@ -57,15 +57,15 @@ mkdir -p ${TMPDIR}
 
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory ${TMPDIR}/cpu2010/bin
+makeDirectory ${TMPDIR}/cpu2010v11/bin
 copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
 
 
 # Generate tar file
 cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/package/cpu2010.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/package/cpu2010v11.tar
 cd ${TMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/cpu2010.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/cpu2010v11.tar *
 checkReturnCode
 
 # Cleanup

diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 5500f3f..6197300 100644 (file)
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -1,202 +1,267 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="62">
-  <logicalFolder name="root" displayName="root" projectFiles="true">
-    <logicalFolder name="HeaderFiles"
-                   displayName="Header Files"
-                   projectFiles="true">
-    </logicalFolder>
-    <logicalFolder name="LibraryFiles"
-                   displayName="Library Files"
-                   projectFiles="true">
-    </logicalFolder>
-    <logicalFolder name="LinkerScript"
-                   displayName="Linker Files"
-                   projectFiles="true">
-    </logicalFolder>
-    <logicalFolder name="ObjectFiles"
-                   displayName="Object Files"
-                   projectFiles="true">
-    </logicalFolder>
-    <logicalFolder name="SourceFiles"
-                   displayName="Source Files"
-                   projectFiles="true">
-      <itemPath>byte2var.c</itemPath>
-      <itemPath>byte2var.h</itemPath>
-      <itemPath>debug_print.c</itemPath>
-      <itemPath>debug_print.h</itemPath>
-      <itemPath>delay.h</itemPath>
-      <itemPath>main.c</itemPath>
-      <itemPath>myad.c</itemPath>
-      <itemPath>myad.h</itemPath>
-      <itemPath>myint.h</itemPath>
-      <itemPath>myspi.c</itemPath>
-      <itemPath>myspi.h</itemPath>
-      <itemPath>mysts.c</itemPath>
-      <itemPath>mysts.h</itemPath>
-      <itemPath>myuart.c</itemPath>
-      <itemPath>myuart.h</itemPath>
-      <itemPath>ring.c</itemPath>
-      <itemPath>ring.h</itemPath>
-      <itemPath>test.c</itemPath>
-      <itemPath>ublox.c</itemPath>
-      <itemPath>ublox.h</itemPath>
-      <itemPath>util.h</itemPath>
-    </logicalFolder>
-    <logicalFolder name="ExternalFiles"
-                   displayName="Important Files"
-                   projectFiles="false">
-      <itemPath>Makefile</itemPath>
-    </logicalFolder>
-  </logicalFolder>
-  <projectmakefile>Makefile</projectmakefile>
-  <confs>
-    <conf name="default" type="2">
-      <toolsSet>
-        <developmentServer>localhost</developmentServer>
-        <targetDevice>PIC24FJ64GA004</targetDevice>
-        <targetHeader></targetHeader>
-        <platformTool>ICD3PlatformTool</platformTool>
-        <languageToolchain>C30</languageToolchain>
-        <languageToolchainVersion>3.24</languageToolchainVersion>
-        <platform>2</platform>
-      </toolsSet>
-      <compileType>
-        <linkerTool>
-          <linkerLibItems>
-          </linkerLibItems>
-        </linkerTool>
-      </compileType>
-      <makeCustomizationType>
-        <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
-        <makeCustomizationPreStep></makeCustomizationPreStep>
-        <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
-        <makeCustomizationPostStep></makeCustomizationPostStep>
-        <makeCustomizationAlternativeFileToLoadEnabled>false</makeCustomizationAlternativeFileToLoadEnabled>
-        <makeCustomizationAlternativeFileToLoad></makeCustomizationAlternativeFileToLoad>
-        <makeCustomizationUseOfUserID>makeCustomizationUseOfUserID</makeCustomizationUseOfUserID>
-        <makeCustomizationUserID>makeCustomizationUserID</makeCustomizationUserID>
-      </makeCustomizationType>
-      <C30>
-        <property key="optimization-level" value="1"/>
-        <property key="preprocessor-macros" value=""/>
-        <property key="code-model" value="default"/>
-        <property key="const-model" value="default"/>
-        <property key="enable-procedural-abstraction" value="false"/>
-        <property key="enable-ansi-warnings" value="false"/>
-        <property key="enable-short-double" value="false"/>
-        <property key="extra-include-directories" value=""/>
-        <property key="post-instruction-scheduling" value="default"/>
-        <property key="enable-unroll-loops" value="false"/>
-        <property key="enable-symbols" value="true"/>
-        <property key="data-model" value="large-data"/>
-        <property key="isolate-each-function" value="false"/>
-        <property key="enable-fatal-warnings" value="false"/>
-        <property key="enable-omit-frame-pointer" value="false"/>
-        <property key="enable-ansi-std" value="false"/>
-        <property key="enable-all-warnings" value="false"/>
-        <property key="pre-instruction-scheduling" value="default"/>
-        <property key="enable-large-arrays" value="false"/>
-        <property key="scalar-model" value="default"/>
-        <appendMe value="-Winline"/>
-      </C30>
-      <C30-AS>
-        <property key="omit-debug-dirs" value="false"/>
-        <property key="extra-include-directories-for-assembler" value=""/>
-        <property key="preprocessor-macros" value=""/>
-        <property key="list-file" value=""/>
-        <property key="list-source" value="false"/>
-        <property key="list-assembly" value="false"/>
-        <property key="relax" value="false"/>
-        <property key="extra-include-directories-for-preprocessor" value=""/>
-        <property key="warning-level" value="emit-warnings"/>
-        <property key="list-section-info" value="false"/>
-        <property key="omit-forms" value="false"/>
-        <property key="list-symbols" value="false"/>
-        <property key="keep-locals" value="false"/>
-        <property key="false-conditionals" value="false"/>
-        <property key="expand-macros" value="false"/>
-        <property key="assembler-symbols" value=""/>
-      </C30-AS>
-      <C30-LD>
-        <property key="preprocessor-macros" value=""/>
-        <property key="general-code-protect" value="no_code_protect"/>
-        <property key="secure-write-protect" value="no_write_protect"/>
-        <property key="warn-section-align" value="false"/>
-        <property key="heap-size" value="40"/>
-        <property key="remove-unused-sections" value="false"/>
-        <property key="stack-size" value=""/>
-        <property key="linker-symbols" value=""/>
-        <property key="trace-symbols" value=""/>
-        <property key="map-file" value=""/>
-        <property key="enable-pack-data" value="true"/>
-        <property key="boot-eeprom" value="no_eeprom"/>
-        <property key="general-write-protect" value="no_write_protect"/>
-        <property key="enable-handles" value="true"/>
-        <property key="enable-data-init" value="true"/>
-        <property key="secure-flash" value="no_flash"/>
-        <property key="boot-write-protect" value="no_write_protect"/>
-        <property key="boot-flash" value="no_flash"/>
-        <property key="report-memory-usage" value="false"/>
-        <property key="generate-cross-reference-file" value="false"/>
-        <property key="input-libraries" value=""/>
-        <property key="secure-ram" value="no_ram"/>
-        <property key="enable-check-sections" value="true"/>
-        <property key="enable-default-isr" value="true"/>
-        <property key="symbol-stripping" value="keep-all"/>
-        <property key="boot-ram" value="no_ram"/>
-        <property key="secure-eeprom" value="no_eeprom"/>
-        <property key="extra-lib-directories" value=""/>
-      </C30-LD>
-      <C30Global>
-        <property key="fast-math" value="false"/>
-        <property key="output-file-format" value="elf"/>
-        <property key="legacy-libc" value="false"/>
-      </C30Global>
-      <ICD3PlatformTool>
-        <property key="UART 2" value="true"/>
-        <property key="UART 1" value="true"/>
-        <property key="programoptions.preserveprogramrange" value="false"/>
-        <property key="programoptions.eraseb4program" value="true"/>
-        <property key="memories.id" value="false"/>
-        <property key="ToolFirmwareFilePath" value=""/>
-        <property key="memories.eeprom" value="false"/>
-        <property key="SecureSegment.SegmentProgramming" value="FullChipProgramming"/>
-        <property key="programoptions.usehighvoltageonmclr" value="false"/>
-        <property key="INPUT CAPTURE 5" value="true"/>
-        <property key="INPUT CAPTURE 4" value="true"/>
-        <property key="INPUT CAPTURE 3" value="true"/>
-        <property key="INPUT CAPTURE 2" value="true"/>
-        <property key="INPUT CAPTURE 1" value="true"/>
-        <property key="programoptions.preserveeeprom" value="false"/>
-        <property key="ADC 1" value="true"/>
-        <property key="debugoptions.useswbreakpoints" value="false"/>
-        <property key="hwtoolclock.frcindebug" value="true"/>
-        <property key="OUTPUT COMPARE 5" value="true"/>
-        <property key="OUTPUT COMPARE 4" value="true"/>
-        <property key="memories.programmemory" value="true"/>
-        <property key="OUTPUT COMPARE 3" value="true"/>
-        <property key="OUTPUT COMPARE 2" value="true"/>
-        <property key="OUTPUT COMPARE 1" value="true"/>
-        <property key="poweroptions.powerenable" value="false"/>
-        <property key="memories.programmemory.start" value="0x0"/>
-        <property key="programoptions.preserveprogramrange.start" value="0x0"/>
-        <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
-        <property key="AutoSelectMemRanges" value="auto"/>
-        <property key="voltagevalue" value="3.25"/>
-        <property key="memories.programmemory.end" value="0xabfb"/>
-        <property key="TIMER5" value="true"/>
-        <property key="TIMER4" value="true"/>
-        <property key="TIMER3" value="true"/>
-        <property key="SPI 2" value="true"/>
-        <property key="TIMER2" value="true"/>
-        <property key="SPI 1" value="true"/>
-        <property key="TIMER1" value="true"/>
-        <property key="CRC" value="true"/>
-        <property key="I2C2" value="true"/>
-        <property key="I2C1" value="true"/>
-        <property key="Freeze All Other Peripherals" value="true"/>
-        <property key="programoptions.preserveprogramrange.end" value="0xff"/>
-      </ICD3PlatformTool>
-    </conf>
-  </confs>
-</configurationDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<configurationDescriptor version="62">\r
+  <logicalFolder name="root" displayName="root" projectFiles="true">\r
+    <logicalFolder name="HeaderFiles"\r
+                   displayName="Header Files"\r
+                   projectFiles="true">\r
+    </logicalFolder>\r
+    <logicalFolder name="LibraryFiles"\r
+                   displayName="Library Files"\r
+                   projectFiles="true">\r
+    </logicalFolder>\r
+    <logicalFolder name="LinkerScript"\r
+                   displayName="Linker Files"\r
+                   projectFiles="true">\r
+    </logicalFolder>\r
+    <logicalFolder name="ObjectFiles"\r
+                   displayName="Object Files"\r
+                   projectFiles="true">\r
+    </logicalFolder>\r
+    <logicalFolder name="SourceFiles"\r
+                   displayName="Source Files"\r
+                   projectFiles="true">\r
+      <itemPath>byte2var.c</itemPath>\r
+      <itemPath>byte2var.h</itemPath>\r
+      <itemPath>debug_print.c</itemPath>\r
+      <itemPath>debug_print.h</itemPath>\r
+      <itemPath>delay.h</itemPath>\r
+      <itemPath>main.c</itemPath>\r
+      <itemPath>myad.c</itemPath>\r
+      <itemPath>myad.h</itemPath>\r
+      <itemPath>myint.h</itemPath>\r
+      <itemPath>myspi.c</itemPath>\r
+      <itemPath>myspi.h</itemPath>\r
+      <itemPath>mysts.c</itemPath>\r
+      <itemPath>mysts.h</itemPath>\r
+      <itemPath>myuart.c</itemPath>\r
+      <itemPath>myuart.h</itemPath>\r
+      <itemPath>ring.c</itemPath>\r
+      <itemPath>ring.h</itemPath>\r
+      <itemPath>test.c</itemPath>\r
+      <itemPath>ublox.c</itemPath>\r
+      <itemPath>ublox.h</itemPath>\r
+      <itemPath>util.h</itemPath>\r
+    </logicalFolder>\r
+    <logicalFolder name="ExternalFiles"\r
+                   displayName="Important Files"\r
+                   projectFiles="false">\r
+      <itemPath>Makefile</itemPath>\r
+    </logicalFolder>\r
+  </logicalFolder>\r
+  <projectmakefile>Makefile</projectmakefile>\r
+  <confs>\r
+    <conf name="default" type="2">\r
+      <toolsSet>\r
+        <developmentServer>localhost</developmentServer>\r
+        <targetDevice>PIC24FJ64GA004</targetDevice>\r
+        <targetHeader></targetHeader>\r
+        <targetPluginBoard></targetPluginBoard>\r
+        <platformTool>ICD3PlatformTool</platformTool>\r
+        <languageToolchain>XC16</languageToolchain>\r
+        <languageToolchainVersion>1.23</languageToolchainVersion>\r
+        <platform>3</platform>\r
+      </toolsSet>\r
+      <compileType>\r
+        <linkerTool>\r
+          <linkerLibItems>\r
+          </linkerLibItems>\r
+        </linkerTool>\r
+        <archiverTool>\r
+        </archiverTool>\r
+        <loading>\r
+          <useAlternateLoadableFile>false</useAlternateLoadableFile>\r
+          <parseOnProdLoad>false</parseOnProdLoad>\r
+          <alternateLoadableFile></alternateLoadableFile>\r
+        </loading>\r
+      </compileType>\r
+      <makeCustomizationType>\r
+        <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>\r
+        <makeCustomizationPreStep></makeCustomizationPreStep>\r
+        <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>\r
+        <makeCustomizationPostStep></makeCustomizationPostStep>\r
+        <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>\r
+        <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>\r
+        <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>\r
+      </makeCustomizationType>\r
+      <C30>\r
+        <property key="code-model" value="default"/>\r
+        <property key="const-model" value="default"/>\r
+        <property key="data-model" value="large-data"/>\r
+        <property key="enable-all-warnings" value="false"/>\r
+        <property key="enable-ansi-std" value="false"/>\r
+        <property key="enable-ansi-warnings" value="false"/>\r
+        <property key="enable-fatal-warnings" value="false"/>\r
+        <property key="enable-large-arrays" value="false"/>\r
+        <property key="enable-omit-frame-pointer" value="false"/>\r
+        <property key="enable-procedural-abstraction" value="false"/>\r
+        <property key="enable-short-double" value="false"/>\r
+        <property key="enable-symbols" value="true"/>\r
+        <property key="enable-unroll-loops" value="false"/>\r
+        <property key="extra-include-directories" value=""/>\r
+        <property key="isolate-each-function" value="false"/>\r
+        <property key="keep-inline" value="true"/>\r
+        <property key="oXC16gcc-align-arr" value="false"/>\r
+        <property key="oXC16gcc-cnsts-mauxflash" value="false"/>\r
+        <property key="oXC16gcc-data-sects" value="false"/>\r
+        <property key="oXC16gcc-errata" value=""/>\r
+        <property key="oXC16gcc-fillupper" value=""/>\r
+        <property key="oXC16gcc-large-aggregate" value="false"/>\r
+        <property key="oXC16gcc-mauxflash" value="false"/>\r
+        <property key="oXC16gcc-mpa-lvl" value=""/>\r
+        <property key="oXC16gcc-name-text-sec" value=""/>\r
+        <property key="oXC16gcc-near-chars" value="false"/>\r
+        <property key="oXC16gcc-no-isr-warn" value="false"/>\r
+        <property key="oXC16gcc-sfr-warn" value="false"/>\r
+        <property key="oXC16gcc-smar-io-lvl" value="1"/>\r
+        <property key="oXC16gcc-smart-io-fmt" value=""/>\r
+        <property key="optimization-level" value="1"/>\r
+        <property key="post-instruction-scheduling" value="default"/>\r
+        <property key="pre-instruction-scheduling" value="default"/>\r
+        <property key="preprocessor-macros" value=""/>\r
+        <property key="scalar-model" value="default"/>\r
+        <property key="use-cci" value="false"/>\r
+        <property key="use-iar" value="false"/>\r
+        <appendMe value="-Winline"/>\r
+      </C30>\r
+      <C30-AR>\r
+        <property key="additional-options-chop-files" value="false"/>\r
+      </C30-AR>\r
+      <C30-AS>\r
+        <property key="assembler-symbols" value=""/>\r
+        <property key="expand-macros" value="false"/>\r
+        <property key="extra-include-directories-for-assembler" value=""/>\r
+        <property key="extra-include-directories-for-preprocessor" value=""/>\r
+        <property key="false-conditionals" value="false"/>\r
+        <property key="keep-locals" value="false"/>\r
+        <property key="list-assembly" value="false"/>\r
+        <property key="list-file" value=""/>\r
+        <property key="list-section-info" value="false"/>\r
+        <property key="list-source" value="false"/>\r
+        <property key="list-symbols" value="false"/>\r
+        <property key="omit-debug-dirs" value="false"/>\r
+        <property key="omit-forms" value="false"/>\r
+        <property key="preprocessor-macros" value=""/>\r
+        <property key="relax" value="false"/>\r
+        <property key="warning-level" value="emit-warnings"/>\r
+      </C30-AS>\r
+      <C30-LD>\r
+        <property key="additional-options-use-response-files" value="false"/>\r
+        <property key="boot-eeprom" value="no_eeprom"/>\r
+        <property key="boot-flash" value="no_flash"/>\r
+        <property key="boot-ram" value="no_ram"/>\r
+        <property key="boot-write-protect" value="no_write_protect"/>\r
+        <property key="enable-check-sections" value="true"/>\r
+        <property key="enable-data-init" value="true"/>\r
+        <property key="enable-default-isr" value="true"/>\r
+        <property key="enable-handles" value="true"/>\r
+        <property key="enable-pack-data" value="true"/>\r
+        <property key="extra-lib-directories" value=""/>\r
+        <property key="fill-flash-options-addr" value=""/>\r
+        <property key="fill-flash-options-const" value=""/>\r
+        <property key="fill-flash-options-how" value="0"/>\r
+        <property key="fill-flash-options-inc-const" value="1"/>\r
+        <property key="fill-flash-options-increment" value=""/>\r
+        <property key="fill-flash-options-seq" value=""/>\r
+        <property key="fill-flash-options-what" value="0"/>\r
+        <property key="general-code-protect" value="no_code_protect"/>\r
+        <property key="general-write-protect" value="no_write_protect"/>\r
+        <property key="generate-cross-reference-file" value="false"/>\r
+        <property key="heap-size" value="40"/>\r
+        <property key="input-libraries" value=""/>\r
+        <property key="linker-stack" value="true"/>\r
+        <property key="linker-symbols" value=""/>\r
+        <property key="map-file" value=""/>\r
+        <property key="oXC16ld-extra-opts" value=""/>\r
+        <property key="oXC16ld-fill-upper" value="0"/>\r
+        <property key="oXC16ld-force-link" value="false"/>\r
+        <property key="oXC16ld-no-smart-io" value="false"/>\r
+        <property key="oXC16ld-nostdlib" value="false"/>\r
+        <property key="oXC16ld-stackguard" value="16"/>\r
+        <property key="preprocessor-macros" value=""/>\r
+        <property key="remove-unused-sections" value="false"/>\r
+        <property key="report-memory-usage" value="false"/>\r
+        <property key="secure-eeprom" value="no_eeprom"/>\r
+        <property key="secure-flash" value="no_flash"/>\r
+        <property key="secure-ram" value="no_ram"/>\r
+        <property key="secure-write-protect" value="no_write_protect"/>\r
+        <property key="stack-size" value=""/>\r
+        <property key="symbol-stripping" value="keep-all"/>\r
+        <property key="trace-symbols" value=""/>\r
+        <property key="warn-section-align" value="false"/>\r
+      </C30-LD>\r
+      <C30Global>\r
+        <property key="common-include-directories" value=""/>\r
+        <property key="dual-boot-partition" value="0"/>\r
+        <property key="fast-math" value="false"/>\r
+        <property key="generic-16-bit" value="false"/>\r
+        <property key="legacy-libc" value="false"/>\r
+        <property key="oXC16glb-macros" value=""/>\r
+        <property key="output-file-format" value="elf"/>\r
+        <property key="relaxed-math" value="false"/>\r
+        <property key="save-temps" value="false"/>\r
+      </C30Global>\r
+      <ICD3PlatformTool>\r
+        <property key="ADC 1" value="true"/>\r
+        <property key="AutoSelectMemRanges" value="auto"/>\r
+        <property key="CRC" value="true"/>\r
+        <property key="Freeze All Other Peripherals" value="true"/>\r
+        <property key="I2C1" value="true"/>\r
+        <property key="I2C2" value="true"/>\r
+        <property key="INPUT CAPTURE 1" value="true"/>\r
+        <property key="INPUT CAPTURE 2" value="true"/>\r
+        <property key="INPUT CAPTURE 3" value="true"/>\r
+        <property key="INPUT CAPTURE 4" value="true"/>\r
+        <property key="INPUT CAPTURE 5" value="true"/>\r
+        <property key="OUTPUT COMPARE 1" value="true"/>\r
+        <property key="OUTPUT COMPARE 2" value="true"/>\r
+        <property key="OUTPUT COMPARE 3" value="true"/>\r
+        <property key="OUTPUT COMPARE 4" value="true"/>\r
+        <property key="OUTPUT COMPARE 5" value="true"/>\r
+        <property key="SPI 1" value="true"/>\r
+        <property key="SPI 2" value="true"/>\r
+        <property key="SecureSegment.SegmentProgramming" value="FullChipProgramming"/>\r
+        <property key="TIMER1" value="true"/>\r
+        <property key="TIMER2" value="true"/>\r
+        <property key="TIMER3" value="true"/>\r
+        <property key="TIMER4" value="true"/>\r
+        <property key="TIMER5" value="true"/>\r
+        <property key="ToolFirmwareFilePath" value=""/>\r
+        <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>\r
+        <property key="UART 1" value="true"/>\r
+        <property key="UART 2" value="true"/>\r
+        <property key="debugoptions.useswbreakpoints" value="false"/>\r
+        <property key="hwtoolclock.frcindebug" value="true"/>\r
+        <property key="memories.aux" value="false"/>\r
+        <property key="memories.bootflash" value="false"/>\r
+        <property key="memories.configurationmemory" value="true"/>\r
+        <property key="memories.configurationmemory2" value="true"/>\r
+        <property key="memories.dataflash" value="true"/>\r
+        <property key="memories.eeprom" value="false"/>\r
+        <property key="memories.flashdata" value="true"/>\r
+        <property key="memories.programmemory" value="true"/>\r
+        <property key="memories.programmemory.end" value="0xabfb"/>\r
+        <property key="memories.programmemory.partition2" value="true"/>\r
+        <property key="memories.programmemory.partition2.end"\r
+                  value="${memories.programmemory.partition2.end.value}"/>\r
+        <property key="memories.programmemory.partition2.start"\r
+                  value="${memories.programmemory.partition2.start.value}"/>\r
+        <property key="memories.programmemory.start" value="0x0"/>\r
+        <property key="poweroptions.powerenable" value="false"/>\r
+        <property key="programoptions.donoteraseauxmem" value="false"/>\r
+        <property key="programoptions.eraseb4program" value="true"/>\r
+        <property key="programoptions.preservedataflash" value="false"/>\r
+        <property key="programoptions.preserveeeprom" value="false"/>\r
+        <property key="programoptions.preserveprogramrange" value="false"/>\r
+        <property key="programoptions.preserveprogramrange.end" value="0xff"/>\r
+        <property key="programoptions.preserveprogramrange.start" value="0x0"/>\r
+        <property key="programoptions.preserveuserid" value="false"/>\r
+        <property key="programoptions.programcalmem" value="false"/>\r
+        <property key="programoptions.programuserotp" value="false"/>\r
+        <property key="programoptions.testmodeentrymethod" value="VPPFirst"/>\r
+        <property key="programoptions.usehighvoltageonmclr" value="false"/>\r
+        <property key="programoptions.uselvpprogramming" value="false"/>\r
+        <property key="voltagevalue" value="3.25"/>\r
+      </ICD3PlatformTool>\r
+    </conf>\r
+  </confs>\r
+</configurationDescriptor>\r

diff --git a/nbproject/private/SuppressibleMessageMemo.properties b/nbproject/private/SuppressibleMessageMemo.properties
new file mode 100644 (file)
index 0000000..6e30c7a
--- /dev/null
+++ b/nbproject/private/SuppressibleMessageMemo.properties
@@ -0,0 +1,17 @@
+#
+#Tue Jul 24 16:28:36 JST 2012
+pk3/CHECK_CLOCK=false
+pk3/DEVID_MISMATCH=false
+pkobskde/CHECK_4_HIGH_VOLTAGE_VPP=false
+pkoblicdbgr/DEVID_MISMATCH=false
+pk3/CHECK_4_HIGH_VOLTAGE_VPP=false
+pkobskde/CHECK_CLOCK=false
+pkoblicdbgr/CHECK_CLOCK=false
+icd3/CHECK_CLOCK=false
+pkobskde/DEVID_MISMATCH=false
+icd3/DEVID_MISMATCH=false
+realice/CHECK_CLOCK=false
+pkoblicdbgr/CHECK_4_HIGH_VOLTAGE_VPP=false
+realice/DEVID_MISMATCH=false
+icd3/CHECK_4_HIGH_VOLTAGE_VPP=false
+realice/CHECK_4_HIGH_VOLTAGE_VPP=false

diff --git a/nbproject/private/configurations.xml b/nbproject/private/configurations.xml
index 78e4e03..cb6caea 100644 (file)
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="62">
-  <projectmakefile>Makefile</projectmakefile>
-  <defaultConf>0</defaultConf>
-  <confs>
-    <conf name="default" type="2">
-      <platformToolSN>:=MPLABCommUSB:=04D8:=9009:=0100:=Microchip Technology, Inc. (www.microchip.com):=MPLAB ICD3 tm (www.microchip.com):=TPM403082521:=x:=en</platformToolSN>
-      <languageToolchainDir>/opt/microchip/mplabc30/v3.24/bin</languageToolchainDir>
-      <mdbdebugger version="1">
-        <placeholder1>place holder 1</placeholder1>
-        <placeholder2>place holder 2</placeholder2>
-      </mdbdebugger>
-      <runprofile version="6">
-        <args></args>
-        <rundir></rundir>
-        <buildfirst>true</buildfirst>
-        <console-type>0</console-type>
-        <terminal-type>0</terminal-type>
-        <remove-instrumentation>0</remove-instrumentation>
-        <environment>
-        </environment>
-      </runprofile>
-    </conf>
-  </confs>
-</configurationDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<configurationDescriptor version="62">\r
+  <projectmakefile>Makefile</projectmakefile>\r
+  <defaultConf>0</defaultConf>\r
+  <confs>\r
+    <conf name="default" type="2">\r
+      <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>TPM403082521:=&lt;drv>x:=&lt;xpt>b:=end</platformToolSN>\r
+      <languageToolchainDir>C:\Program Files (x86)\Microchip\xc16\v1.23\bin</languageToolchainDir>\r
+      <mdbdebugger version="1">\r
+        <placeholder1>place holder 1</placeholder1>\r
+        <placeholder2>place holder 2</placeholder2>\r
+      </mdbdebugger>\r
+      <runprofile version="6">\r
+        <args></args>\r
+        <rundir></rundir>\r
+        <buildfirst>true</buildfirst>\r
+        <console-type>0</console-type>\r
+        <terminal-type>0</terminal-type>\r
+        <remove-instrumentation>0</remove-instrumentation>\r
+        <environment>\r
+        </environment>\r
+      </runprofile>\r
+    </conf>\r
+  </confs>\r
+</configurationDescriptor>\r

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
index c1f155a..778e32b 100644 (file)
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
+<?xml version="1.0" encoding="UTF-8"?><project-private xmlns="http://www.netbeans.org/ns/project-private/1">\r
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>\r
+</project-private>\r

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 7060fd0..313a25f 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>com.microchip.mplab.nbide.embedded.makeproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>CPU2010</name>
-            <make-project-type>0</make-project-type>
-            <c-extensions>c</c-extensions>
-            <cpp-extensions/>
-            <header-extensions>h</header-extensions>
-            <sourceEncoding>UTF-8</sourceEncoding>
-            <make-dep-projects/>
-        </data>
-    </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://www.netbeans.org/ns/project/1">\r
+    <type>com.microchip.mplab.nbide.embedded.makeproject</type>\r
+    <configuration>\r
+        <data xmlns="http://www.netbeans.org/ns/make-project/1">\r
+            <name>CPU2010</name>\r
+            <make-project-type>0</make-project-type>\r
+            <c-extensions>c</c-extensions>\r
+            <cpp-extensions/>\r
+            <header-extensions>h</header-extensions>\r
+            <sourceEncoding>UTF-8</sourceEncoding>\r
+            <asminc-extensions/>\r
+            <make-dep-projects/>\r
+        </data>\r
+    </configuration>\r
+</project>\r