Merge pull request #9 from akadamson/master

non-critical update
EvvGC · Oct 3, 2013 · c20be9b · c20be9b
2 parents b522458 + f4f43a0
commit c20be9b
Show file tree

Hide file tree

Showing 24 changed files with 30 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,6 @@
 # Object files
 *.o
 
-# Libraries
-*.lib
-*.a
-
 # system Directories
 /Debug
 /Release

diff --git a/Libraries/CMSIS/Lib/ARM/arm_cortexM0b_math.lib b/Libraries/CMSIS/Lib/ARM/arm_cortexM0b_math.lib
diff --git a/Libraries/CMSIS/Lib/ARM/arm_cortexM0l_math.lib b/Libraries/CMSIS/Lib/ARM/arm_cortexM0l_math.lib
diff --git a/Libraries/CMSIS/Lib/ARM/arm_cortexM3b_math.lib b/Libraries/CMSIS/Lib/ARM/arm_cortexM3b_math.lib
diff --git a/Libraries/CMSIS/Lib/ARM/arm_cortexM3l_math.lib b/Libraries/CMSIS/Lib/ARM/arm_cortexM3l_math.lib
diff --git a/Libraries/CMSIS/Lib/ARM/arm_cortexM4b_math.lib b/Libraries/CMSIS/Lib/ARM/arm_cortexM4b_math.lib
diff --git a/Libraries/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib b/Libraries/CMSIS/Lib/ARM/arm_cortexM4bf_math.lib
diff --git a/Libraries/CMSIS/Lib/ARM/arm_cortexM4l_math.lib b/Libraries/CMSIS/Lib/ARM/arm_cortexM4l_math.lib
diff --git a/Libraries/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib b/Libraries/CMSIS/Lib/ARM/arm_cortexM4lf_math.lib
diff --git a/Libraries/CMSIS/Lib/G++/libarm_cortexM0l_math.a b/Libraries/CMSIS/Lib/G++/libarm_cortexM0l_math.a
diff --git a/Libraries/CMSIS/Lib/G++/libarm_cortexM3l_math.a b/Libraries/CMSIS/Lib/G++/libarm_cortexM3l_math.a
diff --git a/Libraries/CMSIS/Lib/G++/libarm_cortexM4l_math.a b/Libraries/CMSIS/Lib/G++/libarm_cortexM4l_math.a
diff --git a/Libraries/CMSIS/Lib/G++/libarm_cortexM4lf_math.a b/Libraries/CMSIS/Lib/G++/libarm_cortexM4lf_math.a
diff --git a/Libraries/CMSIS/Lib/GCC/libarm_cortexM0l_math.a b/Libraries/CMSIS/Lib/GCC/libarm_cortexM0l_math.a
diff --git a/Libraries/CMSIS/Lib/GCC/libarm_cortexM3l_math.a b/Libraries/CMSIS/Lib/GCC/libarm_cortexM3l_math.a
diff --git a/Libraries/CMSIS/Lib/GCC/libarm_cortexM4l_math.a b/Libraries/CMSIS/Lib/GCC/libarm_cortexM4l_math.a
diff --git a/Libraries/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a b/Libraries/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a
diff --git a/built-versions/0.4/STM32Gimbal.hex b/built-versions/0.4/STM32Gimbal.hex
@@ -3495,7 +3495,7 @@
 :10DA480065202533642020564350436F6E6E65630E
 :10DA5800744D6F64652025640D0A00005665727365
 :10DA6800696F6E3A2025730D0A000000302E342E9F
-:10DA78003100000074657374207068617365206FED
+:10DA78003200000074657374207068617365206FEC
 :10DA880075747075742025352E31660D0A000000F6
 :10DA98000D0A636F6E66696720646174613A2000DD
 :10DAA80020253032582000004C6F6F703A202537FF
@@ -3551,9 +3551,9 @@
 :10DDC8005F372D6272616E63682072657669736968
 :10DDD8006F6E203230303038335D0D0A000000009D
 :10DDE8004576764743206669726D7761726520567D
-:10DDF80025732C206275696C6420646174652053F6
-:10DE0800657020323920323031332032313A32369F
-:10DE18003A3136200D0A000072756E6E696E672001
+:10DDF80025732C206275696C642064617465204FFA
+:10DE0800637420203320323031332031353A3038B2
+:10DE18003A3339200D0A000072756E6E696E6720FC
 :10DE28006F6E2065787465726E616C20485345206A
 :10DE3800636C6F636B2C20636C6F636B207261740F
 :10DE4800652069732025644D487A0D0A000000009A

