Skip to content

Commit 34cfbb6

Browse files
authored
fix(ci): add missing fw build, correct v14 switch defs (#6156)
1 parent b52e771 commit 34cfbb6

File tree

4 files changed

+37
-3
lines changed

4 files changed

+37
-3
lines changed

.github/workflows/actions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ jobs:
109109
- tx12;tx12mk2;boxer;gx12
110110
- tx16s
111111
- f16
112-
- v16
112+
- v12;v14;v16
113113
- x10;x10express
114114
- x12s
115115
- x7;x7access

radio/util/build-firmware.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,16 @@ def main():
199199
cmake_options["PCBREV"] = "F16"
200200
firmware_options = options_fatfish_f16
201201
maxsize = 2 * 1024 * 1024
202+
elif board_name == "v12":
203+
cmake_options["PCB"] = "X7"
204+
cmake_options["PCBREV"] = "V12"
205+
firmware_options = options_helloradiosky_v12
206+
maxsize = 65536 * 8 * 2
207+
elif board_name == "v14":
208+
cmake_options["PCB"] = "X7"
209+
cmake_options["PCBREV"] = "V14"
210+
firmware_options = options_helloradiosky_v14
211+
maxsize = 65536 * 8 * 2
202212
elif board_name == "v16":
203213
cmake_options["PCB"] = "X10"
204214
cmake_options["PCBREV"] = "V16"

radio/util/fwoptions.py

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,30 @@
331331
"externalaccessmod": ("HARDWARE_EXTERNAL_ACCESS_MOD", "YES", "NO"),
332332
}
333333

334+
options_helloradiosky_v12 = {
335+
"noheli": ("HELI", "NO", "YES"),
336+
"lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"),
337+
"nogvars": ("GVARS", "NO", "YES"),
338+
"faimode": ("FAI", "YES", None),
339+
"faichoice": ("FAI", "CHOICE", None),
340+
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
341+
"flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
342+
"afhds3": ("AFHDS3", "YES", "NO"),
343+
"internalelrs": ("INTERNAL_MODULE_ELRS", "YES", "NO"),
344+
}
345+
346+
options_helloradiosky_v14 = {
347+
"noheli": ("HELI", "NO", "YES"),
348+
"lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"),
349+
"nogvars": ("GVARS", "NO", "YES"),
350+
"faimode": ("FAI", "YES", None),
351+
"faichoice": ("FAI", "CHOICE", None),
352+
"nooverridech": ("OVERRIDE_CHANNEL_FUNCTION", "NO", "YES"),
353+
"flexr9m": ("MODULE_PROTOCOL_FLEX", "YES", None),
354+
"afhds3": ("AFHDS3", "YES", "NO"),
355+
"internalelrs": ("INTERNAL_MODULE_ELRS", "YES", "NO"),
356+
}
357+
334358
options_helloradiosky_v16 = {
335359
"noheli": ("HELI", "NO", "YES"),
336360
"lua": ("LUA", "YES", "NO_MODEL_SCRIPTS"),

radio/util/hw_defs/switch_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@
111111
},
112112
"v14": {
113113
# left side
114-
"SA": {"default": "3POS", "display": [0, 0]},
114+
"SA": {"default": "2POS", "display": [0, 0]},
115115
"SB": {"default": "3POS", "display": [0, 1]},
116116
"SE": {"default": "2POS", "display": [0, 2]},
117117
# right side
118-
"SC": {"default": "3POS", "display": [1, 0]},
118+
"SC": {"default": "2POS", "display": [1, 0]},
119119
"SD": {"default": "3POS", "display": [1, 1]},
120120
"SF": {"default": "TOGGLE", "display": [1, 2]},
121121
},

0 commit comments

Comments
 (0)