update firmware_mk2 project after attempting to compile it with later…

… MPLAB
AJMartel · Mar 22, 2018 · c7fc20c · c7fc20c
1 parent baf3988
commit c7fc20c
Show file tree

Hide file tree

Showing 15 changed files with 140 additions and 29,377 deletions.
diff --git a/hardware/firmware_mk2/nbproject/Makefile-PIC16F1455.mk b/hardware/firmware_mk2/nbproject/Makefile-PIC16F1455.mk
diff --git a/hardware/firmware_mk2/nbproject/Makefile-genesis.properties b/hardware/firmware_mk2/nbproject/Makefile-genesis.properties
@@ -1,11 +1,12 @@
 #
-#Fri Apr 04 00:14:31 PDT 2014
-Copy_of_LPC_USB_Development_Kit_PIC16F1459.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=52258db7536b2d1fec300cefc7ed9230
+#Sun Feb 11 13:16:50 PST 2018
+Copy_of_LPC_USB_Development_Kit_PIC16F1459.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=1ecde863556371fa9144cadd16f678d4
 conf.ids=PIC16F1455,Copy_of_LPC_USB_Development_Kit_PIC16F1459
-PIC16F1455.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=52258db7536b2d1fec300cefc7ed9230
-PIC16F1455.languagetoolchain.version=1.21
+configurations-xml=7059b81462c340e8db93ce357c01e479
+PIC16F1455.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=1ecde863556371fa9144cadd16f678d4
+PIC16F1455.languagetoolchain.version=1.12
 Copy_of_LPC_USB_Development_Kit_PIC16F1459.languagetoolchain.dir=/Applications/microchip/xc8/v1.12/bin
-com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=1f98a0eed69cb2a45c12981fa9470927
+com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5d30ff5128b14865c8a3796a8f0bb8a0
 host.platform=mac
 Copy_of_LPC_USB_Development_Kit_PIC16F1459.languagetoolchain.version=1.12
-PIC16F1455.languagetoolchain.dir=/Applications/microchip/xc8/v1.21/bin
+PIC16F1455.languagetoolchain.dir=/Applications/microchip/xc8/v1.12/bin
diff --git a/hardware/firmware_mk2/nbproject/Makefile-impl.mk b/hardware/firmware_mk2/nbproject/Makefile-impl.mk
@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
 
 
 # Project Name
-PROJECTNAME=blink1mk2
+PROJECTNAME=firmware_mk2
 
 # Active Configuration
 DEFAULTCONF=PIC16F1455

diff --git a/hardware/firmware_mk2/nbproject/Makefile-local-PIC16F1455.mk b/hardware/firmware_mk2/nbproject/Makefile-local-PIC16F1455.mk
@@ -14,23 +14,23 @@
 # You can invoke make with the values of the macros:
 # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...  
 #
-PATH_TO_IDE_BIN=/Applications/microchip/mplabx/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/
+PATH_TO_IDE_BIN=/Applications/microchip/mplabx/v4.05/mplab_ide.app/Contents/Resources/mplab_ide/platform/../mplab_ide/modules/../../bin/
 # Adding MPLAB X bin directory to path.
-PATH:=/Applications/microchip/mplabx/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/:$(PATH)
+PATH:=/Applications/microchip/mplabx/v4.05/mplab_ide.app/Contents/Resources/mplab_ide/platform/../mplab_ide/modules/../../bin/:$(PATH)
 # Path to java used to run MPLAB X when this makefile was created
-MP_JAVA_PATH="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/bin/"
+MP_JAVA_PATH="/Applications/microchip/mplabx/v4.05/sys/java/jre1.8.0_144.jre/Contents/Home/bin/"
 OS_CURRENT="$(shell uname -s)"
-MP_CC="/Applications/microchip/xc8/v1.21/bin/xc8"
+MP_CC="/Applications/microchip/xc8/v1.12/bin/xc8"
 # MP_CPPC is not defined
 # MP_BC is not defined
-# MP_AS is not defined
-# MP_LD is not defined
+MP_AS="/Applications/microchip/xc8/v1.12/bin/xc8"
+MP_LD="/Applications/microchip/xc8/v1.12/bin/xc8"
 # MP_AR is not defined