diff --git a/built-versions/0.4/STM32Gimbal.zip b/built-versions/0.4/STM32Gimbal.zip
diff --git a/built-versions/GUI/0.4/application.windows32/lib/EvvGC_GUI_v0_4.jar b/built-versions/GUI/0.4/application.windows32/lib/EvvGC_GUI_v0_4.jar
diff --git a/built-versions/GUI/0.4/application.windows32/lib/core.jar b/built-versions/GUI/0.4/application.windows32/lib/core.jar
diff --git a/built-versions/GUI/0.4/application.windows32/lib/serial.jar b/built-versions/GUI/0.4/application.windows32/lib/serial.jar
diff --git a/built-versions/GUI/0.4/application.windows32/source/EvvGC_GUI_v0_4.java b/built-versions/GUI/0.4/application.windows32/source/EvvGC_GUI_v0_4.java
@@ -44,8 +44,10 @@ public class EvvGC_GUI_v0_4 extends PApplet {
 int yRPWR        = 150;
 int xYPWR        = 375;
 int yYPWR        = 200;
-int xRollCal     = 500;
+int xRollCal     = 480;
 int yRollCal     = 200;
+int xRollZero    = 540;
+int yRollZero    = 200;
 
 // Constants
 int Y_AXIS = 1;
@@ -64,6 +66,7 @@ public class EvvGC_GUI_v0_4 extends PApplet {
 Numberbox YawPWR;
 Numberbox RollCal;
 Button buttonREAD,buttonWRITE, buttonCONFon, buttonCONFoff, buttonP0, buttonP1, buttonP2, buttonRCOff, buttonRCOn, buttonYawRC, buttonYawAut;
+Button buttonZeroRoll;
 int m=10, i, commListMax;
 
 int green_ = color(0, 120, 170), gray_ = color(60, 60, 60); ///30 120 30
@@ -74,6 +77,7 @@ public class EvvGC_GUI_v0_4 extends PApplet {
 char RCcontrol = '0'; 
 char YawRCon = '0'; 
 String readStatus = "";
+String Version = "0.4.1";
 
 public controlP5.Controller hideLabel(controlP5.Controller c) {
   c.setLabel("");
@@ -90,7 +94,7 @@ public void setup()
 
   textSize(28);
   fill(0, 120, 170);//blue
-  text("EvvGC GUI",20,50);
+  text("EvvGC GUI",20,50); text(Version, 170,50);
 
 
   // Define colors
@@ -146,6 +150,7 @@ public void setup()
   /******************************Calibration cells*************************************************************/
   RollCal = (controlP5.Numberbox) hideLabel(controlP5.addNumberbox("RollCal",0,xRollCal,yRollCal,40,16));
   RollCal.setColorBackground(gray_);RollCal.setMin(-10);RollCal.setDirection(Controller.HORIZONTAL);RollCal.setDecimalPrecision(1);RollCal.setMultiplier(0.2f);RollCal.setMax(10);
+  buttonZeroRoll =      controlP5.addButton("ZERO",1,535,200,40,16); buttonZeroRoll.setColorBackground(gray_);
 
 
   /****************************Buttons*********************************************************************/
@@ -411,6 +416,12 @@ public void Yaw_Auto_Pan() {
   YawRCon = '0';
 }
 
+public void ZERO() {
+  RollCal.setValue(0.0f);
+  println (RollCal.value());
+  println (PApplet.parseInt (RollCal.value()*10+100));
+
+}
 
 
 

diff --git a/built-versions/GUI/0.4/application.windows32/source/EvvGC_GUI_v0_4.pde b/built-versions/GUI/0.4/application.windows32/source/EvvGC_GUI_v0_4.pde
@@ -24,8 +24,10 @@ int xRPWR        = 375;
 int yRPWR        = 150;
 int xYPWR        = 375;
 int yYPWR        = 200;
-int xRollCal     = 500;
+int xRollCal     = 480;
 int yRollCal     = 200;
+int xRollZero    = 540;
+int yRollZero    = 200;
 
 // Constants
 int Y_AXIS = 1;
@@ -44,6 +46,7 @@ Numberbox RollPWR;
 Numberbox YawPWR;
 Numberbox RollCal;
 Button buttonREAD,buttonWRITE, buttonCONFon, buttonCONFoff, buttonP0, buttonP1, buttonP2, buttonRCOff, buttonRCOn, buttonYawRC, buttonYawAut;
+Button buttonZeroRoll;
 int m=10, i, commListMax;
 
 color green_ = color(0, 120, 170), gray_ = color(60, 60, 60); ///30 120 30
@@ -54,6 +57,7 @@ boolean portopen = false;
 char RCcontrol = '0'; 
 char YawRCon = '0'; 
 String readStatus = "";
+String Version = "0.4.1";
 
 controlP5.Controller hideLabel(controlP5.Controller c) {
   c.setLabel("");
@@ -70,7 +74,7 @@ void setup()
 
   textSize(28);
   fill(0, 120, 170);//blue
-  text("EvvGC GUI",20,50);
+  text("EvvGC GUI",20,50); text(Version, 170,50);
 
 
   // Define colors
@@ -126,6 +130,7 @@ void setup()
   /******************************Calibration cells*************************************************************/
   RollCal = (controlP5.Numberbox) hideLabel(controlP5.addNumberbox("RollCal",0,xRollCal,yRollCal,40,16));
   RollCal.setColorBackground(gray_);RollCal.setMin(-10);RollCal.setDirection(Controller.HORIZONTAL);RollCal.setDecimalPrecision(1);RollCal.setMultiplier(0.2);RollCal.setMax(10);
+  buttonZeroRoll =      controlP5.addButton("ZERO",1,535,200,40,16); buttonZeroRoll.setColorBackground(gray_);
 
 
   /****************************Buttons*********************************************************************/
@@ -391,6 +396,12 @@ public void Yaw_Auto_Pan() {
   YawRCon = '0';
 }
 
+public void ZERO() {
+  RollCal.setValue(0.0);
+  println (RollCal.value());
+  println (int (RollCal.value()*10+100));
+
+}