Binary build of v2.4.0. No source changes since previous commit. Release of v2.4.0 EiBotBoard Firmware, both application and application + bootloader images.

pull/57/head
Brian Schmalz 2016-07-04 11:38:45 -05:00
rodzic e9cd42ea91
commit cbc384c150
18 zmienionych plików z 6274 dodań i 25 usunięć

Plik binarny nie jest wyświetlany.

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -1,5 +1,5 @@
MPLINK 5.00, LINKER
Linker Map File - Created Thu Mar 17 18:40:14 2016
Linker Map File - Created Mon Jul 04 11:33:04 2016
Section Info
Section Type Address Location Size(Bytes)

Wyświetl plik

@ -38,6 +38,12 @@ DEBUGGABLE_SUFFIX=cof
FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/app.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
endif
ifeq ($(COMPARE_BUILD), true)
COMPARISON_BUILD=
else
COMPARISON_BUILD=
endif
# Object Directory
OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
@ -231,7 +237,7 @@ dist/${CND_CONF}/${IMAGE_TYPE}/app.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFIL
@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE}
${MP_LD} $(MP_EXTRA_LD_PRE) "source\BL_rm18f46j50_g.lkr" -p$(MP_PROCESSOR_OPTION_LD) -w -m"${DISTDIR}/EBF.X.${IMAGE_TYPE}.map" -l"./source" -z__MPLAB_BUILD=1 -u_CRUNTIME -l ${MP_CC_DIR}\\..\\lib -o dist/${CND_CONF}/${IMAGE_TYPE}/app.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED}
@echo "Creating unified hex file"
@"C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/hexmate" --edf="C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../dat/en_msgs.txt" -break=FFF8 dist/${CND_CONF}/${IMAGE_TYPE}/app.X.${IMAGE_TYPE}.hex ../bootloader.X/dist/46J50/production/bootloader.X.production.hex -odist/${CND_CONF}/production/app.X.production.unified.hex
@"C:/Program Files (x86)/Microchip/MPLABX/v3.30/mplab_ide/mplab_ide/modules/../../bin/hexmate" --edf="C:/Program Files (x86)/Microchip/MPLABX/v3.30/mplab_ide/mplab_ide/modules/../../dat/en_msgs.txt" -break=FFF8 dist/${CND_CONF}/${IMAGE_TYPE}/app.X.${IMAGE_TYPE}.hex ../bootloader.X/dist/46J50/production/bootloader.X.production.hex -odist/${CND_CONF}/production/app.X.production.unified.hex
endif

Wyświetl plik

@ -1,13 +1,13 @@
#
#Mon Mar 14 20:41:31 CDT 2016
EBBv13_XC8_with_bootloader.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=12edf07df11dc3b48011abb2bbd51a8e
#Mon Jul 04 11:32:54 CDT 2016
EBBv13_XC8_with_bootloader.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=1fcb04a4dd7759a0e5b3442e5312996f
EBBv13_no_bootloader.languagetoolchain.version=3.47
EBBv13_with_bootloader.languagetoolchain.version=3.47
EBBv13_45J50_with_bootloader.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=b6c3d3dea57628579a78af87a2927f09
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=4b47e815d50912689a67d0b162f47a58
EBBv13_XC8_no_bootloader.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=12edf07df11dc3b48011abb2bbd51a8e
EBBv13_45J50_with_bootloader.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=59d631641e54929da346a040881695e6
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=db82c52ca9004ff6941d647c285f6c5f
EBBv13_XC8_no_bootloader.com-microchip-mplab-nbide-toolchainXC8-XC8LanguageToolchain.md5=1fcb04a4dd7759a0e5b3442e5312996f
EBBv13_XC8_with_bootloader.languagetoolchain.version=
EBBv13_with_bootloader.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=b6c3d3dea57628579a78af87a2927f09
EBBv13_with_bootloader.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=59d631641e54929da346a040881695e6
configurations-xml=06b4aa53b72543c7aa134655ad59be64
EBBv13_XC8_no_bootloader.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc8\\v1.33\\bin
EBBv13_no_bootloader.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\mplabc18\\v3.47\\bin
@ -18,4 +18,4 @@ conf.ids=EBBv13_with_bootloader,EBBv13_no_bootloader,EBBv13_XC8_no_bootloader,EB
EBBv13_45J50_with_bootloader.languagetoolchain.version=3.47
EBBv13_XC8_with_bootloader.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc8\\v1.33\\bin
EBBv13_XC8_no_bootloader.languagetoolchain.version=
EBBv13_no_bootloader.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=b6c3d3dea57628579a78af87a2927f09
EBBv13_no_bootloader.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=59d631641e54929da346a040881695e6