-DEP_GEN=${MP_JAVA_PATH}java -jar "/Applications/microchip/mplabx/mplab_ide.app/Contents/Resources/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar" 
-MP_CC_DIR="/Applications/microchip/xc8/v1.21/bin"
+DEP_GEN=${MP_JAVA_PATH}java -jar "/Applications/microchip/mplabx/v4.05/mplab_ide.app/Contents/Resources/mplab_ide/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+MP_CC_DIR="/Applications/microchip/xc8/v1.12/bin"
 # MP_CPPC_DIR is not defined
 # MP_BC_DIR is not defined
-# MP_AS_DIR is not defined
-# MP_LD_DIR is not defined
+MP_AS_DIR="/Applications/microchip/xc8/v1.12/bin"
+MP_LD_DIR="/Applications/microchip/xc8/v1.12/bin"
 # MP_AR_DIR is not defined
 # MP_BC_DIR is not defined
diff --git a/hardware/firmware_mk2/nbproject/Makefile-variables.mk b/hardware/firmware_mk2/nbproject/Makefile-variables.mk
@@ -6,15 +6,15 @@
 CND_BASEDIR=`pwd`
 # PIC16F1455 configuration
 CND_ARTIFACT_DIR_PIC16F1455=dist/PIC16F1455/production
-CND_ARTIFACT_NAME_PIC16F1455=blink1mk2.production.hex
-CND_ARTIFACT_PATH_PIC16F1455=dist/PIC16F1455/production/blink1mk2.production.hex
+CND_ARTIFACT_NAME_PIC16F1455=firmware_mk2.production.hex
+CND_ARTIFACT_PATH_PIC16F1455=dist/PIC16F1455/production/firmware_mk2.production.hex
 CND_PACKAGE_DIR_PIC16F1455=${CND_DISTDIR}/PIC16F1455/package
-CND_PACKAGE_NAME_PIC16F1455=blink1mk2.tar
-CND_PACKAGE_PATH_PIC16F1455=${CND_DISTDIR}/PIC16F1455/package/blink1mk2.tar
+CND_PACKAGE_NAME_PIC16F1455=firmwaremk2.tar
+CND_PACKAGE_PATH_PIC16F1455=${CND_DISTDIR}/PIC16F1455/package/firmwaremk2.tar
 # Copy_of_LPC_USB_Development_Kit_PIC16F1459 configuration
 CND_ARTIFACT_DIR_Copy_of_LPC_USB_Development_Kit_PIC16F1459=dist/Copy_of_LPC_USB_Development_Kit_PIC16F1459/production
-CND_ARTIFACT_NAME_Copy_of_LPC_USB_Development_Kit_PIC16F1459=blink1mk2.production.hex
-CND_ARTIFACT_PATH_Copy_of_LPC_USB_Development_Kit_PIC16F1459=dist/Copy_of_LPC_USB_Development_Kit_PIC16F1459/production/blink1mk2.production.hex
+CND_ARTIFACT_NAME_Copy_of_LPC_USB_Development_Kit_PIC16F1459=firmware_mk2.production.hex
+CND_ARTIFACT_PATH_Copy_of_LPC_USB_Development_Kit_PIC16F1459=dist/Copy_of_LPC_USB_Development_Kit_PIC16F1459/production/firmware_mk2.production.hex
 CND_PACKAGE_DIR_Copy_of_LPC_USB_Development_Kit_PIC16F1459=${CND_DISTDIR}/Copy_of_LPC_USB_Development_Kit_PIC16F1459/package
