brendanhaines/RasPi
1
0
Fork 0
mirror of https://github.com/brendanhaines/RasPi.git synced 2025-08-01 13:22:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

Mostly working version. No yaw control yet. Changes output format while setting up oneThatWorks

Browse Source
This commit is contained in:
Brendan Haines
2015-03-18 22:33:59 -06:00
parent 46595bbaac
commit 4a4d2f63aa
5 changed files with 103 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
GroundStation/v2/DisplayController.java
View File

@@ -7,9 +7,6 @@ class DisplayController extends JPanel implements ActionListener {
private MessageContent source = new MessageContent();
private Font normalFont = new Font( "Normal", Font.BOLD, 15 );
private int chanMax = 900;
private int chanMin = 100;
public DisplayController() {
setBackground( Color.DARK_GRAY );
setPreferredSize( new Dimension( 0, 100 ) );
@@ -23,9 +20,9 @@ class DisplayController extends JPanel implements ActionListener {
/**
*
*/
private int scaleChan( int chan, int range ) {
/*private int scaleChan( int chan, int range ) {
return (int)(range * ( ( (double)(chan - chanMin) / (chanMax - chanMin) ) - 0.5 ));
}
}*/
public void paintComponent( Graphics g ) {
super.paintComponent( g );
@@ -47,14 +44,14 @@ class DisplayController extends JPanel implements ActionListener {
g.setColor( Color.RED );
// left stick
g.fillOval(
scaleChan( source.controlValues[ 3 ], boxSide ) - circleRad + boxSide * 3/4,
scaleChan( source.controlValues[ 0 ], boxSide ) - circleRad + boxSide * 3/4,
source.controlValues[ 3 ] * boxSide / 1000 - circleRad + boxSide * 1/4,
source.controlValues[ 0 ] * boxSide / 1000 - circleRad + boxSide * 11/4,
circleDiam,
circleDiam );
// right stick
g.fillOval(
scaleChan( source.controlValues[ 1 ], boxSide ) - circleRad + boxSide * 9/4,
scaleChan( source.controlValues[ 2 ], boxSide ) - circleRad + boxSide * 3/4,
source.controlValues[ 1 ] * boxSide / 1000 - circleRad + boxSide * 7/4,
source.controlValues[ 2 ] * boxSide / 1000 - circleRad + boxSide * 11/4,
circleDiam,
circleDiam );

2
GroundStation/v2/GroundStation.java
View File

@@ -49,7 +49,7 @@ class GroundStation implements ActionListener {
mainWindow.getContentPane().add( tabbedPane );
controllerPanel = new DisplayController( receiveContent );
tabbedPane.add( controllerPanel, "Controller" );
//tabbedPane.add( controllerPanel, "Controller" );
receiveContent.addActionListener( controllerPanel );
motorTestPanel = new MotorTestPanel( sendContent );