Wyświetl plik

@ -15,11 +15,11 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/
PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v3.30/mplab_ide/mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
PATH:=C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/:$(PATH)
PATH:=C:/Program Files (x86)/Microchip/MPLABX/v3.30/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\v3.26\sys\java\jre1.8.0_65/bin/"
MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v3.30\sys\java\jre1.8.0_65/bin/"
OS_CURRENT="$(shell uname -s)"
MP_CC="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\mcc18.exe"
# MP_CPPC is not defined
@ -27,7 +27,7 @@ MP_CC="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\mcc18.exe"
MP_AS="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\..\mpasm\MPASMWIN.exe"
MP_LD="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\mplink.exe"
MP_AR="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\mplib.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v3.30/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin"
# MP_CPPC_DIR is not defined
# MP_BC_DIR is not defined

Wyświetl plik

@ -0,0 +1,53 @@
#include "flash.h"
void EBBWriteBytesFlash(unsigned long startaddr, unsigned int num_bytes, unsigned char *flash_array)
{
unsigned char write_byte=0,flag=0;
DWORD_VAL flash_addr;
flash_addr.Val = startaddr;
startaddr /= FLASH_WRITE_BLOCK ; // Align the starting address block
startaddr *= FLASH_WRITE_BLOCK ;
startaddr += FLASH_WRITE_BLOCK ;
write_byte = startaddr - flash_addr.Val;
while(num_bytes)
{
TBLPTRU = flash_addr.byte.UB; //Load the address to Address pointer registers
TBLPTRH = flash_addr.byte.HB;
TBLPTRL = flash_addr.byte.LB;
while(write_byte--)
{
TABLAT = *flash_array++;
_asm TBLWTPOSTINC _endasm
if(--num_bytes==0) break;
}
TBLPTRU = flash_addr.byte.UB; //Load the address to Address pointer registers
TBLPTRH = flash_addr.byte.HB;
TBLPTRL = flash_addr.byte.LB;
//*********** Flash write sequence ***********************************
EECON1bits.WREN = 1;
if(INTCONbits.GIE)
{
INTCONbits.GIE = 0;
flag=1;
}
EECON2 = 0x55;
EECON2 = 0xAA;
EECON1bits.WR =1;
EECON1bits.WREN = 0 ;
if(flag)
{
INTCONbits.GIE = 1;
flag=0;
}
write_byte = FLASH_WRITE_BLOCK;
flash_addr.Val = flash_addr.Val + FLASH_WRITE_BLOCK; //increment to one block of 64 bytes
}
}

Wyświetl plik

@ -0,0 +1,44 @@
#include "flash.h"
#if defined (FLASH_V1_1) || defined (FLASH_V1_2) || defined (FLASH_V1_3) || defined (FLASH_V1_4) \
|| defined (FLASH_V1_5) || defined (FLASH_V1_6) || defined (FLASH_V2_1) || defined (FLASH_V3_1)
/*********************************************************************
Function: void ReadFlash(unsigned long startaddr, unsigned int num_bytes, unsigned char *flash_array)
PreCondition: None
Input: startaddr - Strating address from which flash has to be read
num_bytes - Number of bytes of flash to be read
*flash_array - Pointer to array to which the flash has be read
Output: Reads the flash content to array passed as pointer
Side Effects: None
Overview: The function reads flash for number of bytes passed as parameter from starting address
Note: Non zero number of bytes has to be passed as parameter for num_bytes
********************************************************************/
void ReadFlash(unsigned long startaddr, unsigned int num_bytes, unsigned char *flash_array)
{
DWORD_VAL flash_addr;
flash_addr.Val = startaddr;
TBLPTRU = flash_addr.byte.UB; //Load the address to Address pointer registers
TBLPTRH = flash_addr.byte.HB;
TBLPTRL = flash_addr.byte.LB;
while(num_bytes--)
{
//*********** Table read sequence ******************************
_asm TBLRDPOSTINC _endasm
*flash_array++ = TABLAT;
}
}
#endif

