Refs #225. Added 29-bit CAN identifier support to the LM3S port.

git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@334 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
This commit is contained in:
Frank Voorburg 2017-08-16 09:03:27 +00:00
parent ff6ce18750
commit 94ecd945a0
28 changed files with 3015 additions and 2883 deletions

View File

@ -61,7 +61,8 @@
* in bits/second. Two CAN messages are reserved for communication with the host. The
* message identifier for sending data from the target to the host is configured with
* BOOT_COM_CAN_TXMSG_ID. The one for receiving data from the host is configured with
* BOOT_COM_CAN_RXMSG_ID. The maximum amount of data bytes in a message for data
* BOOT_COM_CAN_RXMSG_ID. Note that an extended 29-bit CAN identifier is configured by
* OR-ing with mask 0x80000000. The maximum amount of data bytes in a message for data
* transmission and reception is set through BOOT_COM_CAN_TX_MAX_DATA and
* BOOT_COM_CAN_RX_MAX_DATA, respectively. It is common for a microcontroller to have more
* than 1 CAN controller on board. The zero-based BOOT_COM_CAN_CHANNEL_INDEX selects the
@ -73,11 +74,11 @@
/** \brief Configure the desired CAN baudrate. */
#define BOOT_COM_CAN_BAUDRATE (500000)
/** \brief Configure CAN message ID target->host. */
#define BOOT_COM_CAN_TX_MSG_ID (0x7E1)
#define BOOT_COM_CAN_TX_MSG_ID (0x7E1 /*| 0x80000000*/)
/** \brief Configure number of bytes in the target->host CAN message. */
#define BOOT_COM_CAN_TX_MAX_DATA (8)
/** \brief Configure CAN message ID host->target. */
#define BOOT_COM_CAN_RX_MSG_ID (0x667)
#define BOOT_COM_CAN_RX_MSG_ID (0x667 /*| 0x80000000*/)
/** \brief Configure number of bytes in the host->target CAN message. */
#define BOOT_COM_CAN_RX_MAX_DATA (8)
/** \brief Select the desired CAN peripheral as a zero based index. */

View File

@ -1,37 +1,44 @@
<!DOCTYPE CrossStudio_for_ARM_Session_File>
<!DOCTYPE CrossStudio_Session_File>
<session>
<Bookmarks/>
<Breakpoints/>
<Breakpoints>
<Exceptions set="MemManage;UsageFault_Coprocessor;UsageFault_CheckingError;UsageFault_StateError;BusFault;ExceptionEntryReturnFault;HardFault" />
</Breakpoints>
<ExecutionProfileWindow/>
<FrameBufferWindow>
<FrameBufferWindow addressText="" bufferWidth="-1" bufferHeight="-1" addressSpace="" />
</FrameBufferWindow>
<Memory1>
<MemoryWindow autoEvaluate="0" addressText="" numColumns="8" sizeText="" dataSize="1" radix="16" name="" addressSpace="" />
<MemoryWindow autoEvaluate="0" addressText="" addressOrder="0" refreshPeriod="0" columnsText="" sizeText="" viewMode="0" dataSize="1" radix="16" name="openblt_ek_lm3s8962" addressSpace="" />
</Memory1>
<Memory2>
<MemoryWindow autoEvaluate="0" addressText="" numColumns="8" sizeText="" dataSize="1" radix="16" name="" addressSpace="" />
<MemoryWindow autoEvaluate="0" addressText="" addressOrder="0" refreshPeriod="0" columnsText="" sizeText="" viewMode="0" dataSize="1" radix="16" name="openblt_ek_lm3s8962" addressSpace="" />
</Memory2>
<Memory3>
<MemoryWindow autoEvaluate="0" addressText="" numColumns="8" sizeText="" dataSize="1" radix="16" name="" addressSpace="" />
<MemoryWindow autoEvaluate="0" addressText="" addressOrder="0" refreshPeriod="0" columnsText="" sizeText="" viewMode="0" dataSize="1" radix="16" name="openblt_ek_lm3s8962" addressSpace="" />
</Memory3>
<Memory4>
<MemoryWindow autoEvaluate="0" addressText="" numColumns="8" sizeText="" dataSize="1" radix="16" name="" addressSpace="" />
<MemoryWindow autoEvaluate="0" addressText="" addressOrder="0" refreshPeriod="0" columnsText="" sizeText="" viewMode="0" dataSize="1" radix="16" name="openblt_ek_lm3s8962" addressSpace="" />
</Memory4>
<Project>
<ProjectSessionItem path="lm3s8962_crossworks" name="unnamed" />
<ProjectSessionItem path="lm3s8962_crossworks;openblt_ek_lm3s8962" name="unnamed" />
<ProjectSessionItem path="lm3s8962_crossworks;openblt_ek_lm3s8962;Source Files" name="unnamed" />
<ProjectSessionItem path="lm3s8962_crossworks;openblt_ek_lm3s8962;Source Files;Demo" name="unnamed" />
<ProjectSessionItem path="lm3s8962_crossworks;openblt_ek_lm3s8962;Source Files;Demo;Boot" name="unnamed" />
<ProjectSessionItem path="lm3s8962_crossworks;openblt_ek_lm3s8962;Source Files;Source" name="unnamed" />
</Project>
<Register1>
<RegisterWindow openNodes="" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" name="" />
<RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" decimalNodes="" octalNodes="" asciiNodes="" visibleNodes="" name="openblt_ek_lm3s8962" />
</Register1>
<Register2>
<RegisterWindow openNodes="" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" name="" />
<RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" decimalNodes="" octalNodes="" asciiNodes="" visibleNodes="" name="openblt_ek_lm3s8962" />
</Register2>
<Register3>
<RegisterWindow openNodes="" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" name="" />
<RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" decimalNodes="" octalNodes="" asciiNodes="" visibleNodes="" name="openblt_ek_lm3s8962" />
</Register3>
<Register4>
<RegisterWindow openNodes="" binaryNodes="" hiddenNodes="" unsignedNodes="" visibleGroups="" decimalNodes="" octalNodes="" asciiNodes="" name="" />
<RegisterWindow openNodes="" binaryNodes="" unsignedNodes="" decimalNodes="" octalNodes="" asciiNodes="" visibleNodes="" name="openblt_ek_lm3s8962" />
</Register4>
<TargetWindow programAction="" uploadFileType="" programLoadAddress="" programSize="" uploadFileName="" uploadMemoryInterface="" programFileName="" uploadStartAddress="" programFileType="" uploadSize="" programMemoryInterface="" />
<TraceWindow>
@ -50,9 +57,8 @@
<Watches active="0" update="Never" />
</Watch4>
<Files>
<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Work\software\OpenBLT\Target\Demo\ARMCM3_LM3S_EK_LM3S8962_Crossworks\Boot\main.c" y="7" path="C:\Work\software\OpenBLT\Target\Demo\ARMCM3_LM3S_EK_LM3S8962_Crossworks\Boot\main.c" left="0" selected="0" name="unnamed" top="0" />
<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Work\software\OpenBLT\Target\Demo\ARMCM3_LM3S_EK_LM3S8962_Crossworks\Boot\blt_conf.h" y="51" path="C:\Work\software\OpenBLT\Target\Demo\ARMCM3_LM3S_EK_LM3S8962_Crossworks\Boot\blt_conf.h" left="0" selected="0" name="unnamed" top="51" />
<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="C:\Work\software\OpenBLT\Target\Source\backdoor.c" y="26" path="C:\Work\software\OpenBLT\Target\Source\backdoor.c" left="0" selected="1" name="unnamed" top="24" />
<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="../main.c" y="54" path="../main.c" left="0" selected="1" name="unnamed" top="19" />
<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="63" debugPath="../blt_conf.h" y="80" path="../blt_conf.h" left="0" selected="0" name="unnamed" top="63" />
</Files>
<ARMCrossStudioWindow activeProject="openbtl_ek_lm3s8962" autoConnectTarget="Luminary USB Debug" debugSearchFileMap="" fileDialogInitialDirectory="C:\Work\software\OpenBLT\Target\Source\ARMCM3_LM3S\Crossworks" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388991" debugSearchPath="" buildConfiguration="THUMB Debug" />
<ARMCrossStudioWindow activeProject="openblt_ek_lm3s8962" autoConnectTarget="Texas Instruments ICDI" debugSearchFileMap="" fileDialogInitialDirectory="C:/Work/software/OpenBLT/Target/Source/ARMCM3_LM3S/Crossworks" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388991" debugSearchPath="" buildConfiguration="THUMB Debug" />
</session>

