Skip to content

Commit 7946ff7

Browse files
lokherlokher
committed
fix: resolve pre-commit warnings
1 parent a463e98 commit 7946ff7

335 files changed

Lines changed: 31617 additions & 35001 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/zmk_build.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: Build ZMK
22
run-name: ${{ github.event_name }} by ${{ github.actor }}
3-
on:
3+
on:
44
push:
55
pull_request:
66
schedule:
@@ -11,7 +11,7 @@ jobs:
1111

1212
container:
1313
image: ghcr.io/zephyrproject-rtos/ci:v0.26.11
14-
options: '--entrypoint /bin/bash'
14+
options: "--entrypoint /bin/bash"
1515

1616
steps:
1717
- name: set_env
@@ -40,26 +40,26 @@ jobs:
4040
echo "zephyr sdk -> zephyr-sdk-${ZSDK_VERSION}"
4141
ls /opt/toolchains/zephyr-sdk-${ZSDK_VERSION}
4242
/opt/toolchains/zephyr-sdk-${ZSDK_VERSION}/setup.sh -c
43-
43+
4444
- name: checkout manifest
4545
uses: actions/checkout@v4
4646
with:
47-
repository: ${{ env.ZMK_REPOSITORY }}
48-
path: "zmk"
49-
ref: ${{ env.ZMK_REF }}
50-
fetch-depth: 0
51-
persist-credentials: false
52-
47+
repository: ${{ env.ZMK_REPOSITORY }}
48+
path: "zmk"
49+
ref: ${{ env.ZMK_REF }}
50+
fetch-depth: 0
51+
persist-credentials: false
52+
5353
- name: west update
5454
shell: bash
5555
run: |
56-
cd zmk
57-
west init -l app
58-
west update
59-
56+
cd zmk
57+
west init -l app
58+
west update
59+
6060
- name: do build
6161
shell: bash
6262
run: |
63-
cd zmk
64-
cd app
65-
west build -p -b rtl8762gn_evb -- -DSHIELD=rtk_keyboard
63+
cd zmk
64+
cd app
65+
west build -p -b rtl8762gn_evb -- -DSHIELD=rtk_keyboard

‎.vscode/c_cpp_properties.json‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
{
2-
"configurations": [
3-
{
4-
"name": "Linux",
5-
"includePath": [
6-
"${workspaceFolder}/**"
7-
],
8-
"defines": [],
9-
"cStandard": "c17",
10-
"cppStandard": "gnu++17",
11-
"intelliSenseMode": "linux-gcc-arm",
12-
"compilerPath": "/home/william/zephyr-sdk-0.16.5-1/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc",
13-
"compileCommands": "${workspaceFolder}/app/build/compile_commands.json"
14-
}
15-
],
16-
"version": 4
17-
}
2+
"configurations": [
3+
{
4+
"name": "Linux",
5+
"includePath": ["${workspaceFolder}/**"],
6+
"defines": [],
7+
"cStandard": "c17",
8+
"cppStandard": "gnu++17",
9+
"intelliSenseMode": "linux-gcc-arm",
10+
"compilerPath": "/home/william/zephyr-sdk-0.16.5-1/arm-zephyr-eabi/bin/arm-zephyr-eabi-gcc",
11+
"compileCommands": "${workspaceFolder}/app/build/compile_commands.json"
12+
}
13+
],
14+
"version": 4
15+
}

‎app/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,10 +243,10 @@ zephyr_cc_option(-Wfatal-errors)
243243

244244

245245
# ---------------------------------------------------------------------------
246-
# After a successful build: prepend header to the firmware image for RTK's
247-
# OTA DFU, which requires a header with metadata.
248-
# The header prepending tool is a available for Windows, Linux x86_64,
249-
# and macOS ARM64.
246+
# After a successful build: prepend header to the firmware image for RTK's
247+
# OTA DFU, which requires a header with metadata.
248+
# The header prepending tool is a available for Windows, Linux x86_64,
249+
# and macOS ARM64.
250250
# ---------------------------------------------------------------------------
251251
if(WIN32)
252252
set(_PREPEND_HEADER tools/prepend_header/windows-x86_64/prepend_header.exe)

‎app/Kconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ config BT_PERIPHERAL_PREF_LATENCY
243243

244244
config BT_PERIPHERAL_PREF_TIMEOUT
245245
default 400
246-
246+
247247
config BT_SUPPORT_STATIC_RANDOM_ADDRESS
248248
bool "generate static random address when pairing"
249249
default n
@@ -672,9 +672,9 @@ if ZMK_LAUNCHER
672672
config LAUNCHER_USER_SET_DEBOUNCE
673673
bool "enable user set bebouce"
674674
default n
675-
endif
675+
endif
676676

