Skip to content

Commit 16d1dc2

Browse files
tannewttannewt
committed
Update all target sdkconfig
1 parent 6649b17 commit 16d1dc2

File tree

19 files changed

+125
-172
lines changed

19 files changed

+125
-172
lines changed

‎ports/espressif/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ INC += \
7777
-isystem esp-idf/components/bt/host/nimble/port/include \
7878
-isystem esp-idf/components/driver/include \
7979
-isystem esp-idf/components/driver/deprecated \
80+
-isystem esp-idf/components/driver/dac/include \
8081
-isystem esp-idf/components/driver/gpio/include \
8182
-isystem esp-idf/components/driver/i2c/include \
8283
-isystem esp-idf/components/driver/i2s/include \

‎ports/espressif/boards/adafruit_feather_esp32_v2/board.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "supervisor/board.h"
2828
#include "mpconfigboard.h"
2929
#include "shared-bindings/microcontroller/Pin.h"
30-
#include "components/driver/include/driver/gpio.h"
30+
#include "components/driver/gpio/include/driver/gpio.h"
3131
#include "components/hal/include/hal/gpio_hal.h"
3232
#include "common-hal/microcontroller/Pin.h"
3333

‎ports/espressif/boards/adafruit_qualia_s3_rgb666/sdkconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#
55
# Component config
66
#
7-
87
#
98
# LWIP
109
#

‎ports/espressif/boards/espressif_esp32s3_lcd_ev/sdkconfig‎

Lines changed: 18 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,28 @@
1-
CONFIG_ESP32S3_SPIRAM_SUPPORT=y
21
#
3-
# SPI RAM config
2+
# Espressif IoT Development Framework Configuration
43
#
5-
# CONFIG_SPIRAM_MODE_QUAD is not set
6-
CONFIG_SPIRAM_MODE_OCT=y
7-
CONFIG_SPIRAM_TYPE_AUTO=y
8-
# end of SPI RAM config
9-
10-
CONFIG_DEFAULT_PSRAM_CLK_IO=30
11-
#
12-
# PSRAM Clock and CS IO for ESP32S3
134
#
14-
CONFIG_DEFAULT_PSRAM_CS_IO=26
15-
# end of PSRAM Clock and CS IO for ESP32S3
16-
17-
# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set
18-
# CONFIG_SPIRAM_RODATA is not set
19-
CONFIG_SPIRAM_SPEED_80M=y
20-
# CONFIG_SPIRAM_SPEED_40M is not set
21-
CONFIG_SPIRAM=y
22-
CONFIG_SPIRAM_BOOT_INIT=y
23-
# CONFIG_SPIRAM_IGNORE_NOTFOUND is not set
24-
CONFIG_SPIRAM_USE_MEMMAP=y
25-
# CONFIG_SPIRAM_USE_CAPS_ALLOC is not set
26-
# CONFIG_SPIRAM_USE_MALLOC is not set
27-
CONFIG_SPIRAM_MEMTEST=y
5+
# Component config
286
#
29-
# LWIP
307
#
31-
CONFIG_LWIP_LOCAL_HOSTNAME="circuitpy"
32-
# end of LWIP
8+
# ESP System Settings
339
#
10+
CONFIG_ESP_CONSOLE_UART_CUSTOM=y
3411
# CONFIG_ESP_CONSOLE_NONE is not set
35-
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
12+
CONFIG_ESP_CONSOLE_UART=y
3613
CONFIG_ESP_CONSOLE_UART_CUSTOM_NUM_0=y
37-
CONFIG_ESP_CONSOLE_UART_CUSTOM=y
3814
CONFIG_ESP_CONSOLE_UART_NUM=0
39-
CONFIG_ESP_CONSOLE_UART_RX_GPIO=44
4015
CONFIG_ESP_CONSOLE_UART_TX_GPIO=43
41-
CONFIG_ESP_CONSOLE_UART=y
16+
CONFIG_ESP_CONSOLE_UART_RX_GPIO=44
17+
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
18+
# end of ESP System Settings
19+
20+
#
21+
# LWIP
22+
#
23+
CONFIG_LWIP_LOCAL_HOSTNAME="circuitpy"
24+
# end of LWIP
25+
26+
# end of Component config
27+
28+
# end of Espressif IoT Development Framework Configuration

‎ports/espressif/common-hal/alarm/SleepMemory.h‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@
4141
// is set. Any memory not allocated by us can be used by the ESP-IDF for heap or other purposes.
4242

4343
// Use half of RTC_SLOW_MEM or RTC_FAST_MEM.
44-
#define SLEEP_MEMORY_LENGTH (4096)
44+
#ifdef CONFIG_IDF_TARGET_ESP32
45+
#define SLEEP_MEMORY_LENGTH (3 * 1024)
46+
#else
47+
#define SLEEP_MEMORY_LENGTH (4 * 1024)
48+
#endif
4549