View File

@ -3885,19 +3885,19 @@ OUTPUT(C:/Work/software/OpenBLT/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/P
.debug_ranges 0x00000418 0x150 THUMB Debug/../../obj/uart.o
.debug_ranges 0x00000568 0xd0 THUMB Debug/../../obj/can.o
.debug_line 0x00000000 0x2752
.debug_line 0x00000000 0x1ef THUMB Debug/../../obj/boot.o
.debug_line 0x000001ef 0x10f THUMB Debug/../../obj/cstart.o
.debug_line 0x000002fe 0xaa THUMB Debug/../../obj/led.o
.debug_line 0x000003a8 0xc6 THUMB Debug/../../obj/main.o
.debug_line 0x0000046e 0x92 THUMB Debug/../../obj/vectors.o
.debug_line 0x00000500 0xd8 THUMB Debug/../../obj/time.o
.debug_line 0x000005d8 0x76f THUMB Debug/../../obj/gpio.o
.debug_line 0x00000d47 0x31d THUMB Debug/../../obj/interrupt.o
.debug_line 0x00001064 0x7dd THUMB Debug/../../obj/sysctl.o
.debug_line 0x00001841 0x13c THUMB Debug/../../obj/systick.o
.debug_line 0x0000197d 0x742 THUMB Debug/../../obj/uart.o
.debug_line 0x000020bf 0x693 THUMB Debug/../../obj/can.o
.debug_line 0x00000000 0x2754
.debug_line 0x00000000 0x1f1 THUMB Debug/../../obj/boot.o
.debug_line 0x000001f1 0x10f THUMB Debug/../../obj/cstart.o
.debug_line 0x00000300 0xaa THUMB Debug/../../obj/led.o
.debug_line 0x000003aa 0xc6 THUMB Debug/../../obj/main.o
.debug_line 0x00000470 0x92 THUMB Debug/../../obj/vectors.o
.debug_line 0x00000502 0xd8 THUMB Debug/../../obj/time.o
.debug_line 0x000005da 0x76f THUMB Debug/../../obj/gpio.o
.debug_line 0x00000d49 0x31d THUMB Debug/../../obj/interrupt.o
.debug_line 0x00001066 0x7dd THUMB Debug/../../obj/sysctl.o
.debug_line 0x00001843 0x13c THUMB Debug/../../obj/systick.o
.debug_line 0x0000197f 0x742 THUMB Debug/../../obj/uart.o
.debug_line 0x000020c1 0x693 THUMB Debug/../../obj/can.o
.debug_str 0x00000000 0x192b
.debug_str 0x00000000 0x444 THUMB Debug/../../obj/boot.o

View File

@ -324,6 +324,14 @@ static void BootComCanInit(void)
rxMsgObject.ulMsgIDMask = 0x7ff;
rxMsgObject.ulFlags = MSG_OBJ_USE_ID_FILTER;
rxMsgObject.ulMsgLen = 8;
/* is it a 29-bit extended CAN identifier? */
if ((BOOT_COM_CAN_RX_MSG_ID & 0x80000000) != 0)
{
/* configure reception acceptance filter for 29-bit CAN identifier. */
rxMsgObject.ulMsgID &= ~0x80000000;
rxMsgObject.ulMsgIDMask = 0x1fffffff;
rxMsgObject.ulFlags |= MSG_OBJ_EXTENDED_ID;
}
CANMessageSet(CAN0_BASE, CAN_RX_MSGOBJECT_IDX+1, &rxMsgObject, MSG_OBJ_TYPE_RX);
} /*** end of BootCanComInit ***/