Wyświetl plik

@ -188,11 +188,16 @@
// many steps were aborted.
// 2.3.0 08/28/15 - Added new XM command as per issue #29 for driving mixed-axis
// geometry machines.
// 2.4.0 03/14/15 - Added new AM command as per issue #<TBD> for using accelerated
// 2.4.0 03/14/15 - Added new AM command for using accelerated
// stepper motion. Includes going to 32 bit accumulators in ISR
// to achieve necessary resolution, which includes changes to
// SM command as well. Also added "CU,2,0" to turn of SM command
// parameter checking for speed.
// parameter checking for speed.
// NOTE: AM command may not be quite 'right' yet. Although it
// has passed simple tests, it could not be made to reliably
// work from the Inkscape plugin, so it is not currently being
// used. It may have to change in future versions of this
// firmware.
#include <p18cxxx.h>
#include <usart.h>

Wyświetl plik

@ -1,5 +1,5 @@
MPLINK 5.00, LINKER
Linker Map File - Created Tue Mar 15 07:16:16 2016
Linker Map File - Created Mon Jul 04 11:32:59 2016
Section Info
Section Type Address Location Size(Bytes)

Wyświetl plik

@ -38,6 +38,12 @@ DEBUGGABLE_SUFFIX=cof
FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/bootloader.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
endif
ifeq ($(COMPARE_BUILD), true)
COMPARISON_BUILD=
else
COMPARISON_BUILD=
endif
# Object Directory
OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}

Wyświetl plik

@ -1,12 +1,12 @@
#
#Mon Mar 14 20:41:31 CDT 2016
#Mon Jul 04 11:32:55 CDT 2016
46J50.languagetoolchain.version=3.47
conf.ids=46J50,45J50
45J50.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=b6c3d3dea57628579a78af87a2927f09
45J50.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=59d631641e54929da346a040881695e6
configurations-xml=c86d7b5a1429aee62082b7668264f94e
46J50.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\mplabc18\\v3.47\\bin
45J50.languagetoolchain.version=3.47
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=4b47e815d50912689a67d0b162f47a58
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=db82c52ca9004ff6941d647c285f6c5f
45J50.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\mplabc18\\v3.47\\bin
46J50.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=b6c3d3dea57628579a78af87a2927f09
46J50.com-microchip-mplab-nbide-toolchainC18-C18LanguageToolchain.md5=59d631641e54929da346a040881695e6
host.platform=windows

Wyświetl plik

@ -15,11 +15,11 @@
# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...
#
SHELL=cmd.exe
PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/
PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v3.30/mplab_ide/mplab_ide/modules/../../bin/
# Adding MPLAB X bin directory to path.
PATH:=C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/:$(PATH)
PATH:=C:/Program Files (x86)/Microchip/MPLABX/v3.30/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\v3.26\sys\java\jre1.8.0_65/bin/"
MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v3.30\sys\java\jre1.8.0_65/bin/"
OS_CURRENT="$(shell uname -s)"
MP_CC="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\mcc18.exe"
# MP_CPPC is not defined
@ -27,7 +27,7 @@ MP_CC="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\mcc18.exe"
MP_AS="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\..\mpasm\MPASMWIN.exe"
MP_LD="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\mplink.exe"
MP_AR="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin\mplib.exe"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v3.26/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar"
DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v3.30/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar"
MP_CC_DIR="C:\Program Files (x86)\Microchip\mplabc18\v3.47\bin"
# MP_CPPC_DIR is not defined
# MP_BC_DIR is not defined

Wyświetl plik

@ -1,3 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?><project-private xmlns="http://www.netbeans.org/ns/project-private/1">
<?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>