From bdf581346a4b0fc3c6f8e810fbdba10cb322e37e Mon Sep 17 00:00:00 2001 From: "Ake Hedman, Paradise of the Frog" Date: Sat, 11 Jul 2015 18:54:48 +0200 Subject: [PATCH] Fixed hang problem for 2580 processors --- .../nbproject/Makefile-genesis.properties | 4 +-- CANBoot.X/nbproject/configurations.xml | 2 +- .../nbproject/private/configurations.xml | 2 +- CANBoot.X/nbproject/private/private.xml | 6 ++++- CANIO.asm | 27 ++++++++++--------- HISTORY | 4 +++ 6 files changed, 28 insertions(+), 17 deletions(-) diff --git a/CANBoot.X/nbproject/Makefile-genesis.properties b/CANBoot.X/nbproject/Makefile-genesis.properties index 259a4dd..d640e19 100644 --- a/CANBoot.X/nbproject/Makefile-genesis.properties +++ b/CANBoot.X/nbproject/Makefile-genesis.properties @@ -1,11 +1,11 @@ # -#Fri Jul 10 18:01:14 CEST 2015 +#Sat Jul 11 18:52:24 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 +configurations-xml=cdb61f06906b7efdfb7935dbd6e972a1 pic18f26k80-40mhz.languagetoolchain.version=5.62 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=47805b5596804b87cda41e61096929be host.platform=windows diff --git a/CANBoot.X/nbproject/configurations.xml b/CANBoot.X/nbproject/configurations.xml index a316fc7..26f4567 100644 --- a/CANBoot.X/nbproject/configurations.xml +++ b/CANBoot.X/nbproject/configurations.xml @@ -92,6 +92,7 @@ value="Press to browse for a specific firmware version"/> + @@ -196,7 +197,6 @@ value="Press to browse for a specific firmware version"/> - diff --git a/CANBoot.X/nbproject/private/configurations.xml b/CANBoot.X/nbproject/private/configurations.xml index 51924e5..37270ab 100644 --- a/CANBoot.X/nbproject/private/configurations.xml +++ b/CANBoot.X/nbproject/private/configurations.xml @@ -4,7 +4,7 @@ 0 - :=MPLABComm-USB-Microchip:=<vid>04D8:=<pid>9004:=<rev>0100:=<man>Microchip Technology, Inc. (www.microchip.com):=<prod>MPLAB REAL ICE tm (www.microchip.com):=<sn>JIT113110039:=<drv>x:=end + :=MPLABComm-USB-Microchip:=<vid>04D8:=<pid>9004:=<rev>0100:=<man>Microchip Technology, Inc. (www.microchip.com):=<prod>MPLAB REAL ICE tm (www.microchip.com):=<sn>JIT113110039:=<drv>x:=<xpt>b:=end C:\Program Files (x86)\Microchip\MPLABX\v3.05\mpasmx place holder 1 diff --git a/CANBoot.X/nbproject/private/private.xml b/CANBoot.X/nbproject/private/private.xml index cd3e03d..e45a15c 100644 --- a/CANBoot.X/nbproject/private/private.xml +++ b/CANBoot.X/nbproject/private/private.xml @@ -3,6 +3,10 @@ - + + file:/C:/Users/grodansparadis/development/vscp_pic1_bootloader/CANIO.asm + file:/C:/Users/grodansparadis/development/vscp_pic1_bootloader/HISTORY + file:/C:/Users/grodansparadis/development/vscp_pic1_bootloader/CANIO.def + diff --git a/CANIO.asm b/CANIO.asm index 5ae1f61..ebfe9e8 100644 --- a/CANIO.asm +++ b/CANIO.asm @@ -93,12 +93,12 @@ ;* ;* Control bits: ;* ------------ -;* MODE_WRT_UNLCK - Set this to allow write and erase operations to memory. -;* MODE_ERASE_ONLY - Set this to only erase Program Memory on a put command. Must -;* be on 64 byte boundary. -;* MODE_AUTO_ERASE - Set this to automatically erase Program Memory while writing data. -;* MODE_AUTO_INC - Set this to automatically increment the pointer after writing. -;* MODE_ACK - Set this to generate an acknowledge after a 'put' (PG Mode only) +;* Bit 0: MODE_WRT_UNLCK - Set this to allow write and erase operations to memory. +;* Bit 1: MODE_ERASE_ONLY - Set this to only erase Program Memory on a put command. Must +;* be on 64 byte boundary. +;* Bit 2: MODE_AUTO_ERASE - Set this to automatically erase Program Memory while writing data. +;* Bit 3: MODE_AUTO_INC - Set this to automatically increment the pointer after writing. +;* Bit 4: MODE_ACK - Set this to generate an acknowledge after a 'put' (PG Mode only) ;* ;* Special Commands: ;* ---------------- @@ -189,10 +189,10 @@ CONFIG BBSIZ = 2048 ; CONFIG5L - CONFIG CP0 = ON ; Code Protect 00800-03FFF (Enabled) - CONFIG CP1 = ON ; Code Protect 04000-07FFF (Enabled) - CONFIG CP2 = ON ; Code Protect 08000-0BFFF (Enabled) - CONFIG CP3 = ON ; Code Protect 0C000-0FFFF (Enabled) + CONFIG CP0 = OFF ; Code Protect 00800-03FFF (Enabled) + CONFIG CP1 = OFF ; Code Protect 04000-07FFF (Enabled) + CONFIG CP2 = OFF ; Code Protect 08000-0BFFF (Enabled) + CONFIG CP3 = OFF ; Code Protect 0C000-0FFFF (Enabled) ; CONFIG5H CONFIG CPB = ON ; Code Protect Boot (Enabled) @@ -504,6 +504,7 @@ _CANInit: clrf ANCON0 clrf ANCON1 #endif + banksel TRISB movlw b'00001100' ; CAN is input movwf TRISB movlw b'11111101' ; RC0 is input @@ -814,8 +815,10 @@ _SpecialCmdJp1: banksel EEADR - clrf EEADR ; AKHE - Point to first location of EEDATA - clrf EEADRH + #ifdef __18F26K80 + clrf EEADRH ; AKHE - Point to first location of EEDATA + #endif + clrf EEADR clrf EEDATA ; and clear the data movlw b'00000100' ; Setup for EEData rcall _StartWrite diff --git a/HISTORY b/HISTORY index c0a7d43..8f38a00 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,7 @@ +2015-07-11 AKHE Version 0.2.5 +============================= +Fixed bootload problem on 2580 where the sequency hanged + 2015-07-10 AKHE Version 0.2.4 ============================= Fixed problem with not going into bootloader if init. button was not