View File

@ -54,7 +54,7 @@
<Watches active="0" update="Never" />
</Watch4>
<Files>
<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="../main.c" y="24" path="../main.c" left="0" selected="0" name="unnamed" top="9" />
<SessionOpenFile useTextEdit="1" useBinaryEdit="0" codecName="Latin1" x="0" debugPath="../main.c" y="12" path="../main.c" left="0" selected="1" name="unnamed" top="9" />
</Files>
<ARMCrossStudioWindow activeProject="demoprog_ek_lm3s8962" autoConnectTarget="Texas Instruments ICDI" debugSearchFileMap="" fileDialogInitialDirectory="D:/usr/feaser/software/OpenBLT/Target/Demo/ARMCM3_LM3S_EK_LM3S8962_Crossworks/Prog/lib/driverlib" fileDialogDefaultFilter="*.c" autoConnectCapabilities="388991" debugSearchPath="" buildConfiguration="THUMB Debug" />
</session>

View File

@ -7,40 +7,40 @@ start address 0x00000000
Program Header:
LOAD off 0x00008000 vaddr 0x00000000 paddr 0x00000000 align 2**15
filesz 0x00001e86 memsz 0x00001e86 flags r-x
LOAD off 0x00010000 vaddr 0x20000000 paddr 0x00001e86 align 2**15
filesz 0x00001e9a memsz 0x00001e9a flags r-x
LOAD off 0x00010000 vaddr 0x20000000 paddr 0x00001e9a align 2**15
filesz 0x00000001 memsz 0x00000001 flags rw-
LOAD off 0x00010004 vaddr 0x20000004 paddr 0x00001e8c align 2**15
filesz 0x00000000 memsz 0x000006ec flags rw-
LOAD off 0x00010004 vaddr 0x20000004 paddr 0x00001ea0 align 2**15
filesz 0x00000000 memsz 0x00000cec flags rw-
private flags = 5000200: [Version5 EABI] [soft-float ABI]
Sections:
Idx Name Size VMA LMA File off Algn
0 .text 00001e86 00000000 00000000 00008000 2**2
0 .text 00001e9a 00000000 00000000 00008000 2**2
CONTENTS, ALLOC, LOAD, READONLY, CODE
1 .data 00000001 20000000 00001e86 00010000 2**0
1 .data 00000001 20000000 00001e9a 00010000 2**0
CONTENTS, ALLOC, LOAD, DATA
2 .bss 000006ec 20000004 00001e8c 00010004 2**2
2 .bss 00000cec 20000004 00001ea0 00010004 2**2
ALLOC
3 .debug_info 00007e3c 00000000 00000000 00010001 2**0
3 .debug_info 00007e62 00000000 00000000 00010001 2**0
CONTENTS, READONLY, DEBUGGING
4 .debug_abbrev 00001d00 00000000 00000000 00017e3d 2**0
4 .debug_abbrev 00001cb7 00000000 00000000 00017e63 2**0
CONTENTS, READONLY, DEBUGGING
5 .debug_aranges 00000930 00000000 00000000 00019b3d 2**0
5 .debug_aranges 00000938 00000000 00000000 00019b1a 2**0
CONTENTS, READONLY, DEBUGGING
6 .debug_ranges 00000888 00000000 00000000 0001a46d 2**0
6 .debug_ranges 00000890 00000000 00000000 0001a452 2**0
CONTENTS, READONLY, DEBUGGING
7 .debug_line 00002b14 00000000 00000000 0001acf5 2**0
7 .debug_line 00002b38 00000000 00000000 0001ace2 2**0
CONTENTS, READONLY, DEBUGGING
8 .debug_str 00001dbc 00000000 00000000 0001d809 2**0
8 .debug_str 00001dc9 00000000 00000000 0001d81a 2**0
CONTENTS, READONLY, DEBUGGING
9 .comment 00000030 00000000 00000000 0001f5c5 2**0
9 .comment 00000030 00000000 00000000 0001f5e3 2**0
CONTENTS, READONLY
10 .ARM.attributes 00000033 00000000 00000000 0001f5f5 2**0
10 .ARM.attributes 00000033 00000000 00000000 0001f613 2**0
CONTENTS, READONLY
11 .debug_frame 000019a4 00000000 00000000 0001f628 2**2
11 .debug_frame 000019b4 00000000 00000000 0001f648 2**2
CONTENTS, READONLY, DEBUGGING
12 .debug_loc 00004a34 00000000 00000000 00020fcc 2**0
12 .debug_loc 00004a3c 00000000 00000000 00020ffc 2**0
CONTENTS, READONLY, DEBUGGING
SYMBOL TABLE:
00000000 l d .text 00000000 .text
@ -61,8 +61,8 @@ SYMBOL TABLE:
00000000 l df *ABS* 00000000 flashlib.c
00000000 l df *ABS* 00000000 sysctl.c
0000024c l F .text 000000e4 SysCtlPeripheralValid
00001c5c l O .text 0000005c g_pulXtals
00001cd4 l O .text 0000000c g_pulRCGCRegs
00001c70 l O .text 0000005c g_pulXtals
00001ce8 l O .text 0000000c g_pulRCGCRegs
00000000 l df *ABS* 00000000 interrupt.c
00000000 l df *ABS* 00000000 gpio.c
00000768 l F .text 00000040 GPIOBaseValid
@ -75,13 +75,13 @@ SYMBOL TABLE:
00000b94 l F .text 00000064 CANRegRead
00000000 l df *ABS* 00000000 boot.c
00000000 l df *ABS* 00000000 com.c
00001d46 l O .text 00000003 CSWTCH.8
00001d5a l O .text 00000003 CSWTCH.8
20000004 l O .bss 00000040 xcpCtoReqPacket.4167
20000000 l O .data 00000001 comActiveInterface
00001d49 l O .text 00000003 CSWTCH.10
00001d5d l O .text 00000003 CSWTCH.10
00000000 l df *ABS* 00000000 xcp.c
000012c0 l F .text 00000014 XcpSetCtoError
00001d4c l O .text 00000008 xcpStationId
00001d60 l O .text 00000008 xcpStationId
20000044 l O .bss 0000004c xcpInfo
00000000 l df *ABS* 00000000 backdoor.c
20000090 l O .bss 00000001 backdoorOpen
@ -99,82 +99,82 @@ SYMBOL TABLE:
00000000 l df *ABS* 00000000 timer.c
200000e4 l O .bss 00000004 millisecond_counter
00000000 l df *ABS* 00000000 flash.c
0000189c l F .text 00000034 FlashGetSector
000018d0 l F .text 0000004c FlashWriteBlock
0000191c l F .text 00000050 FlashSwitchBlock
0000196c l F .text 00000080 FlashAddToBlock
00001d9c l O .text 000000c0 flashLayout
000018a8 l F .text 00000034 FlashGetSector
000018dc l F .text 0000004c FlashWriteBlock
00001928 l F .text 00000050 FlashSwitchBlock
00001978 l F .text 00000080 FlashAddToBlock
00001db0 l O .text 000000c0 flashLayout
200000e8 l O .bss 00000204 bootBlockInfo
200002ec l O .bss 00000204 blockInfo
00000000 l df *ABS* 00000000 cpu_comp.c
00000000 l df *ABS* 00000000 cstart.c
00001c18 l F .text 00000000 zero_loop
00001c28 l F .text 00000000 zero_loop
00000000 l df *ABS* 00000000
00000200 l *ABS* 00000000 __STACKSIZE__
00000800 l *ABS* 00000000 __STACKSIZE__
000011ec g F .text 00000020 ComInit
00001a04 g F .text 00000048 FlashWrite
00001578 g F .text 00000008 AssertFailure
000017f0 g F .text 0000002c CanReceivePacket
00001bf8 g F .text 00000040 reset_handler
00001a10 g F .text 00000048 FlashWrite
00001584 g F .text 00000008 AssertFailure
000017fc g F .text 0000002c CanReceivePacket
00001c04 g F .text 00000044 reset_handler
00000bf8 g F .text 00000098 CANInit
00001870 g F .text 0000001c TimerUpdate
0000187c g F .text 0000001c TimerUpdate
00001300 g F .text 00000010 XcpPacketTransmitted
0000120c g F .text 0000003c ComTask
00000368 g F .text 00000008 SysCtlDelay
000011b8 g F .text 0000001e BootInit
00000c90 g F .text 0000002c CANEnable
00001554 g F .text 00000020 BackDoorInit
00001576 g F .text 00000002 CopService
00001e86 g .text 00000000 _etext
00001bf0 g F .text 00000004 CpuIrqDisable
00001bdc g F .text 00000006 FlashGetUserProgBaseAddress
00001560 g F .text 00000020 BackDoorInit
00001582 g F .text 00000002 CopService
00001e9a g .text 00000000 _etext
00001bfc g F .text 00000004 CpuIrqDisable
00001be8 g F .text 00000006 FlashGetUserProgBaseAddress
00000ab8 g F .text 00000024 UARTSpaceAvail
00001864 g F .text 0000000c TimerReset
00001870 g F .text 0000000c TimerReset
00000b04 g F .text 0000002c UARTCharPutNonBlocking
000011d6 g F .text 00000016 BootTask
00001b1c g F .text 00000044 FlashWriteChecksum
00001b28 g F .text 00000044 FlashWriteChecksum
0000124c g F .text 00000030 ComTransmitPacket
00000330 g F .text 00000038 SysCtlPeripheralEnable
000012f0 g F .text 00000010 XcpIsConnected
0000181c g F .text 00000004 NvmInit
000019ec g F .text 00000018 FlashInit
0000182c g F .text 00000004 NvmGetUserProgBaseAddress
00001828 g F .text 00000004 NvmInit
000019f8 g F .text 00000018 FlashInit
00001838 g F .text 00000004 NvmGetUserProgBaseAddress
200004f0 g .bss 00000000 _ebss
00001be4 g F .text 0000000c UnusedISR
00001bf0 g F .text 0000000c UnusedISR
00001248 g F .text 00000002 ComFree
000015d8 g F .text 00000028 UartInit
00001824 g F .text 00000004 NvmErase
000015e4 g F .text 00000028 UartInit
00001830 g F .text 00000004 NvmErase
00000adc g F .text 00000028 UARTCharGetNonBlocking
20000004 g .bss 00000000 _bss
00001310 g F .text 0000020c XcpPacketReceived
00001580 g F .text 00000004 CpuInit
00001ba8 g F .text 00000034 FlashDone
00001310 g F .text 00000218 XcpPacketReceived
0000158c g F .text 00000004 CpuInit
00001bb4 g F .text 00000034 FlashDone
00000d98 g F .text 0000007c CANStatusGet
0000179c g F .text 00000054 CanTransmitPacket
000017a8 g F .text 00000054 CanTransmitPacket
00000174 g F .text 000000d8 FlashProgram
000012d4 g F .text 0000001c XcpInit
00001a4c g F .text 000000d0 FlashErase
00001a58 g F .text 000000d0 FlashErase
000000f0 g F .text 00000040 main
000004ac g F .text 000001ac SysCtlClockGet
000009b4 g F .text 00000034 UARTDisable
00001830 g F .text 00000012 NvmDone
00001600 g F .text 0000006c UartTransmitPacket
00001828 g F .text 00000004 NvmVerifyChecksum
0000183c g F .text 00000012 NvmDone
0000160c g F .text 0000006c UartTransmitPacket
00001834 g F .text 00000004 NvmVerifyChecksum
00000ffc g F .text 000001bc CANMessageGet
000015b8 g F .text 0000001e CpuMemCopy
000015c4 g F .text 0000001e CpuMemCopy
000008fc g F .text 00000034 GPIOPinTypeCAN
0000129c g F .text 00000020 ComGetActiveInterfaceMaxTxLen
0000166c g F .text 00000090 UartReceivePacket
00001bf4 g F .text 00000004 CpuIrqEnable
00001678 g F .text 00000090 UartReceivePacket
00001c00 g F .text 00000004 CpuIrqEnable
000006e0 g F .text 00000088 IntDisable
20000000 g .data 00000000 _data
00001574 g F .text 00000002 CopInit
000016fc g F .text 000000a0 CanInit
00001820 g F .text 00000004 NvmWrite
00001584 g F .text 00000034 CpuStartUserProgram
00001580 g F .text 00000002 CopInit
00001708 g F .text 000000a0 CanInit
0000182c g F .text 00000004 NvmWrite
00001590 g F .text 00000034 CpuStartUserProgram
00000cbc g F .text 000000dc CANBitTimingSet
200006f0 g .bss 00000000 _estack
00001b60 g F .text 00000048 FlashVerifyChecksum
20000cf0 g .bss 00000000 _estack
00001b6c g F .text 00000048 FlashVerifyChecksum
20000001 g .data 00000000 _edata
00000000 g O .text 000000f0 _vectab
00000930 g F .text 00000034 GPIOPinTypeUART
@ -182,14 +182,14 @@ SYMBOL TABLE:
00000658 g F .text 00000088 IntEnable
0000127c g F .text 00000020 ComGetActiveInterfaceMaxRxLen
000007a8 g F .text 00000054 GPIODirModeSet
0000151c g F .text 00000038 BackDoorCheck
00001528 g F .text 00000038 BackDoorCheck
200004f0 g .bss 00000000 _stack
0000188c g F .text 00000010 TimerGet
00001898 g F .text 00000010 TimerGet
00000e14 g F .text 000001e8 CANMessageSet
000009e8 g F .text 000000d0 UARTConfigSetExpClk
00000370 g F .text 0000013c SysCtlClockSet
000007fc g F .text 00000100 GPIOPadConfigSet
00001844 g F .text 00000020 TimerInit
00001850 g F .text 00000020 TimerInit
00000130 g F .text 00000044 FlashClear
00000984 g F .text 00000030 UARTEnable

