Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
OVMS3-idf/components/driver/ledc.c

568 lines
24 KiB
C
Raw Normal View History

add ledc driver code
2016-09-23 01:21:37 +00:00
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <esp_types.h>
#include "esp_intr.h"
Add interrupt allocation scheme / interrupt sharing. Also modifies drivers and examples. Also allows interrupts to be marked specifically as having a handler that's all in IRAM.
2016-11-25 09:33:51 +00:00
#include "esp_intr_alloc.h"
add ledc driver code
2016-09-23 01:21:37 +00:00
#include "freertos/FreeRTOS.h"
#include "freertos/semphr.h"
#include "freertos/xtensa_api.h"
#include "soc/gpio_sig_map.h"
#include "driver/ledc.h"
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
#include "soc/ledc_reg.h"
#include "soc/ledc_struct.h"
Update UART driver 1. Use esp_log API for LEDC and GPIO code. 2. Modify some API return value. 3. Add ledc_set_pin() for LEDC 4. Modify typo in uart.h Questions: In uart driver ISR handler, I used xxxFromISR , like xSemaphoreGiveFromISR, do those FromISR functions need to be put in IRAM?
2016-10-24 07:57:23 +00:00
#include "esp_log.h"
add ledc driver code
2016-09-23 01:21:37 +00:00
drivers: remove file paths from log statements Function name and error string are usually sufficient to find the place which has triggered an error. __FILE__ macro generates a string which has absolute file name (with our build system), so there is a lot of long strings present in the program because of that. Fixes https://github.com/espressif/esp-idf/issues/126
2016-12-07 04:01:30 +00:00
static const char* LEDC_TAG = "ledc";
add ledc driver code
2016-09-23 01:21:37 +00:00
static portMUX_TYPE ledc_spinlock = portMUX_INITIALIZER_UNLOCKED;
drivers: remove file paths from log statements Function name and error string are usually sufficient to find the place which has triggered an error. __FILE__ macro generates a string which has absolute file name (with our build system), so there is a lot of long strings present in the program because of that. Fixes https://github.com/espressif/esp-idf/issues/126
2016-12-07 04:01:30 +00:00
#define LEDC_CHECK(a, str, ret_val) \
if (!(a)) { \
ESP_LOGE(LEDC_TAG,"%s(%d): %s", __FUNCTION__, __LINE__, str); \
return (ret_val); \
}
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
typedef struct {
uint16_t speed_mode;
uint16_t direction;
int target_duty;
int cycle_num;
int scale;
ledc_fade_mode_t mode;
xSemaphoreHandle ledc_fade_sem;
xSemaphoreHandle ledc_fade_mux;
} ledc_fade_t;
static ledc_fade_t* s_ledc_fade_rec = NULL;
static ledc_isr_handle_t s_ledc_fade_isr_handle = NULL;
#define LEDC_VAL_NO_CHANGE (-1)
#define LEDC_STEP_NUM_MAX (1023)
#define LEDC_DUTY_DECIMAL_BIT_NUM (4)
#define LEDC_MODE_ERR_STR "LEDC mode error"
#define LEDC_TIMER_ERR_STR "LEDC timer error"
#define LEDC_CHANNEL_ERR_STR "LEDC channel error"
#define LEDC_GPIO_OUT_ERR_STR "LEDC GPIO output number error"
#define LEDC_FADE_DIR_ERR_STR "LEDC fade direction error"
#define LEDC_FADE_SERVICE_ERR_STR "LEDC fade service not installed"
#define LEDC_FADE_TARGET_ERR_STR "LEDC fade target duty error"
#define LEDC_FADE_INSTALLED_ERR_STR "LEDC fade service already installed"
#define LEDC_FADE_MODE_ERR_STR "LEDC fade mode error"
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
esp_err_t ledc_timer_set(ledc_mode_t speed_mode, ledc_timer_t timer_sel, uint32_t div_num, uint32_t bit_num, ledc_clk_src_t clk_src)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(timer_sel <= LEDC_TIMER_3, LEDC_TIMER_ERR_STR, ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.timer_group[speed_mode].timer[timer_sel].conf.div_num = div_num;
LEDC.timer_group[speed_mode].timer[timer_sel].conf.tick_sel = clk_src;
LEDC.timer_group[speed_mode].timer[timer_sel].conf.bit_num = bit_num;
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
if (speed_mode != LEDC_HIGH_SPEED_MODE) {
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.timer_group[speed_mode].timer[timer_sel].conf.low_speed_update = 1;
}
add ledc driver code
2016-09-23 01:21:37 +00:00
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
static IRAM_ATTR esp_err_t ledc_duty_config(ledc_mode_t speed_mode, ledc_channel_t channel_num, int hpoint_val, uint32_t duty_val,
add ledc driver code
2016-09-23 01:21:37 +00:00
uint32_t duty_direction, uint32_t duty_num, uint32_t duty_cycle, uint32_t duty_scale)
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
{
portENTER_CRITICAL(&ledc_spinlock);
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
if (hpoint_val >= 0) {
LEDC.channel_group[speed_mode].channel[channel_num].hpoint.hpoint = hpoint_val;
}
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.channel_group[speed_mode].channel[channel_num].duty.duty = duty_val;
LEDC.channel_group[speed_mode].channel[channel_num].conf1.val = ((duty_direction & LEDC_DUTY_INC_HSCH0_V) << LEDC_DUTY_INC_HSCH0_S) |
((duty_num & LEDC_DUTY_NUM_HSCH0_V) << LEDC_DUTY_NUM_HSCH0_S) |
((duty_cycle & LEDC_DUTY_CYCLE_HSCH0_V) << LEDC_DUTY_CYCLE_HSCH0_S) |
((duty_scale & LEDC_DUTY_SCALE_HSCH0_V) << LEDC_DUTY_SCALE_HSCH0_S);
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
LEDC driver: Use ledc_channel_t for all channel arguments Closes github #54: https://github.com/espressif/esp-idf/issues/54
2016-12-22 02:30:24 +00:00
esp_err_t ledc_bind_channel_timer(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t timer_idx)
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(timer_idx <= LEDC_TIMER_3, LEDC_TIMER_ERR_STR, ESP_ERR_INVALID_ARG);
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
portENTER_CRITICAL(&ledc_spinlock);
LEDC.channel_group[speed_mode].channel[channel].conf0.timer_sel = timer_idx;
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
esp_err_t ledc_timer_rst(ledc_mode_t speed_mode, uint32_t timer_sel)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(timer_sel <= LEDC_TIMER_3, LEDC_TIMER_ERR_STR, ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.timer_group[speed_mode].timer[timer_sel].conf.rst = 1;
LEDC.timer_group[speed_mode].timer[timer_sel].conf.rst = 0;
add ledc driver code
2016-09-23 01:21:37 +00:00
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
esp_err_t ledc_timer_pause(ledc_mode_t speed_mode, uint32_t timer_sel)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(timer_sel <= LEDC_TIMER_3, LEDC_TIMER_ERR_STR, ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.timer_group[speed_mode].timer[timer_sel].conf.pause = 1;
add ledc driver code
2016-09-23 01:21:37 +00:00
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
esp_err_t ledc_timer_resume(ledc_mode_t speed_mode, uint32_t timer_sel)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(timer_sel <= LEDC_TIMER_3, LEDC_TIMER_ERR_STR, ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.timer_group[speed_mode].timer[timer_sel].conf.pause = 0;
add ledc driver code
2016-09-23 01:21:37 +00:00
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
add ledc driver code
2016-09-23 01:21:37 +00:00
static esp_err_t ledc_enable_intr_type(ledc_mode_t speed_mode, uint32_t channel, ledc_intr_type_t type)
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
uint32_t value;
uint32_t intr_type = type;
portENTER_CRITICAL(&ledc_spinlock);
value = LEDC.int_ena.val;
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
if (intr_type == LEDC_INTR_FADE_END) {
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.int_ena.val = value | BIT(LEDC_DUTY_CHNG_END_HSCH0_INT_ENA_S + channel);
add ledc driver code
2016-09-23 01:21:37 +00:00
} else {
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC.int_ena.val = ( value & ( ~( BIT(LEDC_DUTY_CHNG_END_HSCH0_INT_ENA_S + channel) ) ) );
add ledc driver code
2016-09-23 01:21:37 +00:00
}
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
Add disabling/enabling of shared interrupt, add testcase for interrupts
2016-12-07 13:30:21 +00:00
esp_err_t ledc_isr_register(void (*fn)(void*), void * arg, int intr_alloc_flags, ledc_isr_handle_t *handle)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
Add interrupt allocation scheme / interrupt sharing. Also modifies drivers and examples. Also allows interrupts to be marked specifically as having a handler that's all in IRAM.
2016-11-25 09:33:51 +00:00
esp_err_t ret;
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 06:16:52 +00:00
LEDC_CHECK(fn, "ledc isr null", ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
ret = esp_intr_alloc(ETS_LEDC_INTR_SOURCE, intr_alloc_flags, fn, arg, handle);
add ledc driver code
2016-09-23 01:21:37 +00:00
portEXIT_CRITICAL(&ledc_spinlock);
Add interrupt allocation scheme / interrupt sharing. Also modifies drivers and examples. Also allows interrupts to be marked specifically as having a handler that's all in IRAM.
2016-11-25 09:33:51 +00:00
return ret;
add ledc driver code
2016-09-23 01:21:37 +00:00
}
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
esp_err_t ledc_timer_config(ledc_timer_config_t* timer_conf)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
int freq_hz = timer_conf->freq_hz;
int bit_num = timer_conf->bit_num;
int timer_num = timer_conf->timer_num;
int speed_mode = timer_conf->speed_mode;
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
periph_module_enable(PERIPH_LEDC_MODULE);
if (freq_hz == 0 || bit_num == 0 || bit_num > LEDC_TIMER_15_BIT) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 06:16:52 +00:00
ESP_LOGE(LEDC_TAG, "freq_hz=%u bit_num=%u", freq_hz, bit_num);
add ledc driver code
2016-09-23 01:21:37 +00:00
return ESP_ERR_INVALID_ARG;
}
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
if (timer_num > LEDC_TIMER_3) {
ledc: fix reported error when div_param == 256 Whenever bit_num and freq_hz are such that div_param == 256, the code would flag that as an error. In fact, value 256 of div_param was a valid one (HW requires that div_param >= 1.0, when interpreted as a Q10.8 fixed point value). Changed the if statements a bit to make the logic clearer, and added more descriptive error messages. Also added missing error for the unimplemented case of low speed mode.
2016-11-24 04:27:32 +00:00
ESP_LOGE(LEDC_TAG, "invalid timer #%u", timer_num);
add ledc driver code
2016-09-23 01:21:37 +00:00
return ESP_ERR_INVALID_ARG;
}
esp_err_t ret = ESP_OK;
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
uint32_t precision = ( 0x1 << bit_num ); // 2**depth
ledc: fix reported error when div_param == 256 Whenever bit_num and freq_hz are such that div_param == 256, the code would flag that as an error. In fact, value 256 of div_param was a valid one (HW requires that div_param >= 1.0, when interpreted as a Q10.8 fixed point value). Changed the if statements a bit to make the logic clearer, and added more descriptive error messages. Also added missing error for the unimplemented case of low speed mode.
2016-11-24 04:27:32 +00:00
// Try calculating divisor based on LEDC_APB_CLK
ledc_clk_src_t timer_clk_src = LEDC_APB_CLK;
// div_param is a Q10.8 fixed point value
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
uint64_t div_param = ( (uint64_t) LEDC_APB_CLK_HZ << 8 ) / freq_hz / precision;
ledc: fix reported error when div_param == 256 Whenever bit_num and freq_hz are such that div_param == 256, the code would flag that as an error. In fact, value 256 of div_param was a valid one (HW requires that div_param >= 1.0, when interpreted as a Q10.8 fixed point value). Changed the if statements a bit to make the logic clearer, and added more descriptive error messages. Also added missing error for the unimplemented case of low speed mode.
2016-11-24 04:27:32 +00:00
if (div_param < 256) {
// divisor is too low
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
ESP_LOGE(LEDC_TAG, "requested frequency and bit depth can not be achieved, try reducing freq_hz or bit_num. div_param=%d",
(uint32_t ) div_param);
ledc: fix reported error when div_param == 256 Whenever bit_num and freq_hz are such that div_param == 256, the code would flag that as an error. In fact, value 256 of div_param was a valid one (HW requires that div_param >= 1.0, when interpreted as a Q10.8 fixed point value). Changed the if statements a bit to make the logic clearer, and added more descriptive error messages. Also added missing error for the unimplemented case of low speed mode.
2016-11-24 04:27:32 +00:00
ret = ESP_FAIL;
}
if (div_param > LEDC_DIV_NUM_HSTIMER0_V) {
// APB_CLK results in divisor which too high. Try using REF_TICK as clock source.
timer_clk_src = LEDC_REF_TICK;
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
div_param = ( (uint64_t) LEDC_REF_CLK_HZ << 8 ) / freq_hz / precision;
if (div_param < 256 || div_param > LEDC_DIV_NUM_HSTIMER0_V) {
ESP_LOGE(LEDC_TAG, "requested frequency and bit depth can not be achieved, try increasing freq_hz or bit_num. div_param=%d",
(uint32_t ) div_param);
add ledc driver code
2016-09-23 01:21:37 +00:00
ret = ESP_FAIL;
}
}
ledc: fix reported error when div_param == 256 Whenever bit_num and freq_hz are such that div_param == 256, the code would flag that as an error. In fact, value 256 of div_param was a valid one (HW requires that div_param >= 1.0, when interpreted as a Q10.8 fixed point value). Changed the if statements a bit to make the logic clearer, and added more descriptive error messages. Also added missing error for the unimplemented case of low speed mode.
2016-11-24 04:27:32 +00:00
// set timer parameters
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
ledc_timer_set(speed_mode, timer_num, div_param, bit_num, timer_clk_src);
ledc: fix reported error when div_param == 256 Whenever bit_num and freq_hz are such that div_param == 256, the code would flag that as an error. In fact, value 256 of div_param was a valid one (HW requires that div_param >= 1.0, when interpreted as a Q10.8 fixed point value). Changed the if statements a bit to make the logic clearer, and added more descriptive error messages. Also added missing error for the unimplemented case of low speed mode.
2016-11-24 04:27:32 +00:00
// reset timer
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
ledc_timer_rst(speed_mode, timer_num);
return ret;
}
Update UART driver 1. Use esp_log API for LEDC and GPIO code. 2. Modify some API return value. 3. Add ledc_set_pin() for LEDC 4. Modify typo in uart.h Questions: In uart driver ISR handler, I used xxxFromISR , like xSemaphoreGiveFromISR, do those FromISR functions need to be put in IRAM?
2016-10-24 07:57:23 +00:00
esp_err_t ledc_set_pin(int gpio_num, ledc_mode_t speed_mode, ledc_channel_t ledc_channel)
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(ledc_channel <= LEDC_CHANNEL_7, LEDC_CHANNEL_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(GPIO_IS_VALID_OUTPUT_GPIO(gpio_num), LEDC_GPIO_OUT_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
Update UART driver 1. Use esp_log API for LEDC and GPIO code. 2. Modify some API return value. 3. Add ledc_set_pin() for LEDC 4. Modify typo in uart.h Questions: In uart driver ISR handler, I used xxxFromISR , like xSemaphoreGiveFromISR, do those FromISR functions need to be put in IRAM?
2016-10-24 07:57:23 +00:00
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[gpio_num], PIN_FUNC_GPIO);
gpio_set_direction(gpio_num, GPIO_MODE_OUTPUT);
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
if (speed_mode == LEDC_HIGH_SPEED_MODE) {
Update UART driver 1. Use esp_log API for LEDC and GPIO code. 2. Modify some API return value. 3. Add ledc_set_pin() for LEDC 4. Modify typo in uart.h Questions: In uart driver ISR handler, I used xxxFromISR , like xSemaphoreGiveFromISR, do those FromISR functions need to be put in IRAM?
2016-10-24 07:57:23 +00:00
gpio_matrix_out(gpio_num, LEDC_HS_SIG_OUT0_IDX + ledc_channel, 0, 0);
} else {
ledc: fix reported error when div_param == 256 Whenever bit_num and freq_hz are such that div_param == 256, the code would flag that as an error. In fact, value 256 of div_param was a valid one (HW requires that div_param >= 1.0, when interpreted as a Q10.8 fixed point value). Changed the if statements a bit to make the logic clearer, and added more descriptive error messages. Also added missing error for the unimplemented case of low speed mode.
2016-11-24 04:27:32 +00:00
ESP_LOGE(LEDC_TAG, "low speed mode is not implemented");
return ESP_ERR_NOT_SUPPORTED;
Update UART driver 1. Use esp_log API for LEDC and GPIO code. 2. Modify some API return value. 3. Add ledc_set_pin() for LEDC 4. Modify typo in uart.h Questions: In uart driver ISR handler, I used xxxFromISR , like xSemaphoreGiveFromISR, do those FromISR functions need to be put in IRAM?
2016-10-24 07:57:23 +00:00
}
return ESP_OK;
}
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
esp_err_t ledc_channel_config(ledc_channel_config_t* ledc_conf)
{
uint32_t speed_mode = ledc_conf->speed_mode;
uint32_t gpio_num = ledc_conf->gpio_num;
uint32_t ledc_channel = ledc_conf->channel;
uint32_t timer_select = ledc_conf->timer_sel;
uint32_t intr_type = ledc_conf->intr_type;
uint32_t duty = ledc_conf->duty;
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(ledc_channel <= LEDC_CHANNEL_7, LEDC_CHANNEL_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(GPIO_IS_VALID_OUTPUT_GPIO(gpio_num), LEDC_GPIO_OUT_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(timer_select <= LEDC_TIMER_3, LEDC_TIMER_ERR_STR, ESP_ERR_INVALID_ARG);
driver: PCNT minor changes
2016-11-23 10:10:45 +00:00
periph_module_enable(PERIPH_LEDC_MODULE);
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
esp_err_t ret = ESP_OK;
/*set channel parameters*/
/* channel parameters decide how the waveform looks like in one period*/
/* set channel duty, duty range is (0 ~ ((2 ** bit_num) - 1))*/
add ledc driver code
2016-09-23 01:21:37 +00:00
ledc_set_duty(speed_mode, ledc_channel, duty);
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
/*update duty settings*/
ledc_update_duty(speed_mode, ledc_channel);
/*bind the channel with the timer*/
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
ledc_bind_channel_timer(speed_mode, ledc_channel, timer_select);
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
/*set interrupt type*/
add ledc driver code
2016-09-23 01:21:37 +00:00
ledc_enable_intr_type(speed_mode, ledc_channel, intr_type);
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
ESP_LOGD(LEDC_TAG, "LEDC_PWM CHANNEL %1u|GPIO %02u|Duty %04u|Time %01u",
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
ledc_channel, gpio_num, duty, timer_select
add ledc driver code
2016-09-23 01:21:37 +00:00
);
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
/*set LEDC signal in gpio matrix*/
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
PIN_FUNC_SELECT(GPIO_PIN_MUX_REG[gpio_num], PIN_FUNC_GPIO);
gpio_set_direction(gpio_num, GPIO_MODE_OUTPUT);
gpio_matrix_out(gpio_num, LEDC_HS_SIG_OUT0_IDX + ledc_channel, 0, 0);
add ledc driver code
2016-09-23 01:21:37 +00:00
return ret;
}
Modify LEDC driver 1. configure LEDC timer saparately 2. add peripher_crtl.c/.h To enable the peripheral modules, we have to set/clear the control register in dport_reg.h. These bits are disabled by default and they are all in a same register, so we need to add a lock on that. 3. add include esp_err.h in gpio.h
2016-09-28 15:20:34 +00:00
esp_err_t ledc_update_duty(ledc_mode_t speed_mode, ledc_channel_t channel)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(channel <= LEDC_CHANNEL_7, LEDC_CHANNEL_ERR_STR, ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.channel_group[speed_mode].channel[channel].conf0.sig_out_en = 1;
LEDC.channel_group[speed_mode].channel[channel].conf1.duty_start = 1;
add ledc driver code
2016-09-23 01:21:37 +00:00
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
esp_err_t ledc_stop(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t idle_level)
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(channel <= LEDC_CHANNEL_7, LEDC_CHANNEL_ERR_STR, ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.channel_group[speed_mode].channel[channel].conf0.idle_lv = idle_level & 0x1;
LEDC.channel_group[speed_mode].channel[channel].conf0.sig_out_en = 0;
LEDC.channel_group[speed_mode].channel[channel].conf1.duty_start = 0;
add ledc driver code
2016-09-23 01:21:37 +00:00
portEXIT_CRITICAL(&ledc_spinlock);
return ESP_OK;
}
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC driver: Use ledc_channel_t for all channel arguments Closes github #54: https://github.com/espressif/esp-idf/issues/54
2016-12-22 02:30:24 +00:00
esp_err_t ledc_set_fade(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t duty, ledc_duty_direction_t fade_direction,
add ledc driver code
2016-09-23 01:21:37 +00:00
uint32_t step_num, uint32_t duty_cyle_num, uint32_t duty_scale)
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(channel <= LEDC_CHANNEL_7, LEDC_CHANNEL_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(fade_direction <= LEDC_DUTY_DIR_INCREASE, LEDC_FADE_DIR_ERR_STR, ESP_ERR_INVALID_ARG);
if (step_num > LEDC_DUTY_NUM_HSCH0_V || duty_cyle_num > LEDC_DUTY_CYCLE_HSCH0_V || duty_scale > LEDC_DUTY_SCALE_HSCH0_V) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 06:16:52 +00:00
ESP_LOGE(LEDC_TAG, "step_num=%u duty_cyle_num=%u duty_scale=%u", step_num, duty_cyle_num, duty_scale);
add ledc driver code
2016-09-23 01:21:37 +00:00
return ESP_ERR_INVALID_ARG;
}
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
if (s_ledc_fade_rec) {
ledc_enable_intr_type(speed_mode, channel, LEDC_INTR_DISABLE);
}
add ledc driver code
2016-09-23 01:21:37 +00:00
ledc_duty_config(speed_mode,
channel, //uint32_t chan_num,
0, //uint32_t hpoint_val,
duty << 4, //uint32_t duty_val,the least 4 bits are decimal part
fade_direction, //uint32_t increase,
step_num, //uint32_t duty_num,
duty_cyle_num, //uint32_t duty_cycle,
duty_scale //uint32_t duty_scale
);
return ESP_OK;
}
esp_err_t ledc_set_duty(ledc_mode_t speed_mode, ledc_channel_t channel, uint32_t duty)
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(channel <= LEDC_CHANNEL_7, LEDC_CHANNEL_ERR_STR, ESP_ERR_INVALID_ARG);
if (s_ledc_fade_rec) {
ledc_enable_intr_type(speed_mode, channel, LEDC_INTR_DISABLE);
}
add ledc driver code
2016-09-23 01:21:37 +00:00
ledc_duty_config(speed_mode,
channel, //uint32_t chan_num,
0, //uint32_t hpoint_val,
duty << 4, //uint32_t duty_val,the least 4 bits are decimal part
1, //uint32_t increase,
1, //uint32_t duty_num,
1, //uint32_t duty_cycle,
0 //uint32_t duty_scale
);
return ESP_OK;
}
1. add a macro 'GPIO_IS_VALID_OUTPUT_GPIO' and 'GPIO_IS_VALID_OUTPUT_GPIO' in gpio.h 2. add PIN_FUNC_GPIO in io_mux_reg.h, put the io_mux_regs in order 3. use braces around single line if statements in ledc.c and gpio.c
2016-09-23 06:52:26 +00:00
int ledc_get_duty(ledc_mode_t speed_mode, ledc_channel_t channel)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, (-1));
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
uint32_t duty = (LEDC.channel_group[speed_mode].channel[channel].duty_rd.duty_read >> 4);
add ledc driver code
2016-09-23 01:21:37 +00:00
return duty;
}
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
esp_err_t ledc_set_freq(ledc_mode_t speed_mode, ledc_timer_t timer_num, uint32_t freq_hz)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
esp_err_t ret = ESP_OK;
uint32_t div_num = 0;
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
uint32_t bit_num = LEDC.timer_group[speed_mode].timer[timer_num].conf.bit_num;
uint32_t timer_source_clk = LEDC.timer_group[speed_mode].timer[timer_num].conf.tick_sel;
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
uint32_t precision = ( 0x1 << bit_num );
if (timer_source_clk == LEDC_APB_CLK) {
div_num = ( (uint64_t) LEDC_APB_CLK_HZ << 8 ) / freq_hz / precision;
add ledc driver code
2016-09-23 01:21:37 +00:00
} else {
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
div_num = ( (uint64_t) LEDC_REF_CLK_HZ << 8 ) / freq_hz / precision;
add ledc driver code
2016-09-23 01:21:37 +00:00
}
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
if (div_num <= 256 || div_num > LEDC_DIV_NUM_HSTIMER0) {
Minor changes for driver 1. remove "\n" when calling ESP_LOGX APIs. 2. modify uart_event_t for uart rx data. 3. use MICRO for uart inverse value 4. add uart_tx_data_t for internal tx function.
2016-11-07 06:16:52 +00:00
ESP_LOGE(LEDC_TAG, "div param err,div_param=%u", div_num);
add ledc driver code
2016-09-23 01:21:37 +00:00
ret = ESP_FAIL;
}
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
LEDC.timer_group[speed_mode].timer[timer_num].conf.div_num = div_num;
add ledc driver code
2016-09-23 01:21:37 +00:00
portEXIT_CRITICAL(&ledc_spinlock);
return ret;
}
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
uint32_t ledc_get_freq(ledc_mode_t speed_mode, ledc_timer_t timer_num)
add ledc driver code
2016-09-23 01:21:37 +00:00
{
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ( 0 ));
add ledc driver code
2016-09-23 01:21:37 +00:00
portENTER_CRITICAL(&ledc_spinlock);
uint32_t freq = 0;
components/driver: modify LEDC driver 1. modify ledc struct header: combine high speed and low speed channel 2. modify ledc init function 3. add timer control api 4. modify typo in ledc.h
2016-09-26 01:56:03 +00:00
uint32_t timer_source_clk = LEDC.timer_group[speed_mode].timer[timer_num].conf.tick_sel;
uint32_t bit_num = LEDC.timer_group[speed_mode].timer[timer_num].conf.bit_num;
uint32_t div_num = LEDC.timer_group[speed_mode].timer[timer_num].conf.div_num;
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
uint32_t precision = ( 0x1 << bit_num );
if (timer_source_clk == LEDC_APB_CLK) {
freq = ( (uint64_t) LEDC_APB_CLK_HZ << 8 ) / precision / div_num;
add ledc driver code
2016-09-23 01:21:37 +00:00
} else {
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
freq = ( (uint64_t) LEDC_REF_CLK_HZ << 8 ) / precision / div_num;
add ledc driver code
2016-09-23 01:21:37 +00:00
}
portEXIT_CRITICAL(&ledc_spinlock);
return freq;
}
driver: ledc - update fading functions, add example and doc 1. add fading functions. 2. clear up ledc.c and ledc.h 3. update api doc. 4. add ledc example 5. edit ledc.rst and add readme for example code. 6. add s_ prefix for static global values. 7. add mutex for fade functions 8. minor changes according to the comments.
2016-12-25 15:11:24 +00:00
void IRAM_ATTR ledc_fade_isr()
{
int i;
portBASE_TYPE HPTaskAwoken = pdFALSE;
uint32_t intr_status = LEDC.int_st.val; //read LEDC interrupt status.
LEDC.int_clr.val = intr_status; //clear LEDC interrupt status.
for (i = 0; i < 8; i++) {
if (intr_status & BIT(LEDC_DUTY_CHNG_END_HSCH0_INT_ST_S + i)) {
int speed_mode = s_ledc_fade_rec[i].speed_mode;
int duty_cur = LEDC.channel_group[speed_mode].channel[i].duty_rd.duty_read >> LEDC_DUTY_DECIMAL_BIT_NUM;
if (duty_cur == s_ledc_fade_rec[i].target_duty) {
if(s_ledc_fade_rec[i].mode == LEDC_FADE_WAIT_DONE) {
xSemaphoreGiveFromISR(s_ledc_fade_rec[i].ledc_fade_sem, &HPTaskAwoken);
if(HPTaskAwoken == pdTRUE) {
portYIELD_FROM_ISR() ;
}
}
continue;
}
int duty_tar = s_ledc_fade_rec[i].target_duty;
int scale = s_ledc_fade_rec[i].scale;
if (scale == 0) {
continue;
}
int cycle = s_ledc_fade_rec[i].cycle_num;
int delta = s_ledc_fade_rec[i].direction == LEDC_DUTY_DIR_DECREASE ? duty_cur - duty_tar : duty_tar - duty_cur;
int step = delta / scale > LEDC_STEP_NUM_MAX ? LEDC_STEP_NUM_MAX : delta / scale;
if (delta > scale) {
ledc_duty_config(
speed_mode,
i,
LEDC_VAL_NO_CHANGE,
duty_cur << LEDC_DUTY_DECIMAL_BIT_NUM,
s_ledc_fade_rec[i].direction,
step,
cycle,
scale);
} else {
ledc_duty_config(
speed_mode,
i,
LEDC_VAL_NO_CHANGE,
duty_tar << LEDC_DUTY_DECIMAL_BIT_NUM,
s_ledc_fade_rec[i].direction,
1,
1,
0);
}
LEDC.channel_group[speed_mode].channel[i].conf1.duty_start = 1;
}
}
LEDC.int_clr.val = intr_status; //clear LEDC interrupt status.
}
esp_err_t ledc_set_fade_with_time(ledc_mode_t speed_mode, ledc_channel_t channel, int target_duty, int max_fade_time_ms)
{
int timer_sel = LEDC.channel_group[speed_mode].channel[channel].conf0.timer_sel;
int max_duty = ( 1 << ( LEDC.timer_group[speed_mode].timer[timer_sel].conf.bit_num ) ) - 1;
LEDC_CHECK(target_duty <= max_duty, LEDC_FADE_TARGET_ERR_STR, ESP_ERR_INVALID_ARG);
uint32_t freq = ledc_get_freq(speed_mode, timer_sel);
int duty_cur = LEDC.channel_group[speed_mode].channel[channel].duty_rd.duty_read >> LEDC_DUTY_DECIMAL_BIT_NUM;
int duty_delta = target_duty > duty_cur ? target_duty - duty_cur : duty_cur - target_duty;
if (duty_delta == 0) {
return ESP_OK;
}
int total_cycles = max_fade_time_ms * freq / 1000;
int scale, cycle_num;
if (total_cycles > duty_delta) {
scale = 1;
cycle_num = total_cycles / duty_delta;
} else {
cycle_num = 1;
scale = ( duty_delta + total_cycles - 1 ) / total_cycles;
}
return ledc_set_fade_with_step(speed_mode, channel, target_duty, scale, cycle_num);
}
esp_err_t ledc_set_fade_with_step(ledc_mode_t speed_mode, ledc_channel_t channel, int target_duty, int scale, int cycle_num)
{
LEDC_CHECK(s_ledc_fade_rec != NULL, LEDC_FADE_SERVICE_ERR_STR, ESP_ERR_INVALID_STATE);
LEDC_CHECK(speed_mode < LEDC_SPEED_MODE_MAX, LEDC_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
LEDC_CHECK(channel < LEDC_CHANNEL_MAX, LEDC_CHANNEL_ERR_STR, ESP_ERR_INVALID_ARG);
int timer_sel = LEDC.channel_group[speed_mode].channel[channel].conf0.timer_sel;
int max_duty = (1 << (LEDC.timer_group[speed_mode].timer[timer_sel].conf.bit_num)) - 1;
LEDC_CHECK(target_duty <= max_duty, LEDC_FADE_TARGET_ERR_STR, ESP_ERR_INVALID_ARG);
//disable the interrupt, so the operation will not mess up
ledc_enable_intr_type(speed_mode, channel, LEDC_INTR_DISABLE);
portENTER_CRITICAL(&ledc_spinlock);
int duty_cur = LEDC.channel_group[speed_mode].channel[channel].duty_rd.duty_read >> LEDC_DUTY_DECIMAL_BIT_NUM;
int duty_delta = target_duty > duty_cur ? target_duty - duty_cur : duty_cur - target_duty;
if (duty_delta == 0) {
return ESP_OK;
}
s_ledc_fade_rec[channel].speed_mode = speed_mode;
s_ledc_fade_rec[channel].target_duty = target_duty;
s_ledc_fade_rec[channel].cycle_num = cycle_num;
s_ledc_fade_rec[channel].scale = scale;
int step_num;
if (duty_cur > target_duty) {
s_ledc_fade_rec[channel].direction = LEDC_DUTY_DIR_DECREASE;
step_num = ( duty_cur - target_duty ) / scale;
step_num = step_num > LEDC_STEP_NUM_MAX ? LEDC_STEP_NUM_MAX : step_num;
} else {
s_ledc_fade_rec[channel].direction = LEDC_DUTY_DIR_INCREASE;
step_num = ( target_duty - duty_cur ) / scale;
step_num = step_num > LEDC_STEP_NUM_MAX ? LEDC_STEP_NUM_MAX : step_num;
}
portEXIT_CRITICAL(&ledc_spinlock);
ledc_set_fade(
speed_mode,
channel,
duty_cur,
s_ledc_fade_rec[channel].direction,
step_num,
s_ledc_fade_rec[channel].cycle_num,
s_ledc_fade_rec[channel].scale
);
ESP_LOGD(LEDC_TAG, "cur duty: %d; target: %d, step: %d, cycle: %d; scale: %d\n",
LEDC.channel_group[speed_mode].channel[channel].duty_rd.duty_read >> LEDC_DUTY_DECIMAL_BIT_NUM,
target_duty,
step_num,
s_ledc_fade_rec[channel].cycle_num,
s_ledc_fade_rec[channel].scale
);
LEDC.int_clr.val |= BIT(LEDC_DUTY_CHNG_END_HSCH0_INT_ENA_S + channel);
ledc_enable_intr_type(speed_mode, channel, LEDC_INTR_FADE_END);
return ESP_OK;
}
esp_err_t ledc_fade_func_install(int intr_alloc_flags)
{
LEDC_CHECK(s_ledc_fade_rec == NULL, LEDC_FADE_INSTALLED_ERR_STR, ESP_ERR_INVALID_STATE);
s_ledc_fade_rec = (ledc_fade_t*) calloc(LEDC_CHANNEL_MAX, sizeof(ledc_fade_t));
if (s_ledc_fade_rec == NULL) {
return ESP_ERR_NO_MEM;
}
int i = 0;
for (i = 0; i < LEDC_CHANNEL_MAX; i++) {
s_ledc_fade_rec[i].ledc_fade_sem = xSemaphoreCreateBinary();
s_ledc_fade_rec[i].ledc_fade_mux = xSemaphoreCreateMutex();
if (s_ledc_fade_rec[i].ledc_fade_sem == NULL || s_ledc_fade_rec[i].ledc_fade_mux == NULL) {
ledc_fade_func_uninstall();
return ESP_ERR_NO_MEM;
}
}
//OR intr_alloc_flags with ESP_INTR_FLAG_IRAM because the fade isr is in IRAM
ledc_isr_register(ledc_fade_isr, NULL, intr_alloc_flags | ESP_INTR_FLAG_IRAM, &s_ledc_fade_isr_handle);
return ESP_OK;
}
void ledc_fade_func_uninstall()
{
if (s_ledc_fade_rec == NULL) {
return;
}
if(s_ledc_fade_isr_handle) {
esp_intr_free(s_ledc_fade_isr_handle);
s_ledc_fade_isr_handle = NULL;
}
int i;
for (i = 0; i < LEDC_CHANNEL_MAX; i++) {
if (s_ledc_fade_rec[i].ledc_fade_sem) {
xSemaphoreHandle sem_tmp = s_ledc_fade_rec[i].ledc_fade_sem;
s_ledc_fade_rec[i].ledc_fade_sem = NULL;
vSemaphoreDelete(sem_tmp);
}
if (s_ledc_fade_rec[i].ledc_fade_mux) {
xSemaphoreHandle mux_tmp = s_ledc_fade_rec[i].ledc_fade_mux;
s_ledc_fade_rec[i].ledc_fade_mux = NULL;
vSemaphoreDelete(mux_tmp);
}
}
free(s_ledc_fade_rec);
s_ledc_fade_rec = NULL;
return;
}
esp_err_t ledc_fade_start(ledc_channel_t channel, ledc_fade_mode_t wait_done)
{
LEDC_CHECK(s_ledc_fade_rec != NULL, LEDC_FADE_SERVICE_ERR_STR, ESP_ERR_INVALID_STATE);
LEDC_CHECK(wait_done < LEDC_FADE_MAX, LEDC_FADE_MODE_ERR_STR, ESP_ERR_INVALID_ARG);
int speed_mode = s_ledc_fade_rec[channel].speed_mode;
xSemaphoreTake(s_ledc_fade_rec[channel].ledc_fade_mux, portMAX_DELAY);
if (wait_done == LEDC_FADE_WAIT_DONE) {
s_ledc_fade_rec[channel].mode = LEDC_FADE_WAIT_DONE;
ledc_update_duty(speed_mode, channel);
xSemaphoreTake(s_ledc_fade_rec[channel].ledc_fade_sem, portMAX_DELAY);
} else {
s_ledc_fade_rec[channel].mode = LEDC_FADE_NO_WAIT;
ledc_update_duty(speed_mode, channel);
}
xSemaphoreGive(s_ledc_fade_rec[channel].ledc_fade_mux);
return ESP_OK;
}
Reference in a new issue Copy permalink