Fixed problem with init. button entry of bootloader. Default nickname…

… is now used when entering bootloader by holding down init. button and power board.
grodansparadis · Jul 10, 2015 · b546a3e · b546a3e
1 parent 9adcf55
commit b546a3e
Show file tree

Hide file tree

Showing 13 changed files with 228 additions and 134 deletions.
diff --git a/.gitignore b/.gitignore
@@ -50,3 +50,13 @@
 /CANBoot.X/dist/pic18f26k80/production/*.map
 /CANBoot.X/nbproject/*.mk
 /CANBoot.X/nbproject/*.bash
+/CANBoot.X/build/pic18f2580-40mhz/production/_ext/1472/CANIO.err
+/CANBoot.X/build/pic18f2580-40mhz/production/_ext/1472/CANIO.lst
+/CANBoot.X/build/pic18f2580-40mhz/production/_ext/1472/CANIO.o.d
+/CANBoot.X/build/pic18f26k80-40mhz/production/_ext/1472/CANIO.err
+/CANBoot.X/build/pic18f26k80-40mhz/production/_ext/1472/CANIO.lst
+/CANBoot.X/build/pic18f26k80-40mhz/production/_ext/1472/CANIO.o.d
+/CANBoot.X/dist/pic18f2580-40mhz/production/CANBoot.X.production.cof
+/CANBoot.X/dist/pic18f2580-40mhz/production/CANBoot.X.production.map
+/CANBoot.X/dist/pic18f26k80-40mhz/production/CANBoot.X.production.cof
+/CANBoot.X/dist/pic18f26k80-40mhz/production/CANBoot.X.production.map
diff --git a/CANBoot.X/nbproject/Makefile-genesis.properties b/CANBoot.X/nbproject/Makefile-genesis.properties
@@ -1,12 +1,12 @@
 #
-#Thu May 21 14:38:28 CEST 2015
-pic18f26k80.languagetoolchain.version=5.62
-conf.ids=pic18f2580,pic18f26k80
-pic18f2580.com-microchip-mplab-nbide-toolchainMPASMWIN-MPASMWINLanguageToolchain.md5=326d208065f034951cba5f33e504621d
-configurations-xml=5611d846a0cc221aab4420c1ec685b01
-pic18f2580.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v3.00\\mpasmx
-pic18f26k80.com-microchip-mplab-nbide-toolchainMPASMWIN-MPASMWINLanguageToolchain.md5=326d208065f034951cba5f33e504621d
-com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e9e394344dac8fa7117638c068420ddd
-pic18f26k80.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v3.00\\mpasmx
+#Fri Jul 10 18:01:14 CEST 2015
+pic18f26k80-40mhz.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v3.05\\mpasmx
+pic18f2580-40mhz.languagetoolchain.version=5.62
+conf.ids=pic18f2580-40mhz,pic18f26k80-40mhz
+pic18f2580-40mhz.com-microchip-mplab-nbide-toolchainMPASMWIN-MPASMWINLanguageToolchain.md5=739c69f9ccb2f30dcb795546686f5cd4
+pic18f2580-40mhz.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v3.05\\mpasmx
+configurations-xml=5ebaf599cd4aa2b9e10525c77cecdc63
+pic18f26k80-40mhz.languagetoolchain.version=5.62
+com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=47805b5596804b87cda41e61096929be
 host.platform=windows
-pic18f2580.languagetoolchain.version=5.62
+pic18f26k80-40mhz.com-microchip-mplab-nbide-toolchainMPASMWIN-MPASMWINLanguageToolchain.md5=739c69f9ccb2f30dcb795546686f5cd4
diff --git a/CANBoot.X/nbproject/Makefile-impl.mk b/CANBoot.X/nbproject/Makefile-impl.mk
@@ -27,11 +27,11 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
 PROJECTNAME=CANBoot.X
 
 # Active Configuration
-DEFAULTCONF=pic18f26k80
+DEFAULTCONF=pic18f2580-40mhz
 CONF=${DEFAULTCONF}
 
 # All Configurations
-ALLCONFS=pic18f2580 pic18f26k80 
+ALLCONFS=pic18f2580-40mhz pic18f26k80-40mhz 
 
 
 # build
@@ -45,15 +45,15 @@ ALLCONFS=pic18f2580 pic18f26k80
 
 # clobber
 .clobber-impl: .clobber-pre .depcheck-impl
-	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=pic18f2580 clean
-	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=pic18f26k80 clean
+	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=pic18f2580-40mhz clean
+	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=pic18f26k80-40mhz clean
 
 
 
 # all
 .all-impl: .all-pre .depcheck-impl
-	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=pic18f2580 build
-	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=pic18f26k80 build
+	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=pic18f2580-40mhz build
+	    ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=pic18f26k80-40mhz build
 
 
 

diff --git a/CANBoot.X/nbproject/Makefile-variables.mk b/CANBoot.X/nbproject/Makefile-variables.mk
@@ -4,17 +4,17 @@
 # NOCDDL
 #
 CND_BASEDIR=`pwd`
-# pic18f2580 configuration
-CND_ARTIFACT_DIR_pic18f2580=dist/pic18f2580/production
-CND_ARTIFACT_NAME_pic18f2580=CANBoot.X.production.hex
-CND_ARTIFACT_PATH_pic18f2580=dist/pic18f2580/production/CANBoot.X.production.hex
-CND_PACKAGE_DIR_pic18f2580=${CND_DISTDIR}/pic18f2580/package
-CND_PACKAGE_NAME_pic18f2580=canboot.x.tar
-CND_PACKAGE_PATH_pic18f2580=${CND_DISTDIR}/pic18f2580/package/canboot.x.tar
-# pic18f26k80 configuration
-CND_ARTIFACT_DIR_pic18f26k80=dist/pic18f26k80/production
-CND_ARTIFACT_NAME_pic18f26k80=CANBoot.X.production.hex
-CND_ARTIFACT_PATH_pic18f26k80=dist/pic18f26k80/production/CANBoot.X.production.hex
-CND_PACKAGE_DIR_pic18f26k80=${CND_DISTDIR}/pic18f26k80/package
-CND_PACKAGE_NAME_pic18f26k80=canboot.x.tar
-CND_PACKAGE_PATH_pic18f26k80=${CND_DISTDIR}/pic18f26k80/package/canboot.x.tar
+# pic18f2580-40mhz configuration
+CND_ARTIFACT_DIR_pic18f2580-40mhz=dist/pic18f2580-40mhz/production
+CND_ARTIFACT_NAME_pic18f2580-40mhz=CANBoot.X.production.hex
+CND_ARTIFACT_PATH_pic18f2580-40mhz=dist/pic18f2580-40mhz/production/CANBoot.X.production.hex
+CND_PACKAGE_DIR_pic18f2580-40mhz=${CND_DISTDIR}/pic18f2580-40mhz/package
+CND_PACKAGE_NAME_pic18f2580-40mhz=canboot.x.tar
+CND_PACKAGE_PATH_pic18f2580-40mhz=${CND_DISTDIR}/pic18f2580-40mhz/package/canboot.x.tar
+# pic18f26k80-40mhz configuration
+CND_ARTIFACT_DIR_pic18f26k80-40mhz=dist/pic18f26k80-40mhz/production
+CND_ARTIFACT_NAME_pic18f26k80-40mhz=CANBoot.X.production.hex
+CND_ARTIFACT_PATH_pic18f26k80-40mhz=dist/pic18f26k80-40mhz/production/CANBoot.X.production.hex
+CND_PACKAGE_DIR_pic18f26k80-40mhz=${CND_DISTDIR}/pic18f26k80-40mhz/package
+CND_PACKAGE_NAME_pic18f26k80-40mhz=canboot.x.tar
+CND_PACKAGE_PATH_pic18f26k80-40mhz=${CND_DISTDIR}/pic18f26k80-40mhz/package/canboot.x.tar
diff --git a/CANBoot.X/nbproject/configurations.xml b/CANBoot.X/nbproject/configurations.xml
@@ -21,14 +21,16 @@
     </logicalFolder>
     <logicalFolder name="OtherFiles" displayName="Other Files" projectFiles="false">
       <itemPath>../CANIO.def</itemPath>
+      <itemPath>../HISTORY</itemPath>
+      <itemPath>../README.md</itemPath>
     </logicalFolder>
   </logicalFolder>
   <sourceRootList>
     <Elem>..</Elem>
   </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
-    <conf name="pic18f2580" type="2">
+    <conf name="pic18f2580-40mhz" type="2">
       <toolsSet>
         <developmentServer>localhost</developmentServer>
         <targetDevice>PIC18F2580</targetDevice>
@@ -66,7 +68,7 @@
         <property key="default.radix" value="HEX"/>
         <property key="enable.case.sensitivity" value="true"/>
         <property key="hex.output.format" value="INHX32"/>
-        <property key="preprocessor.macros" value=""/>
+        <property key="preprocessor.macros" value="CRYSTAL=40"/>
         <property key="warning.level" value="0"/>
       </MPASMWIN-AS>
       <MPASMWIN-LD>
@@ -132,7 +134,7 @@
         <property key="extended-mode-mplink" value="false"/>
       </mpasmsuite>
     </conf>
-    <conf name="pic18f26k80" type="2">
+    <conf name="pic18f26k80-40mhz" type="2">
       <toolsSet>
         <developmentServer>localhost</developmentServer>
         <targetDevice>PIC18F26K80</targetDevice>
@@ -170,7 +172,7 @@
         <property key="default.radix" value="HEX"/>
         <property key="enable.case.sensitivity" value="true"/>
         <property key="hex.output.format" value="INHX32"/>
-        <property key="preprocessor.macros" value=""/>
+        <property key="preprocessor.macros" value="CRYSTAL=40"/>
         <property key="warning.level" value="0"/>
       </MPASMWIN-AS>
       <MPASMWIN-LD>
@@ -194,6 +196,7 @@
                   value="Press to browse for a specific firmware version"/>
         <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
         <property key="debugoptions.useswbreakpoints" value="false"/>
+        <property key="firmware.download.all" value="false"/>
         <property key="hwtoolclock.frcindebug" value="false"/>
         <property key="hwtoolclock.instructionspeed" value="4"/>
         <property key="hwtoolclock.units" value="mips"/>

diff --git a/CANBoot.X/nbproject/private/SuppressibleMessageMemo.properties b/CANBoot.X/nbproject/private/SuppressibleMessageMemo.properties
@@ -1,3 +1,28 @@
 #
-#Mon Aug 18 12:20:48 CEST 2014
+#Wed Jun 24 14:15:20 CEST 2015
+mdbDebugger/MEMORY_VIEW_LAST_HW_BP_RESOURCE_WARN=false
+icd3/VPP_FIRST_WARNING=false
+pk3/VPP_FIRST_WARNING=false
+pkobskde/CHECK_4_HIGH_VOLTAGE_VPP=false
+pk3/DEVID_MISMATCH=false
+mdbDebugger/NO_HW_BP_RESOURCES_WARN=false
+mdbDebugger/NO_HW_COMBINER_RESOURCES_WARNING=false
+icd3/CAL_WARNING=false
+pkobskde/VPP_FIRST_WARNING=false
+mdbDebugger/MEMORY_VIEW_NO_HW_BP_RESOURCES_WARN=false
+pk3/CHECK_CLOCK=false
+mdbDebugger/LAST_HW_BP_RESOURCE_WARN=false
+pk3/CHECK_4_HIGH_VOLTAGE_VPP=false
+icd3/DEVID_MISMATCH=false
+realice/DEVID_MISMATCH=false
+realice/CHECK_CLOCK=false
+pkoblicdbgr/DEVID_MISMATCH=false
+pkoblicdbgr/CHECK_CLOCK=false
+pkobskde/DEVID_MISMATCH=false
+icd3/CHECK_CLOCK=false
 realice/CHECK_4_HIGH_VOLTAGE_VPP=true
+pkoblicdbgr/CHECK_4_HIGH_VOLTAGE_VPP=false
+pk3/CAL_WARNING=false
+icd3/CHECK_4_HIGH_VOLTAGE_VPP=false
+pkobskde/CHECK_CLOCK=false
+realice/CAL_WARNING=false
diff --git a/CANBoot.X/nbproject/private/configurations.xml b/CANBoot.X/nbproject/private/configurations.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configurationDescriptor version="62">
   <projectmakefile>Makefile</projectmakefile>
-  <defaultConf>1</defaultConf>
+  <defaultConf>0</defaultConf>
   <confs>
-    <conf name="pic18f2580" type="2">
-      <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>9004:=&lt;rev>0100:=&lt;man>Microchip Technology, Inc. (www.microchip.com):=&lt;prod>MPLAB REAL ICE tm (www.microchip.com):=&lt;sn>JIT113110039:=&lt;drv>x:=&lt;xpt>b:=end</platformToolSN>
-      <languageToolchainDir>C:\Program Files (x86)\Microchip\MPLABX\v3.00\mpasmx</languageToolchainDir>
+    <conf name="pic18f2580-40mhz" type="2">
+      <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>9004:=&lt;rev>0100:=&lt;man>Microchip Technology, Inc. (www.microchip.com):=&lt;prod>MPLAB REAL ICE tm (www.microchip.com):=&lt;sn>JIT113110039:=&lt;drv>x:=end</platformToolSN>
+      <languageToolchainDir>C:\Program Files (x86)\Microchip\MPLABX\v3.05\mpasmx</languageToolchainDir>
       <mdbdebugger version="1">
         <placeholder1>place holder 1</placeholder1>
         <placeholder2>place holder 2</placeholder2>
@@ -21,9 +21,9 @@
         </environment>
       </runprofile>
     </conf>
-    <conf name="pic18f26k80" type="2">
+    <conf name="pic18f26k80-40mhz" type="2">
       <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>9004:=&lt;rev>0100:=&lt;man>Microchip Technology, Inc. (www.microchip.com):=&lt;prod>MPLAB REAL ICE tm (www.microchip.com):=&lt;sn>JIT113110039:=&lt;drv>x:=&lt;xpt>b:=end</platformToolSN>
-      <languageToolchainDir>C:\Program Files (x86)\Microchip\MPLABX\v3.00\mpasmx</languageToolchainDir>
+      <languageToolchainDir>C:\Program Files (x86)\Microchip\MPLABX\v3.05\mpasmx</languageToolchainDir>
       <mdbdebugger version="1">
         <placeholder1>place holder 1</placeholder1>
         <placeholder2>place holder 2</placeholder2>

diff --git a/CANBoot.X/nbproject/private/private.xml b/CANBoot.X/nbproject/private/private.xml
@@ -3,9 +3,6 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/C:/Users/grodansparadis/development/vscp_pic1_bootloader/CANIO.asm</file>
-            <file>file:/C:/Users/grodansparadis/development/vscp_pic1_bootloader/CANIO.def</file>
-        </group>
+        <group/>
     </open-files>
 </project-private>