-CND_PACKAGE_NAME_Copy_of_LPC_USB_Development_Kit_PIC16F1459=blink1mk2.tar
-CND_PACKAGE_PATH_Copy_of_LPC_USB_Development_Kit_PIC16F1459=${CND_DISTDIR}/Copy_of_LPC_USB_Development_Kit_PIC16F1459/package/blink1mk2.tar
+CND_PACKAGE_NAME_Copy_of_LPC_USB_Development_Kit_PIC16F1459=firmwaremk2.tar
+CND_PACKAGE_PATH_Copy_of_LPC_USB_Development_Kit_PIC16F1459=${CND_DISTDIR}/Copy_of_LPC_USB_Development_Kit_PIC16F1459/package/firmwaremk2.tar
diff --git a/hardware/firmware_mk2/nbproject/Package-PIC16F1455.bash b/hardware/firmware_mk2/nbproject/Package-PIC16F1455.bash
@@ -10,9 +10,9 @@ CND_CONF=PIC16F1455
 CND_DISTDIR=dist
 TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging
 TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/blink1mk2.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-OUTPUT_BASENAME=blink1mk2.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-PACKAGE_TOP_DIR=blink1mk2/
+OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/firmware_mk2.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+OUTPUT_BASENAME=firmware_mk2.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+PACKAGE_TOP_DIR=firmwaremk2/
 
 # Functions
 function checkReturnCode
@@ -57,15 +57,15 @@ mkdir -p ${TMPDIR}
 
 # Copy files and create directories and links
 cd "${TOP}"
