rcpilot-cvs Mailing List for R/C Pilot Project (Page 3)
Status: Beta
Brought to you by:
mjpawlowsky
Menu
▾
▴
rcpilot-cvs — Notifications of CVS commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
(55) |
Mar
(175) |
Apr
(6) |
May
|
Jun
(24) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <mjp...@us...> - 2004-03-09 20:54:18
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26547 Modified Files: UserPreferencesDialog.java Log Message: Added handler for aquire from GPS. Not finished. value should be saved as Int into UserPrefs. Index: UserPreferencesDialog.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/UserPreferencesDialog.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** UserPreferencesDialog.java 8 Mar 2004 16:05:54 -0000 1.3 --- UserPreferencesDialog.java 9 Mar 2004 20:28:55 -0000 1.4 *************** *** 165,168 **** --- 165,169 ---- aquireFromGPS = new JButton("Aquire from GPS"); + aquireFromGPS.addActionListener(this); remoteVehicleCallSign.setColumns(7); *************** *** 294,299 **** if (e.getSource() == saveButton) { saveChanges(); } - parentDialog.dispose(); } --- 295,303 ---- if (e.getSource() == saveButton) { saveChanges(); + } else if (e.getSource() == aquireFromGPS) { + this.gpsHomeLatitudeTF.setText(GPS.gpsToString(Rcgs.tdata.getGPSLatitude())); + } else { + parentDialog.dispose(); } } |
|
From: <mjp...@us...> - 2004-03-09 20:52:52
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26312 Modified Files: RcgsJMenuBar.java Log Message: moved setting of properties to the Monitor class. Added handler to null the monitor frame. Shouldn't dispose() do that? Index: RcgsJMenuBar.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/RcgsJMenuBar.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RcgsJMenuBar.java 9 Mar 2004 00:09:26 -0000 1.2 --- RcgsJMenuBar.java 9 Mar 2004 20:27:29 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- import java.io.File; import java.io.FilenameFilter; + import java.awt.event.WindowAdapter; + import java.awt.event.WindowEvent; /** *************** *** 26,30 **** private UserPreferencesDialog preferencesDialog; - private Monitor monitorFrame; // Frame to monitor AGWPE packets private JMenuItem connectItem; --- 28,31 ---- *************** *** 152,160 **** public void showMonitor() { ! if(monitorFrame == null) { try { ! monitorFrame = new Monitor(); } catch (MissingResourceException mre) { --- 153,168 ---- public void showMonitor() { ! if(Rcgs.monitorFrame == null) { try { ! Rcgs.monitorFrame = new Monitor(); ! ! Rcgs.monitorFrame.addWindowListener(new WindowAdapter() { ! public void windowClosing(WindowEvent e) { ! Rcgs.monitorFrame.dispose(); ! Rcgs.monitorFrame = null; ! } ! }); } catch (MissingResourceException mre) { *************** *** 162,169 **** } } ! monitorFrame.setBounds(0,0,400,400); // set frame bounds **PKW ! // monitorFrame.setAlwaysOnTop(true); // no such method, see forum=57&thread=121761 **PKW ! monitorFrame.validate(); ! monitorFrame.setVisible(true); ! } } --- 170,175 ---- } } ! } ! ! } |
|
From: <mjp...@us...> - 2004-03-09 20:50:53
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25871 Modified Files: RcgsJFrame.java Log Message: No need to handle closing of frame twice. Index: RcgsJFrame.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/RcgsJFrame.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RcgsJFrame.java 7 Mar 2004 12:06:03 -0000 1.1 --- RcgsJFrame.java 9 Mar 2004 20:25:33 -0000 1.2 *************** *** 46,50 **** // Exit on close - this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); addWindowListener(new WindowAdapter() { public void windowClosing(WindowEvent e) {Rcgs.cleanQuit();} --- 46,49 ---- |
|
From: <mjp...@us...> - 2004-03-09 20:49:11
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25383 Modified Files: Rcgs.java Log Message: Moved monitor frame to here as a static object so that we can keep track of when it it open or not. Index: Rcgs.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Rcgs.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Rcgs.java 7 Mar 2004 15:32:01 -0000 1.12 --- Rcgs.java 9 Mar 2004 20:23:34 -0000 1.13 *************** *** 37,41 **** public static RcgsJFrame frame; ! public static ResourceBundle resources; // Resource string for internationalization public static RcgsJPanels panels; public static TelemetryData tdata; --- 37,42 ---- public static RcgsJFrame frame; ! public static Monitor monitorFrame; // Frame to monitor AGWPE packets ! public static ResourceBundle resources; // Resource string for internationalization public static RcgsJPanels panels; public static TelemetryData tdata; |
|
From: <mjp...@us...> - 2004-03-09 20:47:46
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25050 Modified Files: Monitor.java Log Message: Fixed scroll bars Index: Monitor.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Monitor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Monitor.java 7 Mar 2004 12:06:03 -0000 1.3 --- Monitor.java 9 Mar 2004 20:22:26 -0000 1.4 *************** *** 33,36 **** --- 33,39 ---- import java.awt.*; + + + public class Monitor extends JFrame { *************** *** 42,52 **** public Monitor() { ! this.setTitle("AGWPE Packet Monitor"); ! this.getContentPane().add("Center", monitorPanel); ! monitorPanel.setLayout(new BorderLayout()); monitorPanel.setPreferredSize(new Dimension(400, 400)); ! log.setEditable(false); ! monitorPanel.add(log, BorderLayout.CENTER); ! monitorPanel.add(logScroll,BorderLayout.SOUTH); toLog("AGW Packet Engine Monitor"); } --- 45,65 ---- public Monitor() { ! this.setTitle("AGWPE Packet Monitor"); ! ! this.setBounds(0,0,600,400); // set frame bounds **PKW ! // this.setAlwaysOnTop(true); // no such method, see forum=57&thread=121761 **PKW ! ! ! ! this.getContentPane().add("Center", monitorPanel); ! ! monitorPanel.setLayout(new BorderLayout()); monitorPanel.setPreferredSize(new Dimension(400, 400)); ! log.setEditable(false); ! monitorPanel.add(logScroll); ! ! this.validate(); ! this.setVisible(true); ! toLog("AGW Packet Engine Monitor"); } |
|
From: <mjp...@us...> - 2004-03-09 20:46:51
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24819 Modified Files: InstrumentPanel.java Log Message: Call dataUpdated to fire TelemetryDataChanged. Other stuff need to be calculated as well like distance, bearing etc which does not come from the data but should be calaculated everytime we have new data. Index: InstrumentPanel.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/InstrumentPanel.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** InstrumentPanel.java 9 Mar 2004 00:08:54 -0000 1.7 --- InstrumentPanel.java 9 Mar 2004 20:21:31 -0000 1.8 *************** *** 205,209 **** // Fire off a TelemetryDataChanged Event ! Rcgs.tdata.fireTelemetryDataChanged(); } --- 205,209 ---- // Fire off a TelemetryDataChanged Event ! Rcgs.tdata.dataUpdated(); } |
|
From: <mjp...@us...> - 2004-03-09 20:44:43
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24067 Modified Files: GPS.java Log Message: Negative gps coord coming back with 2 "-" signs. Index: GPS.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/GPS.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GPS.java 7 Mar 2004 12:06:03 -0000 1.2 --- GPS.java 9 Mar 2004 20:19:23 -0000 1.3 *************** *** 129,133 **** int deg = i / 360000; ! double min = ((double)i - ((double)deg * 360000)) / 6000 ; String s = f.format(min); --- 129,133 ---- int deg = i / 360000; ! double min = Math.abs(((double)i - ((double)deg * 360000)) / 6000); String s = f.format(min); |
|
From: <mjp...@us...> - 2004-03-09 20:43:40
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23712 Modified Files: Attitude.java Log Message: Clean up. Index: Attitude.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Attitude.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Attitude.java 8 Mar 2004 20:26:06 -0000 1.6 --- Attitude.java 9 Mar 2004 20:18:17 -0000 1.7 *************** *** 305,309 **** public void telemetryDataChanged(TelemetryDataChangedEvent ev){ this.rot = Rcgs.tdata.getRoll(); - System.out.println ("rot: " + rot ); this.pitch = Rcgs.tdata.getPitch(); this.repaint(); --- 305,308 ---- |
|
From: <mjp...@us...> - 2004-03-09 20:42:15
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23359 Modified Files: Agwpe.java Log Message: Send data to monitor if open. Start of AX25 handler (not completed) Index: Agwpe.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Agwpe.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Agwpe.java 9 Mar 2004 00:06:53 -0000 1.6 --- Agwpe.java 9 Mar 2004 20:16:55 -0000 1.7 *************** *** 136,139 **** --- 136,144 ---- char type = (char)(dkind&0x0ffff); // type is byte value of low word of datakind + + // If the monitor window is open + // send it the frame + sendToMonitor(head); + sendToMonitor(dat); switch(type) *************** *** 142,147 **** dout(10,"UNPROTO"); parseUnProto(dat); ! Rcgs.tdata.fireTelemetryDataChanged(); break; default: dout(10,"unknown type="+type); --- 147,159 ---- dout(10,"UNPROTO"); parseUnProto(dat); ! Rcgs.tdata.dataUpdated(); break; + + case 'K': + dout(10,"RAW AX.25"); + parseAX25(dat); + Rcgs.tdata.dataUpdated(); + break; + default: dout(10,"unknown type="+type); *************** *** 178,182 **** // parses a unproto Frame Datakind 'U' public static void parseUnProto(byte[] dat){ ! int pos = 0; --- 190,195 ---- // parses a unproto Frame Datakind 'U' public static void parseUnProto(byte[] dat){ ! ! int pos = 0; *************** *** 240,244 **** Rcgs.tdata.setEngineRPM(rpm); pos = pos + 3; ! break; default: --- 253,283 ---- Rcgs.tdata.setEngineRPM(rpm); pos = pos + 3; ! break; ! ! case (byte)0x20: ! int lat = 0; ! lat |= (0xFF & dat[pos+4]); ! lat <<= 8; ! lat |= (0xFF & dat[pos+3]); ! lat <<= 8; ! lat |= (0xFF & dat[pos+2]); ! lat <<= 8; ! lat |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setGPSLatitude(lat); ! pos = pos + 5; ! break; ! ! case (byte)0x21: ! int lon = 0; ! lon |= (0xFF & dat[pos+4]); ! lon <<= 8; ! lon |= (0xFF & dat[pos+3]); ! lon <<= 8; ! lon |= (0xFF & dat[pos+2]); ! lon <<= 8; ! lon |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setGPSLongitude(lon); ! pos = pos + 5; ! break; default: *************** *** 257,264 **** } ! public static void parseAX25() throws IOException{ ! ; ! // parses a AX25 Frame ! } /** --- 296,402 ---- } ! ! ! public static void parseAX25(byte[] dat){ ! ! ! ! int pos = 17; ! ! while (pos < dat.length){ ! switch (dat[pos]) { ! ! ! case 0x01: ! short pitch = 0; ! pitch |= (0xFF & dat[pos+2]); ! pitch <<= 8; ! pitch |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setPitch(pitch); ! pos = pos + 3; ! break; ! ! ! case 0x02: ! short roll = 0; ! roll |= (0xFF & dat[pos+2]); ! roll <<= 8; ! roll |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setRoll(roll); ! pos = pos + 3; ! break; ! ! ! case 0x04: ! short speed = 0; ! speed |= (0xFF & dat[pos+2]); ! speed <<= 8; ! speed |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setSpeed(speed);; ! pos = pos + 3; ! break; ! ! ! case 0x05: ! short alt = 0; ! alt |= (0xFF & dat[pos+2]); ! alt <<= 8; ! alt |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setAltitude(alt); ! pos = pos + 3; ! break; ! ! case 0x06: ! short course = 0; ! course |= (0xFF & dat[pos+2]); ! course <<= 8; ! course |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setCourse(course); ! pos = pos + 3; ! break; ! ! case (byte)0xA0: ! short rpm = 0; ! rpm |= (0xFF & dat[pos+2]); ! rpm <<= 8; ! rpm |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setEngineRPM(rpm); ! pos = pos + 3; ! break; ! ! case (byte)0x20: ! int lat = 0; ! lat |= (0xFF & dat[pos+4]); ! lat <<= 8; ! lat |= (0xFF & dat[pos+3]); ! lat <<= 8; ! lat |= (0xFF & dat[pos+2]); ! lat <<= 8; ! lat |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setGPSLatitude(lat); ! pos = pos + 5; ! break; ! ! case (byte)0x21: ! int lon = 0; ! lon |= (0xFF & dat[pos+4]); ! lon <<= 8; ! lon |= (0xFF & dat[pos+3]); ! lon <<= 8; ! lon |= (0xFF & dat[pos+2]); ! lon <<= 8; ! lon |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setGPSLongitude(lon); ! pos = pos + 5; ! break; ! ! default: ! pos++; ! break; ! ! } ! } ! } ! /** *************** *** 353,355 **** --- 491,502 ---- static public void dout(int level, String text){Functions.dout(level,text);} + + private void sendToMonitor(byte[] dat){ + + if (Rcgs.monitorFrame != null){ + System.out.println ("Sendng to monitor: "); + Rcgs.monitorFrame.toLog(Functions.atohex(dat, 0, dat.length)); + } + } + } |
|
From: <mjp...@us...> - 2004-03-09 20:40:33
|
Update of /cvsroot/rcpilot/rcpm/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22991 Modified Files: rcpm.bas Log Message: no message Index: rcpm.bas =================================================================== RCS file: /cvsroot/rcpilot/rcpm/src/rcpm.bas,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** rcpm.bas 14 Feb 2004 14:56:23 -0000 1.1.1.1 --- rcpm.bas 9 Mar 2004 20:15:13 -0000 1.2 *************** *** 117,122 **** ' Send the destination ! curbyte = "V" ! curbyte = curbyte << 1 GOSUB Sendbyte --- 117,122 ---- ' Send the destination ! curbyte = "B" ! curbyte = curbyte << 1 ' Shift one bit left to make room for extension bit (additional call signs) GOSUB Sendbyte *************** *** 125,141 **** GOSUB Sendbyte ! curbyte = "2" curbyte = curbyte << 1 GOSUB Sendbyte ! curbyte = "M" curbyte = curbyte << 1 GOSUB Sendbyte ! curbyte = "U" curbyte = curbyte << 1 GOSUB Sendbyte ! curbyte = "D" curbyte = curbyte << 1 GOSUB Sendbyte --- 125,141 ---- GOSUB Sendbyte ! curbyte = "A" curbyte = curbyte << 1 GOSUB Sendbyte ! curbyte = "C" curbyte = curbyte << 1 GOSUB Sendbyte ! curbyte = "O" curbyte = curbyte << 1 GOSUB Sendbyte ! curbyte = "N" curbyte = curbyte << 1 GOSUB Sendbyte *************** *** 169,173 **** GOSUB Sendbyte ! curbyte = $65 GOSUB Sendbyte --- 169,173 ---- GOSUB Sendbyte ! curbyte = $41 //$65 GOSUB Sendbyte |
|
From: <mjp...@us...> - 2004-03-09 01:09:53
|
Update of /cvsroot/rcpilot/src/rcpilot/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4028 Modified Files: TestServer.java Log Message: no message Index: TestServer.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/tests/TestServer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestServer.java 7 Mar 2004 15:07:48 -0000 1.1 --- TestServer.java 9 Mar 2004 00:45:11 -0000 1.2 *************** *** 14,19 **** private final static int dataSize = 54; ! private static short altitude = 1000; ! private static int altdir = 1; private static short speed = 50; private static short roll = 0; --- 14,18 ---- private final static int dataSize = 54; ! private static short altitude = 1000; private static short speed = 50; private static short roll = 0; *************** *** 22,31 **** private static short rpm = 12000; private static int latitude = 1999675000; ! private static int longitutde = 0; public static void doAlt(){ ! if (altitude > 2000 ) { altdir = -1; } else if (altitude < 200){ --- 21,35 ---- private static short rpm = 12000; private static int latitude = 1999675000; ! private static int longitutde = 0; ! ! private static int altdir = 1; ! private static int rolldir = 1; ! private static int coursedir = 1; ! public static void doAlt(){ ! if (altitude > 1000 ) { altdir = -1; } else if (altitude < 200){ *************** *** 33,37 **** } ! altitude = (short)(altitude + (altdir * (int)(10 * Math.random()))); altitude = (short)Math.max(100, altitude); } --- 37,43 ---- } ! int rnd = (int)(10 * Math.random()); ! ! altitude = (short)(altitude + (altdir * (int)(rnd * Math.random()))); altitude = (short)Math.max(100, altitude); } *************** *** 45,50 **** public static void doRoll(){ ! int dir = Math.random() > 0.5 ?1:-1; ! roll = (short)(roll + (altdir * (int)(2 * Math.random()))); roll = (short)Math.max(-30, roll); roll = (short)Math.min(30, roll); --- 51,58 ---- public static void doRoll(){ ! if(Math.random() > 0.8){ ! rolldir = rolldir * -1; ! } ! roll = (short)(roll + (rolldir * (int)(2 * Math.random()))); roll = (short)Math.max(-30, roll); roll = (short)Math.min(30, roll); *************** *** 65,70 **** public static void doCourse(){ ! int dir = Math.random() > 0.5 ?1:-1; ! course = (short)(course + (dir * (int)(2 * Math.random()))); course = (short)Math.max(0, course); course = (short)Math.min(359, course); --- 73,86 ---- public static void doCourse(){ ! ! if (course < 1){ ! coursedir = 1; ! } else if (coursedir > 358){ ! coursedir = -1; ! } else if (Math.random() > 0.8){ ! coursedir = coursedir * -1; ! } ! ! course = (short)(course + (coursedir * (int)(5 * Math.random()))); course = (short)Math.max(0, course); course = (short)Math.min(359, course); |
|
From: <mjp...@us...> - 2004-03-09 01:09:37
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3934 Modified Files: Variometer.java Log Message: no message Index: Variometer.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Variometer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Variometer.java 9 Mar 2004 00:12:27 -0000 1.4 --- Variometer.java 9 Mar 2004 00:44:55 -0000 1.5 *************** *** 128,132 **** long dTime = new Date().getTime(); // Figure time elapsed in milliseconds ! elapsed = dTime - Rcgs.tdata.getPreviousAltitudeTimestamp(); // Figure out how many feet we have travelled --- 128,134 ---- long dTime = new Date().getTime(); // Figure time elapsed in milliseconds ! elapsed = dTime - Rcgs.tdata.getPreviousAltitudeTimestamp(); ! Rcgs.tdata.setPreviousAltitudeTimestamp(dTime); ! Rcgs.tdata.setPreviousAltitude(alt); // Figure out how many feet we have travelled |
|
From: <mjp...@us...> - 2004-03-09 00:37:57
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29341 Modified Files: Tachometer.java Log Message: Cleaning out setRotations Index: Tachometer.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Tachometer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Tachometer.java 8 Mar 2004 17:36:16 -0000 1.4 --- Tachometer.java 9 Mar 2004 00:13:16 -0000 1.5 *************** *** 115,132 **** } ! ! public void telemetryDataChanged(TelemetryDataChangedEvent ev){ this.repaint(); } - - public void setRotation(int r){ - this.rot = r; - } - - public int getRotation(){ - return this.rot; - } - - } --- 115,126 ---- } ! // The hand is first drawn at 270 degrees for simplicity ! // We need to zero it to 255; ! // range is from 255 degrees to 105 degrees ! // for a total of 210 degrees of movement. ! public void telemetryDataChanged(TelemetryDataChangedEvent ev){ ! this.rot = Math.min((int)(Rcgs.tdata.getEngineRPM() * .006) - 15, 195); this.repaint(); } } |
|
From: <mjp...@us...> - 2004-03-09 00:37:08
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29180 Modified Files: Variometer.java Log Message: Added TelemetryDataChanged Event support for the Variometer component Index: Variometer.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Variometer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Variometer.java 8 Mar 2004 17:36:16 -0000 1.3 --- Variometer.java 9 Mar 2004 00:12:27 -0000 1.4 *************** *** 35,38 **** --- 35,39 ---- import java.awt.geom.*; import java.lang.Math; + import java.util.Date; public class Variometer extends JComponent implements TelemetryDataChangedEventListener{ *************** *** 115,125 **** public void telemetryDataChanged(TelemetryDataChangedEvent ev){ this.repaint(); } - - public void setRotation(int r){ - this.rot = r; - } } --- 116,152 ---- public void telemetryDataChanged(TelemetryDataChangedEvent ev){ + + //TODO Time stamp should be take from the frames + + double palt = Rcgs.tdata.getPreviousAltitude(); + double alt = Rcgs.tdata.getAltitude(); + double fpm = 0; + double elapsed = 0; + double ft = 0; + + // Get the current time + long dTime = new Date().getTime(); + // Figure time elapsed in milliseconds + elapsed = dTime - Rcgs.tdata.getPreviousAltitudeTimestamp(); + + // Figure out how many feet we have travelled + ft = Math.abs(alt - palt); + + // calculate how many ft/min + if (elapsed > 0) // Make sure we don't devide by zero + { + fpm = (ft * ((float)600 / elapsed)); + + // See which direction we are going + if (alt > palt){ + this.rot = (int)(Math.min(fpm, (long)20) * 8); // 8 is the number of degrees per ft/min on our scale + } else { + this.rot = (int)((Math.min(fpm, (long)20) * 8)* -1); + } + } + this.repaint(); } } |
|
From: <mjp...@us...> - 2004-03-09 00:35:41
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28822 Modified Files: RcgsMap.java Log Message: Added TelemetryDataChanged Event support for the RcgsMap component Index: RcgsMap.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/RcgsMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RcgsMap.java 8 Mar 2004 16:23:45 -0000 1.2 --- RcgsMap.java 9 Mar 2004 00:11:00 -0000 1.3 *************** *** 51,55 **** ! public class RcgsMap extends JComponent { --- 51,55 ---- ! public class RcgsMap extends JComponent implements TelemetryDataChangedEventListener{ *************** *** 79,85 **** * Create the Map Panel and get the last map. */ ! public RcgsMap() throws FileNotFoundException, IOException { MediaTracker tracker; this.setName("Map"); --- 79,89 ---- * Create the Map Panel and get the last map. */ ! public RcgsMap(TelemetryData tdata ) throws FileNotFoundException, IOException { MediaTracker tracker; + + // Register for TelemetryDataChangedEvents + TelemetryDataChangedEventListener l = this; + tdata.addTelemetryDataChangedListener(l); this.setName("Map"); *************** *** 255,260 **** } ! ! } --- 259,265 ---- } ! public void telemetryDataChanged(TelemetryDataChangedEvent ev){ ! this.repaint(); ! } } |
|
From: <mjp...@us...> - 2004-03-09 00:35:06
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28747 Modified Files: RcgsJPanels.java Log Message: Added TelemetryDataChanged Event support for the RcgsMap component Index: RcgsJPanels.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/RcgsJPanels.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RcgsJPanels.java 8 Mar 2004 22:13:50 -0000 1.5 --- RcgsJPanels.java 9 Mar 2004 00:10:25 -0000 1.6 *************** *** 123,127 **** mapPanel = new JPanel(new BorderLayout()); try { ! this.map = new RcgsMap(); mapPanel.add(map, BorderLayout.CENTER); } catch (Exception me) {} --- 123,127 ---- mapPanel = new JPanel(new BorderLayout()); try { ! this.map = new RcgsMap(Rcgs.tdata); mapPanel.add(map, BorderLayout.CENTER); } catch (Exception me) {} |
|
From: <mjp...@us...> - 2004-03-09 00:34:06
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28551 Modified Files: RcgsJMenuBar.java Log Message: Clean up Index: RcgsJMenuBar.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/RcgsJMenuBar.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RcgsJMenuBar.java 7 Mar 2004 12:06:04 -0000 1.1 --- RcgsJMenuBar.java 9 Mar 2004 00:09:26 -0000 1.2 *************** *** 144,186 **** } - // private JMenu createBackgroundMenu() { - // // Background Menu - // menu = new JMenu("Background"); - // menu.setMnemonic(KeyEvent.VK_B); - // this.add(menu); - // - // ButtonGroup group = new ButtonGroup(); - // radioMenuItem = new JRadioButtonMenuItem("Blue"); - // radioMenuItem.setMnemonic(KeyEvent.VK_B); - // if (UserPreferences.vid_color == Color.blue){ - // radioMenuItem.setSelected(true); - // } - // radioMenuItem.addActionListener(new ActionListener() { - // public void actionPerformed(ActionEvent e) { - // UserPreferences.setVidColor(Color.blue); - // vidPanel.setBackground(Color.blue); - // frame.repaint(); - // } - // }); - // group.add(radioMenuItem); - // menu.add(radioMenuItem); - // - // radioMenuItem = new JRadioButtonMenuItem("Black"); - // if (UserPreferences.vid_color == Color.black){ - // radioMenuItem.setSelected(true); - // } - // radioMenuItem.setMnemonic(KeyEvent.VK_K); - // radioMenuItem.addActionListener(new ActionListener() { - // public void actionPerformed(ActionEvent e) { - // UserPreferences.setVidColor(Color.black); - // vidPanel.setBackground(Color.black); - // frame.repaint(); - // } - // }); - // group.add(radioMenuItem); - // menu.add(radioMenuItem); - // - // } - /** --- 144,147 ---- |
|
From: <mjp...@us...> - 2004-03-09 00:33:34
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28421 Modified Files: InstrumentPanel.java Log Message: Cleaning out Test field to set tdata Index: InstrumentPanel.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/InstrumentPanel.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** InstrumentPanel.java 8 Mar 2004 22:13:02 -0000 1.6 --- InstrumentPanel.java 9 Mar 2004 00:08:54 -0000 1.7 *************** *** 1,2 **** --- 1,29 ---- + /* + * + * Class to build the component of the Instrument View. + * + * + * Copyright 2004 Michael J. Pawlowsky + * 2004 Ian Dallas + * + * This file is part of R/C Ground Station a module of the R/C Pilot Project. + * + * RCGS is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * RCGS is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with RCGS; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + package rcpilot.rcgs; *************** *** 158,232 **** public void actionPerformed(ActionEvent evt) { ! double fpm = 0; ! double elapsed = 0; ! double ft = 0; ! double alt = 0; ! double palt = Rcgs.tdata.getPreviousAltitude(); ! String text = altField.getText(); altField.selectAll(); - - // Do calculations for Variometer // ! // Fill in the current altitude ! alt = Double.parseDouble(text); ! Rcgs.tdata.setAltitude(alt); ! ! // Get the current time ! long dTime = new Date().getTime(); ! ! // Figure time elapsed in milliseconds ! elapsed = dTime - Rcgs.tdata.getPreviousAltitudeTimestamp(); ! ! // Figure out how many feet we have travelled ! ft = Math.abs(alt - palt); ! ! // calculate how many ft/min ! if (elapsed > 0) // Make sure we don't devide by zero ! { ! fpm = (ft * ((float)600 / elapsed)); ! ! // See which direction we are going ! if (alt > palt){ ! Variometer.rot = (int)(Math.min(fpm, (long)20) * 8); // 8 is the number of degrees per ft/min on our scale ! } else { ! Variometer.rot = (int)((Math.min(fpm, (long)20) * 8)* -1); ! } ! } ! ! // Do calculation for Altimeter ! altimeter.setRotation((int)(alt * .36)); ! ! Rcgs.panels.getHudTab().setRotation((int)alt); ! ! // Do calculation for IAS ! Rcgs.tdata.setSpeed(alt); ! ! // Do calculation for Tachometer ! // Rotate the thousand ! tachometer.setRotation((int)(alt*.006)); ! // The hand is first drawn at 270 degrees for simplicity ! // We need to zero it to 255; ! // range is from 255 degrees to 105 degrees ! // for a total of 210 degrees of movement. ! tachometer.setRotation(Math.min(tachometer.getRotation()-15, 195)); ! ! // Do calculation for Compass ! compass.setRotation(-(int)(alt)); ! // Do calculation for Attitude Indicator ! Rcgs.tdata.setRoll(alt); ! ! // Save our current values in previous values Rcgs.tdata.setPreviousAltitudeTimestamp(dTime); ! Rcgs.tdata.setPreviousAltitude(alt); ! Rcgs.tdata.setGPSLatitude(16363980); Rcgs.tdata.setGPSLongitude(26609700); ! Rcgs.tdata.setCourse(180); ! // get swing to repaint our component ! Rcgs.tdata.fireTelemetryDataChanged(); ! Rcgs.frame.repaint(); } --- 185,209 ---- public void actionPerformed(ActionEvent evt) { ! double value = 0; ! long dTime = new Date().getTime(); ! String text = altField.getText(); altField.selectAll(); // ! // get the JTextField data ! value = Double.parseDouble(text); ! Rcgs.tdata.setAltitude(value); ! Rcgs.tdata.setSpeed(value); ! Rcgs.tdata.setEngineRPM(value); ! Rcgs.tdata.setRoll(value); Rcgs.tdata.setPreviousAltitudeTimestamp(dTime); ! Rcgs.tdata.setPreviousAltitude(value); Rcgs.tdata.setGPSLatitude(16363980); Rcgs.tdata.setGPSLongitude(26609700); ! Rcgs.tdata.setCourse(value); ! // Fire off a TelemetryDataChanged Event ! Rcgs.tdata.fireTelemetryDataChanged(); } |
|
From: <mjp...@us...> - 2004-03-09 00:32:39
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28174 Modified Files: Compass.java Log Message: Clearing out setRotation Index: Compass.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Compass.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Compass.java 8 Mar 2004 17:36:16 -0000 1.4 --- Compass.java 9 Mar 2004 00:07:58 -0000 1.5 *************** *** 172,185 **** - public void telemetryDataChanged(TelemetryDataChangedEvent ev){ this.repaint(); } ! ! ! public void setRotation(int r){ ! this.rot = r; ! } ! } --- 172,180 ---- public void telemetryDataChanged(TelemetryDataChangedEvent ev){ + this.rot = (int)(Rcgs.tdata.getCourse() * -1); this.repaint(); } ! } |
|
From: <mjp...@us...> - 2004-03-09 00:32:13
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28075 Modified Files: Altimeter.java Log Message: Clearing out setRotation Index: Altimeter.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Altimeter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Altimeter.java 8 Mar 2004 17:35:28 -0000 1.4 --- Altimeter.java 9 Mar 2004 00:07:32 -0000 1.5 *************** *** 123,133 **** public void telemetryDataChanged(TelemetryDataChangedEvent ev){ this.repaint(); } - - - public void setRotation(int r){ - this.rot = r; - } } --- 123,129 ---- public void telemetryDataChanged(TelemetryDataChangedEvent ev){ + this.rot = (int)(Rcgs.tdata.getAltitude() * .36); this.repaint(); } } |
|
From: <mjp...@us...> - 2004-03-09 00:31:33
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27873 Modified Files: Agwpe.java Log Message: Finished clearing out the setRotations Index: Agwpe.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Agwpe.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Agwpe.java 8 Mar 2004 20:24:46 -0000 1.5 --- Agwpe.java 9 Mar 2004 00:06:53 -0000 1.6 *************** *** 141,146 **** case 'U': dout(10,"UNPROTO"); ! parseUnProto(dat); // Added by MikeP ! Rcgs.tdata.fireTelemetryDataChanged(); // Added by MikeP break; default: --- 141,146 ---- case 'U': dout(10,"UNPROTO"); ! parseUnProto(dat); ! Rcgs.tdata.fireTelemetryDataChanged(); break; default: *************** *** 176,192 **** - // - // Changed by MikeP - // - public static void parseUnProto(byte[] dat){ - // public static void parseUnProto(byte) throws IOException{ // parses a unproto Frame Datakind 'U' int pos = 0; ! while (pos < dat.length){ ! ! rcpilot.rcgs.InstrumentPanel instruments = rcpilot.rcgs.Rcgs.panels.getInstrumentsPanel(); ! switch (dat[pos]) { --- 176,185 ---- // parses a unproto Frame Datakind 'U' + public static void parseUnProto(byte[] dat){ int pos = 0; ! while (pos < dat.length){ switch (dat[pos]) { *************** *** 198,202 **** pitch |= (0xFF & dat[pos+1]); Rcgs.tdata.setPitch(pitch); - System.out.println ("Agwpe-Pitch: " + pitch); pos = pos + 3; break; --- 191,194 ---- *************** *** 208,213 **** roll <<= 8; roll |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setRoll(roll); ! System.out.println ("Agwpe-Roll: " + roll); pos = pos + 3; break; --- 200,204 ---- roll <<= 8; roll |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setRoll(roll); pos = pos + 3; break; *************** *** 219,224 **** speed <<= 8; speed |= (0xFF & dat[pos+1]); ! rcpilot.rcgs.Rcgs.tdata.setSpeed(speed);; ! instruments.getIas().setRotation((speed *2)); pos = pos + 3; break; --- 210,214 ---- speed <<= 8; speed |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setSpeed(speed);; pos = pos + 3; break; *************** *** 230,235 **** alt <<= 8; alt |= (0xFF & dat[pos+1]); ! rcpilot.rcgs.Rcgs.tdata.setAltitude(alt); ! instruments.getAltimeter().setRotation((int)(alt * .36)); pos = pos + 3; break; --- 220,224 ---- alt <<= 8; alt |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setAltitude(alt); pos = pos + 3; break; *************** *** 240,245 **** course <<= 8; course |= (0xFF & dat[pos+1]); ! rcpilot.rcgs.Rcgs.tdata.setCourse(course); ! instruments.getCompass().setRotation((int)-1*(course)); pos = pos + 3; break; --- 229,233 ---- course <<= 8; course |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setCourse(course); pos = pos + 3; break; *************** *** 250,255 **** rpm <<= 8; rpm |= (0xFF & dat[pos+1]); ! rcpilot.rcgs.Rcgs.tdata.setEngineRPM(rpm); ! instruments.getTachometer().setRotation((int)((rpm * .006) - 15)); pos = pos + 3; break; --- 238,242 ---- rpm <<= 8; rpm |= (0xFF & dat[pos+1]); ! Rcgs.tdata.setEngineRPM(rpm); pos = pos + 3; break; *************** *** 262,268 **** } } - // - // End Changed by MikeP - // --- 249,252 ---- |
|
From: <mjp...@us...> - 2004-03-08 22:38:26
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4432 Modified Files: RcgsJPanels.java Log Message: Added TelemetryDataChangedEvent support for Tracker Index: RcgsJPanels.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/RcgsJPanels.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RcgsJPanels.java 8 Mar 2004 20:28:36 -0000 1.4 --- RcgsJPanels.java 8 Mar 2004 22:13:50 -0000 1.5 *************** *** 76,80 **** GridBagConstraints c = new GridBagConstraints(); trackerPanel = new JPanel(new BorderLayout()); ! tracker_comp = new Tracker(); trackerPanel.add(tracker_comp, BorderLayout.CENTER); c.fill= GridBagConstraints.BOTH; --- 76,80 ---- GridBagConstraints c = new GridBagConstraints(); trackerPanel = new JPanel(new BorderLayout()); ! tracker_comp = new Tracker(Rcgs.tdata); trackerPanel.add(tracker_comp, BorderLayout.CENTER); c.fill= GridBagConstraints.BOTH; |
|
From: <mjp...@us...> - 2004-03-08 22:37:38
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4258 Modified Files: InstrumentPanel.java Log Message: Remove direct access to IAS.rot. Index: InstrumentPanel.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/InstrumentPanel.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** InstrumentPanel.java 8 Mar 2004 20:27:42 -0000 1.5 --- InstrumentPanel.java 8 Mar 2004 22:13:02 -0000 1.6 *************** *** 202,206 **** // Do calculation for IAS Rcgs.tdata.setSpeed(alt); - IAS.rot = (int)(alt*2); // Do calculation for Tachometer --- 202,205 ---- |
|
From: <mjp...@us...> - 2004-03-08 22:36:41
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3887 Modified Files: Tracker.java Log Message: Added TelemetryDataChangedEvent support to get the plan to move. Index: Tracker.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/Tracker.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Tracker.java 7 Mar 2004 12:06:03 -0000 1.5 --- Tracker.java 8 Mar 2004 22:12:02 -0000 1.6 *************** *** 36,40 **** ! public class Tracker extends JComponent { final static Color white = Color.white; --- 36,40 ---- ! public class Tracker extends JComponent implements TelemetryDataChangedEventListener{ final static Color white = Color.white; *************** *** 46,50 **** * Create the Map Panel and get the last map. */ ! public Tracker() { this.setName("Tracker"); this.viewsize = UserPreferences.getTrackerZoom(); --- 46,54 ---- * Create the Map Panel and get the last map. */ ! public Tracker( TelemetryData tdata ) { ! ! TelemetryDataChangedEventListener l = this; ! tdata.addTelemetryDataChangedListener(l); ! this.setName("Tracker"); this.viewsize = UserPreferences.getTrackerZoom(); *************** *** 154,157 **** --- 158,167 ---- + public void telemetryDataChanged(TelemetryDataChangedEvent ev){ + this.repaint(); + } + + + // ********** // |
|
From: <mjp...@us...> - 2004-03-08 22:35:48
|
Update of /cvsroot/rcpilot/src/rcpilot/rcgs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3725 Modified Files: IAS.java Log Message: Removed setRotation Index: IAS.java =================================================================== RCS file: /cvsroot/rcpilot/src/rcpilot/rcgs/IAS.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** IAS.java 8 Mar 2004 17:36:16 -0000 1.4 --- IAS.java 8 Mar 2004 22:11:10 -0000 1.5 *************** *** 36,40 **** public class IAS extends JComponent implements TelemetryDataChangedEventListener { ! protected static int rot = 0; final static Color dkgrey = Color.DARK_GRAY; --- 36,40 ---- public class IAS extends JComponent implements TelemetryDataChangedEventListener { ! protected static short rot = 0; final static Color dkgrey = Color.DARK_GRAY; *************** *** 94,98 **** // limit it to 358 degrees or 179 knots ! rot = Math.min(rot,358); g2.rotate(Math.toRadians(rot), 75, 75); --- 94,98 ---- // limit it to 358 degrees or 179 knots ! rot = (short)Math.min(rot,358); g2.rotate(Math.toRadians(rot), 75, 75); *************** *** 109,119 **** public void telemetryDataChanged(TelemetryDataChangedEvent ev){ this.repaint(); } - - public void setRotation(int r){ - this.rot = r; - } } --- 109,117 ---- public void telemetryDataChanged(TelemetryDataChangedEvent ev){ + + this.rot = (short)(Rcgs.tdata.getSpeed()*2); this.repaint(); } } |
