mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-12 04:40:58 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
07a5a5e6be
@ -1 +1 @@
|
|||||||
Subproject commit be44b3305f9a9fe5f2f49a4e7b978db322dc463e
|
Subproject commit 9dd6eaf669e83eb9d5aaabe736ecfdf2f790a9fd
|
@ -1 +1 @@
|
|||||||
Subproject commit 77cb0a4f7589f89e724f5e6ecb1d76d514dd1212
|
Subproject commit b643aad980d061021565c55745925c2cde4a3c6f
|
@ -182,6 +182,7 @@
|
|||||||
|
|
||||||
#define STM32_IRQ_FDCAN1_PRIORITY 10
|
#define STM32_IRQ_FDCAN1_PRIORITY 10
|
||||||
#define STM32_IRQ_FDCAN2_PRIORITY 10
|
#define STM32_IRQ_FDCAN2_PRIORITY 10
|
||||||
|
#define STM32_IRQ_FDCAN3_PRIORITY 10
|
||||||
|
|
||||||
#define STM32_IRQ_MDMA_PRIORITY 9
|
#define STM32_IRQ_MDMA_PRIORITY 9
|
||||||
|
|
||||||
@ -235,6 +236,7 @@
|
|||||||
*/
|
*/
|
||||||
#define STM32_CAN_USE_FDCAN1 FALSE
|
#define STM32_CAN_USE_FDCAN1 FALSE
|
||||||
#define STM32_CAN_USE_FDCAN2 FALSE
|
#define STM32_CAN_USE_FDCAN2 FALSE
|
||||||
|
#define STM32_CAN_USE_FDCAN3 FALSE
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* DAC driver system settings.
|
* DAC driver system settings.
|
||||||
|
@ -49,6 +49,19 @@
|
|||||||
#define CH_CFG_SMP_MODE FALSE
|
#define CH_CFG_SMP_MODE FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Kernel hardening level.
|
||||||
|
* @details This option is the level of functional-safety checks enabled
|
||||||
|
* in the kerkel. The meaning is:
|
||||||
|
* - 0: No checks, maximum performance.
|
||||||
|
* - 1: Reasonable checks.
|
||||||
|
* - 2: All checks.
|
||||||
|
* .
|
||||||
|
*/
|
||||||
|
#if !defined(CH_CFG_HARDENING_LEVEL)
|
||||||
|
#define CH_CFG_HARDENING_LEVEL 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
@ -360,6 +373,16 @@
|
|||||||
#define CH_CFG_USE_MAILBOXES TRUE
|
#define CH_CFG_USE_MAILBOXES TRUE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Memory checks APIs.
|
||||||
|
* @details If enabled then the memory checks APIs are included in the kernel.
|
||||||
|
*
|
||||||
|
* @note The default is @p TRUE.
|
||||||
|
*/
|
||||||
|
#if !defined(CH_CFG_USE_MEMCHECKS)
|
||||||
|
#define CH_CFG_USE_MEMCHECKS TRUE
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Core Memory Manager APIs.
|
* @brief Core Memory Manager APIs.
|
||||||
* @details If enabled then the core memory manager APIs are included
|
* @details If enabled then the core memory manager APIs are included
|
||||||
|
@ -49,6 +49,19 @@
|
|||||||
#define CH_CFG_SMP_MODE FALSE
|
#define CH_CFG_SMP_MODE FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Kernel hardening level.
|
||||||
|
* @details This option is the level of functional-safety checks enabled
|
||||||
|
* in the kerkel. The meaning is:
|
||||||
|
* - 0: No checks, maximum performance.
|
||||||
|
* - 1: Reasonable checks.
|
||||||
|
* - 2: All checks.
|
||||||
|
* .
|
||||||
|
*/
|
||||||
|
#if !defined(CH_CFG_HARDENING_LEVEL)
|
||||||
|
#define CH_CFG_HARDENING_LEVEL 0
|
||||||
|
#endif
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
@ -360,6 +373,16 @@
|
|||||||
#define CH_CFG_USE_MAILBOXES FALSE
|
#define CH_CFG_USE_MAILBOXES FALSE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Memory checks APIs.
|
||||||
|
* @details If enabled then the memory checks APIs are included in the kernel.
|
||||||
|
*
|
||||||
|
* @note The default is @p TRUE.
|
||||||
|
*/
|
||||||
|
#if !defined(CH_CFG_USE_MEMCHECKS)
|
||||||
|
#define CH_CFG_USE_MEMCHECKS TRUE
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Core Memory Manager APIs.
|
* @brief Core Memory Manager APIs.
|
||||||
* @details If enabled then the core memory manager APIs are included
|
* @details If enabled then the core memory manager APIs are included
|
||||||
|
Loading…
Reference in New Issue
Block a user