@mchp-mcc/scf-pic8-interrupt-v3 1.0.2 → 1.0.4

package/output/interrupt_manager_priorityDisabled.c.ftl

@@ -7,7 +7,7 @@
  * 
  * @brief This file contains the API implementation for the Interrupt Manager driver.
  * 
- * @version Interrupt Manager Driver Version 2.0.5
+ * @version Interrupt Manager Driver Version 2.0.6
 */
 
 ${disclaimer}
@@ -64,7 +64,7 @@ void __interrupt() INTERRUPT_InterruptManager (void)
         </#if>
         <#if (!interrupt.isPeripheralInterrupt || !pieAvailable)>
             <#assign isIfCondUsedBefore = true>
-    ${if_cmd}(${interrupt.enable} == 1 && ${interrupt.flag} == 1)
+    ${if_cmd}(${interrupt.enable} == 1U && ${interrupt.flag} == 1U)
     {
         <#if interrupt.generateISR>
         ${interrupt.isrCallback.name}();
@@ -82,7 +82,7 @@ void __interrupt() INTERRUPT_InterruptManager (void)
         <#else>
                 <#assign if_cmd = "if">
         </#if>  
-    ${if_cmd}(${INTCON.settings.PEIE.bitName} == 1)
+    ${if_cmd}(${INTCON.settings.PEIE.bitName} == 1U)
     {
         <#assign isIfCondUsedBefore = false>
         <#list highInterrupts as interrupt>
@@ -93,7 +93,7 @@ void __interrupt() INTERRUPT_InterruptManager (void)
             </#if> 
             <#if (interrupt.isPeripheralInterrupt && pieAvailable)>
                 <#assign isIfCondUsedBefore = true>
-        ${if_cmd}(${interrupt.enable} == 1 && ${interrupt.flag} == 1)
+        ${if_cmd}(${interrupt.enable} == 1U && ${interrupt.flag} == 1U)
         {
             <#if interrupt.generateISR>
             ${interrupt.isrCallback.name}();

package/output/interrupt_manager_priorityDisabled.h.ftl

@@ -7,7 +7,7 @@
  * 
  * @brief This file contains API prototypes and other data types for the Interrupt Manager driver.
  *
- * @version Interrupt Manager Driver Version 2.0.5
+ * @version Interrupt Manager Driver Version 2.0.6
 */
 
 ${disclaimer}
@@ -22,7 +22,7 @@ ${disclaimer}
  * @param None.
  * @return None.
  */
-#define INTERRUPT_GlobalInterruptEnable() (${INTCON.settings.GIE.bitName} = 1)
+#define INTERRUPT_GlobalInterruptEnable() (${INTCON.settings.GIE.bitName} = 1U)
 
 /**
  * @ingroup interrupt
@@ -30,7 +30,7 @@ ${disclaimer}
  * @param None.
  * @return None.
  */
-#define INTERRUPT_GlobalInterruptDisable() (${INTCON.settings.GIE.bitName} = 0)
+#define INTERRUPT_GlobalInterruptDisable() (${INTCON.settings.GIE.bitName} = 0U)
 
 /**
  * @ingroup interrupt
@@ -48,7 +48,7 @@ ${disclaimer}
  * @param None.
  * @return None.
  */
-#define INTERRUPT_PeripheralInterruptEnable() (${INTCON.settings.PEIE.bitName} = 1)
+#define INTERRUPT_PeripheralInterruptEnable() (${INTCON.settings.PEIE.bitName} = 1U)
 
 /**
  * @ingroup interrupt
@@ -56,7 +56,7 @@ ${disclaimer}
  * @param None.
  * @return None.
  */
-#define INTERRUPT_PeripheralInterruptDisable() (${INTCON.settings.PEIE.bitName} = 0)
+#define INTERRUPT_PeripheralInterruptDisable() (${INTCON.settings.PEIE.bitName} = 0U)
 </#if>
 
 /**
@@ -76,7 +76,7 @@ void INTERRUPT_Initialize (void);
  * @param None.
  * @return None.
  */
-#define ${intPin.customName}_InterruptFlagClear()       (${intPin.flagName} = 0)
+#define ${intPin.customName}_InterruptFlagClear()       (${intPin.flagName} = 0U)
 
 /**
  * @ingroup interrupt
@@ -84,7 +84,7 @@ void INTERRUPT_Initialize (void);
  * @param None.
  * @return None.
  */
-#define ${intPin.customName}_InterruptDisable()     (${intPin.enableBitName} = 0)
+#define ${intPin.customName}_InterruptDisable()     (${intPin.enableBitName} = 0U)
 
 /**
  * @ingroup interrupt
@@ -92,7 +92,7 @@ void INTERRUPT_Initialize (void);
  * @param None.
  * @return None.
  */
-#define ${intPin.customName}_InterruptEnable()       (${intPin.enableBitName} = 1)
+#define ${intPin.customName}_InterruptEnable()       (${intPin.enableBitName} = 1U)
 
 <#if intPin.edge?? && intPin.SFREdgeDetectFromPin??>
 /**
@@ -101,7 +101,7 @@ void INTERRUPT_Initialize (void);
  * @param None.
  * @return None.
  */
-#define ${intPin.customName}_risingEdgeSet()          (${intPin.SFREdgeDetectFromPin} = 1)
+#define ${intPin.customName}_risingEdgeSet()          (${intPin.SFREdgeDetectFromPin} = 1U)
 </#if>
 
 <#if intPin.edge?? && intPin.SFREdgeDetectFromPin??>
@@ -111,7 +111,7 @@ void INTERRUPT_Initialize (void);
  * @param None.
  * @return None.
  */
-#define ${intPin.customName}_fallingEdgeSet()          (${intPin.SFREdgeDetectFromPin} = 0)
+#define ${intPin.customName}_fallingEdgeSet()          (${intPin.SFREdgeDetectFromPin} = 0U)
 </#if>
 <#-- /#if -->
 </#list>

package/output/processor.js

@@ -8234,9 +8234,9 @@ var MyDerivedData = function MyDerivedData(dataModel) {
     var initSectionMessage = "// If using interrupts in PIC18 High/Low Priority Mode you need to enable the Global High and Low Interrupts \n" + "    // If using interrupts in PIC Mid-Range Compatibility Mode you need to enable the Global and Peripheral Interrupts \n" + "    // Use the following macros to: \n\n";
 
     if (!_this.getModel().isComponentValue("ipenIntcon")) {
-      initSectionMessage += "    // Enable the Global Interrupts \n" + "    //INTERRUPT_GlobalInterruptEnable(); \n\n" + "    // Disable the Global Interrupts \n" + "    //INTERRUPT_GlobalInterruptDisable(); \n\n" + "    // Enable the Peripheral Interrupts \n" + "    //INTERRUPT_PeripheralInterruptEnable(); \n\n" + "    // Disable the Peripheral Interrupts \n" + "    //INTERRUPT_PeripheralInterruptDisable(); \n";
+      initSectionMessage += "    // Enable the Peripheral Interrupts \n" + "    //INTERRUPT_PeripheralInterruptEnable(); \n" + "    // Disable the Peripheral Interrupts \n" + "    //INTERRUPT_PeripheralInterruptDisable(); \n\n" + "    // Enable the Global Interrupts \n" + "    //INTERRUPT_GlobalInterruptEnable(); \n" + "    // Disable the Global Interrupts \n" + "    //INTERRUPT_GlobalInterruptDisable(); \n\n";
     } else {
-      initSectionMessage += "    // Enable the Global High Interrupts \n" + "    //INTERRUPT_GlobalInterruptHighEnable(); \n\n" + "    // Disable the Global High Interrupts \n" + "    //INTERRUPT_GlobalInterruptHighDisable(); \n\n" + "    // Enable the Global Low Interrupts \n" + "    //INTERRUPT_GlobalInterruptLowEnable(); \n\n" + "    // Disable the Global Low Interrupts \n" + "    //INTERRUPT_GlobalInterruptLowDisable(); \n\n" + "    // Enable the Peripheral Interrupts \n" + "    //INTERRUPT_PeripheralInterruptEnable(); \n\n" + "    // Disable the Peripheral Interrupts \n" + "    //INTERRUPT_PeripheralInterruptDisable(); \n";
+      initSectionMessage += "    // Enable the Peripheral Interrupts \n" + "    //INTERRUPT_PeripheralInterruptEnable(); \n" + "    // Disable the Peripheral Interrupts \n" + "    //INTERRUPT_PeripheralInterruptDisable(); \n" + "    // Enable the Global High Interrupts \n\n" + "    //INTERRUPT_GlobalInterruptHighEnable(); \n" + "    // Disable the Global High Interrupts \n" + "    //INTERRUPT_GlobalInterruptHighDisable(); \n\n" + "    // Enable the Global Low Interrupts \n" + "    //INTERRUPT_GlobalInterruptLowEnable(); \n" + "    // Disable the Global Low Interrupts \n" + "    //INTERRUPT_GlobalInterruptLowDisable(); \n\n";
     }
 
     return {
@@ -8357,10 +8357,10 @@ var getGeneratorModel = function getGeneratorModel(model, noPrioIntList) {
   if (!registerValues) return {};
   var pieAvailable = (registerValues === null || registerValues === void 0 ? void 0 : (_registerValues$INTCO = registerValues["INTCON"]) === null || _registerValues$INTCO === void 0 ? void 0 : (_registerValues$INTCO2 = _registerValues$INTCO.settings) === null || _registerValues$INTCO2 === void 0 ? void 0 : _registerValues$INTCO2.PEIE) != undefined;
   highInterrupts = noPrioIntList.filter(function (interrupt) {
-    return interrupt.isEnabled;
+    return interrupt.generateISR;
   }).map(function (data) {
     return _objectSpread(_objectSpread({}, data), {}, {
-      isPeripheralInterrupt: data.module !== _Constants__WEBPACK_IMPORTED_MODULE_0__["EXTINT_NAME"] && data.module !== "PIN_MANAGER"
+      isPeripheralInterrupt: data.module !== _Constants__WEBPACK_IMPORTED_MODULE_0__["EXTINT_NAME"] && data.module !== "PIN_MANAGER" && data.module !== "TMR0"
     });
   });
   extIntList = (_extIntList = extIntList).concat.apply(_extIntList, _toConsumableArray(noPrioIntList.filter(function (data) {