Skip to content

Commit b5f8321

Browse files
hierophecthierophect
committed
Merge branch 'esp32-analogin' into esp32-analogout
2 parents 9ac0aae + 97d217a commit b5f8321

File tree

25 files changed

+844
-24
lines changed

25 files changed

+844
-24
lines changed

‎.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,4 +152,4 @@
152152
url = https://github.com/adafruit/Adafruit_CircuitPython_RFM69.git
153153
[submodule "ports/esp32s2/esp-idf"]
154154
path = ports/esp32s2/esp-idf
155-
url = https://github.com/hierophect/esp-idf.git
155+
url = https://github.com/espressif/esp-idf.git

‎ports/atmel-samd/common-hal/canio/CAN.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,6 @@ typedef struct canio_can_obj {
4141
mp_obj_base_t base;
4242
Can *hw;
4343
canio_can_state_t *state;
44-
volatile uint32_t error_warning_state_count;
45-
volatile uint32_t error_passive_state_count;
46-
volatile uint32_t bus_off_state_count;
4744
int baudrate;
4845
uint8_t rx_pin_number:8;
4946
uint8_t tx_pin_number:8;

‎ports/esp32s2/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,7 @@ menuconfig: $(BUILD)/esp-idf/config
271271
# qstr builds include headers so we need to make sure they are up to date
272272
$(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h
273273

274-
# Order here matters
275-
ESP_IDF_COMPONENTS_LINK = freertos log esp_system esp_adc_cal esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
274+
ESP_IDF_COMPONENTS_LINK = freertos log hal esp_system esp_adc_cal esp32s2 bootloader_support pthread esp_timer vfs spi_flash app_update esp_common esp32s2 heap newlib driver xtensa soc esp_ringbuf esp_wifi esp_event wpa_supplicant mbedtls efuse nvs_flash esp_netif lwip esp_rom esp-tls
276275

277276
ESP_IDF_COMPONENTS_INCLUDE = driver freertos log soc
278277

@@ -284,11 +283,11 @@ ESP_IDF_WIFI_COMPONENTS_EXPANDED = $(foreach component, $(ESP_IDF_WIFI_COMPONENT
284283
MBEDTLS_COMPONENTS_LINK = crypto tls x509
285284
MBEDTLS_COMPONENTS_LINK_EXPANDED = $(foreach component, $(MBEDTLS_COMPONENTS_LINK), $(BUILD)/esp-idf/esp-idf/mbedtls/mbedtls/library/libmbed$(component).a)
286285

287-
BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libhal.a
286+
BINARY_BLOBS = esp-idf/components/xtensa/esp32s2/libxt_hal.a
288287
BINARY_WIFI_BLOBS = libcoexist.a libcore.a libespnow.a libmesh.a libnet80211.a libpp.a librtc.a libsmartconfig.a libphy.a
289288
BINARY_BLOBS += $(addprefix esp-idf/components/esp_wifi/lib/esp32s2/, $(BINARY_WIFI_BLOBS))
290289

291-
ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libhal.a
290+
ESP_IDF_COMPONENTS_EXPANDED += $(BUILD)/esp-idf/esp-idf/soc/soc/esp32s2/libsoc_esp32s2.a esp-idf/components/xtensa/esp32s2/libxt_hal.a
292291
ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/esp32s2/esp32s2_out.ld $(BUILD)/esp-idf/esp-idf/esp32s2/ld/esp32s2.project.ld
293292

294293
FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE)

‎ports/esp32s2/common-hal/analogio/AnalogIn.h

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

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

32-
#include "components/soc/include/hal/adc_types.h"
32+
#include "components/hal/include/hal/adc_types.h"
3333
#include "FreeRTOS.h"
3434
#include "freertos/semphr.h"
3535
#include "py/obj.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "shared-bindings/microcontroller/Pin.h"
3636
#include "supervisor/shared/translate.h"
3737

38-
#include "components/driver/include/driver/dac.h"
38+
#include "components/driver/include/driver/dac_common.h"
3939

4040
#include "common-hal/microcontroller/Pin.h"
4141

‎ports/esp32s2/common-hal/busio/I2C.h

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

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

32-
#include "components/soc/include/hal/i2c_types.h"
32+
#include "components/hal/include/hal/i2c_types.h"
3333
#include "FreeRTOS.h"
3434
#include "freertos/semphr.h"
3535
#include "py/obj.h"

‎ports/esp32s2/common-hal/busio/SPI.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
#include "common-hal/microcontroller/Pin.h"
3131

3232
#include "components/driver/include/driver/spi_common_internal.h"
33-
#include "components/soc/include/hal/spi_hal.h"
34-
#include "components/soc/include/hal/spi_types.h"
33+
#include "components/hal/include/hal/spi_hal.h"
34+
#include "components/hal/include/hal/spi_types.h"
3535
#include "py/obj.h"
3636

3737
typedef struct {

‎ports/esp32s2/common-hal/busio/UART.h

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

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

32-
#include "components/soc/include/hal/uart_types.h"
32+
#include "components/hal/include/hal/uart_types.h"
3333
#include "py/obj.h"
3434

3535
typedef struct {

‎ports/esp32s2/common-hal/digitalio/DigitalInOut.c

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

3131
#include "components/driver/include/driver/gpio.h"
3232

33-
#include "components/soc/include/hal/gpio_hal.h"
33+
#include "components/hal/include/hal/gpio_hal.h"
3434

3535
void common_hal_digitalio_digitalinout_never_reset(
3636
digitalio_digitalinout_obj_t *self) {

‎ports/esp32s2/common-hal/microcontroller/Pin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "py/mphal.h"
3333

3434
#include "components/driver/include/driver/gpio.h"
35-
#include "components/soc/include/hal/gpio_hal.h"
35+
#include "components/hal/include/hal/gpio_hal.h"
3636

3737
#ifdef MICROPY_HW_NEOPIXEL
3838
bool neopixel_in_use;

‎ports/esp32s2/esp-idf

Submodule esp-idf updated 662 files

‎ports/esp32s2/peripherals/pins.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
#include "esp32s2_peripherals_config.h"
3636
#include "esp-idf/config/sdkconfig.h"
3737

38-
#include "components/soc/include/hal/gpio_types.h"
39-
#include "components/soc/include/hal/adc_types.h"
38+
#include "components/hal/include/hal/gpio_types.h"
39+
#include "components/hal/include/hal/adc_types.h"
4040

4141
typedef struct {
4242
PIN_PREFIX_FIELDS

‎ports/esp32s2/supervisor/usb.c

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#include "components/driver/include/driver/periph_ctrl.h"
3434
#include "components/driver/include/driver/gpio.h"
3535
#include "components/esp_rom/include/esp32s2/rom/gpio.h"
36+
#include "components/esp_rom/include/esp_rom_gpio.h"
37+
#include "components/hal/esp32s2/include/hal/gpio_ll.h"
3638

3739
#include "freertos/FreeRTOS.h"
3840
#include "freertos/task.h"
@@ -68,17 +70,41 @@ void usb_device_task(void* param)
6870
}
6971
}
7072

73+
static void configure_pins (usb_hal_context_t *usb)
74+
{
75+
/* usb_periph_iopins currently configures USB_OTG as USB Device.
76+
* Introduce additional parameters in usb_hal_context_t when adding support
77+
* for USB Host.
78+
*/
79+
for ( const usb_iopin_dsc_t *iopin = usb_periph_iopins; iopin->pin != -1; ++iopin ) {
80+
if ( (usb->use_external_phy) || (iopin->ext_phy_only == 0) ) {
81+
esp_rom_gpio_pad_select_gpio(iopin->pin);
82+
if ( iopin->is_output ) {
83+
esp_rom_gpio_connect_out_signal(iopin->pin, iopin->func, false, false);
84+
}
85+
else {
86+
esp_rom_gpio_connect_in_signal(iopin->pin, iopin->func, false);
87+
if ( (iopin->pin != GPIO_FUNC_IN_LOW) && (iopin->pin != GPIO_FUNC_IN_HIGH) ) {
88+
gpio_ll_input_enable(&GPIO, iopin->pin);
89+
}
90+
}
91+
esp_rom_gpio_pad_unhold(iopin->pin);
92+
}
93+
}
94+
if ( !usb->use_external_phy ) {
95+
gpio_set_drive_capability(USBPHY_DM_NUM, GPIO_DRIVE_CAP_3);
96+
gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3);
97+
}
98+
}
99+
71100
void init_usb_hardware(void) {
72101
periph_module_reset(PERIPH_USB_MODULE);
73102
periph_module_enable(PERIPH_USB_MODULE);
74103
usb_hal_context_t hal = {
75104
.use_external_phy = false // use built-in PHY
76105
};
77106
usb_hal_init(&hal);
78-
79-
// Initialize the pin drive strength.
80-
gpio_set_drive_capability(USBPHY_DM_NUM, GPIO_DRIVE_CAP_3);
81-
gpio_set_drive_capability(USBPHY_DP_NUM, GPIO_DRIVE_CAP_3);
107+
configure_pins(&hal);
82108

83109
(void) xTaskCreateStatic(usb_device_task,
84110
"usbd",

‎ports/stm/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ SRC_STM32 = $(addprefix $(HAL_DIR)/Src/stm32$(MCU_SERIES_LOWER)xx_,\
198198
ll_utils.c \
199199
)
200200

201+
ifeq ($(CIRCUITPY_CANIO),1)
202+
SRC_STM32 += $(HAL_DIR)/Src/stm32$(MCU_SERIES_LOWER)xx_hal_can.c
203+
endif
204+
201205
# Need this to avoid UART linker problems. TODO: rewrite to use registered callbacks.
202206
# Does not exist for F4 and lower
203207
ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F765xx STM32F767xx STM32F769xx STM32H743xx))

‎ports/stm/boards/feather_stm32f405_express/pins.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4747
{ MP_ROM_QSTR(MP_QSTR_SDIO_CLOCK), MP_ROM_PTR(&pin_PC12) },
4848
{ MP_ROM_QSTR(MP_QSTR_SDIO_COMMAND), MP_ROM_PTR(&pin_PD02) },
4949
{ MP_ROM_QSTR(MP_QSTR_SDIO_DATA), MP_ROM_PTR(&sdio_data_tuple) },
50+
51+
{ MP_OBJ_NEW_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_PB09) },
52+
{ MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_PB08) },
5053
};
5154
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)