Skip to content

Commit

Permalink
ChibiOS 20.3.2 (#11495)
Browse files Browse the repository at this point in the history 
* Update ChibiOS submodule

* Update ChibiOS-Contrib submodule

* Update ChibiOS config files
  • Loading branch information
@tzarc
tzarc authored Jan 19, 2021
1 parent 19c180e commit a7c45da
Show file tree
Hide file tree
Showing 6 changed files with 146 additions and 50 deletions.
2 changes: 1 addition & 1 deletion lib/chibios
Submodule chibios updated 2646 files
2 changes: 1 addition & 1 deletion lib/chibios-contrib
Submodule chibios-contrib updated 586 files
86 changes: 64 additions & 22 deletions platforms/chibios/QMK_PROTON_C/configs/chconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define CHCONF_H

#define _CHIBIOS_RT_CONF_
#define _CHIBIOS_RT_CONF_VER_6_0_
#define _CHIBIOS_RT_CONF_VER_6_1_

/*===========================================================================*/
/**
Expand Down Expand Up @@ -108,21 +108,6 @@
#define CH_CFG_TIME_QUANTUM 0
#endif

/**
* @brief Managed RAM size.
* @details Size of the RAM area to be managed by the OS. If set to zero
* then the whole available RAM is used. The core memory is made
* available to the heap allocator and/or can be used directly through
* the simplified core memory allocator.
*
* @note In order to let the OS manage the whole RAM the linker script must
* provide the @p __heap_base__ and @p __heap_end__ symbols.
* @note Requires @p CH_CFG_USE_MEMCORE.
*/
#if !defined(CH_CFG_MEMCORE_SIZE)
#define CH_CFG_MEMCORE_SIZE 0
#endif

/**
* @brief Idle thread automatic spawn suppression.
* @details When this option is activated the function @p chSysInit()
Expand Down Expand Up @@ -311,6 +296,28 @@
#define CH_CFG_USE_MESSAGES_PRIORITY TRUE
#endif

/**
* @brief Dynamic Threads APIs.
* @details If enabled then the dynamic threads creation APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
* @note Requires @p CH_CFG_USE_WAITEXIT.
* @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
*/
#if !defined(CH_CFG_USE_DYNAMIC)
#define CH_CFG_USE_DYNAMIC TRUE
#endif

/** @} */

/*===========================================================================*/
/**
* @name OSLIB options
* @{
*/
/*===========================================================================*/

/**
* @brief Mailboxes APIs.
* @details If enabled then the asynchronous messages (mailboxes) APIs are
Expand All @@ -334,6 +341,21 @@
#define CH_CFG_USE_MEMCORE TRUE
#endif

/**
* @brief Managed RAM size.
* @details Size of the RAM area to be managed by the OS. If set to zero
* then the whole available RAM is used. The core memory is made
* available to the heap allocator and/or can be used directly through
* the simplified core memory allocator.
*
* @note In order to let the OS manage the whole RAM the linker script must
* provide the @p __heap_base__ and @p __heap_end__ symbols.
* @note Requires @p CH_CFG_USE_MEMCORE.
*/
#if !defined(CH_CFG_MEMCORE_SIZE)
#define CH_CFG_MEMCORE_SIZE 0
#endif

/**
* @brief Heap Allocator APIs.
* @details If enabled then the memory heap allocator APIs are included
Expand Down Expand Up @@ -382,16 +404,36 @@
#endif

/**
* @brief Dynamic Threads APIs.
* @details If enabled then the dynamic threads creation APIs are included
* @brief Objects Caches APIs.
* @details If enabled then the objects caches APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
* @note Requires @p CH_CFG_USE_WAITEXIT.
* @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
*/
#if !defined(CH_CFG_USE_DYNAMIC)
#define CH_CFG_USE_DYNAMIC TRUE
#if !defined(CH_CFG_USE_OBJ_CACHES)
#define CH_CFG_USE_OBJ_CACHES FALSE
#endif

/**
* @brief Delegate threads APIs.
* @details If enabled then the delegate threads APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_DELEGATES)
#define CH_CFG_USE_DELEGATES FALSE
#endif

/**
* @brief Jobs Queues APIs.
* @details If enabled then the jobs queues APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_JOBS)
#define CH_CFG_USE_JOBS FALSE
#endif

/** @} */
Expand Down
10 changes: 8 additions & 2 deletions platforms/chibios/QMK_PROTON_C/configs/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define HALCONF_H

#define _CHIBIOS_HAL_CONF_
#define _CHIBIOS_HAL_CONF_VER_7_0_
#define _CHIBIOS_HAL_CONF_VER_7_1_

#include <mcuconf.h>

Expand Down Expand Up @@ -68,6 +68,13 @@
#define HAL_USE_DAC TRUE
#endif

/**
* @brief Enables the EFlash subsystem.
*/
#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__)
#define HAL_USE_EFL FALSE
#endif

/**
* @brief Enables the GPT subsystem.
*/
Expand Down Expand Up @@ -451,7 +458,6 @@
#define SPI_USE_CIRCULAR FALSE
#endif


/**
* @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
* @note Disabling this option saves both code and data space.
Expand Down
86 changes: 64 additions & 22 deletions platforms/chibios/common/configs/chconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define CHCONF_H

#define _CHIBIOS_RT_CONF_
#define _CHIBIOS_RT_CONF_VER_6_0_
#define _CHIBIOS_RT_CONF_VER_6_1_

/*===========================================================================*/
/**
Expand Down Expand Up @@ -108,21 +108,6 @@
#define CH_CFG_TIME_QUANTUM 0
#endif

/**
* @brief Managed RAM size.
* @details Size of the RAM area to be managed by the OS. If set to zero
* then the whole available RAM is used. The core memory is made
* available to the heap allocator and/or can be used directly through
* the simplified core memory allocator.
*
* @note In order to let the OS manage the whole RAM the linker script must
* provide the @p __heap_base__ and @p __heap_end__ symbols.
* @note Requires @p CH_CFG_USE_MEMCORE.
*/
#if !defined(CH_CFG_MEMCORE_SIZE)
#define CH_CFG_MEMCORE_SIZE 0
#endif

/**
* @brief Idle thread automatic spawn suppression.
* @details When this option is activated the function @p chSysInit()
Expand Down Expand Up @@ -311,6 +296,28 @@
#define CH_CFG_USE_MESSAGES_PRIORITY FALSE
#endif

/**
* @brief Dynamic Threads APIs.
* @details If enabled then the dynamic threads creation APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
* @note Requires @p CH_CFG_USE_WAITEXIT.
* @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
*/
#if !defined(CH_CFG_USE_DYNAMIC)
#define CH_CFG_USE_DYNAMIC FALSE
#endif

/** @} */

/*===========================================================================*/
/**
* @name OSLIB options
* @{
*/
/*===========================================================================*/

/**
* @brief Mailboxes APIs.
* @details If enabled then the asynchronous messages (mailboxes) APIs are
Expand All @@ -334,6 +341,21 @@
#define CH_CFG_USE_MEMCORE FALSE
#endif

/**
* @brief Managed RAM size.
* @details Size of the RAM area to be managed by the OS. If set to zero
* then the whole available RAM is used. The core memory is made
* available to the heap allocator and/or can be used directly through
* the simplified core memory allocator.
*
* @note In order to let the OS manage the whole RAM the linker script must
* provide the @p __heap_base__ and @p __heap_end__ symbols.
* @note Requires @p CH_CFG_USE_MEMCORE.
*/
#if !defined(CH_CFG_MEMCORE_SIZE)
#define CH_CFG_MEMCORE_SIZE 0
#endif

/**
* @brief Heap Allocator APIs.
* @details If enabled then the memory heap allocator APIs are included
Expand Down Expand Up @@ -382,16 +404,36 @@
#endif

/**
* @brief Dynamic Threads APIs.
* @details If enabled then the dynamic threads creation APIs are included
* @brief Objects Caches APIs.
* @details If enabled then the objects caches APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
* @note Requires @p CH_CFG_USE_WAITEXIT.
* @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
*/
#if !defined(CH_CFG_USE_DYNAMIC)
#define CH_CFG_USE_DYNAMIC FALSE
#if !defined(CH_CFG_USE_OBJ_CACHES)
#define CH_CFG_USE_OBJ_CACHES FALSE
#endif

/**
* @brief Delegate threads APIs.
* @details If enabled then the delegate threads APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_DELEGATES)
#define CH_CFG_USE_DELEGATES FALSE
#endif

/**
* @brief Jobs Queues APIs.
* @details If enabled then the jobs queues APIs are included
* in the kernel.
*
* @note The default is @p TRUE.
*/
#if !defined(CH_CFG_USE_JOBS)
#define CH_CFG_USE_JOBS FALSE
#endif

/** @} */
Expand Down
10 changes: 8 additions & 2 deletions platforms/chibios/common/configs/halconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define HALCONF_H

#define _CHIBIOS_HAL_CONF_
#define _CHIBIOS_HAL_CONF_VER_7_0_
#define _CHIBIOS_HAL_CONF_VER_7_1_

#include <mcuconf.h>

Expand Down Expand Up @@ -68,6 +68,13 @@
#define HAL_USE_DAC FALSE
#endif

/**
* @brief Enables the EFlash subsystem.
*/
#if !defined(HAL_USE_EFL) || defined(__DOXYGEN__)
#define HAL_USE_EFL FALSE
#endif

/**
* @brief Enables the GPT subsystem.
*/
Expand Down Expand Up @@ -451,7 +458,6 @@
#define SPI_USE_CIRCULAR FALSE
#endif


/**
* @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
* @note Disabling this option saves both code and data space.
Expand Down

0 comments on commit a7c45da

Please sign in to comment.