From 8f9295b09e909d44375bab9fda2f0c302b071962 Mon Sep 17 00:00:00 2001
From: Philip Gladstone <pjsg@users.noreply.github.com>
Date: Tue, 25 Jan 2022 20:54:17 -0500
Subject: [PATCH] Update to the released version of idf4.4 (#3498)

* Update to the released version of idf4.4

* Try to get the CI Build to work in all cases
---
 components/modules/node.c     |  9 ++++++---
 components/modules/pulsecnt.c | 11 ++++++-----
 sdk/esp32-esp-idf             |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/components/modules/node.c b/components/modules/node.c
index ba4d76cc..11b19077 100644
--- a/components/modules/node.c
+++ b/components/modules/node.c
@@ -106,14 +106,17 @@ static int node_bootreason( lua_State *L)
     case EXT_CPU_RESET:
 #endif
     case DEEPSLEEP_RESET:
-#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
+#if defined(CONFIG_IDF_TARGET_ESP32)
     case SDIO_RESET:
 #endif
-#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
+#if defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3)
     case GLITCH_RTC_RESET:
 #endif
-#if defined(CONFIG_IDF_TARGET_ESP32S3)
+#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C3)
     case EFUSE_RESET:
+    case USB_UART_CHIP_RESET:
+    case USB_JTAG_CHIP_RESET:
+    case POWER_GLITCH_RESET:
 #endif
     case TG0WDT_SYS_RESET:
     case TG1WDT_SYS_RESET:
diff --git a/components/modules/pulsecnt.c b/components/modules/pulsecnt.c
index 99d4b0e1..4f4df34b 100644
--- a/components/modules/pulsecnt.c
+++ b/components/modules/pulsecnt.c
@@ -19,6 +19,7 @@ CONDITIONS OF ANY KIND, either express or implied.
 #include "platform.h"
 #include "task/task.h"
 #include "driver/pcnt.h"
+#include "soc/pcnt_struct.h"
 #include "esp_log.h"
 #include "lextra.h"
 
@@ -135,17 +136,17 @@ static void pulsecnt_task(task_param_t param, task_prio_t prio)
   /*0: positive value to zero; 1: negative value to zero; 2: counter value negative ; 3: counter value positive*/
   // uint8_t moving_to = status & 0x00000003u; // get first two bits
 
-  if (status & PCNT_STATUS_THRES1_M) {
+  if (status & PCNT_EVT_THRES_1) {
       // printf("THRES1 EVT\n");
       thr1 = true;
       // evt_count = pc->thresh1;
   }
-  if (status & PCNT_STATUS_THRES0_M) {
+  if (status & PCNT_EVT_THRES_0) {
       // printf("THRES0 EVT\n");
       thr0 = true;
       // evt_count = pc->thresh0;
   }
-  if (status & PCNT_STATUS_L_LIM_M) {
+  if (status & PCNT_EVT_L_LIM) {
       // printf("L_LIM EVT\n");
       l_lim = true;
       /*
@@ -164,7 +165,7 @@ static void pulsecnt_task(task_param_t param, task_prio_t prio)
       }
       */
   }
-  if (status & PCNT_STATUS_H_LIM_M) {
+  if (status & PCNT_EVT_H_LIM) {
       // printf("H_LIM EVT\n");
       h_lim = true;
       /*
@@ -183,7 +184,7 @@ static void pulsecnt_task(task_param_t param, task_prio_t prio)
       }
       */
   }
-  if (status & PCNT_STATUS_ZERO_M) {
+  if (status & PCNT_EVT_ZERO) {
       // printf("ZERO EVT\n");
       zero = true;
       // evt_count = 0;
diff --git a/sdk/esp32-esp-idf b/sdk/esp32-esp-idf
index a20df743..d83021a6 160000
--- a/sdk/esp32-esp-idf
+++ b/sdk/esp32-esp-idf
@@ -1 +1 @@
-Subproject commit a20df743f1c51e6d65b021ed2ffd3081a2feec64
+Subproject commit d83021a6e8550b4d462e11d61aaab0214dc03f5a