677-
config ZMK_SSD1306
677+
config ZMK_SSD1306
678678
bool "enable ssd1306 display"
679679
default n
680680

‎app/boards/arm/keychron/Kconfig.board‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
config BOARD_RTL8762GTU
2-
bool "RealTek rtl8762gku board"
3-
depends on SOC_SERIES_RTL87X2G
4-
select SOC_PART_NUMBER_RTL8762GTU
2+
bool "RealTek rtl8762gku board"
3+
depends on SOC_SERIES_RTL87X2G
4+
select SOC_PART_NUMBER_RTL8762GTU
55

66
config BOARD_RTL8762GKU
7-
bool "RealTek rtl8762gku board"
8-
depends on SOC_SERIES_RTL87X2G
9-
select SOC_PART_NUMBER_RTL8762GKU
7+
bool "RealTek rtl8762gku board"
8+
depends on SOC_SERIES_RTL87X2G
9+
select SOC_PART_NUMBER_RTL8762GKU
1010

‎app/boards/arm/keychron/Kconfig.defconfig‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
if BOARD_RTL8762GTU || BOARD_RTL8762GKU
22

33
config BOARD
4-
default "rtl8762gtu"
4+
default "rtl8762gtu"
55

66
config RTK_DFU
7-
bool "enable rtk dfu"
8-
default y
7+
bool "enable rtk dfu"
8+
default y
99

1010
config DEBUG_IO
11-
bool "enable debug io"
12-
default n
13-
11+
bool "enable debug io"
12+
default n
13+
1414
endif #BOARD_RTL8762GTU

‎app/boards/arm/keychron/keychron.dts‎

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -3,86 +3,86 @@
33
#include "rtl8762gku_kb-pinctrl.dtsi"
44
#include <behaviors.dtsi>
55
/ {
6-
model = "RealTek rtl8762gku ";
7-
compatible = "realtek,rtl8762gku";
6+
model = "RealTek rtl8762gku ";
7+
compatible = "realtek,rtl8762gku";
88

9-
chosen {
10-
zephyr,sram = &ram_data;
11-
zephyr,flash = &flash;
12-
zephyr,code-partition = &app_partition;
13-
zephyr,itcm = &ram_code;
14-
zephyr,console = &uart2;
15-
zephyr,shell-uart = &uart2;
16-
zephyr,flash-controller = &fmc;
17-
zephyr,entropy = &trng;
18-
};
9+
chosen {
10+
zephyr,sram = &ram_data;
11+
zephyr,flash = &flash;
12+
zephyr,code-partition = &app_partition;
13+
zephyr,itcm = &ram_code;
14+
zephyr,console = &uart2;
15+
zephyr,shell-uart = &uart2;
16+
zephyr,flash-controller = &fmc;
17+
zephyr,entropy = &trng;
18+
};
1919

20-
/* These aliases are provided for compatibility with samples */
21-
aliases {
22-
};
23-
encoder_any: encoder_any {
24-
compatible = "zmk,behavior-sensor-rotate-var";
25-
#sensor-binding-cells = <2>;
26-
bindings = <&kp>, <&kp>;
27-
tap-ms =<20>;
28-
};
20+
/* These aliases are provided for compatibility with samples */
21+
aliases {
22+
};
23+
encoder_any: encoder_any {
24+
compatible = "zmk,behavior-sensor-rotate-var";
25+
#sensor-binding-cells = <2>;
26+
bindings = <&kp>, <&kp>;
27+
tap-ms =<20>;
28+
};
2929
};
3030

