v1.4.0 to suppress errors and warnings

khoih-prog · web-flow · commit f85c83625eae · 2022-08-03T20:45:35.000-04:00
### Releases v1.4.0

1. Suppress errors and warnings for new ESP32 core v2.0.4+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -15,7 +15,7 @@ If you don't find anything, please [open a new issue](https://github.com/khoih-p
 Please ensure to specify the following:
 
 * Arduino IDE version (e.g. 1.8.19) or Platform.io version
-* `ESP32` Core Version (e.g. ESP32 core v2.0.3)
+* `ESP32` Core Version (e.g. ESP32 core v2.0.4)
 * `ESP32` Board type (e.g. ESP32_DEV Module, etc.)
 * `ESP32-S2` Board type (e.g. ESP32S2_DEV Module, ESP32_S2_Saola, etc.)
 * `ESP32_S3` Board type (e.g. ESP32S3_DEV, ESP32_S3_BOX, UM TINYS3, UM PROS3, UM FEATHERS3, etc.)
@@ -31,10 +31,10 @@ Please ensure to specify the following:
 
 ```
 Arduino IDE version: 1.8.19
-ESP32 core v2.0.3
+ESP32 core v2.0.4
 ESP32S3_DEV Module
 OS: Ubuntu 20.04 LTS
-Linux xy-Inspiron-3593 5.13.0-44-generic #49~20.04.1-Ubuntu SMP Wed May 18 18:44:28 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
+Linux xy-Inspiron-3593 5.15.0-41-generic #44~20.04.1-Ubuntu SMP Fri Jun 24 13:27:29 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
 
 Context:
 I encountered a crash while trying to use the Timer Interrupt.
diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Releases v1.4.0](#releases-v140)
   * [Releases v1.3.0](#releases-v130)
   * [Releases v1.2.1](#releases-v121)
   * [Releases v1.2.0](#releases-v120)
@@ -24,6 +25,10 @@
 
 ## Changelog
 
+### Releases v1.4.0
+
+1. Suppress errors and warnings for new ESP32 core v2.0.4+
+
 ### Releases v1.3.1
 
 1. Add support to new Adafruit boards such as QTPY_ESP32S2, FEATHER_ESP32S3_NOPSRAM and QTPY_ESP32S3_NOPSRAM
diff --git a/examples/ESP32_ISR_MultiServos/ESP32_ISR_MultiServos.ino b/examples/ESP32_ISR_MultiServos/ESP32_ISR_MultiServos.ino
@@ -83,7 +83,10 @@
 #include "ESP32_ISR_Servo.h"
 
 //See file .../hardware/espressif/esp32/variants/(esp32|doitESP32devkitV1)/pins_arduino.h
-#define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#if !defined(LED_BUILTIN)
+  #define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#endif
+
 #define PIN_LED           2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
 
 #define PIN_D0            0         // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32
diff --git a/examples/ESP32_MultipleRandomServos/ESP32_MultipleRandomServos.ino b/examples/ESP32_MultipleRandomServos/ESP32_MultipleRandomServos.ino
@@ -81,7 +81,10 @@
 #include "ESP32_ISR_Servo.h"
 
 //See file .../hardware/espressif/esp32/variants/(esp32|doitESP32devkitV1)/pins_arduino.h
-#define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#if !defined(LED_BUILTIN)
+  #define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#endif
+
 #define PIN_LED           2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
 
 #define PIN_D0            0         // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32
diff --git a/examples/ESP32_MultipleServos/ESP32_MultipleServos.ino b/examples/ESP32_MultipleServos/ESP32_MultipleServos.ino
@@ -82,7 +82,10 @@
 #include "ESP32_ISR_Servo.h"
 
 //See file .../hardware/espressif/esp32/variants/(esp32|doitESP32devkitV1)/pins_arduino.h
-#define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#if !defined(LED_BUILTIN)
+  #define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#endif
+
 #define PIN_LED           2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
 
 #define PIN_D0            0         // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32
diff --git a/examples/ISR_MultiServos/ISR_MultiServos.ino b/examples/ISR_MultiServos/ISR_MultiServos.ino
@@ -83,7 +83,10 @@
 #include "ESP32_ISR_Servo.h"
 
 //See file .../hardware/espressif/esp32/variants/(esp32|doitESP32devkitV1)/pins_arduino.h
-#define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#if !defined(LED_BUILTIN)
+  #define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#endif
+
 #define PIN_LED           2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
 
 #define PIN_D0            0         // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32
diff --git a/examples/MultipleRandomServos/MultipleRandomServos.ino b/examples/MultipleRandomServos/MultipleRandomServos.ino
@@ -82,7 +82,10 @@
 #include "ESP32_ISR_Servo.h"
 
 //See file .../hardware/espressif/esp32/variants/(esp32|doitESP32devkitV1)/pins_arduino.h
-#define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#if !defined(LED_BUILTIN)
+  #define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#endif
+
 #define PIN_LED           2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
 
 #define PIN_D0            0         // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32
diff --git a/examples/MultipleServos/MultipleServos.ino b/examples/MultipleServos/MultipleServos.ino
@@ -82,7 +82,10 @@
 #include "ESP32_ISR_Servo.h"
 
 //See file .../hardware/espressif/esp32/variants/(esp32|doitESP32devkitV1)/pins_arduino.h
-#define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#if !defined(LED_BUILTIN)
+  #define LED_BUILTIN       2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
+#endif
+
 #define PIN_LED           2         // Pin D2 mapped to pin GPIO2/ADC12 of ESP32, control on-board LED
 
 #define PIN_D0            0         // Pin D0 mapped to pin GPIO0/BOOT/ADC11/TOUCH1 of ESP32
diff --git a/examples/multiFileProject/multiFileProject.ino b/examples/multiFileProject/multiFileProject.ino
@@ -13,8 +13,8 @@
   #error This code is designed to run on ESP32 platform, not Arduino nor ESP32! Please check your Tools->Board setting.
 #endif
 
-#define ESP32_ISR_SERVO_VERSION_MIN_TARGET      "ESP32_ISR_Servo v1.2.0"
-#define ESP32_ISR_SERVO_VERSION_MIN             1002000
+#define ESP32_ISR_SERVO_VERSION_MIN_TARGET      "ESP32_ISR_Servo v1.4.0"
+#define ESP32_ISR_SERVO_VERSION_MIN             1004000
 
 #include "multiFileProject.h"
 
diff --git a/library.json b/library.json
@@ -1,8 +1,8 @@
 {
   "name": "ESP32_ISR_Servo",
-  "version": "1.3.1",
+  "version": "1.4.0",
   "keywords": "timer, interrupt, isr, hardware, servo, isr-based-servo, servo-control, esp32, esp32-s2, esp32-s3, esp32-c3, mission-critical, precise, non-blocking",
-  "description": "This library enables you to use 1 Hardware Timer on an ESP32-based board to control up to 16 or more servo motors. Now supporting ESP32, ESP32_S2, ESP32_S3, ESP32_C3-based boards. Tested OK with ESP32 core v2.0.3",
+  "description": "This library enables you to use 1 Hardware Timer on an ESP32-based board to control up to 16 or more servo motors. Now supporting ESP32, ESP32_S2, ESP32_S3, ESP32_C3-based boards. Tested OK with ESP32 core v2.0.4",
   "authors":
   {
     "name":  "Khoi Hoang",
diff --git a/library.properties b/library.properties
@@ -1,10 +1,10 @@
 name=ESP32_ISR_Servo
-version=1.3.1
+version=1.4.0
 author=Khoi Hoang
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 license=MIT
 sentence=This library enables you to use Interrupt from Hardware Timers on an ESP32 board to control multiple servo motors.
-paragraph=This library enables you to use 1 Hardware Timer on an ESP32-based board to control 16 or more servo motors. Now supporting ESP32, ESP32_S2, ESP32_S3, ESP32_C3-based boards. Tested OK with ESP32 core v2.0.3
+paragraph=This library enables you to use 1 Hardware Timer on an ESP32-based board to control 16 or more servo motors. Now supporting ESP32, ESP32_S2, ESP32_S3, ESP32_C3-based boards. Tested OK with ESP32 core v2.0.4
 category=Device Control
 url=https://github.com/khoih-prog/ESP32_ISR_Servo
 architectures=esp32
diff --git a/src/ESP32FastTimerInterrupt.hpp b/src/ESP32FastTimerInterrupt.hpp
@@ -12,7 +12,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.3.1
+  Version: 1.4.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -24,6 +24,7 @@
   1.2.1   K Hoang      07/03/2022 Fix bug
   1.3.0   K Hoang      08/05/2022 Fix issue with ESP32 core v2.0.1+
   1.3.1   K Hoang      16/06/2022 Add support to new Adafruit boards
+  1.4.0   K Hoang      03/08/2022 Suppress errors and warnings for new ESP32 core
 *****************************************************************************************************************************/
 
 #pragma once
@@ -43,8 +44,8 @@
  
 typedef enum
 {
-  TIMER_GROUP_0 = 0, /*!<Hw timer group 0
-  TIMER_GROUP_1 = 1, /*!<Hw timer group 1
+  TIMER_GROUP_0 = 0, // Hw timer group 0
+  TIMER_GROUP_1 = 1, // Hw timer group 1
   TIMER_GROUP_MAX,
 } timer_group_t;
 
@@ -53,8 +54,8 @@ typedef enum
  
 typedef enum 
 {
-  TIMER_0 = 0, /*!<Select timer0 of GROUPx
-  TIMER_1 = 1, /*!<Select timer1 of GROUPx
+  TIMER_0 = 0, // Select timer0 of GROUPx
+  TIMER_1 = 1, // Select timer1 of GROUPx
   TIMER_MAX,
 } timer_idx_t;
 
@@ -122,6 +123,28 @@ typedef struct
 
 */
 
+/*
+  //ESP32 core v2.0.4, timer_config_t defined in tools/sdk/esp32/include/hal/include/hal/timer_types.h:
+  #if SOC_TIMER_GROUP_SUPPORT_XTAL
+  typedef enum {
+    TIMER_SRC_CLK_APB = 0,  // Select APB as the source clock
+    TIMER_SRC_CLK_XTAL = 1, // Select XTAL as the source clock
+  } timer_src_clk_t;
+  #endif
+  typedef struct {
+    timer_alarm_t alarm_en;           // Timer alarm enable
+    timer_start_t counter_en;         // Counter enable
+    timer_intr_mode_t intr_type;      // Interrupt mode
+    timer_count_dir_t counter_dir;    // Counter direction
+    timer_autoreload_t auto_reload;   // Timer auto-reload
+    uint32_t divider;                 // Counter clock divider. The divider's range is from from 2 to 65536
+  #if SOC_TIMER_GROUP_SUPPORT_XTAL
+    timer_src_clk_t clk_src;          // Use XTAL as source clock
+  #endif
+  } timer_config_t;
+
+*/
+
 class ESP32TimerInterrupt;
 
 //typedef ESP32TimerInterrupt ESP32Timer;
@@ -170,8 +193,11 @@ class ESP32TimerInterrupt
       .counter_en   = TIMER_START,          //starts counting counter once timer_init called
       .intr_type    = TIMER_INTR_MAX,
       .counter_dir  = TIMER_COUNT_UP,       //counts from 0 to counter value
-      .auto_reload  = TIMER_AUTORELOAD_EN,  // reloads counter automatically
-      .divider      = TIMER_DIVIDER
+      .auto_reload  = TIMER_AUTORELOAD_EN,  //reloads counter automatically
+      .divider      = TIMER_DIVIDER,
+#if SOC_TIMER_GROUP_SUPPORT_XTAL
+      .clk_src      = TIMER_SRC_CLK_XTAL    //Use XTAL as source clock
+#endif      
     };
 
     timer_idx_t       _timerIndex;
diff --git a/src/ESP32_ISR_Servo.h b/src/ESP32_ISR_Servo.h
@@ -11,7 +11,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.3.1
+  Version: 1.4.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -23,6 +23,7 @@
   1.2.1   K Hoang      07/03/2022 Fix bug
   1.3.0   K Hoang      08/05/2022 Fix issue with ESP32 core v2.0.1+
   1.3.1   K Hoang      16/06/2022 Add support to new Adafruit boards
+  1.4.0   K Hoang      03/08/2022 Suppress errors and warnings for new ESP32 core
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/ESP32_ISR_Servo.hpp b/src/ESP32_ISR_Servo.hpp
@@ -11,7 +11,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.3.1
+  Version: 1.4.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -23,6 +23,7 @@
   1.2.1   K Hoang      07/03/2022 Fix bug
   1.3.0   K Hoang      08/05/2022 Fix issue with ESP32 core v2.0.1+
   1.3.1   K Hoang      16/06/2022 Add support to new Adafruit boards
+  1.4.0   K Hoang      03/08/2022 Suppress errors and warnings for new ESP32 core
  *****************************************************************************************************************************/
 
 #pragma once
@@ -47,13 +48,13 @@
 #endif
 
 #if !defined(ESP32_ISR_SERVO_VERSION)
-  #define ESP32_ISR_SERVO_VERSION             "ESP32_ISR_Servo v1.3.1"
+  #define ESP32_ISR_SERVO_VERSION             "ESP32_ISR_Servo v1.4.0"
   
   #define ESP32_ISR_SERVO_VERSION_MAJOR       1
-  #define ESP32_ISR_SERVO_VERSION_MINOR       3
-  #define ESP32_ISR_SERVO_VERSION_PATCH       1
+  #define ESP32_ISR_SERVO_VERSION_MINOR       4
+  #define ESP32_ISR_SERVO_VERSION_PATCH       0
 
-  #define ESP32_ISR_SERVO_VERSION_INT         1003001
+  #define ESP32_ISR_SERVO_VERSION_INT         1004000
   
 #endif
 
diff --git a/src/ESP32_ISR_Servo_Debug.h b/src/ESP32_ISR_Servo_Debug.h
@@ -11,7 +11,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.3.1
+  Version: 1.4.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -23,6 +23,7 @@
   1.2.1   K Hoang      07/03/2022 Fix bug
   1.3.0   K Hoang      08/05/2022 Fix issue with ESP32 core v2.0.1+
   1.3.1   K Hoang      16/06/2022 Add support to new Adafruit boards
+  1.4.0   K Hoang      03/08/2022 Suppress errors and warnings for new ESP32 core
  *****************************************************************************************************************************/
 
 #pragma once
diff --git a/src/ESP32_ISR_Servo_Impl.h b/src/ESP32_ISR_Servo_Impl.h
@@ -11,7 +11,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.3.1
+  Version: 1.4.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -23,6 +23,7 @@
   1.2.1   K Hoang      07/03/2022 Fix bug
   1.3.0   K Hoang      08/05/2022 Fix issue with ESP32 core v2.0.1+
   1.3.1   K Hoang      16/06/2022 Add support to new Adafruit boards
+  1.4.0   K Hoang      03/08/2022 Suppress errors and warnings for new ESP32 core
  *****************************************************************************************************************************/
 
 #include "ESP32_ISR_Servo.h"

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ESP32_ISR_Servo",`
`3`		`- "version": "1.3.1",`
	`3`	`+ "version": "1.4.0",`
`4`	`4`	`"keywords": "timer, interrupt, isr, hardware, servo, isr-based-servo, servo-control, esp32, esp32-s2, esp32-s3, esp32-c3, mission-critical, precise, non-blocking",`
`5`		`- "description": "This library enables you to use 1 Hardware Timer on an ESP32-based board to control up to 16 or more servo motors. Now supporting ESP32, ESP32_S2, ESP32_S3, ESP32_C3-based boards. Tested OK with ESP32 core v2.0.3",`
	`5`	`+ "description": "This library enables you to use 1 Hardware Timer on an ESP32-based board to control up to 16 or more servo motors. Now supporting ESP32, ESP32_S2, ESP32_S3, ESP32_C3-based boards. Tested OK with ESP32 core v2.0.4",`
`6`	`6`	`"authors":`
`7`	`7`	`{`
`8`	`8`	`"name": "Khoi Hoang",`