Skip to content

Commit c88d63c

Browse files
davidflowersdavidflowers
committed
Pull request #1: Feature/prep for release
Merge in MCU16CE/pic24-dspic-can-canfd-bootloader from ~C12109/pic24-dspic-can-canfd-bootloader:feature/prep_for_release to develop * commit 'dd7d1617f2c2fab1bd7febb04027db258c8b4340': move to relative path for file redirection so it works once downloaded. adding index.html files and renaming help files to be consistent. review feedback. review feedback. limit keywords used. Update source path for build system. add top level documentation and filtering information. adding demo files to release.
2 parents bc21a66 + dd7d161 commit c88d63c

File tree

483 files changed

+192883
-21
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

483 files changed

+192883
-21
lines changed

‎.main-meta/main.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
"metaDataVersion":"1.0.0",
66
"name":"com.microchip.mplabx.project.pic24-dspic-can-canfd-bootloader",
77
"version":"x.x.x",
8-
"displayName":"xxxxxxxxxxxxxxx",
8+
"displayName":"PIC24/dsPIC CAN/CAN-FD Bootloader",
99
"projectName":"pic24-dspic-can-canfd-bootloader",
10-
"shortDescription":"xxxxxxxxxxxxxxx",
10+
"shortDescription":"CAN and CAN-FD bootloader example using the ISO-15765-2 CAN transport layer for the PIC24 and dsPIC product lines.",
1111
"ide":{
1212
"name":"MPLABX",
1313
"semverRange":">=5.40.0"
1414
},
1515
"compiler":{
1616
"name":"XC16",
17-
"semverRange":"^1.50.0"
17+
"semverRange":"^1.61.0"
1818
},
1919
"dfp":{
20-
"name":"xxxxxxxxxxxxxxx",
21-
"semverRange":">=x.x.x"
20+
"name":"dsPIC33CK-MP_DFP",
21+
"semverRange":">=1.5.135"
2222
},
2323
"configurator": {
2424
"name": "MCC",
@@ -30,17 +30,18 @@
3030
"content":{
3131
"metaDataVersion":"1.0.0",
3232
"category":"com.microchip.device",
33-
"name":"xxxxxxxxxxxxxxx",
33+
"name":"dsPIC33CK256MP508",
3434
"versionRange":"*"
3535
}
3636
},
3737
"peripherals":[
38-
"DMA",
39-
"CAN"
38+
"CAN",
39+
"CAN FD"
4040
],
4141
"keywords":[
42-
"DMA",
43-
"Sensor"
42+
"CAN",
43+
"Bootloader",
44+
"CAN-FD"
4445
]
4546
}
4647
}

‎README.md‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
![image](images/microchip.jpg)
22

3-
## PIC24 DSPIC CAN CANFD BOOTLOADER
4-
5-
Board Image if any.
3+
## PIC24/dsPIC CAN/CAN-FD Bootloader Demo
64

75
## Summary
86

7+
An example bootloader using the 16-bit MCC bootloader and the CAN or CAN-FD peripheral.
98

109
## Related Documentation
1110

11+
https://www.microchip.com/16-bit-bootloader
1212

13-
## Software Used
14-
15-
16-
## Hardware Used
17-
18-
19-
## Setup
13+
## Setup And Operation
2014

15+
There are 3 configurations provided in this demo:
16+
1) Using CAN classic on a device with the CAN-FD module
17+
2) Using CAN-FD on a device with the CAN-FD module
18+
3) Using CAN classic on a device with the enhanced CAN controller
2119

22-
## Operation
20+
The hardware and software setup is different for each of these use cases. There are readme*.html files associated with each folder that describe the required hardware and software as well as how to setup and run each of the corresponding demos.
2321

22+
https://microchip-pic-avr-examples.github.io/pic24-dspic-can-canfd-bootloader/dspic33ck-can
23+
https://microchip-pic-avr-examples.github.io/pic24-dspic-can-canfd-bootloader/dspic33ck-canfd
24+
https://microchip-pic-avr-examples.github.io/pic24-dspic-can-canfd-bootloader/dspic33ep-can2.0b
2425

