aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------lib/chibios0
m---------lib/chibios-contrib0
-rw-r--r--platforms/chibios/QMK_PROTON_C/configs/chconf.h86
-rw-r--r--platforms/chibios/QMK_PROTON_C/configs/halconf.h10
-rw-r--r--platforms/chibios/common/configs/chconf.h86
-rw-r--r--platforms/chibios/common/configs/halconf.h10
6 files changed, 144 insertions, 48 deletions
diff --git a/lib/chibios b/lib/chibios
Subproject 313416b8fda90d9973a749a0a35970956852c28 Subproject ffe54d63cb10a355add318f8e922e39f1c3d4bf
diff --git a/lib/chibios-contrib b/lib/chibios-contrib
Subproject e3a3a24047717af33b098266e11c2e4e5102206 Subproject 61baa6b036138c155f7cfc5646d833d9423f324
diff --git a/platforms/chibios/QMK_PROTON_C/configs/chconf.h b/platforms/chibios/QMK_PROTON_C/configs/chconf.h
index aac330370..944576529 100644
--- a/platforms/chibios/QMK_PROTON_C/configs/chconf.h
+++ b/platforms/chibios/QMK_PROTON_C/configs/chconf.h
@@ -29,7 +29,7 @@
29#define CHCONF_H 29#define CHCONF_H
30 30
31#define _CHIBIOS_RT_CONF_ 31#define _CHIBIOS_RT_CONF_
32#define _CHIBIOS_RT_CONF_VER_6_0_ 32#define _CHIBIOS_RT_CONF_VER_6_1_
33 33
34/*===========================================================================*/ 34/*===========================================================================*/
35/** 35/**
@@ -109,21 +109,6 @@
109#endif 109#endif
110 110
111/** 111/**
112 * @brief Managed RAM size.
113 * @details Size of the RAM area to be managed by the OS. If set to zero
114 * then the whole available RAM is used. The core memory is made
115 * available to the heap allocator and/or can be used directly through
116 * the simplified core memory allocator.
117 *
118 * @note In order to let the OS manage the whole RAM the linker script must
119 * provide the @p __heap_base__ and @p __heap_end__ symbols.
120 * @note Requires @p CH_CFG_USE_MEMCORE.
121 */
122#if !defined(CH_CFG_MEMCORE_SIZE)
123#define CH_CFG_MEMCORE_SIZE 0
124#endif
125
126/**
127 * @brief Idle thread automatic spawn suppression. 112 * @brief Idle thread automatic spawn suppression.
128 * @details When this option is activated the function @p chSysInit() 113 * @details When this option is activated the function @p chSysInit()
129 * does not spawn the idle thread. The application @p main() 114 * does not spawn the idle thread. The application @p main()
@@ -312,6 +297,28 @@
312#endif 297#endif
313 298
314/** 299/**
300 * @brief Dynamic Threads APIs.
301 * @details If enabled then the dynamic threads creation APIs are included
302 * in the kernel.
303 *
304 * @note The default is @p TRUE.
305 * @note Requires @p CH_CFG_USE_WAITEXIT.
306 * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
307 */
308#if !defined(CH_CFG_USE_DYNAMIC)
309#define CH_CFG_USE_DYNAMIC TRUE
310#endif
311
312/** @} */
313
314/*===========================================================================*/
315/**
316 * @name OSLIB options
317 * @{
318 */
319/*===========================================================================*/
320
321/**
315 * @brief Mailboxes APIs. 322 * @brief Mailboxes APIs.
316 * @details If enabled then the asynchronous messages (mailboxes) APIs are 323 * @details If enabled then the asynchronous messages (mailboxes) APIs are
317 * included in the kernel. 324 * included in the kernel.
@@ -335,6 +342,21 @@
335#endif 342#endif
336 343
337/** 344/**
345 * @brief Managed RAM size.
346 * @details Size of the RAM area to be managed by the OS. If set to zero
347 * then the whole available RAM is used. The core memory is made
348 * available to the heap allocator and/or can be used directly through
349 * the simplified core memory allocator.
350 *
351 * @note In order to let the OS manage the whole RAM the linker script must
352 * provide the @p __heap_base__ and @p __heap_end__ symbols.
353 * @note Requires @p CH_CFG_USE_MEMCORE.
354 */
355#if !defined(CH_CFG_MEMCORE_SIZE)
356#define CH_CFG_MEMCORE_SIZE 0
357#endif
358
359/**
338 * @brief Heap Allocator APIs. 360 * @brief Heap Allocator APIs.
339 * @details If enabled then the memory heap allocator APIs are included 361 * @details If enabled then the memory heap allocator APIs are included
340 * in the kernel. 362 * in the kernel.
@@ -382,16 +404,36 @@
382#endif 404#endif
383 405
384/** 406/**
385 * @brief Dynamic Threads APIs. 407 * @brief Objects Caches APIs.
386 * @details If enabled then the dynamic threads creation APIs are included 408 * @details If enabled then the objects caches APIs are included
387 * in the kernel. 409 * in the kernel.
388 * 410 *
389 * @note The default is @p TRUE. 411 * @note The default is @p TRUE.
390 * @note Requires @p CH_CFG_USE_WAITEXIT.
391 * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
392 */ 412 */
393#if !defined(CH_CFG_USE_DYNAMIC) 413#if !defined(CH_CFG_USE_OBJ_CACHES)
394#define CH_CFG_USE_DYNAMIC TRUE 414#define CH_CFG_USE_OBJ_CACHES FALSE
415#endif
416
417/**
418 * @brief Delegate threads APIs.
419 * @details If enabled then the delegate threads APIs are included
420 * in the kernel.
421 *
422 * @note The default is @p TRUE.
423 */
424#if !defined(CH_CFG_USE_DELEGATES)
425#define CH_CFG_USE_DELEGATES FALSE
426#endif
427
428/**
429 * @brief Jobs Queues APIs.
430 * @details If enabled then the jobs queues APIs are included
431 * in the kernel.
432 *
433 * @note The default is @p TRUE.
434 */
435#if !defined(CH_CFG_USE_JOBS)
436#define CH_CFG_USE_JOBS FALSE
395#endif 437#endif
396 438
397/** @} */ 439/** @} */
diff --git a/platforms/chibios/QMK_PROTON_C/configs/halconf.h b/platforms/chibios/QMK_PROTON_C/configs/halconf.h
index a9f2cf77b..41fbac29e 100644
--- a/platforms/chibios/QMK_PROTON_C/configs/halconf.h
+++ b/platforms/chibios/QMK_PROTON_C/configs/halconf.h
@@ -29,7 +29,7 @@
29#define HALCONF_H 29#define HALCONF_H
30 30
31#define _CHIBIOS_HAL_CONF_ 31#define _CHIBIOS_HAL_CONF_
32#define _CHIBIOS_HAL_CONF_VER_7_0_ 32#define _CHIBIOS_HAL_CONF_VER_7_1_
33 33
34#include <mcuconf.h> 34#include <mcuconf.h>
35 35
@@ -69,6 +69,13 @@
69#endif 69#endif
70 70
71/** 71/**
72 * @brief Enables the EFlash subsystem.
73 */
74#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__)
75#define HAL_USE_EFL FALSE
76#endif
77
78/**
72 * @brief Enables the GPT subsystem. 79 * @brief Enables the GPT subsystem.
73 */ 80 */
74#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) 81#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
@@ -451,7 +458,6 @@
451#define SPI_USE_CIRCULAR FALSE 458#define SPI_USE_CIRCULAR FALSE
452#endif 459#endif
453 460
454
455/** 461/**
456 * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. 462 * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
457 * @note Disabling this option saves both code and data space. 463 * @note Disabling this option saves both code and data space.
diff --git a/platforms/chibios/common/configs/chconf.h b/platforms/chibios/common/configs/chconf.h
index 51ec2fb5b..78516a768 100644
--- a/platforms/chibios/common/configs/chconf.h
+++ b/platforms/chibios/common/configs/chconf.h
@@ -29,7 +29,7 @@
29#define CHCONF_H 29#define CHCONF_H
30 30
31#define _CHIBIOS_RT_CONF_ 31#define _CHIBIOS_RT_CONF_
32#define _CHIBIOS_RT_CONF_VER_6_0_ 32#define _CHIBIOS_RT_CONF_VER_6_1_
33 33
34/*===========================================================================*/ 34/*===========================================================================*/
35/** 35/**
@@ -109,21 +109,6 @@
109#endif 109#endif
110 110
111/** 111/**
112 * @brief Managed RAM size.
113 * @details Size of the RAM area to be managed by the OS. If set to zero
114 * then the whole available RAM is used. The core memory is made
115 * available to the heap allocator and/or can be used directly through
116 * the simplified core memory allocator.
117 *
118 * @note In order to let the OS manage the whole RAM the linker script must
119 * provide the @p __heap_base__ and @p __heap_end__ symbols.
120 * @note Requires @p CH_CFG_USE_MEMCORE.
121 */
122#if !defined(CH_CFG_MEMCORE_SIZE)
123#define CH_CFG_MEMCORE_SIZE 0
124#endif
125
126/**
127 * @brief Idle thread automatic spawn suppression. 112 * @brief Idle thread automatic spawn suppression.
128 * @details When this option is activated the function @p chSysInit() 113 * @details When this option is activated the function @p chSysInit()
129 * does not spawn the idle thread. The application @p main() 114 * does not spawn the idle thread. The application @p main()
@@ -312,6 +297,28 @@
312#endif 297#endif
313 298
314/** 299/**
300 * @brief Dynamic Threads APIs.
301 * @details If enabled then the dynamic threads creation APIs are included
302 * in the kernel.
303 *
304 * @note The default is @p TRUE.
305 * @note Requires @p CH_CFG_USE_WAITEXIT.
306 * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
307 */
308#if !defined(CH_CFG_USE_DYNAMIC)
309#define CH_CFG_USE_DYNAMIC FALSE
310#endif
311
312/** @} */
313
314/*===========================================================================*/
315/**
316 * @name OSLIB options
317 * @{
318 */
319/*===========================================================================*/
320
321/**
315 * @brief Mailboxes APIs. 322 * @brief Mailboxes APIs.
316 * @details If enabled then the asynchronous messages (mailboxes) APIs are 323 * @details If enabled then the asynchronous messages (mailboxes) APIs are
317 * included in the kernel. 324 * included in the kernel.
@@ -335,6 +342,21 @@
335#endif 342#endif
336 343
337/** 344/**
345 * @brief Managed RAM size.
346 * @details Size of the RAM area to be managed by the OS. If set to zero
347 * then the whole available RAM is used. The core memory is made
348 * available to the heap allocator and/or can be used directly through
349 * the simplified core memory allocator.
350 *
351 * @note In order to let the OS manage the whole RAM the linker script must
352 * provide the @p __heap_base__ and @p __heap_end__ symbols.
353 * @note Requires @p CH_CFG_USE_MEMCORE.
354 */
355#if !defined(CH_CFG_MEMCORE_SIZE)
356#define CH_CFG_MEMCORE_SIZE 0
357#endif
358
359/**
338 * @brief Heap Allocator APIs. 360 * @brief Heap Allocator APIs.
339 * @details If enabled then the memory heap allocator APIs are included 361 * @details If enabled then the memory heap allocator APIs are included
340 * in the kernel. 362 * in the kernel.
@@ -382,16 +404,36 @@
382#endif 404#endif
383 405
384/** 406/**
385 * @brief Dynamic Threads APIs. 407 * @brief Objects Caches APIs.
386 * @details If enabled then the dynamic threads creation APIs are included 408 * @details If enabled then the objects caches APIs are included
387 * in the kernel. 409 * in the kernel.
388 * 410 *
389 * @note The default is @p TRUE. 411 * @note The default is @p TRUE.
390 * @note Requires @p CH_CFG_USE_WAITEXIT.
391 * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
392 */ 412 */
393#if !defined(CH_CFG_USE_DYNAMIC) 413#if !defined(CH_CFG_USE_OBJ_CACHES)
394#define CH_CFG_USE_DYNAMIC FALSE 414#define CH_CFG_USE_OBJ_CACHES FALSE
415#endif
416
417/**
418 * @brief Delegate threads APIs.
419 * @details If enabled then the delegate threads APIs are included
420 * in the kernel.
421 *
422 * @note The default is @p TRUE.
423 */
424#if !defined(CH_CFG_USE_DELEGATES)
425#define CH_CFG_USE_DELEGATES FALSE
426#endif
427
428/**
429 * @brief Jobs Queues APIs.
430 * @details If enabled then the jobs queues APIs are included
431 * in the kernel.
432 *
433 * @note The default is @p TRUE.
434 */
435#if !defined(CH_CFG_USE_JOBS)
436#define CH_CFG_USE_JOBS FALSE
395#endif 437#endif
396 438
397/** @} */ 439/** @} */
diff --git a/platforms/chibios/common/configs/halconf.h b/platforms/chibios/common/configs/halconf.h
index 880e7f97a..264ae4e6c 100644
--- a/platforms/chibios/common/configs/halconf.h
+++ b/platforms/chibios/common/configs/halconf.h
@@ -29,7 +29,7 @@
29#define HALCONF_H 29#define HALCONF_H
30 30
31#define _CHIBIOS_HAL_CONF_ 31#define _CHIBIOS_HAL_CONF_
32#define _CHIBIOS_HAL_CONF_VER_7_0_ 32#define _CHIBIOS_HAL_CONF_VER_7_1_
33 33
34#include <mcuconf.h> 34#include <mcuconf.h>
35 35
@@ -69,6 +69,13 @@
69#endif 69#endif
70 70
71/** 71/**
72 * @brief Enables the EFlash subsystem.
73 */
74#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__)
75#define HAL_USE_EFL FALSE
76#endif
77
78/**
72 * @brief Enables the GPT subsystem. 79 * @brief Enables the GPT subsystem.
73 */ 80 */
74#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) 81#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
@@ -451,7 +458,6 @@
451#define SPI_USE_CIRCULAR FALSE 458#define SPI_USE_CIRCULAR FALSE
452#endif 459#endif
453 460
454
455/** 461/**
456 * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. 462 * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
457 * @note Disabling this option saves both code and data space. 463 * @note Disabling this option saves both code and data space.
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-05 05:04:06 +0000