[Jmri-commits] jmri/jmrix/loconet/locobuffer LocoBufferStatsFrame.java, 1.4, 1.5

[Bob J. <jac...@us...>]

Update of /cvsroot/jmri/jmri/jmrix/loconet/locobuffer
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv6526/src/jmri/jmrix/loconet/locobuffer

Modified Files:
	LocoBufferStatsFrame.java 
Log Message:
pr2 code

Index: LocoBufferStatsFrame.java
===================================================================
RCS file: /cvsroot/jmri/jmri/jmrix/loconet/locobuffer/LocoBufferStatsFrame.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LocoBufferStatsFrame.java	1 Jul 2006 16:43:50 -0000	1.4
--- LocoBufferStatsFrame.java	6 Jul 2006 21:21:29 -0000	1.5
***************
*** 5,8 ****
--- 5,10 ----
  import jmri.jmrix.loconet.*;
  
+ import jmri.util.StringUtil;
+ 
  import java.awt.*;
  import java.awt.event.*;
***************
*** 24,43 ****
  public class LocoBufferStatsFrame extends JFrame implements LocoNetListener {
  
      public LocoBufferStatsFrame() {
!         super("LocoBuffer Stats Monitor");
          getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
  
          // add GUI items
!         JPanel panel = new JPanel();
!         panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
!         panel.add(new JLabel(" Version:"));
!         panel.add(version);
!         panel.add(new JLabel(" Breaks:"));
!         panel.add(breaks);
!         panel.add(new JLabel(" Errors:"));
!         panel.add(errors);
!         getContentPane().add(panel);
  
!         panel = new JPanel();
          panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
          getContentPane().add(updateButton);
--- 26,78 ----
  public class LocoBufferStatsFrame extends JFrame implements LocoNetListener {
  
+     JPanel lb2Panel;
+     JPanel rawPanel;
+     JPanel pr2Panel;
+     
      public LocoBufferStatsFrame() {
!         super("LocoNet Stats Monitor");
          getContentPane().setLayout(new BoxLayout(getContentPane(), BoxLayout.Y_AXIS));
  
          // add GUI items
!         rawPanel = new JPanel();
!         rawPanel.setLayout(new BoxLayout(rawPanel, BoxLayout.X_AXIS));
!         rawPanel.add(new JLabel(" Raw data:"));
!         rawPanel.add(r1);
!         rawPanel.add(r2);
!         rawPanel.add(r3);
!         rawPanel.add(r4);
!         rawPanel.add(r5);
!         rawPanel.add(r6);
!         rawPanel.add(r7);
!         rawPanel.add(r8);
!         
!         lb2Panel = new JPanel();
!         lb2Panel.setLayout(new BoxLayout(lb2Panel, BoxLayout.X_AXIS));
!         lb2Panel.add(new JLabel(" Version:"));
!         lb2Panel.add(version);
!         lb2Panel.add(new JLabel(" Breaks:"));
!         lb2Panel.add(breaks);
!         lb2Panel.add(new JLabel(" Errors:"));
!         lb2Panel.add(errors);
  
!         pr2Panel = new JPanel();
!         pr2Panel.setLayout(new BoxLayout(pr2Panel, BoxLayout.X_AXIS));
!         pr2Panel.add(new JLabel(" Serial number:"));
!         pr2Panel.add(serial);
!         pr2Panel.add(new JLabel(" Status:"));
!         pr2Panel.add(status);
!         pr2Panel.add(new JLabel(" Current:"));
!         pr2Panel.add(current);
!         pr2Panel.add(new JLabel(" Hardware Version:"));
!         pr2Panel.add(hardware);
!         pr2Panel.add(new JLabel(" Software Version:"));
!         pr2Panel.add(software);
!         
!        
!         getContentPane().add(rawPanel);
!         getContentPane().add(lb2Panel);
!         getContentPane().add(pr2Panel);
! 
!         JPanel panel = new JPanel();
          panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
          getContentPane().add(updateButton);
***************
*** 70,87 ****
  
      public void message(LocoNetMessage msg){
!         if( updatePending &&
!               ( msg.getOpCode() == LnConstants.OPC_PEER_XFER ) &&
!               ( msg.getElement( 1 ) == 0x10 ) &&
!               ( msg.getElement( 2 ) == 0x50 ) &&
!               ( msg.getElement( 3 ) == 0x50 ) &&
!               ( msg.getElement( 4 ) == 0x01 ) &&
!               ( ( msg.getElement( 5 ) & 0xF0 ) == 0x0 ) &&
!               ( ( msg.getElement( 10 ) & 0xF0 ) == 0x0 ) )
!             { // LocoBuffer form
!             int[] data = msg.getPeerXfrData() ;
!             version.setText( Integer.toHexString( ( data[0] << 8 ) + data[4] ) );
!             breaks.setText( Integer.toString( (data[5] << 16) + (data[6] << 8) + data[7] ) );
!             errors.setText( Integer.toString( (data[1] << 16) + (data[2] << 8) + data[3] ) );
!             updatePending = false ;
          } else if (updatePending &&
                ( msg.getOpCode() == LnConstants.OPC_PEER_XFER ) &&
--- 105,125 ----
  
      public void message(LocoNetMessage msg){
!       if( updatePending &&
!           ( msg.getOpCode() == LnConstants.OPC_PEER_XFER ) &&
!           ( msg.getElement( 1 ) == 0x10 ) &&
!           ( msg.getElement( 2 ) == 0x50 ) &&
!           ( msg.getElement( 3 ) == 0x50 ) &&
!           ( msg.getElement( 4 ) == 0x01 ) &&
!           ( ( msg.getElement( 5 ) & 0xF0 ) == 0x0 ) &&
!           ( ( msg.getElement( 10 ) & 0xF0 ) == 0x0 ) ) {
!         // LocoBuffer II form
!         int[] data = msg.getPeerXfrData() ;
!         
!         version.setText( StringUtil.twoHexFromInt( data[0]) + StringUtil.twoHexFromInt(data[4] ) );
!         breaks.setText( Integer.toString( (data[5] << 16) + (data[6] << 8) + data[7] ) );
!         errors.setText( Integer.toString( (data[1] << 16) + (data[2] << 8) + data[3] ) );
!         
!         updatePending = false ;
! 
          } else if (updatePending &&
                ( msg.getOpCode() == LnConstants.OPC_PEER_XFER ) &&
***************
*** 91,99 ****
                ( msg.getElement( 4 ) == 0x01 ) ) 
              {  // PR2 form
!             int[] data = msg.getPeerXfrData() ;
!             version.setText( Integer.toHexString( ( data[0] << 8 ) + data[4] ) );
!             breaks.setText( Integer.toString( (data[5] << 16) + (data[6] << 8) + data[7] ) );
!             errors.setText( Integer.toString( (data[1] << 16) + (data[2] << 8) + data[3] ) );
!             updatePending = false ;
          }
      }
--- 129,147 ----
                ( msg.getElement( 4 ) == 0x01 ) ) 
              {  // PR2 form
!             serial.setText(Integer.toString(data[1]*256+data[0]));
!             status.setText(StringUtil.twoHexFromInt(data[2]));
!             current.setText(Integer.toString( data[3]) );
!             hardware.setText(Integer.toString( data[4]) );
!             software.setText(Integer.toString( data[5]) );
! 
!         } else if (updatePending) {
!             r1.setText(StringUtil.twoHexFromInt(data[0]));
!             r2.setText(StringUtil.twoHexFromInt(data[1]));
!             r3.setText(StringUtil.twoHexFromInt(data[2]));
!             r4.setText(StringUtil.twoHexFromInt(data[3]));
!             r5.setText(StringUtil.twoHexFromInt(data[4]));
!             r6.setText(StringUtil.twoHexFromInt(data[5]));
!             r7.setText(StringUtil.twoHexFromInt(data[6]));
!             r8.setText(StringUtil.twoHexFromInt(data[7]));
          }
      }
***************
*** 123,126 ****
--- 171,189 ----
      }
  
+     JTextField r1 = new JTextField(3);
+     JTextField r2 = new JTextField(3);
+     JTextField r3 = new JTextField(3);
+     JTextField r4 = new JTextField(3);
+     JTextField r5 = new JTextField(3);
+     JTextField r6 = new JTextField(3);
+     JTextField r7 = new JTextField(3);
+     JTextField r8 = new JTextField(3);
+     
+     JTextField serial = new JTextField(6);
+     JTextField status = new JTextField(5);
+     JTextField current = new JTextField(4);
+     JTextField hardware = new JTextField(2);
+     JTextField software = new JTextField(3);
+ 
      JTextField version = new JTextField("  XXXX");
      public JTextField breaks = new JTextField("     0");
***************
*** 128,131 ****
--- 191,195 ----
      boolean updatePending = false ;
  
+     
      JButton updateButton = new JButton("Update");