-makeDirectory ${TMPDIR}/blink1mk2/bin
+makeDirectory ${TMPDIR}/firmwaremk2/bin
 copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
 
 
 # Generate tar file
 cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/package/blink1mk2.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/package/firmwaremk2.tar
 cd ${TMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/blink1mk2.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/firmwaremk2.tar *
 checkReturnCode
 
 # Cleanup

diff --git a/hardware/firmware_mk2/nbproject/configurations.xml b/hardware/firmware_mk2/nbproject/configurations.xml
@@ -71,18 +71,23 @@
         <targetPluginBoard></targetPluginBoard>
         <platformTool>PICkit3PlatformTool</platformTool>
         <languageToolchain>XC8</languageToolchain>
-        <languageToolchainVersion>1.21</languageToolchainVersion>
+        <languageToolchainVersion>1.12</languageToolchainVersion>
         <platform>4</platform>
       </toolsSet>
       <compileType>
         <linkerTool>
           <linkerLibItems>
           </linkerLibItems>
         </linkerTool>
+        <archiverTool>
+        </archiverTool>
         <loading>
           <useAlternateLoadableFile>false</useAlternateLoadableFile>
+          <parseOnProdLoad>false</parseOnProdLoad>
           <alternateLoadableFile></alternateLoadableFile>
         </loading>
+        <subordinates>
+        </subordinates>
       </compileType>
       <makeCustomizationType>
         <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
@@ -96,18 +101,24 @@
       <HI-TECH-COMP>
         <property key="asmlist" value="true"/>
         <property key="define-macros" value=""/>
+        <property key="disable-optimizations" value="false"/>
         <property key="extra-include-directories"
                   value=".;../../../Microchip/Include;../Microchip/Include;../Microchip/USB"/>
+        <property key="favor-optimization-for" value="+speed,-space"/>
         <property key="identifier-length" value="100"/>
+        <property key="local-generation" value="false"/>
         <property key="operation-mode" value="pro"/>
         <property key="opt-xc8-compiler-strict_ansi" value="false"/>
         <property key="optimization-assembler" value="true"/>
         <property key="optimization-assembler-files" value="true"/>
         <property key="optimization-debug" value="false"/>
         <property key="optimization-global" value="true"/>
+        <property key="optimization-invariant-enable" value="false"/>
+        <property key="optimization-invariant-value" value="16"/>
         <property key="optimization-level" value="9"/>
         <property key="optimization-set" value="default"/>
         <property key="optimization-speed" value="true"/>
+        <property key="optimization-stable-enable" value="false"/>
         <property key="preprocess-assembler" value="true"/>
         <property key="undefine-macros" value=""/>
         <property key="use-cci" value="false"/>
@@ -167,28 +178,43 @@
         <property key="memories.aux" value="false"/>
         <property key="memories.bootflash" value="false"/>
         <property key="memories.configurationmemory" value="false"/>
+        <property key="memories.configurationmemory2" value="true"/>
+        <property key="memories.dataflash" value="true"/>
         <property key="memories.eeprom" value="false"/>
         <property key="memories.flashdata" value="true"/>
         <property key="memories.id" value="false"/>
+        <property key="memories.instruction.ram" value="true"/>
+        <property key="memories.instruction.ram.ranges"
+                  value="${memories.instruction.ram.ranges}"/>
         <property key="memories.programmemory" value="true"/>
-        <property key="memories.programmemory.end" value="0x1fff"/>
-        <property key="memories.programmemory.start" value="0x0"/>
+        <property key="memories.programmemory.ranges" value="0-1fff"/>
         <property key="poweroptions.powerenable" value="false"/>
         <property key="programmertogo.imagename" value=""/>
+        <property key="programoptions.donoteraseauxmem" value="false"/>
         <property key="programoptions.eraseb4program" value="true"/>
         <property key="programoptions.pgmspeed" value="2"/>
+        <property key="programoptions.preservedataflash" value="false"/>
+        <property key="programoptions.preservedataflash.ranges"
+                  value="${programoptions.preservedataflash.ranges}"/>
         <property key="programoptions.preserveeeprom" value="false"/>
+        <property key="programoptions.preserveeeprom.ranges" value=""/>
+        <property key="programoptions.preserveprogram.ranges" value=""/>
         <property key="programoptions.preserveprogramrange" value="false"/>
-        <property key="programoptions.preserveprogramrange.end" value="0x1fff"/>
-        <property key="programoptions.preserveprogramrange.start" value="0x0"/>
         <property key="programoptions.preserveuserid" value="false"/>
+        <property key="programoptions.programcalmem" value="false"/>
+        <property key="programoptions.programuserotp" value="false"/>
         <property key="programoptions.testmodeentrymethod" value="VPPFirst"/>
         <property key="programoptions.usehighvoltageonmclr" value="false"/>
         <property key="programoptions.uselvpprogramming" value="true"/>
         <property key="voltagevalue" value="5.0"/>
       </PICkit3PlatformTool>
       <XC8-config-global>
+        <property key="advanced-elf" value="true"/>
         <property key="output-file-format" value="-mcof,+elf"/>
+        <property key="stack-size-high" value="auto"/>
+        <property key="stack-size-low" value="auto"/>
+        <property key="stack-size-main" value="auto"/>
+        <property key="stack-type" value="compiled"/>
       </XC8-config-global>
     </conf>
     <conf name="Copy_of_LPC_USB_Development_Kit_PIC16F1459" type="2">
@@ -207,10 +233,15 @@
           <linkerLibItems>
           </linkerLibItems>
         </linkerTool>
+        <archiverTool>
+        </archiverTool>
         <loading>
           <useAlternateLoadableFile>false</useAlternateLoadableFile>
+          <parseOnProdLoad>false</parseOnProdLoad>
           <alternateLoadableFile></alternateLoadableFile>
         </loading>
+        <subordinates>
+        </subordinates>
       </compileType>
       <makeCustomizationType>
         <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
@@ -224,18 +255,24 @@
       <HI-TECH-COMP>
         <property key="asmlist" value="true"/>
         <property key="define-macros" value=""/>
+        <property key="disable-optimizations" value="false"/>
         <property key="extra-include-directories"
                   value="..;../../../../Microchip/Include;/Users/tod/projects/picusb/Microchip"/>
+        <property key="favor-optimization-for" value="+speed,-space"/>
         <property key="identifier-length" value="31"/>
+        <property key="local-generation" value="false"/>
         <property key="operation-mode" value="pro"/>
         <property key="opt-xc8-compiler-strict_ansi" value="false"/>
         <property key="optimization-assembler" value="true"/>
         <property key="optimization-assembler-files" value="false"/>
         <property key="optimization-debug" value="false"/>
         <property key="optimization-global" value="true"/>
+        <property key="optimization-invariant-enable" value="false"/>
+        <property key="optimization-invariant-value" value="16"/>
         <property key="optimization-level" value="9"/>
         <property key="optimization-set" value="default"/>
         <property key="optimization-speed" value="true"/>
+        <property key="optimization-stable-enable" value="false"/>
         <property key="preprocess-assembler" value="false"/>
         <property key="undefine-macros" value=""/>
         <property key="use-cci" value="false"/>
@@ -295,28 +332,43 @@
         <property key="memories.aux" value="false"/>
         <property key="memories.bootflash" value="false"/>
         <property key="memories.configurationmemory" value="false"/>
+        <property key="memories.configurationmemory2" value="true"/>
+        <property key="memories.dataflash" value="true"/>
         <property key="memories.eeprom" value="false"/>
         <property key="memories.flashdata" value="true"/>
         <property key="memories.id" value="false"/>
+        <property key="memories.instruction.ram" value="true"/>
+        <property key="memories.instruction.ram.ranges"
+                  value="${memories.instruction.ram.ranges}"/>
         <property key="memories.programmemory" value="true"/>
-        <property key="memories.programmemory.end" value="0x1fff"/>
-        <property key="memories.programmemory.start" value="0x0"/>
+        <property key="memories.programmemory.ranges" value="0-1fff"/>
         <property key="poweroptions.powerenable" value="true"/>
         <property key="programmertogo.imagename" value=""/>
+        <property key="programoptions.donoteraseauxmem" value="false"/>
         <property key="programoptions.eraseb4program" value="true"/>
         <property key="programoptions.pgmspeed" value="2"/>
+        <property key="programoptions.preservedataflash" value="false"/>
+        <property key="programoptions.preservedataflash.ranges"
+                  value="${programoptions.preservedataflash.ranges}"/>
         <property key="programoptions.preserveeeprom" value="false"/>
+        <property key="programoptions.preserveeeprom.ranges" value=""/>
+        <property key="programoptions.preserveprogram.ranges" value=""/>
         <property key="programoptions.preserveprogramrange" value="false"/>
-        <property key="programoptions.preserveprogramrange.end" value="0x1fff"/>
-        <property key="programoptions.preserveprogramrange.start" value="0x0"/>
         <property key="programoptions.preserveuserid" value="false"/>
+        <property key="programoptions.programcalmem" value="false"/>
+        <property key="programoptions.programuserotp" value="false"/>
         <property key="programoptions.testmodeentrymethod" value="VPPFirst"/>
         <property key="programoptions.usehighvoltageonmclr" value="false"/>
         <property key="programoptions.uselvpprogramming" value="true"/>
         <property key="voltagevalue" value="5.0"/>
       </PICkit3PlatformTool>
       <XC8-config-global>
+        <property key="advanced-elf" value="true"/>
         <property key="output-file-format" value="-mcof,+elf"/>
+        <property key="stack-size-high" value="auto"/>
+        <property key="stack-size-low" value="auto"/>
+        <property key="stack-size-main" value="auto"/>
+        <property key="stack-type" value="compiled"/>
       </XC8-config-global>
     </conf>
   </confs>

diff --git a/hardware/firmware_mk2/nbproject/private/configurations.xml b/hardware/firmware_mk2/nbproject/private/configurations.xml
@@ -4,8 +4,8 @@
   <defaultConf>0</defaultConf>
   <confs>
     <conf name="PIC16F1455" type="2">
-      <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>900A:=&lt;rev>0002:=&lt;man>Microchip Technology Inc.:=&lt;prod>PICkit 3:=&lt;sn>BUR131883210:=&lt;drv>x:=end</platformToolSN>
-      <languageToolchainDir>/Applications/microchip/xc8/v1.21/bin</languageToolchainDir>
+      <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>900A:=&lt;rev>0002:=&lt;man>Microchip Technology Inc.:=&lt;prod>PICkit 3:=&lt;sn>BUR131883210:=&lt;drv>x:=&lt;xpt>h:=end</platformToolSN>
+      <languageToolchainDir>/Applications/microchip/xc8/v1.12/bin</languageToolchainDir>
       <mdbdebugger version="1">
         <placeholder1>place holder 1</placeholder1>
         <placeholder2>place holder 2</placeholder2>

diff --git a/hardware/firmware_mk2/nbproject/private/private.xml b/hardware/firmware_mk2/nbproject/private/private.xml
@@ -1,4 +1,7 @@
 <?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"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group/>
+    </open-files>
 </project-private>