Skip to content

Commit 4e9eb35

Browse files
authored
feat(pre-commit): Add JSON formatter to pre-commit hooks (#10324)
1 parent 1e04762 commit 4e9eb35

File tree

20 files changed

+120
-120
lines changed

20 files changed

+120
-120
lines changed

.pre-commit-config.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ repos:
2525
args: [--fix=lf]
2626
- id: trailing-whitespace
2727
args: [--markdown-linebreak-ext=md]
28+
- id: pretty-format-json
29+
args: [--autofix]
30+
types_or: [json]
31+
exclude: |
32+
(?x)(
33+
diagram\..*\.json$|
34+
package\.json$|
35+
^package\/.*$
36+
)
2837
- repo: https://github.com/codespell-project/codespell
2938
rev: "v2.3.0"
3039
hooks:
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32s2": false
5-
},
62
"fqbn": {
73
"esp32s3": [
84
"espressif:esp32:esp32s3:USBMode=hwcdc,PartitionScheme=huge_app,FlashMode=dio"
95
]
6+
},
7+
"targets": {
8+
"esp32": false,
9+
"esp32s2": false
1010
}
1111
}
+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2+
"fqbn": {
3+
"esp32s3": [
4+
"espressif:esp32:esp32s3:USBMode=default,PartitionScheme=esp_sr_16,FlashSize=16M,FlashMode=dio"
5+
]
6+
},
27
"targets": {
38
"esp32": false,
49
"esp32c3": false,
510
"esp32c6": false,
611
"esp32h2": false,
712
"esp32s2": false
8-
},
9-
"fqbn": {
10-
"esp32s3": [
11-
"espressif:esp32:esp32s3:USBMode=default,PartitionScheme=esp_sr_16,FlashSize=16M,FlashMode=dio"
12-
]
1313
}
1414
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"targets": {
3-
"esp32": false,
4-
"esp32c2": false,
5-
"esp32c3": false,
6-
"esp32s2": false,
7-
"esp32s3": false
8-
}
2+
"targets": {
3+
"esp32": false,
4+
"esp32c2": false,
5+
"esp32c3": false,
6+
"esp32s2": false,
7+
"esp32s3": false
98
}
9+
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"targets": {
33
"esp32": false,
4-
"esp32s2": false,
54
"esp32c3": false,
65
"esp32c6": false,
7-
"esp32h2": false
6+
"esp32h2": false,
7+
"esp32s2": false
88
}
99
}

tests/performance/psramspeed/ci.json

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"qemu": false,
44
"wokwi": false
55
},
6-
76
"targets": {
87
"esp32c3": false,
98
"esp32c6": false,

tests/performance/ramspeed/ci.json

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
2-
"platform": {
3-
"qemu": false,
4-
"wokwi": false
5-
},
6-
72
"fqbn": {
83
"esp32": [
94
"espressif:esp32:esp32:PSRAM=disabled,PartitionScheme=huge_app"
@@ -14,5 +9,9 @@
149
"esp32s3": [
1510
"espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app"
1611
]
12+
},
13+
"platform": {
14+
"qemu": false,
15+
"wokwi": false
1716
}
1817
}

tests/validation/democfg/ci.json

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
11
{
2-
"platforms": {
3-
"qemu": false,
4-
"hardware": true,
5-
"wokwi": true
6-
},
7-
8-
"targets": {
9-
"esp32": true,
10-
"esp32s2": true,
11-
"esp32s3": true,
12-
"esp32c3": true,
13-
"esp32c6": true,
14-
"esp32h2": false
15-
},
16-
172
"fqbn": {
183
"esp32": [
194
"espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
@@ -25,5 +10,18 @@
2510
"esp32s3": [
2611
"espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app"
2712
]
13+
},
14+
"platforms": {
15+
"hardware": true,
16+
"qemu": false,
17+
"wokwi": true
18+
},
19+
"targets": {
20+
"esp32": true,
21+
"esp32c3": true,
22+
"esp32c6": true,
23+
"esp32h2": false,
24+
"esp32s2": true,
25+
"esp32s3": true
2826
}
2927
}

tests/validation/gpio/ci.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"platforms": {
3-
"qemu": false,
43
"hardware": false,
4+
"qemu": false,
55
"wokwi": false
66
}
77
}

tests/validation/nvs/ci.json

+12-13
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,13 @@
11
{
2-
"platforms": {
3-
"qemu": false
4-
},
5-
62
"fqbn": {
73
"esp32": [
84
"espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
95
"espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio"
106
],
11-
"esp32s2": [
12-
"espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
13-
"espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio"
14-
],
157
"esp32c3": [
168
"espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=dio",
179
"espressif:esp32:esp32c3:PartitionScheme=huge_app,FlashMode=qio"
1810
],
19-
"esp32s3": [
20-
"espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
21-
"espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
22-
"espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio"
23-
],
2411
"esp32c6": [
2512
"espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=dio",
2613
"espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=dio,FlashFreq=40",
@@ -32,6 +19,18 @@
3219
"espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=dio,FlashFreq=16",
3320
"espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=qio",
3421
"espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=qio,FlashFreq=16"
22+
],
23+
"esp32s2": [
24+
"espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
25+
"espressif:esp32:esp32s2:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=qio"
26+
],
27+
"esp32s3": [
28+
"espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
29+
"espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
30+
"espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio"
3531
]
32+
},
33+
"platforms": {
34+
"qemu": false
3635
}
3736
}

tests/validation/touch/ci.json

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"qemu": false,
44
"wokwi": false
55
},
6-
76
"targets": {
87
"esp32c3": false,
98
"esp32c6": false,

tests/validation/wifi/ci.json

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
{
2-
"platforms": {
3-
"qemu": false,
4-
"hardware": false
5-
},
6-
7-
"targets": {
8-
"esp32h2": false
9-
},
10-
112
"extra_tags": [
123
"wifi"
134
],
14-
155
"fqbn": {
166
"esp32": [
177
"espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app,FlashMode=dio",
@@ -26,5 +16,12 @@
2616
"espressif:esp32:esp32s3:PSRAM=disabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio",
2717
"espressif:esp32:esp32s3:PSRAM=enabled,USBMode=default,PartitionScheme=huge_app,FlashMode=qio"
2818
]
19+
},
20+
"platforms": {
21+
"hardware": false,
22+
"qemu": false
23+
},
24+
"targets": {
25+
"esp32h2": false
2926
}
3027
}

0 commit comments

Comments
 (0)