Diff: coilgun.cpp

Revision:

11:49959d33916f

Parent:

10:7518047a0375

Child:

12:7cc6aeaa4bf8

--- a/coilgun.cpp	Tue Sep 02 15:22:41 2014 +0000
+++ b/coilgun.cpp	Fri Nov 21 18:09:22 2014 +0000
@@ -8,7 +8,7 @@
     kickPin = 0;
     chipPin = 0;
     chargePin = 0;
-    //donePin.fall(this, &Coilgun::chargeEnd);
+    donePin.fall(this, &Coilgun::chargeEnd);
     
     currentKickLength = 0;
     currentKickDelay = 0;
@@ -119,7 +119,7 @@
 void Coilgun::discharge() {
     changeState(discharging);
     dischargeTimeout.attach(this, &Coilgun::dischargeEnd, 10.0); // End discharging after 10 seconds
-    discharger.attach_us(this, &Coilgun::dischargeKick, 10000); // calls short kick every 10ms
+    discharger.attach_us(this, &Coilgun::dischargeKick, 50000); // calls short kick every 50ms
     isCharged = false;
 }
 
@@ -129,7 +129,7 @@
 }
 
 void Coilgun::dischargeKick(void) {
-    kick(100, 0, 0, 0, false);
+    kick(300, 0, 0, 0, false);
 }
 
 void Coilgun::changeState(State new_state){