View File

@ -61,7 +61,8 @@
* in bits/second. Two CAN messages are reserved for communication with the host. The
* message identifier for sending data from the target to the host is configured with
* BOOT_COM_CAN_TXMSG_ID. The one for receiving data from the host is configured with
* BOOT_COM_CAN_RXMSG_ID. The maximum amount of data bytes in a message for data
* BOOT_COM_CAN_RXMSG_ID. Note that an extended 29-bit CAN identifier is configured by
* OR-ing with mask 0x80000000. The maximum amount of data bytes in a message for data
* transmission and reception is set through BOOT_COM_CAN_TX_MAX_DATA and
* BOOT_COM_CAN_RX_MAX_DATA, respectively. It is common for a microcontroller to have more
* than 1 CAN controller on board. The zero-based BOOT_COM_CAN_CHANNEL_INDEX selects the
@ -73,11 +74,11 @@
/** \brief Configure the desired CAN baudrate. */
#define BOOT_COM_CAN_BAUDRATE (500000)
/** \brief Configure CAN message ID target->host. */
#define BOOT_COM_CAN_TX_MSG_ID (0x7E1)
#define BOOT_COM_CAN_TX_MSG_ID (0x7E1 /*| 0x80000000*/)
/** \brief Configure number of bytes in the target->host CAN message. */
#define BOOT_COM_CAN_TX_MAX_DATA (8)
/** \brief Configure CAN message ID host->target. */
#define BOOT_COM_CAN_RX_MSG_ID (0x667)
#define BOOT_COM_CAN_RX_MSG_ID (0x667 /*| 0x80000000*/)
/** \brief Configure number of bytes in the host->target CAN message. */
#define BOOT_COM_CAN_RX_MAX_DATA (8)
/** \brief Select the desired CAN peripheral as a zero based index. */