4650
typedef struct {
4751
mp_obj_base_t base;

‎ports/espressif/common-hal/analogio/AnalogIn.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
103103

104104
adc_cali_scheme_ver_t supported_schemes;
105105
adc_cali_check_scheme(&supported_schemes);
106-
adc_cali_scheme_ver_t calibration_scheme;
106+
adc_cali_scheme_ver_t calibration_scheme = 0;
107107
adc_cali_handle_t calibration;
108108

109109
#if defined(ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED) && ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
@@ -124,7 +124,7 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
124124
.atten = ATTENUATION,
125125
.bitwidth = DATA_WIDTH,
126126
#ifdef CONFIG_IDF_TARGET_ESP32
127-
.default_vref = DEFAULT_VREF;
127+
.default_vref = DEFAULT_VREF,
128128
#endif
129129
};
130130
if (adc_cali_create_scheme_line_fitting(&config, &calibration) == ESP_OK) {

‎ports/espressif/common-hal/analogio/AnalogOut.c‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,63 +35,69 @@
3535
#include "shared-bindings/microcontroller/Pin.h"
3636
#include "supervisor/shared/translate/translate.h"
3737

38-
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32S2)
39-
#include "components/driver/include/driver/dac_common.h"
40-
#define HAS_DAC 1
38+
#ifdef SOC_DAC_SUPPORTED
39+
#include "driver/dac_oneshot.h"
40+
4141
#if defined(CONFIG_IDF_TARGET_ESP32)
42-
#define pin_CHANNEL_1 pin_GPIO25
43-
#define pin_CHANNEL_2 pin_GPIO26
42+
#define pin_CHANNEL_0 pin_GPIO25
43+
#define pin_CHANNEL_1 pin_GPIO26
4444
#elif defined(CONFIG_IDF_TARGET_ESP32S2)
45-
#define pin_CHANNEL_1 pin_GPIO17
46-
#define pin_CHANNEL_2 pin_GPIO18
45+
#define pin_CHANNEL_0 pin_GPIO17
46+
#define pin_CHANNEL_1 pin_GPIO18
4747
#endif
48-
#else
49-
#define HAS_DAC 0
48+
static dac_oneshot_handle_t _active_handles[SOC_DAC_CHAN_NUM];
5049
#endif
5150

