Skip to content

Commit

Permalink
Upgrade to NCS v2.5.0
Browse files Browse the repository at this point in the history
Signed-off-by: Pavel Hübner <[email protected]>
  • Loading branch information
hubpav committed Nov 23, 2023
1 parent d79242f commit e9f5c17
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 9 deletions.
17 changes: 13 additions & 4 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
---
BasedOnStyle: LLVM
AlignConsecutiveMacros: AcrossComments
AllowShortBlocksOnASingleLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
Expand All @@ -24,7 +24,9 @@ AttributeMacros:
- __packed
- __printf_like
- __syscall
- __syscall_always_inline
- __subsystem
BitFieldColonSpacing: After
BreakBeforeBraces: Linux
ColumnLimit: 100
ConstructorInitializerIndentWidth: 8
Expand Down Expand Up @@ -63,7 +65,12 @@ ForEachMacros:
- 'Z_GENLIST_FOR_EACH_CONTAINER_SAFE'
- 'Z_GENLIST_FOR_EACH_NODE'
- 'Z_GENLIST_FOR_EACH_NODE_SAFE'
IncludeBlocks: Regroup
- 'STRUCT_SECTION_FOREACH'
- 'TYPE_SECTION_FOREACH'
IfMacros:
- 'CHECKIF'
# Disabled for now, see bug https://github.com/zephyrproject-rtos/zephyr/issues/48520
#IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^".*\.h"$'
Priority: 0
Expand All @@ -75,8 +82,10 @@ IncludeCategories:
Priority: 3
IndentCaseLabels: false
IndentWidth: 8
# SpaceBeforeParens: ControlStatementsExceptControlMacros # clang-format >= 13.0
UseTab: Always
InsertBraces: true
SpaceBeforeParens: ControlStatementsExceptControlMacros
SortIncludes: Never
UseTab: ForContinuationAndIndentation
WhitespaceSensitiveMacros:
- STRINGIFY
- Z_STRINGIFY
4 changes: 3 additions & 1 deletion application/src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@

LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);

void main(void)
int main(void)
{
LOG_INF("Build time: " __DATE__ " " __TIME__);

return 0;
}
8 changes: 4 additions & 4 deletions west.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
manifest:
version: "0.12"
remotes:
- name: hardwario-chester
url-base: [email protected].com:chester
- name: hardwario
url-base: https://github.com/hardwario
projects:
- name: sdk.git
remote: hardwario-chester
- name: chester-sdk.git
remote: hardwario
revision: main
path: chester
import: true
Expand Down

0 comments on commit e9f5c17

Please sign in to comment.