Pull request #6: 16-Bit Data EEPROM Emulation Demo @v1.0.1

harishagari · harishagari · commit 5fa710cbda27 · 2022-11-28T21:47:00.000-07:00
Merge in MCU16CE/dspic33ck-curiosity-data-eeprom-emulation-demo from develop to master

* commit 'f38d24b224ffbc1f8762ce55802efa35722603f3':
  Updated the demo to use the latest version of Melody
  Updated the demo to use the latest version of Melody
diff --git a/.main-meta/main.json b/.main-meta/main.json
@@ -4,7 +4,7 @@
    "content": {
       "metaDataVersion": "1.3.0",
       "name": "com.microchip.mplabx.project.dspic33ck-curiosity-data-eeprom-emulation-demo",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "displayName": "dsPIC33CK Curiosity Data EEPROM Emulation Demo",
       "projectName": "dspic33ck-curiosity-data-eeprom-emulation-demo",
       "shortDescription": "dsPIC33CK Curiosity Data EEPROM Emulation Demo",
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,9 @@
+# 16-Bit Data EEPROM Emulation Demo v1.0.1
+### Release Highlights
+
+Updated the demo to use the latest version of Melody
+
+
 # 16-Bit Data EEPROM Emulation Demo v1.0.0
 ### Release Highlights
 
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/dspic33ck-curiosity-data-eeprom-emulation-demo.mc3 b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/dspic33ck-curiosity-data-eeprom-emulation-demo.mc3
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/flash.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/flash.h
@@ -4,11 +4,11 @@
  * 
  * @file         flash.h
  * 
- * @defgroup     flashdriver Flash Driver
+ * @ingroup      flashdriver Flash Driver
  * 
  * @brief        FLASH driver using dsPIC MCUs
  *
- * @version      Driver Version 1.0.1
+ * @version      Driver Version 1.0.2
  *
  * @skipline     Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/flash_hardware.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/flash_hardware.h
@@ -8,7 +8,7 @@
  * 
  * @brief       This is the generated driver header file for the FLASH driver
  *
- * @version     Driver Version 1.0.1
+ * @version     Driver Version 1.0.2
  *
  * @skipline    Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/flash_interface.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/flash_interface.h
@@ -8,7 +8,7 @@
  * 
  * @brief       FLASH Driver using dsPIC MCUs
  *
- * @version     Driver Version 1.0.0
+ * @version     Driver Version 1.0.2
  *
  * @skipline    Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/flash_types.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/flash_types.h
@@ -4,11 +4,11 @@
  * 
  * @file        flash_types.h
  * 
- * @defgroup    flashdriver Flash Driver
+ * @ingroup     flashdriver Flash Driver
  * 
  * @brief       FLASH Driver using dsPIC MCUs
  *
- * @version     Driver Version 1.0.0
+ * @version     Driver Version 1.0.2
  *
  * @skipline    Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/src/flash.c b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/flash/src/flash.c
@@ -7,7 +7,7 @@
  *            
  * @brief     This is the generated driver source file for FLASH driver
  *            
- * @version   Driver Version 1.0.1
+ * @version   Driver Version 1.0.2
  *           
  * @skipline  Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/clock.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/clock.h
@@ -7,7 +7,7 @@
  *            
  * @brief     Clock configurator driver for System and Peripheral Clock using dsPIC MCUs.
  *            
- * @version   Driver Version 1.0.0
+ * @version   Driver Version 1.0.1
  *            
  * @skipline  Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/dmt.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/dmt.h
@@ -9,7 +9,7 @@
  *            is to interrupt the processor in the event of a software 
  *            malfunction.
  *
- * @version   Driver Version 1.1.0
+ * @version   Driver Version 1.1.1
  *
  * @skipline  Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/interrupt.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/interrupt.h
@@ -7,7 +7,7 @@
  *            
  * @brief     Interrupt Priority configuration driver using dsPIC MCUs.
  *            
- * @version   Driver Version 1.0.0
+ * @version   Driver Version 1.1.0
  *            
  * @skipline  Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/interrupt_types.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/interrupt_types.h
@@ -0,0 +1,58 @@
+/**
+ * INTERRUPT Generated Driver Header File 
+ * 
+ * @file      interrupt_types.h
+ *            
+ * @defgroup  interruptdriver
+ *            
+ * @brief     This is the generated driver types header file for the INTERRUPT driver
+ *            
+ * @version   Driver Version 1.1.0
+ *            
+ * @skipline  Device : dsPIC33CK256MP508
+*/
+
+/*
+� [2022] Microchip Technology Inc. and its subsidiaries.
+
+    Subject to your compliance with these terms, you may use Microchip 
+    software and any derivatives exclusively with Microchip products. 
+    You are responsible for complying with 3rd party license terms  
+    applicable to your use of 3rd party software (including open source  
+    software) that may accompany Microchip software. SOFTWARE IS ?AS IS.? 
+    NO WARRANTIES, WHETHER EXPRESS, IMPLIED OR STATUTORY, APPLY TO THIS 
+    SOFTWARE, INCLUDING ANY IMPLIED WARRANTIES OF NON-INFRINGEMENT,  
+    MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT 
+    WILL MICROCHIP BE LIABLE FOR ANY INDIRECT, SPECIAL, PUNITIVE, 
+    INCIDENTAL OR CONSEQUENTIAL LOSS, DAMAGE, COST OR EXPENSE OF ANY 
+    KIND WHATSOEVER RELATED TO THE SOFTWARE, HOWEVER CAUSED, EVEN IF 
+    MICROCHIP HAS BEEN ADVISED OF THE POSSIBILITY OR THE DAMAGES ARE 
+    FORESEEABLE. TO THE FULLEST EXTENT ALLOWED BY LAW, MICROCHIP?S 
+    TOTAL LIABILITY ON ALL CLAIMS RELATED TO THE SOFTWARE WILL NOT 
+    EXCEED AMOUNT OF FEES, IF ANY, YOU PAID DIRECTLY TO MICROCHIP FOR 
+    THIS SOFTWARE.
+*/
+
+#ifndef INTERRUPT_TYPES_H
+#define INTERRUPT_TYPES_H
+
+/**
+ * @ingroup  interruptdriver
+ * @enum     interrupt_types.h
+ * @brief    Defines the interrupt priority values.
+*/
+
+enum INTERRUPT_PRIORITY
+{
+	INTERRUPT_PRIORITY_1 = 1,
+	INTERRUPT_PRIORITY_2 = 2,
+	INTERRUPT_PRIORITY_3 = 3,
+	INTERRUPT_PRIORITY_4 = 4,
+	INTERRUPT_PRIORITY_5 = 5,
+	INTERRUPT_PRIORITY_6 = 6,
+	INTERRUPT_PRIORITY_7 = 7,
+	INTERRUPT_MAX_PRIORITY = 7
+};
+
+#endif
+
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/clock.c b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/clock.c
@@ -7,7 +7,7 @@
  *            
  * @brief     This is the generated source file for CLOCK driver
  *            
- * @version   Driver Version 1.0.0
+ * @version   Driver Version 1.0.1
  *            
  * @skipline  Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/config_bits.c b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/config_bits.c
@@ -61,11 +61,11 @@
 #pragma config XTBST = ENABLE    //XT Boost->Boost the kick-start
 
 // FWDT
-#pragma config RWDTPS = PS1    //Run Mode Watchdog Timer Post Scaler select bits->1:1
-#pragma config RCLKSEL = FCY    //Watchdog Timer Clock Select bits->Use peripheral clk when system clock is not INTOSC/LPRC and device is not in Sleep;otherwise, use INTOSC/LPRC
+#pragma config RWDTPS = PS1048576    //Run Mode Watchdog Timer Post Scaler select bits->1:1048576
+#pragma config RCLKSEL = LPRC    //Watchdog Timer Clock Select bits->Always use LPRC
 #pragma config WINDIS = ON    //Watchdog Timer Window Enable bit->Watchdog Timer in Non-Window mode
 #pragma config WDTWIN = WIN25    //Watchdog Timer Window Select bits->WDT Window is 25% of WDT period
-#pragma config SWDTPS = PS1    //Sleep Mode Watchdog Timer Post Scaler select bits->1:1
+#pragma config SWDTPS = PS1048576    //Sleep Mode Watchdog Timer Post Scaler select bits->1:1048576
 #pragma config FWDTEN = ON_SW    //Watchdog Timer Enable bit->WDT controlled via SW, use WDTCON.ON bit
 
 // FPOR
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/dmt.c b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/dmt.c
@@ -7,7 +7,7 @@
  * 
  * @brief     This is the generated driver source file for DMT driver
  *
- * @version   Driver Version 1.1.0
+ * @version   Driver Version 1.1.1
  *
  * @skipline  Device : dsPIC33CK256MP508
 */
@@ -145,7 +145,10 @@ void __attribute__ ((weak)) DMT_EventCallback( void )
 
 void __attribute__ ((interrupt, no_auto_psv)) _DMTInterrupt(void)
 {
-    (*DMT_EventHandler)();
+    if(NULL != DMT_EventHandler)
+    {
+        (*DMT_EventHandler)();
+    }
     IFS2bits.DMTIF = 0U;
 }
 
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/interrupt.c b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/interrupt.c
@@ -7,7 +7,7 @@
  *            
  * @brief     This is the generated driver source file for INTERRUPT driver
  *            
- * @version   Driver Version 1.0.0
+ * @version   Driver Version 1.1.0
  *            
  * @skipline  Device : dsPIC33CK256MP508
 */
@@ -45,30 +45,10 @@ void INTERRUPT_Initialize(void)
     // Priority: 1
     IPC11bits.DMTIP = 1;
     
-    // U1EVT: UART1 Event
-    // Priority: 1
-    IPC47bits.U1EVTIP = 1;
-    
-    // U1E: UART1 Error
-    // Priority: 1
-    IPC12bits.U1EIP = 1;
-    
-    // U1TX: UART1 TX
-    // Priority: 1
-    IPC3bits.U1TXIP = 1;
-    
-    // U1RX: UART1 RX
-    // Priority: 1
-    IPC2bits.U1RXIP = 1;
-    
 }
 
 void INTERRUPT_Deinitialize(void)
 {
     //POR default value of priority
     IPC11bits.DMTIP = 4;
-    IPC47bits.U1EVTIP = 4;
-    IPC12bits.U1EIP = 4;
-    IPC3bits.U1TXIP = 4;
-    IPC2bits.U1RXIP = 4;
 }
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/pins.c b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/pins.c
@@ -58,7 +58,7 @@ void PINS_Initialize(void)
     TRISA = 0x001F;
     TRISB = 0xFFFD;
     TRISC = 0xFFFF;
