From 7255a9530f783b4d3eefc48b96d0cf95bb242e42 Mon Sep 17 00:00:00 2001
From: HomeSpan <homespan@icloud.com>
Date: Sat, 18 Sep 2021 16:28:56 -0500
Subject: [PATCH] Updating Extras to work through S2 and C3 issues

---
 src/.DS_Store            | Bin 6148 -> 6148 bytes
 src/extras/PwmPin.cpp    |  14 ++++++++---
 src/extras/RFControl.cpp |   4 +--
 src/extras/extras.ino    |  51 +++++++++++++++++++++++----------------
 4 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/.DS_Store b/src/.DS_Store
index 06a362e58201a14d5ed0ab99a69fd20031892ea4..6c095b11a1dce045bb2733cdec97daff5ce0d95c 100644
GIT binary patch
delta 327
zcmZoMXfc=|#>B)qu~2NHo}wr-0|Nsi1A_nqLn1?QQh9MfQcix-=8cTY8S6n(Yz(Ok
z6$~W|Maa@X@smjfIhn;J1_sv|nV4Bv+1NQifR`gSI3vG2xFoTpwAd-JC>q2ING!=n
zg0e&M^K;<r#H6sy)be-%5$F88lElos)FQCv%#>81l9=%H%)FHRa;N;#yp&?FLBS9i
zP7sI}kf^S<Fw;>mG_b7IQK&XFG_llCFgG!)t>xqpS2eWtOvtUQs;;T6n+bF+5HJEg
z2?qR78b-~U%)_Y3Qx;s5my@5D4ises`u-uyW_AvK4qz|=Ip3Kl^NUz=01W_}u{l6w
G3o`&y-c|qr

delta 214
zcmZoMXfc=|#>B`mu~2NHo}wr#0|Nsi1A_nqLn1?QN^x>dQht8U#KPr_tdl=7Y1ZeY
z8wMxm=N14}0YTziAi>6v%22^j!cYX#k(=-0l9ZF51Qh3}G44%at~~6BsU`)k=FRuB
zdTYut)f8kP+p_>@1Q=|#WIo5Tv7wc5Gdl-A2hi1<4Vk|)Pv#e~<N(P79nQ2lKx7Lu
E06{G?CIA2c

diff --git a/src/extras/PwmPin.cpp b/src/extras/PwmPin.cpp
index e33902f..db0a7d9 100644
--- a/src/extras/PwmPin.cpp
+++ b/src/extras/PwmPin.cpp
@@ -22,7 +22,9 @@ LedC::LedC(uint8_t pin, uint16_t freq){
           
             int res=LEDC_TIMER_BIT_MAX-1;                               // find the maximum possible resolution
             while(getApbFrequency()/(freq*pow(2,res))<1)
-              res--;      
+              res--;     
+
+            Serial.println(getApbFrequency()/(freq*pow(2,res)));
               
             timerList[nTimer][nMode]->duty_resolution=(ledc_timer_bit_t)res;
             ledc_timer_config(timerList[nTimer][nMode]);
@@ -191,9 +193,11 @@ ledc_timer_config_t *LedC::timerList[LEDC_TIMER_MAX][LEDC_SPEED_MODE_MAX]={};
 
 ////////////////////////////
 
-//*******************************************************
-// DEPRECATED - INCLUDED FOR BACKWARDS COMPATIBILITY ONLY
-//*******************************************************
+//*****************************************************************
+// DEPRECATED - INCLUDED FOR BACKWARDS COMPATIBILITY FOR ESP32 ONLY
+//*****************************************************************
+
+#ifdef CONFIG_IDF_TARGET_ESP32
 
 PwmPin::PwmPin(uint8_t channel, uint8_t pin){
   this->channel=channel & 0x0F;
@@ -283,3 +287,5 @@ void PwmPin::HSVtoRGB(float h, float s, float v, float *r, float *g, float *b ){
       break;
   }
 }
+
+#endif
diff --git a/src/extras/RFControl.cpp b/src/extras/RFControl.cpp
index 0e5990a..5990831 100644
--- a/src/extras/RFControl.cpp
+++ b/src/extras/RFControl.cpp
@@ -15,7 +15,7 @@ RFControl::RFControl(int pin){
     REG_SET_BIT(RMT_APB_CONF_REG,3);                          // enables access to RMT memory and enables wraparound mode (though the latter does not seem to be needed to set continuous TX)
     REG_WRITE(RMT_INT_ENA_REG,1<<RMT_CH0_TX_END_INT_ENA_S);   // enable end-transmission interrupt so that interrupt vector is called
     REG_WRITE(RMT_CH0CONF0_REG,0x08000000);                   // disable carrier wave; set channel 0 to use all 8 blocks of RMT memory       
-    esp_intr_alloc(ETS_RMT_INTR_SOURCE,0,eot_int,NULL,NULL);  // set RMT general interrupt vector
+//    esp_intr_alloc(ETS_RMT_INTR_SOURCE,0,eot_int,NULL,NULL);  // set RMT general interrupt vector
 
     configured=true;
   }
@@ -99,5 +99,5 @@ void RFControl::eot_int(void *arg){
     
 boolean RFControl::configured=false;
 volatile int RFControl::numCycles;
-uint32_t *RFControl::pRMT=(uint32_t *)RMT_CHANNEL_MEM(0);
+//int32_t *RFControl::pRMT=(uint32_t *)RMT_CHANNEL_MEM(0);
 int RFControl::pCount=0;
diff --git a/src/extras/extras.ino b/src/extras/extras.ino
index 76c7343..5cf40df 100644
--- a/src/extras/extras.ino
+++ b/src/extras/extras.ino
@@ -14,33 +14,42 @@ void setup(){
 
   Serial.println("Starting...");
 
-  LedPin led0(18,100,0);
-  LedPin led1(19,100,2000);
-  LedPin led2(16,10,80000);
-  LedPin led3(17,100,2000);
-  LedPin led4(23,100,2);
-  LedPin led5(22,0,3000);
-  LedPin led6(14,0,1);
-  LedPin led7(32,0,1850);
-  LedPin led8(15);
-  LedPin led9(33);
-  LedPin led10(27);
-  ServoPin led14(25);
-  LedPin led11(12,100,23);
-  LedPin led12(13,100);
-  LedPin led13(26);
-  LedPin led15(4,0);
-  LedPin led16(5,0);
+  LedPin led12(12,99,500);
+  LedPin led5(5,20,20000);
+  LedPin led6(6,20,5000);
+//  LedPin led3(17,50,1);
+//  LedPin led2(16,10,8000);
+//  LedPin led4(23,100,2);
+//  LedPin led5(22,0,3000);
+//  LedPin led6(14,0,1);
+//  LedPin led7(32,0,1850);
+//  LedPin led8(15);
+//  LedPin led9(33);
+//  LedPin led10(27);
+//  ServoPin led14(25);
+//  LedPin led11(12,100,23);
+//  LedPin led12(13,100);
+//  LedPin led13(26);
+//  LedPin led15(4,0);
 
-  led16.set(20);
-  led0.set(5);
-  led14.set(100);
+Serial.printf("HELLO\n");
 
-  Serial.println(led0.getPin());
+//  led16.set(20);
+//  led0.set(5);
+//  led14.set(100);
+
+//  Serial.println(led0.getPin());
 //  Serial.println(led14.getPin());
 //  Serial.println(led15.getPin());
 //  Serial.println(led16.getPin());
 
+Serial.printf("RES0: %d\n",REG_GET_FIELD(LEDC_LSTIMER0_CONF_REG,LEDC_LSTIMER0_DUTY_RES));
+Serial.printf("RES1: %d\n",REG_GET_FIELD(LEDC_LSTIMER1_CONF_REG,LEDC_LSTIMER1_DUTY_RES));
+Serial.printf("RES2: %d\n",REG_GET_FIELD(LEDC_LSTIMER2_CONF_REG,LEDC_LSTIMER2_DUTY_RES));
+Serial.printf("DIV0: %d\n",REG_GET_FIELD(LEDC_LSTIMER0_CONF_REG,LEDC_CLK_DIV_LSTIMER0)>>8);
+Serial.printf("DIV1: %d\n",REG_GET_FIELD(LEDC_LSTIMER1_CONF_REG,LEDC_CLK_DIV_LSTIMER1)>>8);
+Serial.printf("DIV2: %d\n",REG_GET_FIELD(LEDC_LSTIMER2_CONF_REG,LEDC_CLK_DIV_LSTIMER2)>>8);
+
 //  uint32_t v=REG_READ(LEDC_HSTIMER0_CONF_REG);
 //  Serial.printf("HS %d %d %d %d\n",(v>>25)&1,v&0x1f,(v>>13)&0x3FF,(v>>5)&0xFF);