Skip to content

Commit 5c3509e

Browse files
committed
commit
1 parent c3b0d8a commit 5c3509e

File tree

2 files changed

+96
-2
lines changed

2 files changed

+96
-2
lines changed

src/js/tabs/norn_config.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ norn_config.initialize = function (callback) {
8181
droneSizeSelect.append(`<option value="9">9</option>`);
8282
droneSizeSelect.append(`<option value="10">10</option>`);
8383
droneSizeSelect.append(`<option value="13">13</option>`);
84-
droneSizeSelect.append(`<option value="15">15</option>`);
8584
droneSizeSelect.on("change", function () {
8685
self.analyticsChanges["NornDroneSize"] = $(this).val() || null;
86+
clearMandatoryFieldValidation();
8787
});
8888
}
8989

@@ -237,6 +237,7 @@ norn_config.initialize = function (callback) {
237237
// Check mandatory fields and highlight missing ones
238238
const mandatoryFields = [
239239
{ selector: "select[name='norn_fc']", label: "Flight Controller" },
240+
{ selector: "select[name='norn_drone_size']", label: "Drone Size" },
240241
{ selector: "select[name='norn_manticore']", label: "Manticore" },
241242
{ selector: "select[name='norn_vtx']", label: "VTX" },
242243
{ selector: "select[name='norn_video_format']", label: "Video Format" },
@@ -272,13 +273,15 @@ norn_config.initialize = function (callback) {
272273

273274
// Validate mandatory fields
274275
const fcKey = $("select[name='norn_fc']").val();
276+
const droneSize = $("select[name='norn_drone_size']").val();
275277
const manticoreKey = $("select[name='norn_manticore']").val();
276278
const vtxKey = $("select[name='norn_vtx']").val();
277279
const videoFormat = $("select[name='norn_video_format']").val();
278280
const controller = $("select[name='norn_controller']").val();
279281

280282
const missingFields = [];
281283
if (!fcKey) missingFields.push("Flight Controller");
284+
if (!droneSize) missingFields.push("Drone Size");
282285
if (!manticoreKey) missingFields.push("Manticore");
283286
if (!vtxKey) missingFields.push("VTX");
284287
if (!videoFormat) missingFields.push("Video Format");

src/norn-configs/template.hbs

Lines changed: 92 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,95 @@ set osd_gps_lat_pos = 18859
221221
set osd_gps_lon_pos = 18827
222222
set osd_gps_lat_pos = 18795
223223
{{/if}}
224-
{{/if}}
224+
{{/if}}
225+
226+
# PROFILE CONFIGURATION
227+
{{!-- Profile configuration for 7", 8", and 9" drones --}}
228+
{{#if (or (eq droneSize '7') (eq droneSize '8') (eq droneSize '9'))}}
229+
profile 0
230+
231+
set dterm_lpf1_dyn_min_hz = 60
232+
set dterm_lpf1_dyn_max_hz = 120
233+
set dterm_lpf1_static_hz = 60
234+
set dterm_lpf2_static_hz = 120
235+
set p_pitch = 38
236+
set i_pitch = 43
237+
set d_pitch = 29
238+
set f_pitch = 106
239+
set p_roll = 37
240+
set i_roll = 38
241+
set d_roll = 27
242+
set f_roll = 101
243+
set i_yaw = 44
244+
set f_yaw = 101
245+
set d_min_roll = 21
246+
set d_min_pitch = 23
247+
set auto_profile_cell_count = 6
248+
set thrust_linear = 20
249+
set simplified_pids_mode = OFF
250+
set simplified_i_gain = 90
251+
set simplified_d_gain = 95
252+
set simplified_pi_gain = 55
253+
set simplified_dmax_gain = 10
254+
set simplified_feedforward_gain = 85
255+
set simplified_dterm_filter_multiplier = 80
256+
{{/if}}
257+
{{!-- Profile configuration for 10" drones --}}
258+
{{#if (eq droneSize '10')}}
259+
profile 0
260+
261+
set dterm_lpf1_dyn_min_hz = 60
262+
set dterm_lpf1_dyn_max_hz = 120
263+
set dterm_lpf1_static_hz = 60
264+
set dterm_lpf2_static_hz = 120
265+
set simplified_dterm_filter_multiplier = 80
266+
{{/if}}
267+
{{!-- Profile configuration for 13" drones --}}
268+
{{#if (eq droneSize '13')}}
269+
profile 0
270+
271+
set dterm_lpf1_dyn_min_hz = 60
272+
set dterm_lpf1_dyn_max_hz = 120
273+
set dterm_lpf1_static_hz = 60
274+
set dterm_lpf2_static_hz = 105
275+
set iterm_rotation = ON
276+
set iterm_windup = 90
277+
set p_pitch = 56
278+
set i_pitch = 80
279+
set d_pitch = 47
280+
set f_pitch = 74
281+
set p_roll = 53
282+
set i_roll = 76
283+
set d_roll = 42
284+
set f_roll = 71
285+
set p_yaw = 50
286+
set i_yaw = 120
287+
set f_yaw = 70
288+
set d_max_roll = 44
289+
set d_max_pitch = 50
290+
set thrust_linear = 20
291+
set dyn_idle_min_rpm = 25
292+
set simplified_pids_mode = RP
293+
set simplified_i_gain = 80
294+
set simplified_d_gain = 140
295+
set simplified_pi_gain = 120
296+
set simplified_d_max_gain = 20
297+
set simplified_feedforward_gain = 60
298+
set simplified_dterm_filter = OFF
299+
set simplified_dterm_filter_multiplier = 80
300+
{{/if}}
301+
302+
profile 1
303+
profile 2
304+
profile 3
305+
306+
# restore original profile selection
307+
profile 0
308+
309+
rateprofile 0
310+
rateprofile 1
311+
rateprofile 2
312+
rateprofile 3
313+
314+
# restore original rateprofile selection
315+
rateprofile 0

0 commit comments

Comments
 (0)