| 15,6 → 15,7 |
|---|
| import dongfang.mkt.comm.FrameQueue; |
| import dongfang.mkt.comm.MKConnection; |
| import dongfang.mkt.comm.serial.RXTXSerialPort; |
| import dongfang.mkt.comm.tcp.MKTCPConnection; |
| import dongfang.mkt.frames.OSDDataRequestFrame; |
| import dongfang.mkt.frames.OSDDataResponseFrame; |
| |
| 64,10 → 65,12 |
|---|
| w.write(" <currentPosition " + f.getCurrentPosition().toXML() + "/>\n"); |
| w.write(" <targetPosition " + f.getTargetPosition().toXML() + " " + f.getCurrentToTarget().toXML() + "/>\n"); |
| w.write(" <homePosition " + f.getHomePosition().toXML() + " " + f.getCurrentToHome().toXML() + "/>\n"); |
| w.write(" <heading compass=\"" + f.getCompassHeading() + "\" flight=\"" + f.getDirectionOfFlight() + "\" groundSpeed=\"" + ((double)f.getGroundSpeed())/100 + "\"/>\n"); |
| w.write(" <heading compass=\"" + f.getCompassHeading() + "\" flight=\"" + f.getDirectionOfFlight() + "\" groundSpeed=\"" + f.getGroundSpeed() + "\"/>\n"); |
| |
| w.write(" <waypoints index=\"" + f.getWaypointIndex() + "\" count=\"" + f.getWaypointCount() + "\"/>\n"); |
| w.write(" <height barometric=\"" + f.getHeightByPressure() + "\" barometricVerticalVelocity=\"" + f.getVerticalVelocityByPressure() + "\" gpsVerticalVelocity=\"" + f.getVerticalVelocityByGPS() + "\"/>\n"); |
| |
| double gpsHeight = f.getCurrentPosition().getAltitude() - f.getHomePosition().getAltitude(); |
| w.write(" <height barometric=\"" + f.getHeightByPressure() + "\" gps=\"" + gpsHeight + "\" barometricVerticalVelocity=\"" + f.getVerticalVelocityByPressure() + "\" gpsVerticalVelocity=\"" + f.getVerticalVelocityByGPS() + "\"/>\n"); |
| |
| w.write(" <status rcQuality=\"" + f.getRcQuality() + "\" fcflags=\"" + f.getFcFlags() + "\" fcflags2=\"" + f.getFcFlags2() + "\" ncflags=\"" + f.getNcFlags() + "\" errorCode=\"" + f.getErrorCode() + "\" numberOfSatellites=\"" + f.getNumberOfSatellites() + "\"/>\n"); |
| w.write(" <flight time=\"" + f.getFlightTime() + "\" batteryVoltage=\"" + f.getBatteryVoltage() + "\" throttle=\"" + f.getThrottle() + "\" current=\"" + f.getCurrent() + "\" capacityUsed=\"" + f.getCapacityUsed() + "\"/>\n"); |
| 160,8 → 163,8 |
|---|
| public static void main(String[] args) throws IOException { |
| OSDLogger test = new OSDLogger(); |
| |
| MKConnection _port = new RXTXSerialPort(); |
| _port.init(null); |
| MKConnection _port = new MKTCPConnection(); //RXTXSerialPort(); |
| _port.init("8080"); |
| |
| FrameQueue q = new FrameQueue(_port); |
| String encoding = "iso-8859-1"; |