-    TRISD = 0xFFEF;
+    TRISD = 0xFFFF;
     TRISE = 0xFFFF;
 
 
@@ -96,16 +96,5 @@ void PINS_Initialize(void)
     ANSELD = 0x2C00;
     ANSELE = 0x000F;
 
-    /****************************************************************************
-     * Set the PPS
-     ***************************************************************************/
-     __builtin_write_RPCON(0x0000); // unlock PPS
-
-        RPINR18bits.U1RXR = 0x0043; //RD3->UART1:U1RX;
-        RPOR18bits.RP68R = 0x0001;  //RD4->UART1:U1TX;
-
-     __builtin_write_RPCON(0x0800); // lock PPS
-
-
 }
 
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/system.c b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/src/system.c
@@ -7,7 +7,7 @@
  *            
  * @brief     This is the generated driver header file for the System driver
  *            
- * @version   Driver Version 1.0.0
+ * @version   Driver Version 1.0.1
  *            
  * @skipline  Device : dsPIC33CK256MP508
 */
@@ -35,20 +35,18 @@
 #include "../system.h"
 #include "../system_types.h"
 #include "../clock.h"
+#include "../pins.h"
 #include "../dmt.h"
 #include "../interrupt.h"
-#include "../pins.h"
-#include "../../uart/uart1.h"
 
 
 void SYSTEM_Initialize(void)
 {
     CLOCK_Initialize();
     PINS_Initialize();
     DMT_Initialize();
-    UART1_Initialize();
-    INTERRUPT_Initialize();
     INTERRUPT_GlobalEnable();
+    INTERRUPT_Initialize();
 }
 
 /**
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/system.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/system.h
@@ -7,7 +7,7 @@
  * 
  * @brief     System driver using dsPIC MCUs.
  *
- * @version   Driver Version 1.0.0
+ * @version   Driver Version 1.0.1
  *
  * @skipline  Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/system_types.h b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/mcc_generated_files/system/system_types.h
@@ -7,7 +7,7 @@
  *            
  * @brief     This is the generated driver types header file for the System driver
  *            
- * @version   Driver Version 1.0.0
+ * @version   Driver Version 1.0.1
  *            
  * @skipline  Device : dsPIC33CK256MP508
 */
