Skip to content

Commit 017b05c

Browse files
jason-laytonjason-layton
committed
MPAE-18819 - editorial and grammatical updates to README.MD, updating MPLABX project to latest compiler and IDE version and rebuiling project configuration, updates and bug fixes to meta data file, replacing image of development board with marcom image from digital asset manager
1 parent 88267f6 commit 017b05c

File tree

6 files changed

+172
-73
lines changed

6 files changed

+172
-73
lines changed

‎.main-meta/main.json

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
"displayName": "MCP4821-Speaker",
99
"projectName": "pic18f56q24-curiosity-nano-explorer-mcp4821-speaker",
1010
"shortDescription": "This example will demonstrate how to interface the MCP4821-Speaker on-board the Curiosity Nano Explorer development board using DAC protocol.",
11-
"ide": {
11+
"ide": {
1212
"name": "MPLAB X",
13-
"semverRange": ">=6.20.0"
13+
"semverRange": ">=6.25.0"
1414
},
1515
"compiler": [
1616
{
1717
"name": "XC8",
18-
"semverRange": "^2.46.0"
18+
"semverRange": "^3.00.0"
1919
}
2020
],
2121
"dfp": {
22-
"name": "1.26.442",
23-
"semverRange": "^1.26.442"
22+
"name": "1.27.449",
23+
"semverRange": "^1.27.449"
2424
},
2525
"configurator": {
2626
"name": "MCC",
27-
"semverRange": "5.5.1"
27+
"semverRange": ">=5.5.1"
2828
},
2929
"device": {
3030
"metaDataVersion": "1.0.0",
@@ -37,12 +37,8 @@
3737
}
3838
},
3939
"author": "Gabrielle Simms",
40-
"peripherals": [
41-
"SPI"
42-
],
43-
"keywords": [
44-
"digital-to-analog", "speaker", "melody"
45-
],
40+
"peripherals": ["SPI", "ADC"],
41+
"keywords": ["Analog-to-Digital Converter", "Melody", "Audio"],
4642
"additionalData": {
4743
"longDescription": {
4844
"metaDataVersion": "1.0.0",

‎MCP4821-Speaker.X/main.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,12 @@ void SquareWave(void){
6363
int main(void)
6464
{
6565
SYSTEM_Initialize();
66-
6766
// Enable the Global Interrupts
6867
INTERRUPT_GlobalInterruptEnable();
6968

7069
while(1)
7170
{
7271
SquareWave();
73-
7472
__delay_ms(1);
75-
7673
}
7774
}

‎MCP4821-Speaker.X/nbproject/configurations.xml

Lines changed: 116 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,13 @@
8787
<targetDevice>PIC18F56Q24</targetDevice>
8888
<targetHeader></targetHeader>
8989
<targetPluginBoard></targetPluginBoard>
90-
<platformTool>nEdbgTool</platformTool>
90+
<platformTool>noID</platformTool>
9191
<languageToolchain>XC8</languageToolchain>
92-
<languageToolchainVersion>2.46</languageToolchainVersion>
92+
<languageToolchainVersion>3.00</languageToolchainVersion>
9393
<platform>3</platform>
9494
</toolsSet>
9595
<packs>
96-
<pack name="PIC18F-Q_DFP" vendor="Microchip" version="1.25.433"/>
96+
<pack name="PIC18F-Q_DFP" vendor="Microchip" version="1.27.449"/>
9797
</packs>
9898
<ScriptingSettings>
9999
</ScriptingSettings>
@@ -159,15 +159,24 @@
159159
<HI-TECH-LINK>
160160
<property key="additional-options-checksum" value=""/>
161161
<property key="additional-options-checksumAVR" value=""/>
162+
<property key="additional-options-checksumAVR2" value="0"/>
162163
<property key="additional-options-code-offset" value=""/>
163164
<property key="additional-options-command-line" value=""/>
164165
<property key="additional-options-errata" value=""/>
165166
<property key="additional-options-extend-address" value="false"/>
167+
<property key="additional-options-fillAVR2" value="0"/>
166168
<property key="additional-options-trace-type" value=""/>
167169
<property key="additional-options-use-response-files" value="false"/>
168170
<property key="backup-reset-condition-flags" value="false"/>
169171
<property key="calibrate-oscillator" value="false"/>
170172
<property key="calibrate-oscillator-value" value="0x3400"/>
173+
<property key="checksum-flash-options-addressce" value=""/>
174+
<property key="checksum-flash-options-addresscs" value=""/>
175+
<property key="checksum-flash-options-algorithmc"
176+
value="Select checksum algorithm"/>
177+
<property key="checksum-flash-options-destc" value=""/>
178+
<property key="checksum-flash-options-offsetc" value="0xFFFF"/>
179+
<property key="checksum-flash-options-widthc" value="2"/>
171180
<property key="clear-bss" value="true"/>
172181
<property key="code-model-external" value="wordwrite"/>
173182
<property key="code-model-rom" value=""/>
@@ -183,12 +192,16 @@
183192
<property key="display-psect-usage" value="false"/>
184193
<property key="extra-lib-directories" value=""/>
185194
<property key="fill-flash-options-addr" value=""/>
195+
<property key="fill-flash-options-addrfe" value=""/>
196+
<property key="fill-flash-options-addrfs" value=""/>
186197
<property key="fill-flash-options-const" value=""/>
198+
<property key="fill-flash-options-constf" value=""/>
187199
<property key="fill-flash-options-how" value="0"/>
188200
<property key="fill-flash-options-inc-const" value="1"/>
189201
<property key="fill-flash-options-increment" value=""/>
190202
<property key="fill-flash-options-seq" value=""/>
191203
<property key="fill-flash-options-what" value="0"/>
204+
<property key="fill-flash-options-wwidthf" value="2"/>
192205
<property key="format-hex-file-for-download" value="false"/>
193206
<property key="initialize-data" value="true"/>
194207
<property key="input-libraries" value="libm"/>
@@ -203,6 +216,56 @@
203216
<property key="program-the-device-with-default-config-words" value="false"/>
204217
<property key="remove-unused-sections" value="true"/>
205218
</HI-TECH-LINK>
219+
<Tool>
220+
<property key="AutoSelectMemRanges" value="auto"/>
221+
<property key="Freeze Peripherals" value="true"/>
222+
<property key="communication.activationmode" value="nohv"/>
223+
<property key="communication.interface"
224+
value="${communication.interface.default}"/>
225+
<property key="communication.speed" value="${communication.speed.default}"/>
226+
<property key="debugoptions.debug-startup" value="Use system settings"/>
227+
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
228+
<property key="debugoptions.useswbreakpoints" value="false"/>
229+
<property key="event.recorder.debugger.behavior" value="Running"/>
230+
<property key="event.recorder.enabled" value="false"/>
231+
<property key="event.recorder.scvd.files" value=""/>
232+
<property key="firmware.path"
233+
value="Press to browse for a specific firmware version"/>
234+
<property key="firmware.toolpack"
235+
value="Press to select which tool pack to use"/>
236+
<property key="firmware.update.action" value="firmware.update.use.latest"/>
237+
<property key="freeze.timers" value="false"/>
238+
<property key="lastid" value=""/>
239+
<property key="memories.aux" value="false"/>
240+
<property key="memories.bootflash" value="true"/>
241+
<property key="memories.configurationmemory" value="true"/>
242+
<property key="memories.configurationmemory2" value="true"/>
243+
<property key="memories.dataflash" value="true"/>
244+
<property key="memories.eeprom" value="true"/>
245+
<property key="memories.exclude.configurationmemory" value="true"/>
246+
<property key="memories.flashdata" value="true"/>
247+
<property key="memories.id" value="true"/>
248+
<property key="memories.instruction.ram.ranges"
249+
value="${memories.instruction.ram.ranges}"/>
250+
<property key="memories.programmemory" value="true"/>
251+
<property key="memories.programmemory.ranges" value="0-ffff"/>
252+
<property key="poweroptions.powerenable" value="false"/>
253+
<property key="programoptions.eraseb4program" value="true"/>
254+
<property key="programoptions.preservedataflash" value="false"/>
255+
<property key="programoptions.preservedataflash.ranges"
256+
value="${memories.dataflash.default}"/>
257+
<property key="programoptions.preserveeeprom" value="false"/>
258+
<property key="programoptions.preserveeeprom.ranges" value="380000-3801ff"/>
259+
<property key="programoptions.preserveprogram.ranges" value=""/>
260+
<property key="programoptions.preserveprogramrange" value="false"/>
261+
<property key="programoptions.preserveuserid" value="false"/>
262+
<property key="programoptions.programuserotp" value="false"/>
263+
<property key="toolpack.updateoptions"
264+
value="toolpack.updateoptions.uselatestoolpack"/>
265+
<property key="toolpack.updateoptions.packversion"
266+
value="Press to select which tool pack to use"/>
267+
<property key="voltagevalue" value=""/>
268+
</Tool>
206269
<XC8-CO>
207270
<property key="coverage-enable" value=""/>
208271
<property key="stack-guidance" value="false"/>
@@ -225,6 +288,56 @@
225288
<property key="user-pack-device-support" value=""/>
226289
<property key="wpo-lto" value="false"/>
227290
</XC8-config-global>
291+
<nEdbgTool>
292+
<property key="AutoSelectMemRanges" value="auto"/>
293+
<property key="Freeze Peripherals" value="true"/>
294+
<property key="communication.activationmode" value="nohv"/>
295+
<property key="communication.interface"
296+
value="${communication.interface.default}"/>
297+
<property key="communication.speed" value="${communication.speed.default}"/>
298+
<property key="debugoptions.debug-startup" value="Use system settings"/>
299+
<property key="debugoptions.reset-behaviour" value="Use system settings"/>
300+
<property key="debugoptions.useswbreakpoints" value="false"/>
301+
<property key="event.recorder.debugger.behavior" value="Running"/>
302+
<property key="event.recorder.enabled" value="false"/>
303+
<property key="event.recorder.scvd.files" value=""/>
304+
<property key="firmware.path"
305+
value="Press to browse for a specific firmware version"/>
306+
<property key="firmware.toolpack"
307+
value="Press to select which tool pack to use"/>
308+
<property key="firmware.update.action" value="firmware.update.use.latest"/>
309+
<property key="freeze.timers" value="false"/>
310+
<property key="lastid" value=""/>
311+
<property key="memories.aux" value="false"/>
312+
<property key="memories.bootflash" value="true"/>
313+
<property key="memories.configurationmemory" value="true"/>
314+
<property key="memories.configurationmemory2" value="true"/>
315+
<property key="memories.dataflash" value="true"/>
316+
<property key="memories.eeprom" value="true"/>
317+
<property key="memories.exclude.configurationmemory" value="true"/>
318+
<property key="memories.flashdata" value="true"/>
319+
<property key="memories.id" value="true"/>
320+
<property key="memories.instruction.ram.ranges"
321+
value="${memories.instruction.ram.ranges}"/>
322+
<property key="memories.programmemory" value="true"/>
323+
<property key="memories.programmemory.ranges" value="0-ffff"/>
324+
<property key="poweroptions.powerenable" value="false"/>
325+
<property key="programoptions.eraseb4program" value="true"/>
326+
<property key="programoptions.preservedataflash" value="false"/>
327+
<property key="programoptions.preservedataflash.ranges"
328+
value="${memories.dataflash.default}"/>
329+
<property key="programoptions.preserveeeprom" value="false"/>
330+
<property key="programoptions.preserveeeprom.ranges" value="380000-3801ff"/>
331+
<property key="programoptions.preserveprogram.ranges" value=""/>
332+
<property key="programoptions.preserveprogramrange" value="false"/>
333+
<property key="programoptions.preserveuserid" value="false"/>
334+
<property key="programoptions.programuserotp" value="false"/>
335+
<property key="toolpack.updateoptions"
336+
value="toolpack.updateoptions.uselatestoolpack"/>
337+
<property key="toolpack.updateoptions.packversion"
338+
value="Press to select which tool pack to use"/>
339+
<property key="voltagevalue" value=""/>
340+
</nEdbgTool>
228341
</conf>
229342
</confs>
230343
</configurationDescriptor>

0 commit comments

Comments
 (0)