Skip to content

Commit a0bbdc0

Browse files
author
Eugene Lebedev
committed
Improve x4 params management
1 parent ff8927e commit a0bbdc0

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

ACAcontrollerState.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,12 @@ void controllerstate_init(void) {
169169
ui8_speedlimit_actual_kph = limit;
170170
ui8_throttle_min_range = ADC_THROTTLE_MIN_VALUE;
171171
ui8_throttle_max_range = ADC_THROTTLE_MAX_VALUE;
172+
#ifdef X4_MIN_RANGE
173+
ui16_X4_min_range = X4_MIN_RANGE;
174+
#endif
175+
#ifdef X4_MAX_RANGE
176+
ui16_X4_max_range = X4_MAX_RANGE;
177+
#endif
172178
flt_s_pas_threshold = PAS_THRESHOLD;
173179
flt_s_pid_gain_p = P_FACTOR;
174180
flt_s_pid_gain_i = I_FACTOR;

tools/JavaConfigurator/src/OSEC.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -259,21 +259,21 @@ public void loadSettings(File f) throws IOException {
259259
if (tmp != null && tmp.trim().length() > 0) {
260260
txtX4MinRange.setText(tmp);
261261
} else {
262-
txtX4MinRange.setText("43"); // default value
262+
txtX4MinRange.setText("500"); // default value matching ACAcontrollerState.c
263263
}
264264
} catch (Exception e) {
265-
txtX4MinRange.setText("43"); // default value
265+
txtX4MinRange.setText("500"); // default value matching ACAcontrollerState.c
266266
}
267267

268268
try {
269269
tmp = in.readLine();
270270
if (tmp != null && tmp.trim().length() > 0) {
271271
txtX4MaxRange.setText(tmp);
272272
} else {
273-
txtX4MaxRange.setText("182"); // default value
273+
txtX4MaxRange.setText("900"); // default value matching ACAcontrollerState.c
274274
}
275275
} catch (Exception e) {
276-
txtX4MaxRange.setText("182"); // default value
276+
txtX4MaxRange.setText("900"); // default value matching ACAcontrollerState.c
277277
}
278278

279279
int acaFlags = Integer.parseInt(in.readLine());
@@ -859,7 +859,7 @@ public void actionPerformed(ActionEvent arg0) {
859859
contentPane.add(lblX4MinRange);
860860

861861
txtX4MinRange = new JTextField();
862-
txtX4MinRange.setText("43");
862+
txtX4MinRange.setText("500");
863863
txtX4MinRange.setColumns(10);
864864
txtX4MinRange.setBounds(530, 250, 50, 20);
865865
contentPane.add(txtX4MinRange);
@@ -870,7 +870,7 @@ public void actionPerformed(ActionEvent arg0) {
870870
contentPane.add(lblX4MaxRange);
871871

872872
txtX4MaxRange = new JTextField();
873-
txtX4MaxRange.setText("182");
873+
txtX4MaxRange.setText("900");
874874
txtX4MaxRange.setColumns(10);
875875
txtX4MaxRange.setBounds(530, 270, 50, 20);
876876
contentPane.add(txtX4MaxRange);

0 commit comments

Comments
 (0)