From 6b2f2157f37ac74be6cd2725f2b096698ba984d3 Mon Sep 17 00:00:00 2001 From: Nathan Schulte Date: Thu, 16 Jan 2025 16:34:25 -0600 Subject: [PATCH 1/4] ChibiOS: use FOME-Tech/ChibiOS:stable_20.3.x.FOME FOME-Tech/ChibiOS:stable_20.3.x.FOME is identical to the current targetted commit --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 5590b42151..d2431bc45d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "firmware/ChibiOS"] path = firmware/ChibiOS - url = https://github.com/rusefi/ChibiOS.git - branch = stable_20.3.x.rusefi + url = https://github.com/FOME-Tech/ChibiOS.git + branch = stable_20.3.x.FOME [submodule "firmware/ChibiOS-Contrib"] path = firmware/ChibiOS-Contrib url = https://github.com/rusefi/ChibiOS-Contrib.git From d44654b55cf45dc6a4b749242ee672e0e77c68a1 Mon Sep 17 00:00:00 2001 From: Nathan Schulte Date: Thu, 16 Jan 2025 11:40:05 -0600 Subject: [PATCH 2/4] use nmschulte/ChibiOS:nms/lse-wait_max-fome-v20.3.x --- .gitmodules | 4 ++-- firmware/ChibiOS | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index d2431bc45d..4003909529 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "firmware/ChibiOS"] path = firmware/ChibiOS - url = https://github.com/FOME-Tech/ChibiOS.git - branch = stable_20.3.x.FOME + url = https://github.com/nmschulte/ChibiOS.git + branch = nms/lse-wait_max-fome-v20.3.x [submodule "firmware/ChibiOS-Contrib"] path = firmware/ChibiOS-Contrib url = https://github.com/rusefi/ChibiOS-Contrib.git diff --git a/firmware/ChibiOS b/firmware/ChibiOS index d46398838e..579d5d4972 160000 --- a/firmware/ChibiOS +++ b/firmware/ChibiOS @@ -1 +1 @@ -Subproject commit d46398838ea9e0c5a85d2437cab4ccc6ad85bef9 +Subproject commit 579d5d49729ef2da9159d39b441622613d85d9a6 From 7a8130cb0c4fd2f9e6743e108e80259b11e40763 Mon Sep 17 00:00:00 2001 From: Nathan Schulte Date: Thu, 16 Jan 2025 04:34:52 -0600 Subject: [PATCH 3/4] FOME-ize LSE MAX_WAIT macros FOME-Tech/ChibiOS:stable_20.3.x.FOME -- 7ea171c0588b64da7ba5013f2a3e94132cbf49f7 --- firmware/docs/rusEFI_custom_chibios.md | 2 +- firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h | 8 ++++---- firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h | 8 ++++---- firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/firmware/docs/rusEFI_custom_chibios.md b/firmware/docs/rusEFI_custom_chibios.md index ba91498e17..fd10fa1c83 100644 --- a/firmware/docs/rusEFI_custom_chibios.md +++ b/firmware/docs/rusEFI_custom_chibios.md @@ -4,7 +4,7 @@ At the moment rusEFI uses https://github.com/rusefi/ChibiOS/tree/stable_20.3.x.r rusEFI custom version of ChibiOS has the following changes: -*) LSE auto-detection/fallback, RUSEFI_STM32_LSE_WAIT_MAX/RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL +*) LSE auto-detection/fallback, FOME_STM32_LSE_WAIT_MAX/FOME_STM32_LSE_WAIT_MAX_RTCSEL # TODO items below this line need to be reviewed, seems to NOT be up to date with 20.3 patch diff --git a/firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h b/firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h index ec4882b799..7b3ae22383 100644 --- a/firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h +++ b/firmware/hw_layer/ports/stm32/stm32f4/cfg/mcuconf.h @@ -38,8 +38,8 @@ #define STM32F417_MCUCONF // Allows LSE init to timeout and configure fallback RTC clock source in case -#define RUSEFI_STM32_LSE_WAIT_MAX 1000000 -#define RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI +#define FOME_STM32_LSE_WAIT_MAX 1000000 +#define FOME_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI /* * HAL driver system settings. @@ -51,7 +51,7 @@ #ifndef STM32_HSE_ENABLED #define STM32_HSE_ENABLED TRUE #endif -// see RUSEFI_STM32_LSE_WAIT_MAX +// see FOME_STM32_LSE_WAIT_MAX #define STM32_LSE_ENABLED TRUE #define STM32_CLOCK48_REQUIRED TRUE #define STM32_SW STM32_SW_PLL @@ -63,7 +63,7 @@ #define STM32_HPRE STM32_HPRE_DIV1 #define STM32_PPRE1 STM32_PPRE1_DIV4 #define STM32_PPRE2 STM32_PPRE2_DIV2 -// see RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL +// see FOME_STM32_LSE_WAIT_MAX_RTCSEL #define STM32_RTCSEL STM32_RTCSEL_LSE #ifndef STM32_RTCPRE_VALUE #define STM32_RTCPRE_VALUE 8 diff --git a/firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h b/firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h index 07d255c9e8..e666589482 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h +++ b/firmware/hw_layer/ports/stm32/stm32f7/cfg/mcuconf.h @@ -60,8 +60,8 @@ #define STM32F7xx_MCUCONF // Allows LSE init to timeout and configure fallback RTC clock source in case -#define RUSEFI_STM32_LSE_WAIT_MAX 1000000 -#define RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI +#define FOME_STM32_LSE_WAIT_MAX 1000000 +#define FOME_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI /* * HAL driver system settings. @@ -73,7 +73,7 @@ #define STM32_HSI_ENABLED TRUE #define STM32_LSI_ENABLED TRUE #define STM32_HSE_ENABLED TRUE -// see RUSEFI_STM32_LSE_WAIT_MAX +// see FOME_STM32_LSE_WAIT_MAX #define STM32_LSE_ENABLED TRUE #define STM32_CLOCK48_REQUIRED TRUE #define STM32_SW STM32_SW_PLL @@ -85,7 +85,7 @@ #define STM32_HPRE STM32_HPRE_DIV1 #define STM32_PPRE1 STM32_PPRE1_DIV4 #define STM32_PPRE2 STM32_PPRE2_DIV2 -// see RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL +// see FOME_STM32_LSE_WAIT_MAX_RTCSEL #define STM32_RTCSEL STM32_RTCSEL_LSE #define STM32_RTCPRE_VALUE 8 #define STM32_MCO1SEL STM32_MCO1SEL_HSI diff --git a/firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h b/firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h index 2231726750..61040646ea 100644 --- a/firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h +++ b/firmware/hw_layer/ports/stm32/stm32h7/cfg/mcuconf.h @@ -41,8 +41,8 @@ #define STM32H757_MCUCONF // Allows LSE init to timeout and configure fallback RTC clock source in case -#define RUSEFI_STM32_LSE_WAIT_MAX 1000000 -#define RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI_CK +#define FOME_STM32_LSE_WAIT_MAX 1000000 +#define FOME_STM32_LSE_WAIT_MAX_RTCSEL STM32_RTCSEL_LSI_CK /* * General settings. @@ -82,7 +82,7 @@ #define STM32_CSI_ENABLED TRUE #define STM32_HSI48_ENABLED TRUE #define STM32_HSE_ENABLED TRUE -// see RUSEFI_STM32_LSE_WAIT_MAX +// see FOME_STM32_LSE_WAIT_MAX #define STM32_LSE_ENABLED TRUE #define STM32_HSIDIV STM32_HSIDIV_DIV1 @@ -132,7 +132,7 @@ * Reading STM32 Reference Manual is required. */ #define STM32_SW STM32_SW_PLL1_P_CK -// see RUSEFI_STM32_LSE_WAIT_MAX_RTCSEL +// see FOME_STM32_LSE_WAIT_MAX_RTCSEL #define STM32_RTCSEL STM32_RTCSEL_LSE_CK #define STM32_D1CPRE STM32_D1CPRE_DIV1 #define STM32_D1HPRE STM32_D1HPRE_DIV2 From 203215296fc27eb32451c64fda25ccbc9068341b Mon Sep 17 00:00:00 2001 From: Nathan Schulte Date: Thu, 16 Jan 2025 19:30:30 -0600 Subject: [PATCH 4/4] s/rusEFI/FOME/ im hw_layer/ports/stm32 BOARD_NAME --- firmware/hw_layer/ports/stm32/stm32f4/board.h | 2 +- firmware/hw_layer/ports/stm32/stm32f7/board.h | 2 +- firmware/hw_layer/ports/stm32/stm32h7/board.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/firmware/hw_layer/ports/stm32/stm32f4/board.h b/firmware/hw_layer/ports/stm32/stm32f4/board.h index ada37d1e06..dc5a388177 100644 --- a/firmware/hw_layer/ports/stm32/stm32f4/board.h +++ b/firmware/hw_layer/ports/stm32/stm32f4/board.h @@ -24,7 +24,7 @@ /* * Board identifier. */ -#define BOARD_NAME "F4 for rusEFI" +#define BOARD_NAME "F4 for FOME" #define EFI_USB_AF 10U #define EFI_USB_SERIAL_DM Gpio::A11 diff --git a/firmware/hw_layer/ports/stm32/stm32f7/board.h b/firmware/hw_layer/ports/stm32/stm32f7/board.h index bc22c66f95..c19be826a1 100644 --- a/firmware/hw_layer/ports/stm32/stm32f7/board.h +++ b/firmware/hw_layer/ports/stm32/stm32f7/board.h @@ -30,7 +30,7 @@ * Board identifier. */ #define BOARD_ST_NUCLEO144_F767ZI -#define BOARD_NAME "F7 for rusEFI" +#define BOARD_NAME "F7 for FOME" #define EFI_USB_AF 10U #define EFI_USB_SERIAL_DM Gpio::A11 diff --git a/firmware/hw_layer/ports/stm32/stm32h7/board.h b/firmware/hw_layer/ports/stm32/stm32h7/board.h index dc046fec29..417185a678 100644 --- a/firmware/hw_layer/ports/stm32/stm32h7/board.h +++ b/firmware/hw_layer/ports/stm32/stm32h7/board.h @@ -29,7 +29,7 @@ /* * Board identifier. */ -#define BOARD_NAME "H7 rusEFI" +#define BOARD_NAME "H7 for FOME" #define EFI_USB_AF 10U #define EFI_USB_SERIAL_DM Gpio::A11