View File

@ -28,13 +28,13 @@ Idx Name Size VMA LMA File off Algn
CONTENTS, READONLY, DEBUGGING
6 .debug_ranges 00000630 00000000 00000000 000134e3 2**0
CONTENTS, READONLY, DEBUGGING
7 .debug_line 00001aad 00000000 00000000 00013b13 2**0
7 .debug_line 00001aaf 00000000 00000000 00013b13 2**0
CONTENTS, READONLY, DEBUGGING
8 .debug_str 00001536 00000000 00000000 000155c0 2**0
8 .debug_str 00001536 00000000 00000000 000155c2 2**0
CONTENTS, READONLY, DEBUGGING
9 .comment 00000030 00000000 00000000 00016af6 2**0
9 .comment 00000030 00000000 00000000 00016af8 2**0
CONTENTS, READONLY
10 .ARM.attributes 00000033 00000000 00000000 00016b26 2**0
10 .ARM.attributes 00000033 00000000 00000000 00016b28 2**0
CONTENTS, READONLY
11 .debug_frame 000011fc 00000000 00000000 00016b5c 2**2
CONTENTS, READONLY, DEBUGGING

View File

@ -324,6 +324,14 @@ static void BootComCanInit(void)
rxMsgObject.ulMsgIDMask = 0x7ff;
rxMsgObject.ulFlags = MSG_OBJ_USE_ID_FILTER;
rxMsgObject.ulMsgLen = 8;
/* is it a 29-bit extended CAN identifier? */
if ((BOOT_COM_CAN_RX_MSG_ID & 0x80000000) != 0)
{
/* configure reception acceptance filter for 29-bit CAN identifier. */
rxMsgObject.ulMsgID &= ~0x80000000;
rxMsgObject.ulMsgIDMask = 0x1fffffff;
rxMsgObject.ulFlags |= MSG_OBJ_EXTENDED_ID;
}
CANMessageSet(CAN0_BASE, CAN_RX_MSGOBJECT_IDX+1, &rxMsgObject, MSG_OBJ_TYPE_RX);
} /*** end of BootCanComInit ***/

View File