2526

‎dspic33ck-can/app.X/Makefile‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
#
2+
# There exist several targets which are by default empty and which can be
3+
# used for execution of your targets. These targets are usually executed
4+
# before and after some main targets. They are:
5+
#
6+
# .build-pre: called before 'build' target
7+
# .build-post: called after 'build' target
8+
# .clean-pre: called before 'clean' target
9+
# .clean-post: called after 'clean' target
10+
# .clobber-pre: called before 'clobber' target
11+
# .clobber-post: called after 'clobber' target
12+
# .all-pre: called before 'all' target
13+
# .all-post: called after 'all' target
14+
# .help-pre: called before 'help' target
15+
# .help-post: called after 'help' target
16+
#
17+
# Targets beginning with '.' are not intended to be called on their own.
18+
#
19+
# Main targets can be executed directly, and they are:
20+
#
21+
# build build a specific configuration
22+
# clean remove built files from a configuration
23+
# clobber remove all built files
24+
# all build all configurations
25+
# help print help mesage
26+
#
27+
# Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
28+
# .help-impl are implemented in nbproject/makefile-impl.mk.
29+
#
30+
# Available make variables:
31+
#
32+
# CND_BASEDIR base directory for relative paths
33+
# CND_DISTDIR default top distribution directory (build artifacts)
34+
# CND_BUILDDIR default top build directory (object files, ...)
35+
# CONF name of current configuration
36+
# CND_ARTIFACT_DIR_${CONF} directory of build artifact (current configuration)
37+
# CND_ARTIFACT_NAME_${CONF} name of build artifact (current configuration)
38+
# CND_ARTIFACT_PATH_${CONF} path to build artifact (current configuration)
39+
# CND_PACKAGE_DIR_${CONF} directory of package (current configuration)
40+
# CND_PACKAGE_NAME_${CONF} name of package (current configuration)
41+
# CND_PACKAGE_PATH_${CONF} path to package (current configuration)
42+
#
43+
# NOCDDL
44+
45+
46+
# Environment
47+
MKDIR=mkdir
48+
CP=cp
49+
CCADMIN=CCadmin
50+
RANLIB=ranlib
51+
52+
53+
# build
54+
build: .build-post
55+
56+
.build-pre:
57+
# Add your pre 'build' code here...
58+
59+
.build-post: .build-impl
60+
# Add your post 'build' code here...
61+
62+
63+
# clean
64+
clean: .clean-post
65+
66+
.clean-pre:
67+
# Add your pre 'clean' code here...
68+
# WARNING: the IDE does not call this target since it takes a long time to
69+
# simply run make. Instead, the IDE removes the configuration directories
70+
# under build and dist directly without calling make.
71+
# This target is left here so people can do a clean when running a clean
72+
# outside the IDE.
73+
74+
.clean-post: .clean-impl
75+
# Add your post 'clean' code here...
76+
77+
78+
# clobber
79+
clobber: .clobber-post
80+
81+
.clobber-pre:
82+
# Add your pre 'clobber' code here...
83+
84+
.clobber-post: .clobber-impl
85+
# Add your post 'clobber' code here...
86+
87+
88+
# all
89+
all: .all-post
90+
91+
.all-pre:
92+
# Add your pre 'all' code here...
93+
94+
.all-post: .all-impl
95+
# Add your post 'all' code here...
96+
97+
98+
# help
99+
help: .help-post
100+
101+
.help-pre:
102+
# Add your pre 'help' code here...
103+
104+
.help-post: .help-impl
105+
# Add your post 'help' code here...
106+
107+
108+
109+
# include project implementation makefile
110+
include nbproject/Makefile-impl.mk
111+
112+
# include project make variables
113+
include nbproject/Makefile-variables.mk

0 commit comments

Comments
 (0)