Skip to content

Commit b9cd660

Browse files
areiter128areiter128
committed
Merge pull request #14 in MCU16CE/dspic33ck-power-pwm-complementary from MCU16ASMPSCE/dspic33ck-power-pwm-complementary:feature/_data_structure_cleanup to develop
* commit '93ae9feb17200a92b2ea7731aec4c122377ccf55': (28 commits) Updated microchip.png with the original logo file Fixed typo 'Develpoment' to 'Development' Revert "Updated Microchip logo to solve display issues with previous version" Fixing typo "Intial' to 'initial' fixed typo 'Configuraiton' -> 'Configuration' Updated Microchip logo to solve display issues with previous version Added function p33c_PwmModule_GetHandle to stay consistent with abstracted SFRs for module and generator registers added device protection for dsPIC33C MPLAB X configuraiton change after having renamed files pwm.c/h to pwm_init.c/h Minor format edits - no content change Moved PWM mode configuration to the top of configuration settings to make it clearly visible for users where/how the PWM mode is adjusted changed PWM configuration template pgConfigClear hafter having been renamed from pgConfigDispose to pgConfigClear Fixed header inclusions after having renamed pwm.h header file to pwm_init.h Minor format edits - no content change Grouped fuction prototype declarations into "essential" and "higher level" groups to make it easier for users to find and understand them Renamed guarding condition of header file Added NULL-pointer protection to functions Bugfix: fixed type conflict between pointer and integer renamed PWM configuration template "Dispose" to "Clear" to make it more intuitive when used in reset as well as dispose functions renamed files pwm.c/.h to pwm_init.c/h ...
2 parents 5505675 + 93ae9fe commit b9cd660

File tree

8 files changed

+314
-185
lines changed

8 files changed

+314
-185
lines changed

‎.main-meta/main.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version": "1.0.0",
88
"displayName": "dsPIC33CK/CH-MP PWM Configuration: Complementary PWM Output",
99
"projectName": "dspic33ck-power-pwm-complementary",
10-
"shortDescription": "Complementary PWM Output Configuration Example for dsPIC33CK/CH-MP devices",
10+
"shortDescription": "Complementary PWM Output Configuration Example for dsPIC33CK-MP devices",
1111
"ide": {
1212
"name": "MPLABX",
1313
"semverRange": ">=5.40.0"

‎dspic33ck-power-pwm-complementary.X/main.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,20 +200,20 @@ int main(void)
200200
while(SW_Read() == SW_PRESSED);
201201

202202
// Update PWM timing registers
203-
if(my_pg.pgHandle->PGxPER.value == 20000) // IF period is set to 200 kHz)
203+
if(my_pg->PGxPER.value == 20000) // IF period is set to 200 kHz)
204204
{
205-
my_pg.pgHandle->PGxPER.value = 4000; // set period to 1 MHz
206-
my_pg.pgHandle->PGxDC.value = 1000; // rescale to 25% duty cycle
205+
my_pg->PGxPER.value = 4000; // set period to 1 MHz
206+
my_pg->PGxDC.value = 1000; // rescale to 25% duty cycle
207207
}
208208
else
209209
{
210-
my_pg.pgHandle->PGxPER.value = 20000; // set period to 200 kHz
211-
my_pg.pgHandle->PGxDC.value = 5000; // rescale to 25% duty cycle
210+
my_pg->PGxPER.value = 20000; // set period to 200 kHz
211+
my_pg->PGxDC.value = 5000; // rescale to 25% duty cycle
212212
}
213213

214214
// Set UPDATE bit of master PWM generator #1
215215
DBGPIN_Set(); // Set debug pin as oscilloscope trigger
216-
my_pg.pgHandle->PGxSTAT.bits.UPDREQ = 1; // Set Update Bit (apply new timing to PWM generator)
216+
my_pg->PGxSTAT.bits.UPDREQ = 1; // Set Update Bit (apply new timing to PWM generator)
217217
}
218218

219219
}

‎dspic33ck-power-pwm-complementary.X/main.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
// include application specific header files
4141
#include "config/hal.h"
42-
#include "pwm.h"
42+
#include "pwm_init.h"
4343