@ -1,5 +1,5 @@
S01B00006F70656E626C745F656B5F6C6D3373383936322E737265632F
S1130000480200207D2400006522000065220000D3
S1130000480800207D2400006522000065220000CD
S113001065220000652200006522000065220000C0
S113002065220000652200006522000065220000B0
S113003065220000652200006522000065220000A0
@ -271,8 +271,8 @@ S11310C001604FF40072001D00F080F9012002BDA0
S11310D038B504460D460E48844208D10B4C2946C7
S11310E02046FFF7E3FF00280DD1002032BDB5F5FF
S11310F0004F01D10446F2E7204600F049F80028E9
S1131100EDD1002032BD204632BD0000480200204F
S11311104C0400202DE9F0410746884614461D463C
S1131100EDD1002032BD204632BD00004808002049
S11311104C0A00202DE9F0410746884614461D4636
S11311204FEA58267602386810F1010F05D131468E
S11311303846FFF7BBFF00281DD03868B04205D001
S113114031463846FFF7C4FF070014D03868A8EBCF
@ -358,7 +358,7 @@ S11316300CF80F484CF24F314160002181600521C4
S1131640016000200B49086001BD002008490860C2
S1131650704707480068C00303D506480168491C61
S11316600160704780B5FFF7F4FF0248006802BDCF
S113167010E000E0F0060020DFF884030021018080
S113167010E000E0F00C0020DFF88403002101807A
S113168000F1440100224A6080F843200A80114698
S113169081707047DFF868030178481E8041C043B9
S11316A0C00F70470020D64981F84300704710B539
@ -415,7 +415,7 @@ S11319C0686031BD38B50E4C04F14405416868685F
S11319D0FFF7BCFD002803D13120BDE83240E4E626
S11319E0FF20E0700120288031BD80B5FFF7D2FCD4
S11319F00348FF21C1700121A0F8441001BD00007B
S1131A009C0600203120D0E64F70656E424C540095
S1131A009C0C00203120D0E64F70656E424C54008F
S1131A1000B585B00420029010200090642302E0F9
S1131A200098401E00900098002824D008200190BF
S1131A3001E0401E019001980028F1D0009941185E
@ -428,7 +428,7 @@ S1131A90BFFF012804D08B210FF2B000FEF7C0FE77
S1131AA02046FEF7FBFB40F26760009040F2FF70B7
S1131AB0019008200290039002236A4601212046E7
S1131AC0FEF7BAFC06B010BD70B586B005460E46EA
S1131AD01C4C01212046FEF769FC800704D5A62191
S1131AD01C4C01212046FEF769FC800704D5AE2189
S1131AE00FF26800FEF79CFE40F2E17000900020C7
S1131AF002900396049503466A4602212046FEF7A7
S1131B009BFC01212046FEF751FC0546FEF741FFF0
@ -458,7 +458,7 @@ S1131C7000F00BF910F1010F02D02070012010BD0B
S1131C80002010BD10B50A4C0146204600F013F99F
S1131C90002803D1002010BDFEF77BFE204600F093
S1131CA0DFF80028F8D0012010BD0000010000106A
S1131CB000C0004050060020433A5C576F726B5CD2
S1131CB000C00040500C0020433A5C576F726B5CCC
S1131CC0736F6674776172655C4F70656E424C54D5
S1131CD05C5461726765745C536F757263655C41D3
S1131CE0524D434D335F4C4D33535C756172742ECA
@ -566,7 +566,7 @@ S113233000F009B810B50F4C01202070FFF792F996
S11323406060BDE8104010B5FFF76EF9012810D0A9
S1132350084C207801280CD1FFF784F9616801F555
S1132360FA71884205D300202070BDE81040FFF7C1
S113237011B810BDE806002019E050F8041BCB0783
S113237011B810BDE80C002019E050F8041BCB077D
S113238044BFA9F101035918121F0023042A41F87C
S1132390043BF9D25FEA827C0B4604D54FF0000C73
S11323A0A1F800C09B1CD10744BF0021197050F84C
@ -577,12 +577,12 @@ S11323E0015B02D5521CF9D1F0E7521EF4D5EDE79A
S11323F010B5074979441831064C7C44163404E07E
S11324000A68081D114488470146A142F8D110BD4D
S1132410080000002400000061FFFFFFAC0400007E
S1132420480200200000000091FFFFFF7000000040
S1132420480800200000000091FFFFFF700000003A
S1132430080000000000002000F00BF8002801D084
S1132440FFF7D6FF0020AFF30080FFF733FF00F063
S113245002F80120704700F001B800000746384632
S113246000F002F8FBE7000080B5AFF30080024AF9
S113247011001820ABBEFBE726000200034B9D466B
S1132480AFF30080AFF30080FFF7D6FF48020020CF
S1132480AFF30080AFF30080FFF7D6FF48080020C9
S1132490AFF30080AFF30080FFF7CEFF0004BD0070
S903249147

View File

@ -61,7 +61,8 @@
* in bits/second. Two CAN messages are reserved for communication with the host. The
* message identifier for sending data from the target to the host is configured with
* BOOT_COM_CAN_TXMSG_ID. The one for receiving data from the host is configured with
* BOOT_COM_CAN_RXMSG_ID. The maximum amount of data bytes in a message for data
* BOOT_COM_CAN_RXMSG_ID. Note that an extended 29-bit CAN identifier is configured by
* OR-ing with mask 0x80000000. The maximum amount of data bytes in a message for data
* transmission and reception is set through BOOT_COM_CAN_TX_MAX_DATA and
* BOOT_COM_CAN_RX_MAX_DATA, respectively. It is common for a microcontroller to have more
* than 1 CAN controller on board. The zero-based BOOT_COM_CAN_CHANNEL_INDEX selects the
@ -73,11 +74,11 @@
/** \brief Configure the desired CAN baudrate. */
#define BOOT_COM_CAN_BAUDRATE (500000)
/** \brief Configure CAN message ID target->host. */
#define BOOT_COM_CAN_TX_MSG_ID (0x7E1)
#define BOOT_COM_CAN_TX_MSG_ID (0x7E1 /*| 0x80000000*/)
/** \brief Configure number of bytes in the target->host CAN message. */
#define BOOT_COM_CAN_TX_MAX_DATA (8)
/** \brief Configure CAN message ID host->target. */
#define BOOT_COM_CAN_RX_MSG_ID (0x667)
#define BOOT_COM_CAN_RX_MSG_ID (0x667 /*| 0x80000000*/)
/** \brief Configure number of bytes in the host->target CAN message. */
#define BOOT_COM_CAN_RX_MAX_DATA (8)
/** \brief Select the desired CAN peripheral as a zero based index. */

