Skip to content

Commit

Permalink
Merge pull request #20 from akadamson/master
Browse files Browse the repository at this point in the history 
0.4.4 release
  • Loading branch information
@akadamson
akadamson committed Nov 15, 2013
2 parents dd1d151 + 9f75631 commit ab5e568
Show file tree
Hide file tree
Showing 21 changed files with 4,584 additions and 3,829 deletions.
17 changes: 3 additions & 14 deletions GUI/EvvGC_GUI_v0_4/EvvGC_GUI_v0_4.pde
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ boolean portopen = false;
char RCcontrol = '0';
char YawRCon = '0';
String readStatus = "";
String Version = "0.4.1.1";
String Version = "0.4.1.2";

controlP5.Controller hideLabel(controlP5.Controller c) {
c.setLabel("");
Expand Down Expand Up @@ -169,14 +169,11 @@ void draw() {
fill(75); strokeWeight(0);stroke(80);
rect(0, 240, 600, 100, 0);


fill(255);

// Background
// setGradient(0, 0, width, 80, c2, c1, Y_AXIS);



textSize(12);
text("Pitch P:",35,112);
textSize(12);
Expand All @@ -192,7 +189,6 @@ void draw() {
textSize(12);
text("Yaw D:",158,211);


textSize(12);
text("Pitch Power: %",301,112);
textSize(12);
Expand Down Expand Up @@ -220,9 +216,6 @@ void draw() {
textSize(12);
text(readStatus,110,263);




if(PitchP.value()==0)PitchP.setValue(0.01);
if(RollP.value()==0)RollP.setValue(0.01);
if(YawP.value()==0)YawP.setValue(0.01);
Expand Down Expand Up @@ -312,7 +305,6 @@ readStatus="Read OK";

public void CONFIGon() {


myPort.write("i"); //enter config command
buttonWRITE.setColorBackground(green_);
buttonREAD.setColorBackground(green_);
Expand All @@ -325,7 +317,6 @@ public void CONFIGon() {

public void CONFIGoff() {


myPort.write("j"); //exit config command
buttonWRITE.setColorBackground(gray_);
buttonREAD.setColorBackground(gray_);
Expand Down Expand Up @@ -377,7 +368,6 @@ public void RC_OFF() {
RCcontrol = '0';
}


public void RC_ON() {
buttonRCOff.setColorBackground(gray_);
buttonRCOn.setColorBackground(green_);
Expand All @@ -390,7 +380,6 @@ public void Yaw_RC_Pan() {
YawRCon = '1';
}


public void Yaw_Auto_Pan() {
buttonYawRC.setColorBackground(gray_);
buttonYawAut.setColorBackground(green_);
Expand All @@ -399,8 +388,8 @@ public void Yaw_Auto_Pan() {

public void ZERO() {
RollCal.setValue(0.0);
println (RollCal.value());
println (int (RollCal.value()*10+100));
//println (RollCal.value());
//println (int (RollCal.value()*10+100));

}

Expand Down
Binary file modified GUI/EvvGC_GUI_v0_4/application.windows32/lib/EvvGC_GUI_v0_4.jar
View file
Binary file not shown.
17 changes: 3 additions & 14 deletions GUI/EvvGC_GUI_v0_4/application.windows32/source/EvvGC_GUI_v0_4.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public class EvvGC_GUI_v0_4 extends PApplet {
char RCcontrol = '0';
char YawRCon = '0';
String readStatus = "";
String Version = "0.4.1.1";
String Version = "0.4.1.2";

public controlP5.Controller hideLabel(controlP5.Controller c) {
c.setLabel("");
Expand Down Expand Up @@ -189,14 +189,11 @@ public void draw() {
fill(75); strokeWeight(0);stroke(80);
rect(0, 240, 600, 100, 0);


fill(255);

// Background
// setGradient(0, 0, width, 80, c2, c1, Y_AXIS);



textSize(12);
text("Pitch P:",35,112);
textSize(12);
Expand All @@ -212,7 +209,6 @@ public void draw() {
textSize(12);
text("Yaw D:",158,211);


textSize(12);
text("Pitch Power: %",301,112);
textSize(12);
Expand Down Expand Up @@ -240,9 +236,6 @@ public void draw() {
textSize(12);
text(readStatus,110,263);




if(PitchP.value()==0)PitchP.setValue(0.01f);
if(RollP.value()==0)RollP.setValue(0.01f);
if(YawP.value()==0)YawP.setValue(0.01f);
Expand Down Expand Up @@ -332,7 +325,6 @@ public void READ() {

public void CONFIGon() {


myPort.write("i"); //enter config command
buttonWRITE.setColorBackground(green_);
buttonREAD.setColorBackground(green_);
Expand All @@ -345,7 +337,6 @@ public void CONFIGon() {

public void CONFIGoff() {


myPort.write("j"); //exit config command
buttonWRITE.setColorBackground(gray_);
buttonREAD.setColorBackground(gray_);
Expand Down Expand Up @@ -397,7 +388,6 @@ public void RC_OFF() {
RCcontrol = '0';
}


public void RC_ON() {
buttonRCOff.setColorBackground(gray_);
buttonRCOn.setColorBackground(green_);
Expand All @@ -410,7 +400,6 @@ public void Yaw_RC_Pan() {
YawRCon = '1';
}


public void Yaw_Auto_Pan() {
buttonYawRC.setColorBackground(gray_);
buttonYawAut.setColorBackground(green_);
Expand All @@ -419,8 +408,8 @@ public void Yaw_Auto_Pan() {

public void ZERO() {
RollCal.setValue(0.0f);
println (RollCal.value());
println (PApplet.parseInt (RollCal.value()*10+100));
//println (RollCal.value());
//println (int (RollCal.value()*10+100));

}

Expand Down
17 changes: 3 additions & 14 deletions GUI/EvvGC_GUI_v0_4/application.windows32/source/EvvGC_GUI_v0_4.pde
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ boolean portopen = false;
char RCcontrol = '0';
char YawRCon = '0';
String readStatus = "";
String Version = "0.4.1.1";
String Version = "0.4.1.2";

controlP5.Controller hideLabel(controlP5.Controller c) {
c.setLabel("");
Expand Down Expand Up @@ -169,14 +169,11 @@ void draw() {
fill(75); strokeWeight(0);stroke(80);
rect(0, 240, 600, 100, 0);


fill(255);

// Background
// setGradient(0, 0, width, 80, c2, c1, Y_AXIS);



textSize(12);
text("Pitch P:",35,112);
textSize(12);
Expand All @@ -192,7 +189,6 @@ void draw() {
textSize(12);
text("Yaw D:",158,211);


textSize(12);
text("Pitch Power: %",301,112);
textSize(12);
Expand Down Expand Up @@ -220,9 +216,6 @@ void draw() {
textSize(12);
text(readStatus,110,263);




if(PitchP.value()==0)PitchP.setValue(0.01);
if(RollP.value()==0)RollP.setValue(0.01);
if(YawP.value()==0)YawP.setValue(0.01);
Expand Down Expand Up @@ -312,7 +305,6 @@ readStatus="Read OK";

public void CONFIGon() {


myPort.write("i"); //enter config command
buttonWRITE.setColorBackground(green_);
buttonREAD.setColorBackground(green_);
Expand All @@ -325,7 +317,6 @@ public void CONFIGon() {

public void CONFIGoff() {


myPort.write("j"); //exit config command
buttonWRITE.setColorBackground(gray_);
buttonREAD.setColorBackground(gray_);
Expand Down Expand Up @@ -377,7 +368,6 @@ public void RC_OFF() {
RCcontrol = '0';
}


public void RC_ON() {
buttonRCOff.setColorBackground(gray_);
buttonRCOn.setColorBackground(green_);
Expand All @@ -390,7 +380,6 @@ public void Yaw_RC_Pan() {
YawRCon = '1';
}


public void Yaw_Auto_Pan() {
buttonYawRC.setColorBackground(gray_);
buttonYawAut.setColorBackground(green_);
Expand All @@ -399,8 +388,8 @@ public void Yaw_Auto_Pan() {

public void ZERO() {
RollCal.setValue(0.0);
println (RollCal.value());
println (int (RollCal.value()*10+100));
//println (RollCal.value());
//println (int (RollCal.value()*10+100));

}

Expand Down
23 changes: 20 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Port from initial Keil source to Eclipse of firmware for EvvGC 3/2axis Brushless Gimbal Controller

## Master branch, firmware v0.4 requires the use of GUI 0.4 #
## Master branch, firmware v0.4 requires the use of GUI 0.4 ##
See GUI directory for latest version

#### GUI instructions ####
Expand All @@ -26,13 +26,30 @@ have to be changed to support this version and you need to accomplish the follow
- disconnect your usb/serial adapter from UART4
- connect motors and power up, and use as you wish


## Setting Up Windows Build Environment ##

You may setup your development environment using Cygwin (terminal emulator for windows) by follow the
You may setup your development environment using Cygwin (terminal emulator for windows) by follow the
tutorial Documentation/devEnvSetupEclipse.md

#### OR ####

You may setup your development environment in a more simple manner, not needing the full Cygwin by
following the tutorial Documentation/devEnvSetupNoCygwin.md

Original work Copyright (c) 2012 [Evaldis - RCG user name]
Modified work Copyright 2012 Alan K. Adamson

This file is part of EvvGC.

EvvGC 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 3 of the License, or
(at your option) any later version.

EvvGC 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 EvvGC. If not, see <http://www.gnu.org/licenses/>.
Binary file modified built-versions/0.4/STM32Gimbal.USB.bin
View file
Binary file not shown.
Binary file modified built-versions/0.4/STM32Gimbal.bin
View file
Binary file not shown.
Loading

0 comments on commit ab5e568

Please # to comment.