4444
#ifdef __cplusplus
4545
extern "C" {

‎dspic33ck-power-pwm-complementary.X/nbproject/configurations.xml‎

Lines changed: 49 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<itemPath>mcc_generated_files/system.h</itemPath>
3030
</logicalFolder>
3131
<itemPath>main.h</itemPath>
32-
<itemPath>sources/pwm.h</itemPath>
32+
<itemPath>sources/pwm_init.h</itemPath>
3333
</logicalFolder>
3434
<logicalFolder name="LinkerScript"
3535
displayName="Linker Files"
@@ -56,7 +56,7 @@
5656
<itemPath>mcc_generated_files/pin_manager.c</itemPath>
5757
</logicalFolder>
5858
<itemPath>main.c</itemPath>
59-
<itemPath>sources/pwm.c</itemPath>
59+
<itemPath>sources/pwm_init.c</itemPath>
6060
</logicalFolder>
6161
<logicalFolder name="ExternalFiles"
6262
displayName="Important Files"
@@ -76,7 +76,7 @@
7676
<targetDevice>dsPIC33CK256MP506</targetDevice>
7777
<targetHeader></targetHeader>
7878
<targetPluginBoard></targetPluginBoard>
79-
<platformTool>ICD4Tool</platformTool>
79+
<platformTool>Simulator</platformTool>
8080
<languageToolchain>XC16</languageToolchain>
8181
<languageToolchainVersion>1.50</languageToolchainVersion>
8282
<platform>3</platform>
@@ -455,19 +455,13 @@
455455
<property key="periphComp6.gte" value="gt"/>
456456
<property key="reset.scl" value="false"/>
457457
<property key="reset.type" value="MCLR"/>
458-
<property key="tracecontrol.include.timestamp" value="summarydataenabled"/>
459-
<property key="tracecontrol.select" value="0"/>
460-
<property key="tracecontrol.stallontracebufferfull" value="false"/>
461-
<property key="tracecontrol.timestamp" value="0"/>
462-
<property key="tracecontrol.tracebufmax" value="546000"/>
463-
<property key="tracecontrol.tracefile" value="defmplabxtrace.log"/>
464-
<property key="tracecontrol.traceresetonrun" value="false"/>
458+
<property key="toolpack.updateoptions"
459+
value="toolpack.updateoptions.uselatestoolpack"/>
460+
<property key="toolpack.updateoptions.packversion"
461+
value="Press to select which tool pack to use"/>
465462
<property key="uart0io.output" value="window"/>
466463
<property key="uart0io.outputfile" value=""/>
467464
<property key="uart0io.uartioenabled" value="false"/>
468-
<property key="uart10io.output" value="window"/>
469-
<property key="uart10io.outputfile" value=""/>
470-
<property key="uart10io.uartioenabled" value="false"/>
471465
<property key="uart1io.output" value="window"/>
472466
<property key="uart1io.outputfile" value=""/>
473467
<property key="uart1io.uartioenabled" value="false"/>
@@ -486,15 +480,48 @@
486480
<property key="uart6io.output" value="window"/>
487481
<property key="uart6io.outputfile" value=""/>
488482
<property key="uart6io.uartioenabled" value="false"/>
489-
<property key="uart7io.output" value="window"/>
490-
<property key="uart7io.outputfile" value=""/>
491-
<property key="uart7io.uartioenabled" value="false"/>
492-
<property key="uart8io.output" value="window"/>
493-
<property key="uart8io.outputfile" value=""/>
494-
<property key="uart8io.uartioenabled" value="false"/>
495-
<property key="uart9io.output" value="window"/>
496-
<property key="uart9io.outputfile" value=""/>
497-
<property key="uart9io.uartioenabled" value="false"/>
483+
<property key="usart0io.output" value="window"/>
484+
<property key="usart0io.outputfile" value=""/>
485+
<property key="usart0io.uartioenabled" value="false"/>
486+
<property key="usart1io.output" value="window"/>
487+
<property key="usart1io.outputfile" value=""/>
488+
<property key="usart1io.uartioenabled" value="false"/>
489+
<property key="usart2io.output" value="window"/>
490+
<property key="usart2io.outputfile" value=""/>
491+
<property key="usart2io.uartioenabled" value="false"/>
492+
<property key="usart3io.output" value="window"/>
493+
<property key="usart3io.outputfile" value=""/>
494+
<property key="usart3io.uartioenabled" value="false"/>
495+
<property key="usart4io.output" value="window"/>
496+
<property key="usart4io.outputfile" value=""/>
497+
<property key="usart4io.uartioenabled" value="false"/>
498+
<property key="usartc0io.output" value="window"/>
499+
<property key="usartc0io.outputfile" value=""/>
500+
<property key="usartc0io.uartioenabled" value="false"/>
501+
<property key="usartc1io.output" value="window"/>
502+
<property key="usartc1io.outputfile" value=""/>
503+
<property key="usartc1io.uartioenabled" value="false"/>
504+
<property key="usartd0io.output" value="window"/>
505+
<property key="usartd0io.outputfile" value=""/>
506+
<property key="usartd0io.uartioenabled" value="false"/>
507+
<property key="usartd1io.output" value="window"/>
508+
<property key="usartd1io.outputfile" value=""/>
509+
<property key="usartd1io.uartioenabled" value="false"/>
510+
<property key="usarte0io.output" value="window"/>
511+
<property key="usarte0io.outputfile" value=""/>
512+
<property key="usarte0io.uartioenabled" value="false"/>
513+
<property key="usarte1io.output" value="window"/>
514+
<property key="usarte1io.outputfile" value=""/>
515+
<property key="usarte1io.uartioenabled" value="false"/>
516+
<property key="usarte2io.output" value="window"/>
517+
<property key="usarte2io.outputfile" value=""/>
518+
<property key="usarte2io.uartioenabled" value="false"/>
519+
<property key="usartf0io.output" value="window"/>
520+
<property key="usartf0io.outputfile" value=""/>
521+
<property key="usartf0io.uartioenabled" value="false"/>
522+
<property key="usartf1io.output" value="window"/>
523+
<property key="usartf1io.outputfile" value=""/>
524+
<property key="usartf1io.uartioenabled" value="false"/>
498525
<property key="warningmessagebreakoptions.W0001_CORE_BITREV_MODULO_EN"
499526
value="report"/>
500527
<property key="warningmessagebreakoptions.W0002_CORE_SECURE_MEMORYACCESS"

0 commit comments

Comments
 (0)