File diff suppressed because it is too large Load Diff

View File

@ -73,14 +73,14 @@
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>40</YPos2><SelStart2>2714</SelStart2><SelEnd2>2714</SelEnd2></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\blt_conf.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>29</YPos2><SelStart2>3117</SelStart2><SelEnd2>3117</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\IAR\cstart.s</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>25</YPos2><SelStart2>2249</SelStart2><SelEnd2>2249</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\hooks.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>48</YPos2><SelStart2>3065</SelStart2><SelEnd2>3065</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\uart.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>150</YPos2><SelStart2>6517</SelStart2><SelEnd2>6517</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\..\..\Source\com.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>96</YPos2><SelStart2>4795</SelStart2><SelEnd2>4795</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\..\..\Source\boot.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>33</YPos2><SelStart2>2586</SelStart2><SelEnd2>2586</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>39</YPos2><SelStart2>2714</SelStart2><SelEnd2>2714</SelEnd2></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\blt_conf.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>38</YPos2><SelStart2>4846</SelStart2><SelEnd2>4846</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
<Top><Row0><Sizes><Toolbar-029C7138><key>iaridepm.enu1</key></Toolbar-029C7138></Sizes></Row0><Row1><Sizes><Toolbar-09C4EC10><key>debuggergui.enu1</key></Toolbar-09C4EC10></Sizes></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>698</Bottom><Right>238</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>243</yscreen><sizeHorzCX>125000</sizeHorzCX><sizeHorzCY>241071</sizeHorzCY><sizeVertCX>125000</sizeVertCX><sizeVertCY>694444</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>698</Bottom><Right>481</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>104167</sizeHorzCX><sizeHorzCY>198413</sizeHorzCY><sizeVertCX>251563</sizeVertCX><sizeVertCY>694444</sizeVertCY></Rect></Wnd3></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>241</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>243</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>241071</sizeHorzCY><sizeVertCX>125000</sizeVertCX><sizeVertCY>241071</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-04A01F58><key>iaridepm.enu1</key></Toolbar-04A01F58></Sizes></Row0><Row1><Sizes><Toolbar-0DD3B450><key>debuggergui.enu1</key></Toolbar-0DD3B450></Sizes></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>697</Bottom><Right>238</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>243</yscreen><sizeHorzCX>125000</sizeHorzCX><sizeHorzCY>241311</sizeHorzCY><sizeVertCX>125000</sizeVertCX><sizeVertCY>694141</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>697</Bottom><Right>481</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>104167</sizeHorzCX><sizeHorzCY>198610</sizeHorzCY><sizeVertCX>251563</sizeVertCX><sizeVertCY>694141</sizeVertCY></Rect></Wnd3></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>241</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>243</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>241311</sizeHorzCY><sizeVertCX>125000</sizeVertCX><sizeVertCY>241311</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Project>

View File

@ -9,7 +9,7 @@ TriggerName=main
LimitSize=0
ByteLimit=50
[DebugChecksum]
Checksum=1927027699
Checksum=-412817264
[Exceptions]
StopOnUncaught=_ 0
StopOnThrow=_ 0

View File

@ -12,7 +12,7 @@
<Column0>244</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
<Column0>261</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>
</Workspace>
<Build>
@ -25,7 +25,7 @@
<Windows>
<Wnd2>
<Wnd0>
<Tabs>
<Tab>
<Identity>TabID-17931-22022</Identity>
@ -37,7 +37,7 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd2><Wnd3>
<SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<Tabs>
<Tab>
<Identity>TabID-24560-22511</Identity>
@ -47,20 +47,20 @@
</Tab>
<Tab><Identity>TabID-23843-13527</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
<SelectedTab>0</SelectedTab></Wnd3></Windows>
<SelectedTab>0</SelectedTab></Wnd1></Windows>
<Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>40</YPos2><SelStart2>2976</SelStart2><SelEnd2>2976</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\blt_conf.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>29</YPos2><SelStart2>3117</SelStart2><SelEnd2>3117</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\IAR\cstart.s</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>25</YPos2><SelStart2>2249</SelStart2><SelEnd2>2249</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\hooks.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>48</YPos2><SelStart2>3065</SelStart2><SelEnd2>3065</SelEnd2></Tab><ActiveTab>3</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\..\..\Source\ARMCM3_LM3S\uart.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>150</YPos2><SelStart2>6517</SelStart2><SelEnd2>6517</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\..\..\Source\com.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>96</YPos2><SelStart2>4795</SelStart2><SelEnd2>4795</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\..\..\Source\boot.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>33</YPos2><SelStart2>2586</SelStart2><SelEnd2>2586</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>39</YPos2><SelStart2>2714</SelStart2><SelEnd2>2714</SelEnd2></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\blt_conf.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>38</YPos2><SelStart2>4846</SelStart2><SelEnd2>4846</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
<Top><Row0><Sizes><Toolbar-029C7138><key>iaridepm.enu1</key></Toolbar-029C7138></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>775</Bottom><Right>335</Right><x>-2</x><y>-2</y><xscreen>187</xscreen><yscreen>169</yscreen><sizeHorzCX>97396</sizeHorzCX><sizeHorzCY>167659</sizeHorzCY><sizeVertCX>175521</sizeVertCX><sizeVertCY>770833</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>188</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>190</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>188492</sizeHorzCY><sizeVertCX>97396</sizeVertCX><sizeVertCY>167659</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-04A01F58><key>iaridepm.enu1</key></Toolbar-04A01F58></Sizes></Row0><Row1><Sizes/></Row1><Row2><Sizes/></Row2></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>962</Bottom><Right>335</Right><x>-2</x><y>-2</y><xscreen>187</xscreen><yscreen>169</yscreen><sizeHorzCX>97396</sizeHorzCX><sizeHorzCY>167825</sizeHorzCY><sizeVertCX>175521</sizeVertCX><sizeVertCY>957299</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>962</Bottom><Right>428</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>190</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>188679</sizeHorzCY><sizeVertCX>223958</sizeVertCX><sizeVertCY>957299</sizeVertCY></Rect></Wnd1></Sizes></Row0></Right><Bottom><Row0><Sizes/></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