diff --git a/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/nbproject/configurations.xml b/dspic33ck-curiosity-data-eeprom-emulation-demo/dspic33c-data-eeprom-emulation-demo.X/nbproject/configurations.xml
@@ -27,6 +27,7 @@
           <itemPath>mcc_generated_files/system/reset_types.h</itemPath>
           <itemPath>mcc_generated_files/system/traps.h</itemPath>
           <itemPath>mcc_generated_files/system/system.h</itemPath>
+          <itemPath>mcc_generated_files/system/interrupt_types.h</itemPath>
         </logicalFolder>
         <logicalFolder name="uart" displayName="uart" projectFiles="true">
           <itemPath>mcc_generated_files/uart/uart1.h</itemPath>
@@ -80,7 +81,7 @@
                    displayName="Important Files"
                    projectFiles="false">
       <itemPath>Makefile</itemPath>
-      <itemPath>dspic33c-data-eeprom-emulation-demo.mc3</itemPath>
+      <itemPath>dspic33ck-curiosity-data-eeprom-emulation-demo.mc3</itemPath>
     </logicalFolder>
   </logicalFolder>
   <projectmakefile>Makefile</projectmakefile>

Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`*`
`5`	`5`	`* @file flash.h`
`6`	`6`	`*`
`7`		`- * @defgroup flashdriver Flash Driver`
	`7`	`+ * @ingroup flashdriver Flash Driver`
