Diff: coilgun.cpp

Revision:

1:aa39e3a9d06f

Parent:

0:2d5820be7f51

Child:

2:781ea1999ad3

--- a/coilgun.cpp	Mon Sep 09 17:07:52 2013 +0000
+++ b/coilgun.cpp	Mon Sep 09 18:25:23 2013 +0000
@@ -1,8 +1,8 @@
-#include "motor.h"
+#include "coilgun.h"
 
-CoilGun::CoilGun(PinName chargePin, PinName kickPin, PinName donePin)
-    : charge(chargePin), kick(kickPin), done(donePin) {
-    done.fall(this, &CoilGun.doneCallback);
+CoilGun::CoilGun(PinName chargePinName, PinName kickPinName, PinName donePin)
+    : chargePin(chargePinName), kickPin(kickPinName), done(donePin) {
+    //done.fall(this, &CoilGun.doneCallback);
 }
 
 void CoilGun::kick(int length) {
@@ -10,17 +10,17 @@
 }
 
 void CoilGun::setCharge(bool chargeState) {
-    if (setCharge) {
-        charge = 1;
+    if (chargeState) {
+        chargePin = 1;
     } else {
-        charge = 0;
+        chargePin = 0;
     }    
 }
 
 void CoilGun::discharge() {
-    charge = 0;
+    chargePin = 0;
 }
 
 void CoilGun::doneCallback(void) {
-    charge = 0;
+    chargePin = 0;
 }
\ No newline at end of file