View File

@ -324,6 +324,14 @@ static void BootComCanInit(void)
rxMsgObject.ulMsgIDMask = 0x7ff;
rxMsgObject.ulFlags = MSG_OBJ_USE_ID_FILTER;
rxMsgObject.ulMsgLen = 8;
/* is it a 29-bit extended CAN identifier? */
if ((BOOT_COM_CAN_RX_MSG_ID & 0x80000000) != 0)
{
/* configure reception acceptance filter for 29-bit CAN identifier. */
rxMsgObject.ulMsgID &= ~0x80000000;
rxMsgObject.ulMsgIDMask = 0x1fffffff;
rxMsgObject.ulFlags |= MSG_OBJ_EXTENDED_ID;
}
CANMessageSet(CAN0_BASE, CAN_RX_MSGOBJECT_IDX+1, &rxMsgObject, MSG_OBJ_TYPE_RX);
} /*** end of BootCanComInit ***/

File diff suppressed because it is too large Load Diff

View File

@ -24,7 +24,7 @@
<Windows>
<Wnd2>
<Wnd0>
<Tabs>
<Tab>
<Identity>TabID-30499-23628</Identity>
@ -36,7 +36,7 @@
</Tab>
</Tabs>
<SelectedTab>0</SelectedTab></Wnd2><Wnd3>
<SelectedTab>0</SelectedTab></Wnd0><Wnd1>
<Tabs>
<Tab>
<Identity>TabID-20859-24014</Identity>
@ -46,20 +46,20 @@
</Tab>
<Tab><Identity>TabID-15280-30213</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs>
<SelectedTab>0</SelectedTab></Wnd3></Windows>
<SelectedTab>0</SelectedTab></Wnd1></Windows>
<Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\boot.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>147</YPos2><SelStart2>7605</SelStart2><SelEnd2>7605</SelEnd2></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\boot.h</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>0</YPos2><SelStart2>2073</SelStart2><SelEnd2>2073</SelEnd2></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>59</YPos2><SelStart2>4049</SelStart2><SelEnd2>4049</SelEnd2></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\main.c</Filename><XPos>0</XPos><YPos>0</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd><XPos2>0</XPos2><YPos2>59</YPos2><SelStart2>4049</SelStart2><SelEnd2>4049</SelEnd2></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>
<Positions>
<Top><Row0><Sizes><Toolbar-04D4A660><key>iaridepm.enu1</key></Toolbar-04D4A660></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>721</Bottom><Right>394</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>243</yscreen><sizeHorzCX>125000</sizeHorzCX><sizeHorzCY>241311</sizeHorzCY><sizeVertCX>206250</sizeVertCX><sizeVertCY>717974</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>241</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>243</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>241311</sizeHorzCY><sizeVertCX>125000</sizeVertCX><sizeVertCY>241311</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
<Top><Row0><Sizes><Toolbar-062F1F58><key>iaridepm.enu1</key></Toolbar-062F1F58></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>721</Bottom><Right>394</Right><x>-2</x><y>-2</y><xscreen>240</xscreen><yscreen>243</yscreen><sizeHorzCX>125000</sizeHorzCX><sizeHorzCY>241311</sizeHorzCY><sizeVertCX>206250</sizeVertCX><sizeVertCY>717974</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>241</Bottom><Right>1922</Right><x>-2</x><y>-2</y><xscreen>1924</xscreen><yscreen>243</yscreen><sizeHorzCX>1002083</sizeHorzCX><sizeHorzCY>241311</sizeHorzCY><sizeVertCX>125000</sizeVertCX><sizeVertCY>241311</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>
</Desktop>
</Workspace>

View File

@ -144,6 +144,14 @@ void CanInit(void)
rxMsgObject.ulMsgIDMask = 0x7ff;
rxMsgObject.ulFlags = MSG_OBJ_USE_ID_FILTER;
rxMsgObject.ulMsgLen = 8;
/* is it a 29-bit extended CAN identifier? */
if ((BOOT_COM_CAN_RX_MSG_ID & 0x80000000) != 0)
{
/* configure reception acceptance filter for 29-bit CAN identifier. */
rxMsgObject.ulMsgID &= ~0x80000000;
rxMsgObject.ulMsgIDMask = 0x1fffffff;
rxMsgObject.ulFlags |= MSG_OBJ_EXTENDED_ID;
}
CANMessageSet(CAN0_BASE, CAN_RX_MSGOBJECT_IDX+1, &rxMsgObject, MSG_OBJ_TYPE_RX);
} /*** end of CanInit ***/
@ -167,6 +175,12 @@ void CanTransmitPacket(blt_int8u *data, blt_int8u len)
/* prepare the message and submit it for transmission */
msgObject.ulMsgID = BOOT_COM_CAN_TX_MSG_ID;
msgObject.ulFlags = 0;
/* is it a 29-bit extended CAN identifier? */
if ((BOOT_COM_CAN_TX_MSG_ID & 0x80000000) != 0)
{
msgObject.ulMsgID &= ~0x80000000;
msgObject.ulFlags |= MSG_OBJ_EXTENDED_ID;
}
msgObject.ulMsgLen = len;
msgObject.pucMsgData = data;
CANMessageSet(CAN0_BASE, CAN_TX_MSGOBJECT_IDX+1, &msgObject, MSG_OBJ_TYPE_TX);