diff --git a/.DS_Store b/.DS_Store index 86381ba..4cf94ea 100644 Binary files a/.DS_Store and b/.DS_Store differ 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 ba87411..cd8393a 100644 Binary files a/src/.DS_Store and b/src/.DS_Store differ 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 #include -#include - -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 -#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>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); }