Add support for fields: - ui16_X4_min_range (Min, Torque x4) -

ui16_X4_max_range (Max, Torque x4)

Author: Eugene Lebedev

tools/JavaConfigurator/src/OSEC.java

@@ -101,6 +101,8 @@ public String toString() {
 	private JTextField ramp_end;
 	private JTextField ramp_start;
 	private JTextField flt_tqCalibrationFactor;
+	private JTextField txtX4MinRange;
+	private JTextField txtX4MaxRange;
 	private JTextField p_factor;
 	private JTextField i_factor;
 	private JTextField GearRatio;
@@ -250,6 +252,29 @@ public void loadSettings(File f) throws IOException {
 			txtAngle5.setText(tmp);
 		}
 		flt_tqCalibrationFactor.setText(in.readLine());
+		
+		// Load X4 range values if they exist in the file
+		try {
+			tmp = in.readLine();
+			if (tmp != null && tmp.trim().length() > 0) {
+				txtX4MinRange.setText(tmp);
+			} else {
+				txtX4MinRange.setText("43"); // default value
+			}
+		} catch (Exception e) {
+			txtX4MinRange.setText("43"); // default value
+		}
+		
+		try {
+			tmp = in.readLine();
+			if (tmp != null && tmp.trim().length() > 0) {
+				txtX4MaxRange.setText(tmp);
+			} else {
+				txtX4MaxRange.setText("182"); // default value
+			}
+		} catch (Exception e) {
+			txtX4MaxRange.setText("182"); // default value
+		}
 
 		int acaFlags = Integer.parseInt(in.readLine());
 		cbAssistLevelInfluencesThrottle.setSelected((acaFlags & 1) > 0);
@@ -828,6 +853,28 @@ public void actionPerformed(ActionEvent arg0) {
 		flt_tqCalibrationFactor.setBounds(350, 270, 50, 20);
 		contentPane.add(flt_tqCalibrationFactor);
 
+		JLabel lblX4MinRange = new JLabel("Min, Torque x4");
+		lblX4MinRange.setBounds(415, 250, 100, 14);
+		lblX4MinRange.setForeground(Color.GRAY);
+		contentPane.add(lblX4MinRange);
+
+		txtX4MinRange = new JTextField();
+		txtX4MinRange.setText("43");
+		txtX4MinRange.setColumns(10);
+		txtX4MinRange.setBounds(530, 250, 50, 20);
+		contentPane.add(txtX4MinRange);
+
+		JLabel lblX4MaxRange = new JLabel("Max, Torque x4");
+		lblX4MaxRange.setBounds(415, 270, 100, 14);
+		lblX4MaxRange.setForeground(Color.GRAY);
+		contentPane.add(lblX4MaxRange);
+
+		txtX4MaxRange = new JTextField();
+		txtX4MaxRange.setText("182");
+		txtX4MaxRange.setColumns(10);
+		txtX4MaxRange.setBounds(530, 270, 50, 20);
+		contentPane.add(txtX4MaxRange);
+
 		JLabel lblRampEnd = new JLabel("Ramp end");
 		lblRampEnd.setBounds(250, 290, 80, 14);
 		lblRampEnd.setForeground(Color.GRAY);
@@ -1297,6 +1344,15 @@ public void actionPerformed(ActionEvent arg0) {
 					text_to_save = "#define TQS_CALIB " + flt_tqCalibrationFactor.getText();
 					iWriter.println(flt_tqCalibrationFactor.getText());
 					pWriter.println(text_to_save);
+					
+					// Save X4 range values
+					iWriter.println(txtX4MinRange.getText());
+					iWriter.println(txtX4MaxRange.getText());
+					
+					text_to_save = "#define X4_MIN_RANGE " + txtX4MinRange.getText();
+					pWriter.println(text_to_save);
+					text_to_save = "#define X4_MAX_RANGE " + txtX4MaxRange.getText();
+					pWriter.println(text_to_save);
 
 					int acaFlags = 128;
 					acaFlags |= (cbAssistLevelInfluencesThrottle.isSelected() ? 1 : 0);