3131
&flash {
32-
partitions {
33-
compatible = "fixed-partitions";
34-
#address-cells = <1>;
35-
#size-cells = <1>;
36-
reserved: partition@0 {
37-
label = "reserved-image";
38-
reg = <0x0 DT_SIZE_K(4)>;
39-
};
40-
config_file: partition@1000 {
41-
label = "config-file-image";
42-
reg = <0x1000 DT_SIZE_K(4)>;
43-
};
44-
boot_patch_0: partition@2000 {
45-
label = "boot-patch-0-image";
46-
reg = <0x2000 DT_SIZE_K(32)>;
47-
};
48-
boot_patch_1: partition@a000 {
49-
label = "boot-patch-1-image";
50-
reg = <0xA000 DT_SIZE_K(32)>;
51-
};
52-
ota_header: partition@12000 {
53-
label = "ota-header-image";
54-
reg = <0x12000 DT_SIZE_K(4)>;
55-
};
56-
system_patch: partition@13000 {
57-
label = "system-patch-image";
58-
reg = <0x13000 DT_SIZE_K(32)>;
59-
};
60-
stack_patch: partition@1b000 {
61-
label = "stack-patch-image";
62-
reg = <0x1B000 DT_SIZE_K(72)>;
63-
};
64-
app_partition: partition@2d000 {
65-
label = "app-image";
66-
reg = <0x2D000 DT_SIZE_K(800)>;
67-
};
68-
storage_partition: partition@f5000 {
69-
label = "storage";
70-
reg = <0xF5000 DT_SIZE_K(44)>;
71-
};
72-
};
32+
partitions {
33+
compatible = "fixed-partitions";
34+
#address-cells = <1>;
35+
#size-cells = <1>;
36+
reserved: partition@0 {
37+
label = "reserved-image";
38+
reg = <0x0 DT_SIZE_K(4)>;
39+
};
40+
config_file: partition@1000 {
41+
label = "config-file-image";
42+
reg = <0x1000 DT_SIZE_K(4)>;
43+
};
44+
boot_patch_0: partition@2000 {
45+
label = "boot-patch-0-image";
46+
reg = <0x2000 DT_SIZE_K(32)>;
47+
};
48+
boot_patch_1: partition@a000 {
49+
label = "boot-patch-1-image";
50+
reg = <0xA000 DT_SIZE_K(32)>;
51+
};
52+
ota_header: partition@12000 {
53+
label = "ota-header-image";
54+
reg = <0x12000 DT_SIZE_K(4)>;
55+
};
56+
system_patch: partition@13000 {
57+
label = "system-patch-image";
58+
reg = <0x13000 DT_SIZE_K(32)>;
59+
};
60+
stack_patch: partition@1b000 {
61+
label = "stack-patch-image";
62+
reg = <0x1B000 DT_SIZE_K(72)>;
63+
};
64+
app_partition: partition@2d000 {
65+
label = "app-image";
66+
reg = <0x2D000 DT_SIZE_K(800)>;
67+
};
68+
storage_partition: partition@f5000 {
69+
label = "storage";
70+
reg = <0xF5000 DT_SIZE_K(44)>;
71+
};
72+
};
7373
};
7474

7575
&cpu {
76-
clock-frequency = <40000000>;
76+
clock-frequency = <40000000>;
7777
};
7878

7979
&uart2 {
80-
pinctrl-0 = <&uart2_default>;
81-
pinctrl-1 = <&uart2_sleep>;
82-
pinctrl-names = "default","sleep";
83-
status = "okay";
84-
current-speed = <2000000>;
85-
parity = "none";
86-
stop-bits = "1";
87-
data-bits = <8>;
80+
pinctrl-0 = <&uart2_default>;
81+
pinctrl-1 = <&uart2_sleep>;
82+
pinctrl-names = "default","sleep";
83+
status = "okay";
84+
current-speed = <2000000>;
85+
parity = "none";
86+
stop-bits = "1";
87+
data-bits = <8>;
8888
};

‎app/boards/arm/keychron/rtl8762gku_kb-pinctrl.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#include <dt-bindings/pinctrl/rtl87x2g-pinctrl.h>
77

88
&pinctrl {
9-
uart2_default: uart2_default {
10-
group1 {
11-
psels = <RTL87X2G_PSEL(UART2_TX, P3_1, DIR_OUT, DRV_HIGH, PULL_UP)>,
12-
<RTL87X2G_PSEL(UART2_RX, P3_3, DIR_IN, DRV_HIGH, PULL_UP)>;
13-
};
14-
};
9+
uart2_default: uart2_default {
10+
group1 {
11+
psels = <RTL87X2G_PSEL(UART2_TX, P3_1, DIR_OUT, DRV_HIGH, PULL_UP)>,
12+
<RTL87X2G_PSEL(UART2_RX, P3_3, DIR_IN, DRV_HIGH, PULL_UP)>;
13+
};
14+
};
1515
};
1616

‎app/boards/arm/rtl8762gn_evb/Kconfig.board‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
config BOARD_RTL8762GN_EVB
2-
bool "RealTek rtl8762gn evaluation board"
3-
depends on SOC_SERIES_RTL87X2G
4-
select SOC_PART_NUMBER_RTL8762GN
2+
bool "RealTek rtl8762gn evaluation board"
3+
depends on SOC_SERIES_RTL87X2G
4+
select SOC_PART_NUMBER_RTL8762GN
55

‎app/boards/arm/rtl8762gn_evb/Kconfig.defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
if BOARD_RTL8762GN_EVB
22

33
config BOARD
4-
default "rtl8762gn_evb"
4+
default "rtl8762gn_evb"
55

66
endif #BOARD_RTL8762GN_EVB

0 commit comments

Comments
 (0)