Revert "Update ChibiOS, ChibiOS-Contrib. (#25730)"
This reverts commit e83672fdc4.
This commit is contained in:
parent
f63d01d786
commit
70b301f6af
29 changed files with 110 additions and 97 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
"eeprom": {
|
"eeprom": {
|
||||||
"driver": "wear_leveling",
|
"driver": "wear_leveling",
|
||||||
"wear_leveling": {
|
"wear_leveling": {
|
||||||
"backing_size": 16384,
|
"backing_size": 32768,
|
||||||
"driver": "spi_flash"
|
"driver": "spi_flash"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit d5b7ac30a02c4962338a38b3a05e5f8da97a8c81
|
Subproject commit 8bd61b804303f1614d574546c2dd735eeabb09f5
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 5a9ad82b6ba4f649cdb800e8c2bbc9be2d3ce767
|
Subproject commit 8d863d9ee4eecea68ad8d15f7e7c2b451aea79d9
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
@ -73,8 +73,6 @@
|
||||||
#define STM32_PPRE STM32_PPRE_DIV1
|
#define STM32_PPRE STM32_PPRE_DIV1
|
||||||
#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK
|
#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK
|
||||||
#define STM32_MCOPRE STM32_MCOPRE_DIV1
|
#define STM32_MCOPRE STM32_MCOPRE_DIV1
|
||||||
#define STM32_MCO2SEL STM32_MCOSEL_NOCLOCK
|
|
||||||
#define STM32_MCO2PRE STM32_MCOPRE_DIV1
|
|
||||||
#define STM32_LSCOSEL STM32_LSCOSEL_NOCLOCK
|
#define STM32_LSCOSEL STM32_LSCOSEL_NOCLOCK
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -109,8 +107,9 @@
|
||||||
#define STM32_IRQ_EXTI4_15_PRIORITY 3
|
#define STM32_IRQ_EXTI4_15_PRIORITY 3
|
||||||
#define STM32_IRQ_EXTI1921_PRIORITY 3
|
#define STM32_IRQ_EXTI1921_PRIORITY 3
|
||||||
|
|
||||||
#define STM32_IRQ_I2C1_PRIORITY 3
|
#define STM32_IRQ_USART1_PRIORITY 2
|
||||||
#define STM32_IRQ_I2C2_3_PRIORITY 3
|
#define STM32_IRQ_USART2_LP2_PRIORITY 2
|
||||||
|
#define STM32_IRQ_USART3_4_5_6_LP1_PRIORITY 2
|
||||||
|
|
||||||
#define STM32_IRQ_TIM1_UP_PRIORITY 1
|
#define STM32_IRQ_TIM1_UP_PRIORITY 1
|
||||||
#define STM32_IRQ_TIM1_CC_PRIORITY 1
|
#define STM32_IRQ_TIM1_CC_PRIORITY 1
|
||||||
|
|
@ -123,12 +122,6 @@
|
||||||
#define STM32_IRQ_TIM16_PRIORITY 1
|
#define STM32_IRQ_TIM16_PRIORITY 1
|
||||||
#define STM32_IRQ_TIM17_PRIORITY 1
|
#define STM32_IRQ_TIM17_PRIORITY 1
|
||||||
|
|
||||||
#define STM32_IRQ_USART1_PRIORITY 2
|
|
||||||
#define STM32_IRQ_USART2_LP2_PRIORITY 2
|
|
||||||
#define STM32_IRQ_USART3_4_5_6_LP1_PRIORITY 2
|
|
||||||
|
|
||||||
#define STM32_IRQ_USB1_UCPD1_2_PRIORITY 3
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ADC driver system settings.
|
* ADC driver system settings.
|
||||||
*/
|
*/
|
||||||
|
|
@ -173,12 +166,16 @@
|
||||||
#define STM32_I2C_USE_I2C2 FALSE
|
#define STM32_I2C_USE_I2C2 FALSE
|
||||||
#define STM32_I2C_USE_I2C3 FALSE
|
#define STM32_I2C_USE_I2C3 FALSE
|
||||||
#define STM32_I2C_BUSY_TIMEOUT 50
|
#define STM32_I2C_BUSY_TIMEOUT 50
|
||||||
#define STM32_I2C_I2C1_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C2_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C3_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C2_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C3_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C3_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C1_IRQ_PRIORITY 3
|
||||||
|
#define STM32_I2C_I2C2_IRQ_PRIORITY 3
|
||||||
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C3_DMA_PRIORITY 1
|
|
||||||
#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
|
#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
@ -299,6 +296,7 @@
|
||||||
* USB driver system settings.
|
* USB driver system settings.
|
||||||
*/
|
*/
|
||||||
#define STM32_USB_USE_USB1 TRUE
|
#define STM32_USB_USE_USB1 TRUE
|
||||||
|
#define STM32_USB_USB1_LP_IRQ_PRIORITY 3
|
||||||
#define STM32_USB_USE_ISOCHRONOUS FALSE
|
#define STM32_USB_USE_ISOCHRONOUS FALSE
|
||||||
#define STM32_USB_USE_FAST_COPY TRUE
|
#define STM32_USB_USE_FAST_COPY TRUE
|
||||||
#define STM32_USB_HOST_WAKEUP_DURATION 2
|
#define STM32_USB_HOST_WAKEUP_DURATION 2
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
@ -119,10 +119,6 @@
|
||||||
|
|
||||||
#define STM32_IRQ_FDCAN1_PRIORITY 10
|
#define STM32_IRQ_FDCAN1_PRIORITY 10
|
||||||
|
|
||||||
#define STM32_IRQ_I2C1_PRIORITY 5
|
|
||||||
#define STM32_IRQ_I2C2_PRIORITY 5
|
|
||||||
#define STM32_IRQ_I2C3_PRIORITY 5
|
|
||||||
|
|
||||||
#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7
|
#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7
|
||||||
#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7
|
#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7
|
||||||
#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7
|
#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7
|
||||||
|
|
@ -205,9 +201,15 @@
|
||||||
#define STM32_I2C_USE_I2C2 FALSE
|
#define STM32_I2C_USE_I2C2 FALSE
|
||||||
#define STM32_I2C_USE_I2C3 FALSE
|
#define STM32_I2C_USE_I2C3 FALSE
|
||||||
#define STM32_I2C_BUSY_TIMEOUT 50
|
#define STM32_I2C_BUSY_TIMEOUT 50
|
||||||
#define STM32_I2C_I2C1_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C2_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C3_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C2_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C3_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C3_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C1_IRQ_PRIORITY 5
|
||||||
|
#define STM32_I2C_I2C2_IRQ_PRIORITY 5
|
||||||
|
#define STM32_I2C_I2C3_IRQ_PRIORITY 5
|
||||||
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C3_DMA_PRIORITY 3
|
#define STM32_I2C_I2C3_DMA_PRIORITY 3
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
@ -127,11 +127,6 @@
|
||||||
#define STM32_IRQ_FDCAN2_PRIORITY 10
|
#define STM32_IRQ_FDCAN2_PRIORITY 10
|
||||||
#define STM32_IRQ_FDCAN3_PRIORITY 10
|
#define STM32_IRQ_FDCAN3_PRIORITY 10
|
||||||
|
|
||||||
#define STM32_IRQ_I2C1_PRIORITY 5
|
|
||||||
#define STM32_IRQ_I2C2_PRIORITY 5
|
|
||||||
#define STM32_IRQ_I2C3_PRIORITY 5
|
|
||||||
#define STM32_IRQ_I2C4_PRIORITY 5
|
|
||||||
|
|
||||||
#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7
|
#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7
|
||||||
#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7
|
#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7
|
||||||
#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7
|
#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7
|
||||||
|
|
@ -189,7 +184,6 @@
|
||||||
#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
|
#define STM32_CAN_USE_FDCAN3 FALSE
|
||||||
#define STM32_CAN_FDCAN_PRESC FDCAN_CONFIG_CKDIV_PDIV_20
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* DAC driver system settings.
|
* DAC driver system settings.
|
||||||
|
|
@ -247,10 +241,18 @@
|
||||||
#define STM32_I2C_USE_I2C3 FALSE
|
#define STM32_I2C_USE_I2C3 FALSE
|
||||||
#define STM32_I2C_USE_I2C4 FALSE
|
#define STM32_I2C_USE_I2C4 FALSE
|
||||||
#define STM32_I2C_BUSY_TIMEOUT 50
|
#define STM32_I2C_BUSY_TIMEOUT 50
|
||||||
#define STM32_I2C_I2C1_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C2_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C3_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C2_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C4_DMA_CHANNEL STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C2_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C3_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C3_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C4_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C4_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
#define STM32_I2C_I2C1_IRQ_PRIORITY 5
|
||||||
|
#define STM32_I2C_I2C2_IRQ_PRIORITY 5
|
||||||
|
#define STM32_I2C_I2C3_IRQ_PRIORITY 5
|
||||||
|
#define STM32_I2C_I2C4_IRQ_PRIORITY 5
|
||||||
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C3_DMA_PRIORITY 3
|
#define STM32_I2C_I2C3_DMA_PRIORITY 3
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
@ -276,7 +276,6 @@
|
||||||
#define STM32_I2C_USE_I2C2 FALSE
|
#define STM32_I2C_USE_I2C2 FALSE
|
||||||
#define STM32_I2C_USE_I2C3 FALSE
|
#define STM32_I2C_USE_I2C3 FALSE
|
||||||
#define STM32_I2C_USE_I2C4 FALSE
|
#define STM32_I2C_USE_I2C4 FALSE
|
||||||
#define STM32_I2C_USE_I2C5 FALSE
|
|
||||||
#define STM32_I2C_BUSY_TIMEOUT 50
|
#define STM32_I2C_BUSY_TIMEOUT 50
|
||||||
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
|
|
@ -286,18 +285,14 @@
|
||||||
#define STM32_I2C_I2C3_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C3_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C4_RX_BDMA_STREAM STM32_BDMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C4_RX_BDMA_STREAM STM32_BDMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C4_TX_BDMA_STREAM STM32_BDMA_STREAM_ID_ANY
|
#define STM32_I2C_I2C4_TX_BDMA_STREAM STM32_BDMA_STREAM_ID_ANY
|
||||||
#define STM32_I2C_I2C5_RX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
|
||||||
#define STM32_I2C_I2C5_TX_DMA_STREAM STM32_DMA_STREAM_ID_ANY
|
|
||||||
#define STM32_I2C_I2C1_IRQ_PRIORITY 5
|
#define STM32_I2C_I2C1_IRQ_PRIORITY 5
|
||||||
#define STM32_I2C_I2C2_IRQ_PRIORITY 5
|
#define STM32_I2C_I2C2_IRQ_PRIORITY 5
|
||||||
#define STM32_I2C_I2C3_IRQ_PRIORITY 5
|
#define STM32_I2C_I2C3_IRQ_PRIORITY 5
|
||||||
#define STM32_I2C_I2C4_IRQ_PRIORITY 5
|
#define STM32_I2C_I2C4_IRQ_PRIORITY 5
|
||||||
#define STM32_I2C_I2C5_IRQ_PRIORITY 5
|
|
||||||
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
#define STM32_I2C_I2C1_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
#define STM32_I2C_I2C2_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C3_DMA_PRIORITY 3
|
#define STM32_I2C_I2C3_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C4_DMA_PRIORITY 3
|
#define STM32_I2C_I2C4_DMA_PRIORITY 3
|
||||||
#define STM32_I2C_I2C5_DMA_PRIORITY 3
|
|
||||||
#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
|
#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
@ -29,17 +29,10 @@
|
||||||
#define HALCONF_H
|
#define HALCONF_H
|
||||||
|
|
||||||
#define _CHIBIOS_HAL_CONF_
|
#define _CHIBIOS_HAL_CONF_
|
||||||
#define _CHIBIOS_HAL_CONF_VER_9_1_
|
#define _CHIBIOS_HAL_CONF_VER_8_4_
|
||||||
|
|
||||||
#include <mcuconf.h>
|
#include <mcuconf.h>
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Enables the HAL safety subsystem.
|
|
||||||
*/
|
|
||||||
#if !defined(HAL_USE_SAFETY) || defined(__DOXYGEN__)
|
|
||||||
#define HAL_USE_SAFETY FALSE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Enables the PAL subsystem.
|
* @brief Enables the PAL subsystem.
|
||||||
*/
|
*/
|
||||||
|
|
@ -312,14 +305,6 @@
|
||||||
/* I2C driver related settings. */
|
/* I2C driver related settings. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Slave mode API enable switch.
|
|
||||||
* @note The low level driver must support this capability.
|
|
||||||
*/
|
|
||||||
#if !defined(I2C_ENABLE_SLAVE_MODE)
|
|
||||||
#define I2C_ENABLE_SLAVE_MODE FALSE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Enables the mutual exclusion APIs on the I2C bus.
|
* @brief Enables the mutual exclusion APIs on the I2C bus.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
ChibiOS - Copyright (C) 2006-2026 Giovanni Di Sirio.
|
ChibiOS - Copyright (C) 2006..2020 Giovanni Di Sirio
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|
@ -29,17 +29,10 @@
|
||||||
#define HALCONF_H
|
#define HALCONF_H
|
||||||
|
|
||||||
#define _CHIBIOS_HAL_CONF_
|
#define _CHIBIOS_HAL_CONF_
|
||||||
#define _CHIBIOS_HAL_CONF_VER_9_1_
|
#define _CHIBIOS_HAL_CONF_VER_8_4_
|
||||||
|
|
||||||
#include <mcuconf.h>
|
#include <mcuconf.h>
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Enables the HAL safety subsystem.
|
|
||||||
*/
|
|
||||||
#if !defined(HAL_USE_SAFETY) || defined(__DOXYGEN__)
|
|
||||||
#define HAL_USE_SAFETY FALSE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Enables the PAL subsystem.
|
* @brief Enables the PAL subsystem.
|
||||||
*/
|
*/
|
||||||
|
|
@ -312,14 +305,6 @@
|
||||||
/* I2C driver related settings. */
|
/* I2C driver related settings. */
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Slave mode API enable switch.
|
|
||||||
* @note The low level driver must support this capability.
|
|
||||||
*/
|
|
||||||
#if !defined(I2C_ENABLE_SLAVE_MODE)
|
|
||||||
#define I2C_ENABLE_SLAVE_MODE FALSE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Enables the mutual exclusion APIs on the I2C bus.
|
* @brief Enables the mutual exclusion APIs on the I2C bus.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -279,7 +279,7 @@ PLATFORM_SRC = \
|
||||||
$(PLATFORMSRC) \
|
$(PLATFORMSRC) \
|
||||||
$(BOARDSRC) \
|
$(BOARDSRC) \
|
||||||
$(STREAMSSRC) \
|
$(STREAMSSRC) \
|
||||||
$(CHIBIOS)/os/various/newlib_bindings/syscalls.c \
|
$(CHIBIOS)/os/various/syscalls.c \
|
||||||
$(PLATFORM_COMMON_DIR)/syscall-fallbacks.c \
|
$(PLATFORM_COMMON_DIR)/syscall-fallbacks.c \
|
||||||
$(PLATFORM_COMMON_DIR)/wait.c \
|
$(PLATFORM_COMMON_DIR)/wait.c \
|
||||||
$(PLATFORM_COMMON_DIR)/synchronization_util.c \
|
$(PLATFORM_COMMON_DIR)/synchronization_util.c \
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ upgrade_conf_files_generic() {
|
||||||
pushd "$qmk_firmware_dir/lib/chibios/tools/updater" >/dev/null 2>&1
|
pushd "$qmk_firmware_dir/lib/chibios/tools/updater" >/dev/null 2>&1
|
||||||
for file in $(find_chibi_files "$qmk_firmware_dir" -name "$search_filename") ; do
|
for file in $(find_chibi_files "$qmk_firmware_dir" -name "$search_filename") ; do
|
||||||
cp -f "$file" "$file.orig"
|
cp -f "$file" "$file.orig"
|
||||||
clang-format --style='{IndentPPDirectives: None, ColumnLimit: 0}' -i "$file"
|
clang-format --style='{IndentPPDirectives: None}' -i "$file"
|
||||||
cp -f "$file" "$file.formatted"
|
cp -f "$file" "$file.formatted"
|
||||||
bash "$update_script" "$file"
|
bash "$update_script" "$file"
|
||||||
if ! diff "$file" "$file.formatted" >/dev/null 2>&1 ; then
|
if ! diff "$file" "$file.formatted" >/dev/null 2>&1 ; then
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue