Subversion Repositories Projects

Compare Revisions

Ignore whitespace Rev 1570 → Rev 1569

/dongfang_FC_rewrite_tool/xslt/googleEarthPlot.xsl
File deleted
/dongfang_FC_rewrite_tool/xslt/heightControlDebug.xsl
File deleted
\ No newline at end of file
/dongfang_FC_rewrite_tool/xslt/synthAbsoluteAltitude.xsl
File deleted
/dongfang_FC_rewrite_tool/configsets/ADXRS610/config.xml
1,6 → 1,6
<parameterset eepromVersion="3" length="73">
<parameter name="bitConfig">
<bit name="CFG_SIMPLE_HEIGHT_CONTROL" value="1"/>
<bit name="CFG_SIMPLE_HEIGHT_CONTROL" value="0"/>
<bit name="CFG_SIMPLE_HC_HOLD_SWITCH" value="0"/>
<bit name="CFG_HEADING_HOLD" value="0"/>
<bit name="CFG_COMPASS_ACTIVE" value="0"/>
67,10 → 67,10
<parameter name="airpressureAccZCorrection" value="184"/>
<parameter name="heightP" value="var1"/>
<parameter name="heightI" value="var2"/>
<parameter name="heightD" value="100"/>
<parameter name="heightD" value="0"/>
<parameter name="heightSetting" value="var0"/>
<parameter name="heightControlMaxIntegral" value="40"/>
<parameter name="heightMaxThrottleChange" value="40"/>
<parameter name="heightControlMaxIntegral" value="30"/>
<parameter name="heightMaxThrottleChange" value="30"/>
<parameter name="heightSlewRate" value="200"/>
 
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/SimpleOSDTool.java
49,7 → 49,7
 
public static void main(String[] args) throws IOException {
SimpleOSDTool test = new SimpleOSDTool();
MKConnection _port = new MKTCPConnection(); //
MKConnection _port = new MKTCPConnection(); // new RXTXSerialPort();
_port.init("8080");
FrameQueue q = new FrameQueue(_port);
SimpleOSDView v = new SimpleOSDView ();
/dongfang_FC_rewrite_tool/src/dongfang/mkt/main/UniversalConfigurator.java
245,7 → 245,7
if ("w".equals(args[0]) && (args.length!=3 && args.length!=4)) help();
if ("r".equals(args[0]) && (args.length!=3 && args.length!=4)) help();
 
String portIdentifier = null;
String portIdentifier = "COM10";
if ("r".equals(args[0])) {
readConfiguration(portIdentifier, Integer.parseInt(args[1]));
/dongfang_FC_rewrite_tool/src/dongfang/mkt/ui/offscreendisplay/MapImageView.java
135,6 → 135,7
GPSPosition upperLeft = new GPSPosition();
GPSPosition lowerRight = new GPSPosition();
/*
upperLeft.setLatitude(47.328355);
upperLeft.setLongitude(8.518231);
 
142,16 → 143,20
lowerRight.setLatitude(47.321532);
lowerRight.setLongitude(8.530822);
// upperLeft.setLatitude(47.344577);
// upperLeft.setLongitude(8.529304);
// geotagged geo:lat=47.324614 geo:lon=8.528202
highlight.setLatitude(47.324714);
highlight.setLongitude(8.528102);
*/
upperLeft.setLatitude(47.344577);
upperLeft.setLongitude(8.529304);
 
// * l/r: geotagged geo:lat=47.321749 geo:lon=8.534403
// lowerRight.setLatitude(47.337576);
// lowerRight.setLongitude(8.542220);
lowerRight.setLatitude(47.337576);
lowerRight.setLongitude(8.542220);
setSize(MAPWIDTH, MAPHEIGHT);
this.upperLeft = upperLeft;
this.lowerRight = lowerRight;
mapImage = Toolkit.getDefaultToolkit().getImage("flugplatz_large.jpg");
mapImage = Toolkit.getDefaultToolkit().getImage("qth.jpg");
}
}
/dongfang_FC_rewrite_tool/src/dongfang/mkt/ui/offscreendisplay/VariousInfoPane.java
1,7 → 1,6
package dongfang.mkt.ui.offscreendisplay;
 
import java.awt.BorderLayout;
import java.awt.Font;
import java.awt.GridLayout;
import java.util.Formatter;
import java.util.Locale;
18,22 → 17,15
import dongfang.mkt.frames.OSDDataResponseFrame;
 
public class VariousInfoPane extends JPanel implements OSDDataConsumer {
static class BigLabel extends JLabel {
public BigLabel() {
super();
setFont(getFont().deriveFont(Font.BOLD, 16));
}
}
 
class PositionsPanel extends JPanel implements OSDDataConsumer {
class CurrentPositionPanel extends JPanel {
BigLabel lat;
BigLabel lon;
JLabel lat;
JLabel lon;
 
void init() {
lat = new BigLabel();
lon = new BigLabel();
lat = new JLabel();
lon = new JLabel();
}
 
int getNumRows() {
55,11 → 47,11
}
 
class HomePositionPanel extends CurrentPositionPanel {
BigLabel home;
JLabel home;
 
void init() {
super.init();
home = new BigLabel();
home = new JLabel();
}
 
int getNumRows() {
126,16 → 118,16
 
class HeightsPanel extends JPanel implements OSDDataConsumer {
class HeightPanel extends JPanel implements OSDDataConsumer {
BigLabel baroHeight;
BigLabel GPSHeight;
BigLabel baroVVI;
BigLabel GPSVVI;
JLabel baroHeight;
JLabel GPSHeight;
JLabel baroVVI;
JLabel GPSVVI;
 
void init() {
baroHeight = new BigLabel();
GPSHeight = new BigLabel();
baroVVI = new BigLabel();
GPSVVI = new BigLabel();
baroHeight = new JLabel();
GPSHeight = new JLabel();
baroVVI = new JLabel();
GPSVVI = new JLabel();
}
 
int getNumRows() {
211,14 → 203,14
}
 
class SpeedHeadingPanel extends JPanel implements OSDDataConsumer {
BigLabel noseDirection;
BigLabel flightDirection;
BigLabel speed;
JLabel noseDirection;
JLabel flightDirection;
JLabel speed;
 
void init() {
noseDirection = new BigLabel();
flightDirection = new BigLabel();
speed = new BigLabel();
noseDirection = new JLabel();
flightDirection = new JLabel();
speed = new JLabel();
Border b = BorderFactory.createTitledBorder(
BorderFactory.createEtchedBorder(), "Speed and heading");
setBorder(b);
261,7 → 253,6
class StatusPanel extends JPanel implements OSDDataConsumer {
JProgressBar dataAgeProgress;
JProgressBar battery;
BigLabel numberOfSatellites;
long dataTime = 0;
 
268,7 → 259,6
void init() {
dataAgeProgress = new JProgressBar(0, 5000);
battery = new JProgressBar(100, 130);
numberOfSatellites = new BigLabel();
//dataAgeProgress.setEnabled(false);
Border b = BorderFactory.createTitledBorder(
292,7 → 282,7
}
 
int getNumRows() {
return 3;
return 2;
}
 
void layoutSubs() {
300,8 → 290,6
add(dataAgeProgress);
add(new JLabel("Battery"));
add(battery);
add(new JLabel("Satellites"));
add(numberOfSatellites);
}
 
StatusPanel() {
315,7 → 303,6
return;
dataTime = System.currentTimeMillis();
battery.setValue(data.getBatteryVoltage());
numberOfSatellites.setText("" + data.getNumberOfSatellites());
}
}