From 61a87ccc636688e360c6c81e2e8d540f6ea4ada0 Mon Sep 17 00:00:00 2001
From: Gregg <homespan@icloud.com>
Date: Sun, 19 Sep 2021 13:53:20 -0500
Subject: [PATCH] Clean up PWM - ready for testing

To do: Test RGB LED Examples with ESP32 and ESP32-S2 boards.

Next:  Re-work Remote Control routines to make compatible with S2 and C3
---
 .DS_Store             | Bin 14340 -> 14340 bytes
 .gitignore            |   2 ++
 src/.DS_Store         | Bin 6148 -> 6148 bytes
 src/extras/PwmPin.h   |   3 --
 src/extras/extras.ino |  75 +++---------------------------------------
 5 files changed, 7 insertions(+), 73 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 86381ba3a85e5e94a47b3dea5da57e9ee876b65e..4cf94eadcbafbf219f6e63bd7b418e0b5be548ec 100644
GIT binary patch
delta 53
zcmZoEXepSmn<+bb<6bFArtSWlZ%QVy0lAZH6(m?R9tqr>9H}4!VN@!}F>csALm@{T
E044DgfdBvi

delta 53
zcmZoEXepSmn<;Mn#=TOKOa~WlzA2f+2INk*Rghq@Iaj`Ia-@O`gi)y=$JnrWhC+@w
E08u;?#Q*>R

diff --git a/.gitignore b/.gitignore
index 169af9e..06d5ef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 .development
+.DS_Store
+src/.DS_Store
diff --git a/src/.DS_Store b/src/.DS_Store
index ba874113d6552e063b01ff44295ccf783c55a32c..cd8393a9b53d65b9061407073572938ae3331f4d 100644
GIT binary patch
delta 382
zcmZoMXfc=|#>B)qu~2NHo}wr_0|Nsi1A_nqLn1?QQh9MfQcix-=8cTY8S6n(Yz(Ok
z6$~W|Maa@X@zY5KIhn;J1_sv|nV4Bv+1NQaIJh}@Ibwq|^2>uu5=%;pof3<pLA-#(
zl8huMJ0w3p2hL7R3d>9_j~5Ve&d)1J%*;zI0&C7pNd+p23D3;TOUW;H$}i1JDFz!9
z43XjF<mBLt7m%v1HZwNSQ82VHsnt=aHZ(Of1ab_GjB0B+ImA^BZ9NlmE32w&YU^eL
z-3tVaKyQKpKa_@1b0+gJnk$Fu0{JN3&CPdl0fh!ooFnCOkMq6BX^dWyC`!tLi}G^v
o^U{Gz7=eKn&a#=EgP#K!x<Jl%=E?jbmK;D^!4_{05ZS^E06A-82LJ#7

delta 104
zcmZoMXfc=|#>B`mu~2NHo}wr#0|Nsi1A_nqLn1?QN^x>dQht8U#KPr_tdl=8nKQ*V
zPS#<TVZE@L`RJX=zRX^mw=xH@Y(Buu%CwoCgP#Lv&gPBG-<c=#i&%01O#&Ikv^hXz
G3o`(%b{j1K

diff --git a/src/extras/PwmPin.h b/src/extras/PwmPin.h
index 963aee7..2057e07 100644
--- a/src/extras/PwmPin.h
+++ b/src/extras/PwmPin.h
@@ -16,9 +16,6 @@
 
 #include <Arduino.h>
 #include <driver/ledc.h>
-#include <vector>
-
-using std::vector;
 
 #define DEFAULT_PWM_FREQ     5000
 
diff --git a/src/extras/extras.ino b/src/extras/extras.ino
index 3b9cb04..c433195 100644
--- a/src/extras/extras.ino
+++ b/src/extras/extras.ino
@@ -3,8 +3,6 @@
 // as well as compile and test from this point.  This file is ignored when the library is included in other sketches.
 
 #include "PwmPin.h"
-#include <soc/ledc_reg.h> 
-#include "esp_rom_gpio.h"
 
 void setup(){
  
@@ -17,76 +15,13 @@ void setup(){
 
   LedPin *led[20];
 
-//  int p[]={33,27,4,32,18,19,16,17,5};
-    int p[]={11,7,3,1,38,33,9};
+//  uint8_t p[]={33,27,4,32,18,19,16,17,5};       // ESP32 test
+    uint8_t p[]={11,7,3,1,38,33,9,10};          // ESP32-S2 test
 
-  for(int i=0;i<sizeof(p)/4;i++)
-    led[i]=new LedPin(p[i],20,5000+i);    
+  for(int i=0;i<sizeof(p);i++)
+    led[i]=new LedPin(p[i],20,5000);    
 
-  new LedPin(10,200,65535);
-  new LedPin(5,200,65535);
-  
-//Serial.printf("HSTIMER0: %d %d %d %d\n",
-//  REG_GET_FIELD(LEDC_HSTIMER0_CONF_REG,LEDC_TICK_SEL_HSTIMER0),
-//  REG_GET_FIELD(LEDC_HSTIMER0_CONF_REG,LEDC_DIV_NUM_HSTIMER0)>>8,
-//  REG_GET_FIELD(LEDC_HSTIMER0_CONF_REG,LEDC_DIV_NUM_HSTIMER0)&0xFF,
-//  REG_GET_FIELD(LEDC_HSTIMER0_CONF_REG,LEDC_HSTIMER0_DUTY_RES)
-//  );
-//
-//Serial.printf("HSCHAN0: %d %d %d %d %d\n",
-//  REG_READ(LEDC_HSCH0_CONF0_REG),
-//  REG_READ(LEDC_HSCH0_HPOINT_REG),
-//  REG_READ(LEDC_HSCH0_DUTY_REG)>>4,
-//  REG_READ(LEDC_HSCH0_DUTY_REG)&0xF,
-//  REG_GET_FIELD(LEDC_HSCH0_CONF1_REG,LEDC_DUTY_INC_HSCH0)
-//  );
-//
-//Serial.printf("LSTIMER0: %d %d %d %d\n",
-//  REG_GET_FIELD(LEDC_LSTIMER0_CONF_REG,LEDC_TICK_SEL_LSTIMER0),
-//  REG_GET_FIELD(LEDC_LSTIMER0_CONF_REG,LEDC_DIV_NUM_LSTIMER0)>>8, 
-//  REG_GET_FIELD(LEDC_LSTIMER0_CONF_REG,LEDC_DIV_NUM_LSTIMER0)&0xFF,
-//  REG_GET_FIELD(LEDC_LSTIMER0_CONF_REG,LEDC_LSTIMER0_DUTY_RES)
-//  );
-//
-//delay(100);
-//  
-//Serial.printf("LSCHAN0: %d %d %d %d %d\n",
-//  REG_READ(LEDC_LSCH0_CONF0_REG),
-//  REG_READ(LEDC_LSCH0_HPOINT_REG),
-//  REG_READ(LEDC_LSCH0_DUTY_REG)>>4,
-//  REG_READ(LEDC_LSCH0_DUTY_REG)&0xF,
-//  REG_GET_FIELD(LEDC_LSCH0_CONF1_REG,LEDC_DUTY_INC_LSCH0)
-//  );
-//
-//Serial.printf("LOW CLOCK: %d\n",REG_READ(LEDC_CONF_REG));  
-//
-//Serial.printf("GPIO 32: %d %d %d %d\n",
-//  REG_GET_FIELD(GPIO_FUNC32_OUT_SEL_CFG_REG,GPIO_FUNC32_OEN_INV_SEL),
-//  REG_GET_FIELD(GPIO_FUNC32_OUT_SEL_CFG_REG,GPIO_FUNC32_OEN_SEL),
-//  REG_GET_FIELD(GPIO_FUNC32_OUT_SEL_CFG_REG,GPIO_FUNC32_OUT_INV_SEL),
-//  REG_GET_FIELD(GPIO_FUNC32_OUT_SEL_CFG_REG,GPIO_FUNC32_OUT_SEL)
-//  );
-//  
-//Serial.printf("GPIO 5: %d %d %d %d\n",
-//  REG_GET_FIELD(GPIO_FUNC5_OUT_SEL_CFG_REG,GPIO_FUNC5_OEN_INV_SEL),
-//  REG_GET_FIELD(GPIO_FUNC5_OUT_SEL_CFG_REG,GPIO_FUNC5_OEN_SEL),
-//  REG_GET_FIELD(GPIO_FUNC5_OUT_SEL_CFG_REG,GPIO_FUNC5_OUT_INV_SEL),
-//  REG_GET_FIELD(GPIO_FUNC5_OUT_SEL_CFG_REG,GPIO_FUNC5_OUT_SEL)
-//  );
-//
-//Serial.printf("GPIO 4: %d %d %d %d\n",
-//  REG_GET_FIELD(GPIO_FUNC4_OUT_SEL_CFG_REG,GPIO_FUNC4_OEN_INV_SEL),
-//  REG_GET_FIELD(GPIO_FUNC4_OUT_SEL_CFG_REG,GPIO_FUNC4_OEN_SEL),
-//  REG_GET_FIELD(GPIO_FUNC4_OUT_SEL_CFG_REG,GPIO_FUNC4_OUT_INV_SEL),
-//  REG_GET_FIELD(GPIO_FUNC4_OUT_SEL_CFG_REG,GPIO_FUNC4_OUT_SEL)
-//  );  
-//
-//Serial.printf("GPIO 33: %d %d %d %d\n",
-//  REG_GET_FIELD(GPIO_FUNC33_OUT_SEL_CFG_REG,GPIO_FUNC33_OEN_INV_SEL),
-//  REG_GET_FIELD(GPIO_FUNC33_OUT_SEL_CFG_REG,GPIO_FUNC33_OEN_SEL),
-//  REG_GET_FIELD(GPIO_FUNC33_OUT_SEL_CFG_REG,GPIO_FUNC33_OUT_INV_SEL),
-//  REG_GET_FIELD(GPIO_FUNC33_OUT_SEL_CFG_REG,GPIO_FUNC33_OUT_SEL)
-//  );  
+  led[7]->set(100);
 
   while(1);
 }