51+
5252
void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
5353
const mcu_pin_obj_t *pin) {
54-
#if HAS_DAC
55-
if (pin == &pin_CHANNEL_1) {
56-
self->channel = DAC_CHANNEL_1;
57-
} else if (pin == &pin_CHANNEL_2) {
58-
self->channel = DAC_CHANNEL_2;
54+
#ifdef SOC_DAC_SUPPORTED
55+
if (pin == &pin_CHANNEL_0) {
56+
self->channel = DAC_CHAN_0;
57+
} else if (pin == &pin_CHANNEL_1) {
58+
self->channel = DAC_CHAN_1;
5959
} else {
6060
raise_ValueError_invalid_pin();
6161
}
62-
dac_output_enable(self->channel);
62+
dac_oneshot_config_t config = {
63+
.chan_id = self->channel
64+
};
65+
dac_oneshot_new_channel(&config, &self->handle);
66+
_active_handles[self->channel] = self->handle;
6367
#else
6468
mp_raise_NotImplementedError(NULL);
6569
#endif
6670
}
6771

6872
bool common_hal_analogio_analogout_deinited(analogio_analogout_obj_t *self) {
69-
#if HAS_DAC
70-
return self->channel == DAC_CHANNEL_MAX;
73+
#ifdef SOC_DAC_SUPPORTED
74+
return self->handle == NULL;
7175
#else
7276
return false;
7377
#endif
7478
}
7579

7680
void common_hal_analogio_analogout_deinit(analogio_analogout_obj_t *self) {
77-
#if HAS_DAC
78-
dac_output_disable(self->channel);
79-
self->channel = DAC_CHANNEL_MAX;
81+
#ifdef SOC_DAC_SUPPORTED
82+
dac_oneshot_del_channel(self->handle);
83+
self->handle = NULL;
84+
_active_handles[self->channel] = NULL;
8085
#endif
8186
}
8287

8388
void common_hal_analogio_analogout_set_value(analogio_analogout_obj_t *self,
8489
uint16_t value) {
85-
#if HAS_DAC
90+
#ifdef SOC_DAC_SUPPORTED
8691
uint8_t dac_value = (value * 255) / 65535;
87-
dac_output_enable(self->channel);
88-
dac_output_voltage(self->channel, dac_value);
92+
dac_oneshot_output_voltage(self->handle, dac_value);
8993
#endif
9094
}
9195

9296
void analogout_reset(void) {
93-
#if HAS_DAC
94-
dac_output_disable(DAC_CHANNEL_1);
95-
dac_output_disable(DAC_CHANNEL_2);
97+
#ifdef SOC_DAC_SUPPORTED
98+
for (uint8_t c = 0; c < SOC_DAC_CHAN_NUM; c++) {
99+
dac_oneshot_del_channel(_active_handles[c]);
100+
_active_handles[c] = NULL;
101+
}
96102
#endif
97103
}

‎ports/espressif/common-hal/analogio/AnalogOut.h‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,17 @@
3030

3131
#include "common-hal/microcontroller/Pin.h"
3232

33+
#ifdef SOC_DAC_SUPPORTED
34+
#include "esp-idf/components/driver/dac/include/driver/dac_oneshot.h"
35+
#endif
3336
#include "py/obj.h"
3437

3538
typedef struct {
3639
mp_obj_base_t base;
37-
const mcu_pin_obj_t *pin;
40+
#ifdef SOC_DAC_SUPPORTED
41+
dac_oneshot_handle_t handle;
3842
uint8_t channel;
43+
#endif
3944
} analogio_analogout_obj_t;
4045

4146
void analogout_reset(void);

‎ports/espressif/common-hal/canio/Listener.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
#include "hal/twai_ll.h"
4141

42-
#if SOC_TWAI_CONTROLLER_NUM > 1 || !defined(TWAI)
42+
#if !defined(TWAI) && defined(TWAI0)
4343
#define TWAI TWAI0
4444
#endif
4545

‎ports/espressif/esp-idf-config/sdkconfig-debug.defaults‎

Lines changed: 6 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,21 @@
11
#
2-
# Bootloader config
2+
# Espressif IoT Development Framework Configuration
33
#
4-
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
5-
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set
6-
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set
7-
# CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_NONE is not set
8-
# CONFIG_BOOTLOADER_LOG_LEVEL_NONE is not set
9-
# CONFIG_BOOTLOADER_LOG_LEVEL_ERROR is not set
10-
# CONFIG_BOOTLOADER_LOG_LEVEL_WARN is not set
11-
CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
12-
# CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
13-
# CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
14-
# end of Bootloader config
15-
16-
# CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
174
#
185
# Compiler options
196
#
207
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
21-
# CONFIG_COMPILER_OPTIMIZATION_PERF is not set
22-
# CONFIG_COMPILER_OPTIMIZATION_NONE is not set
23-
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y
24-
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set
25-
# CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set
26-
CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2
27-
# CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set
288
# end of Compiler options
299

30-
CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
10+
#
11+
# Component config
12+
#
3113
#
3214
# ESP System Settings
3315
#
3416
CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT=y
35-
# CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT is not set
36-
# CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set
37-
# CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set
3817
# end of ESP System Settings
3918

40-
CONFIG_ESP_CONSOLE_UART_DEFAULT=y
41-
# CONFIG_ESP_CONSOLE_USB_CDC is not set
42-
# CONFIG_ESP_CONSOLE_UART_CUSTOM is not set
43-
# CONFIG_ESP_CONSOLE_NONE is not set
44-
CONFIG_ESP_CONSOLE_UART=y
45-
CONFIG_ESP_CONSOLE_MULTIPLE_UART=y
46-
CONFIG_ESP_CONSOLE_UART_NUM=0
47-
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
48-
#
49-
# FreeRTOS
50-
#
51-
CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
52-
CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
53-
# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
54-
# CONFIG_FREERTOS_ASSERT_DISABLE is not set
55-
CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
56-
CONFIG_FREERTOS_DEBUG_OCDAWARE=y
57-
# end of FreeRTOS
19+
# end of Component config
5820

59-
CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y
60-
#
61-
# Hardware Abstraction Layer (HAL) and Low Level (LL)
62-
#
63-
# CONFIG_HAL_ASSERTION_DISABLE is not set
64-
# CONFIG_HAL_ASSERTION_SILENT is not set
65-
# CONFIG_HAL_ASSERTION_ENABLE is not set
66-
CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2
67-
# end of Hardware Abstraction Layer (HAL) and Low Level (LL)
68-
69-
#
70-
# Log output
71-
#
72-
# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
73-
# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
74-
# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
75-
CONFIG_LOG_DEFAULT_LEVEL_INFO=y
76-
# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
77-
# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
78-
# end of Log output
79-
80-
CONFIG_LWIP_ESP_LWIP_ASSERT=y
81-
#
82-
# Deprecated options for backward compatibility
83-
#
84-
CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y
85-
# CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set
86-
CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y
87-
# CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set
88-
# CONFIG_OPTIMIZATION_ASSERTIONS_DISABLED is not set
89-
CONFIG_OPTIMIZATION_ASSERTION_LEVEL=2
90-
CONFIG_CONSOLE_UART_DEFAULT=y
91-
# CONFIG_CONSOLE_UART_CUSTOM is not set
92-
# CONFIG_ESP_CONSOLE_UART_NONE is not set
93-
CONFIG_CONSOLE_UART_NUM=0
94-
CONFIG_CONSOLE_UART_BAUDRATE=115200
95-
# end of Deprecated options for backward compatibility
21+
# end of Espressif IoT Development Framework Configuration

0 commit comments

Comments
 (0)