`8`	`8`	`*`
`9`	`9`	`* @brief FLASH driver using dsPIC MCUs`
`10`	`10`	`*`
`11`		`- * @version Driver Version 1.0.1`
	`11`	`+ * @version Driver Version 1.0.2`
`12`	`12`	`*`
`13`	`13`	`* @skipline Device : dsPIC33CK256MP508`
`14`	`14`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* @brief This is the generated driver header file for the FLASH driver`
`10`	`10`	`*`
`11`		`- * @version Driver Version 1.0.1`
	`11`	`+ * @version Driver Version 1.0.2`
`12`	`12`	`*`
`13`	`13`	`* @skipline Device : dsPIC33CK256MP508`
`14`	`14`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -4,11 +4,11 @@`
`4`	`4`	`*`
`5`	`5`	`* @file flash_types.h`
`6`	`6`	`*`
`7`		`- * @defgroup flashdriver Flash Driver`
	`7`	`+ * @ingroup flashdriver Flash Driver`
`8`	`8`	`*`
`9`	`9`	`* @brief FLASH Driver using dsPIC MCUs`
`10`	`10`	`*`
`11`		`- * @version Driver Version 1.0.0`
	`11`	`+ * @version Driver Version 1.0.2`
`12`	`12`	`*`
`13`	`13`	`* @skipline Device : dsPIC33CK256MP508`
`14`	`14`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* @brief This is the generated driver source file for FLASH driver`
`9`	`9`	`*`
`10`		`- * @version Driver Version 1.0.1`
	`10`	`+ * @version Driver Version 1.0.2`
`11`	`11`	`*`
`12`	`12`	`* @skipline Device : dsPIC33CK256MP508`
`13`	`13`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* @brief Clock configurator driver for System and Peripheral Clock using dsPIC MCUs.`
`9`	`9`	`*`
`10`		`- * @version Driver Version 1.0.0`
	`10`	`+ * @version Driver Version 1.0.1`
`11`	`11`	`*`
`12`	`12`	`* @skipline Device : dsPIC33CK256MP508`
`13`	`13`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* is to interrupt the processor in the event of a software`
`10`	`10`	`* malfunction.`
`11`	`11`	`*`
`12`		`- * @version Driver Version 1.1.0`
	`12`	`+ * @version Driver Version 1.1.1`
`13`	`13`	`*`
`14`	`14`	`* @skipline Device : dsPIC33CK256MP508`
`15`	`15`	`*/`