diff --git a/firmware/config/stm32h7ems/efifeatures.h b/firmware/config/stm32h7ems/efifeatures.h index 421f930693..0bf1fef595 100644 --- a/firmware/config/stm32h7ems/efifeatures.h +++ b/firmware/config/stm32h7ems/efifeatures.h @@ -2,12 +2,6 @@ #pragma once -#undef EFI_MEMS -#define EFI_MEMS FALSE - -#undef EFI_USB_SERIAL -#define EFI_USB_SERIAL FALSE - #undef EFI_INTERNAL_FLASH #define EFI_INTERNAL_FLASH FALSE @@ -35,9 +29,6 @@ #undef EFI_CONSOLE_UART_DEVICE -#undef EFI_UART_GPS -#define EFI_UART_GPS FALSE - #undef BOARD_TLE6240_COUNT #undef BOARD_MC33972_COUNT #undef BOARD_TLE8888_COUNT @@ -50,6 +41,3 @@ #undef BOARD_EXT_GPIOCHIPS #define BOARD_EXT_GPIOCHIPS (BOARD_TLE6240_COUNT + BOARD_MC33972_COUNT + BOARD_TLE8888_COUNT + BOARD_DRV8860_COUNT + BOARD_MC33810_COUNT) - -#undef ENABLE_PERF_TRACE -#define ENABLE_PERF_TRACE FALSE \ No newline at end of file diff --git a/firmware/config/stm32h7ems/halconf.h b/firmware/config/stm32h7ems/halconf.h index d98d2c8e54..6eea9828e7 100644 --- a/firmware/config/stm32h7ems/halconf.h +++ b/firmware/config/stm32h7ems/halconf.h @@ -149,7 +149,7 @@ * @brief Enables the SERIAL over USB subsystem. */ #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL_USB FALSE +#define HAL_USE_SERIAL_USB TRUE #endif /** @@ -184,7 +184,7 @@ * @brief Enables the USB subsystem. */ #if !defined(HAL_USE_USB) || defined(__DOXYGEN__) -#define HAL_USE_USB FALSE +#define HAL_USE_USB TRUE #endif /** @@ -427,7 +427,7 @@ * buffers. */ #if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_USB_BUFFERS_SIZE 256 +#define SERIAL_USB_BUFFERS_SIZE 320 #endif /** diff --git a/firmware/config/stm32h7ems/mcuconf.h b/firmware/config/stm32h7ems/mcuconf.h index 9176de5a2d..6e31cd8457 100644 --- a/firmware/config/stm32h7ems/mcuconf.h +++ b/firmware/config/stm32h7ems/mcuconf.h @@ -154,7 +154,7 @@ #define STM32_SAI1SEL STM32_SAI1SEL_PLL1_Q_CK #define STM32_LPTIM1SEL STM32_LPTIM1SEL_PCLK1 #define STM32_CECSEL STM32_CECSEL_LSE_CK -#define STM32_USBSEL STM32_USBSEL_PLL1_Q_CK +#define STM32_USBSEL STM32_USBSEL_HSI48_CK #define STM32_I2C123SEL STM32_I2C123SEL_PCLK1 #define STM32_RNGSEL STM32_RNGSEL_HSI48_CK #define STM32_USART16SEL STM32_USART16SEL_PCLK2 diff --git a/firmware/hw_layer/ports/stm32/stm32h7/board.h b/firmware/hw_layer/ports/stm32/stm32h7/board.h index 2d12547f9f..2c3f624639 100644 --- a/firmware/hw_layer/ports/stm32/stm32h7/board.h +++ b/firmware/hw_layer/ports/stm32/stm32h7/board.h @@ -36,6 +36,10 @@ #define BOARD_ST_NUCLEO144_H743ZI #define BOARD_NAME "STMicroelectronics STM32 Nucleo144-H743ZI" +#define EFI_USB_AF 10U +#define EFI_USB_SERIAL_DM GPIOA_11 +#define EFI_USB_SERIAL_DP GPIOA_12 + /* * input-floating is the default pin mode. input-output boards should provision appropriate pull-ups/pull-downs. */ diff --git a/firmware/hw_layer/ports/stm32/stm32h7/device_mpu_util.h b/firmware/hw_layer/ports/stm32/stm32h7/device_mpu_util.h index 7463b16bca..8b13f13bf9 100644 --- a/firmware/hw_layer/ports/stm32/stm32h7/device_mpu_util.h +++ b/firmware/hw_layer/ports/stm32/stm32h7/device_mpu_util.h @@ -9,5 +9,6 @@ #include "stm32h7xx_hal_flash_ex.h" +#define MCU_SERIAL_NUMBER_LOCATION (uint8_t*)(0x1FF1E800) // todo SPI! #2284